Diff of /trunk/src/josm_presets.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 53 by harbaum, Fri Feb 6 09:00:44 2009 UTC revision 112 by harbaum, Fri Mar 6 13:41:08 2009 UTC
# Line 26  Line 26 
26  #error "Tree not enabled in libxml"  #error "Tree not enabled in libxml"
27  #endif  #endif
28    
29    #ifdef ENABLE_BROWSER_INTERFACE
30  #ifndef USE_HILDON  #ifndef USE_HILDON
31  #include <libgnome/gnome-url.h>  #include <libgnome/gnome-url.h>
32  #else  #else
# Line 50  static void on_info(GtkWidget *widget, w Line 51  static void on_info(GtkWidget *widget, w
51                               DBUS_TYPE_BOOLEAN, FALSE, DBUS_TYPE_INVALID);                               DBUS_TYPE_BOOLEAN, FALSE, DBUS_TYPE_INVALID);
52  #endif  #endif
53  }  }
54    #endif
55    
56  /* --------------------- presets.xml parsing ----------------------- */  /* --------------------- presets.xml parsing ----------------------- */
57    
# Line 440  static tag_t *presets_item_dialog(appdat Line 442  static tag_t *presets_item_dialog(appdat
442    GtkWidget *dialog = NULL;    GtkWidget *dialog = NULL;
443    gboolean ok = FALSE;    gboolean ok = FALSE;
444    tag_t *tag = NULL, **ctag = &tag;    tag_t *tag = NULL, **ctag = &tag;
445    #ifdef ENABLE_BROWSER_INTERFACE
446    www_context_t *www_context = NULL;    www_context_t *www_context = NULL;
447    #endif
448    
449    printf("dialog for item %s\n", item->name);    printf("dialog for item %s\n", item->name);
450    
# Line 471  static tag_t *presets_item_dialog(appdat Line 475  static tag_t *presets_item_dialog(appdat
475          GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,          GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
476          NULL);          NULL);
477    
478    #ifdef ENABLE_BROWSER_INTERFACE
479      /* if a web link has been provided for this item install */      /* if a web link has been provided for this item install */
480      /* a button for this */      /* a button for this */
481      if(item->link) {      if(item->link) {
# Line 483  static tag_t *presets_item_dialog(appdat Line 488  static tag_t *presets_item_dialog(appdat
488        gtk_signal_connect(GTK_OBJECT(button), "clicked",        gtk_signal_connect(GTK_OBJECT(button), "clicked",
489                           GTK_SIGNAL_FUNC(on_info), (gpointer)www_context);                           GTK_SIGNAL_FUNC(on_info), (gpointer)www_context);
490      }      }
491    #endif
492    
493      /* special handling for the first label/separators */      /* special handling for the first label/separators */
494      guint widget_skip = 0;  // number of initial widgets to skip      guint widget_skip = 0;  // number of initial widgets to skip
# Line 671  static tag_t *presets_item_dialog(appdat Line 677  static tag_t *presets_item_dialog(appdat
677    if(interactive_widget_cnt)    if(interactive_widget_cnt)
678      gtk_widget_destroy(dialog);      gtk_widget_destroy(dialog);
679    
680    #ifdef ENABLE_BROWSER_INTERFACE
681    if(www_context)    if(www_context)
682      g_free(www_context);      g_free(www_context);
683    #endif
684    
685    return tag;    return tag;
686  }  }
Legend:
Removed from v.53  
changed lines
  Added in v.112