Diff of /trunk/src/main.c

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

revision 121 by harbaum, Sat Sep 19 19:19:42 2009 UTC revision 122 by harbaum, Mon Sep 21 13:15:25 2009 UTC
# Line 346  static gboolean cachelist_update(gpointe Line 346  static gboolean cachelist_update(gpointe
346    
347    if(appdata->cachelist_update)    if(appdata->cachelist_update)
348      cachelist_redraw(appdata);      cachelist_redraw(appdata);
349    
350  #endif  #endif
351    
352    return TRUE;    return TRUE;
# Line 1552  cb_menu_export_log(GtkWidget *widget, gp Line 1553  cb_menu_export_log(GtkWidget *widget, gp
1553    notes_log_export(appdata);    notes_log_export(appdata);
1554  }  }
1555    
1556  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1557  static void  static void
1558  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1559    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
# Line 1671  static void submenu_cleanup(GtkWidget *m Line 1672  static void submenu_cleanup(GtkWidget *m
1672  }  }
1673    
1674  static const menu_entry_t submenu_export_entries[] = {  static const menu_entry_t submenu_export_entries[] = {
1675    #ifdef ENABLE_MAEMO_MAPPER
1676    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1677      G_CALLBACK(cb_menu_export_mmpoi)  },      G_CALLBACK(cb_menu_export_mmpoi)  },
1678    #endif
1679    { "Export Field Notes",      "Save a Garmin Field Notes file",    { "Export Field Notes",      "Save a Garmin Field Notes file",
1680      G_CALLBACK(cb_menu_export_log)    },      G_CALLBACK(cb_menu_export_log)    },
1681    { "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 1823  void menu_create(appdata_t *appdata) {
1823    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1824    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1825    
1826  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1827    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1828    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1829    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 2284  int main(int argc, char *argv[]) { Line 2287  int main(int argc, char *argv[]) {
2287      fprintf(stderr, "error initiating osso context\n");      fprintf(stderr, "error initiating osso context\n");
2288    }    }
2289    
2290    #ifdef ENABLE_MAEMO_MAPPER
2291    dbus_register(&appdata);    dbus_register(&appdata);
2292  #endif  #endif
2293    #endif
2294    
2295    icons_init();    icons_init();
2296    
Legend:
Removed from v.121  
changed lines
  Added in v.122