Diff of /trunk/src/main.c

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

revision 120 by harbaum, Sat Sep 19 19:19:42 2009 UTC revision 123 by harbaum, Wed Sep 23 11:23:45 2009 UTC
# Line 95  void errorf(const char *fmt, ...) { Line 95  void errorf(const char *fmt, ...) {
95    GtkWidget *dialog = gtk_message_dialog_new(    GtkWidget *dialog = gtk_message_dialog_new(
96                             GTK_WINDOW(NULL),                             GTK_WINDOW(NULL),
97                             GTK_DIALOG_DESTROY_WITH_PARENT,                             GTK_DIALOG_DESTROY_WITH_PARENT,
98                             GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,  #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
99                             buf);                             GTK_MESSAGE_ERROR,
100    #else
101                               GTK_MESSAGE_OTHER,
102    #endif
103                               GTK_BUTTONS_CLOSE, buf);
104    
105    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));
106    
# Line 346  static gboolean cachelist_update(gpointe Line 350  static gboolean cachelist_update(gpointe
350    
351    if(appdata->cachelist_update)    if(appdata->cachelist_update)
352      cachelist_redraw(appdata);      cachelist_redraw(appdata);
353    
354  #endif  #endif
355    
356    return TRUE;    return TRUE;
# Line 1552  cb_menu_export_log(GtkWidget *widget, gp Line 1557  cb_menu_export_log(GtkWidget *widget, gp
1557    notes_log_export(appdata);    notes_log_export(appdata);
1558  }  }
1559    
1560  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1561  static void  static void
1562  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1563    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
# Line 1671  static void submenu_cleanup(GtkWidget *m Line 1676  static void submenu_cleanup(GtkWidget *m
1676  }  }
1677    
1678  static const menu_entry_t submenu_export_entries[] = {  static const menu_entry_t submenu_export_entries[] = {
1679    #ifdef ENABLE_MAEMO_MAPPER
1680    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1681      G_CALLBACK(cb_menu_export_mmpoi)  },      G_CALLBACK(cb_menu_export_mmpoi)  },
1682    #endif
1683    { "Export Field Notes",      "Save a Garmin Field Notes file",    { "Export Field Notes",      "Save a Garmin Field Notes file",
1684      G_CALLBACK(cb_menu_export_log)    },      G_CALLBACK(cb_menu_export_log)    },
1685    { "Export Garmin GPX",       "Save modified waypoints in GPX file",    { "Export Garmin GPX",       "Save modified waypoints in GPX file",
# Line 1820  void menu_create(appdata_t *appdata) { Line 1827  void menu_create(appdata_t *appdata) {
1827    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1828    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1829    
1830  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1831    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1832    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1833    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 2284  int main(int argc, char *argv[]) { Line 2291  int main(int argc, char *argv[]) {
2291      fprintf(stderr, "error initiating osso context\n");      fprintf(stderr, "error initiating osso context\n");
2292    }    }
2293    
2294    #ifdef ENABLE_MAEMO_MAPPER
2295    dbus_register(&appdata);    dbus_register(&appdata);
2296  #endif  #endif
2297    #endif
2298    
2299    icons_init();    icons_init();
2300    
Legend:
Removed from v.120  
changed lines
  Added in v.123