Diff of /trunk/src/main.c

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

revision 20 by harbaum, Sat Jul 4 19:42:28 2009 UTC revision 63 by harbaum, Wed Aug 19 12:35:25 2009 UTC
# Line 202  void cachelist_view_onRowActivated(GtkTr Line 202  void cachelist_view_onRowActivated(GtkTr
202    GtkTreeIter   iter;    GtkTreeIter   iter;
203    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
204    
205    #ifdef USE_MAEMO
206      /* check if a cache is already selected and ignore click if yes */
207      /* (was probably a double click) */
208      if(appdata->cur_cache) return;
209    #endif
210    
211    if(gtk_tree_model_get_iter(model, &iter, path)) {    if(gtk_tree_model_get_iter(model, &iter, path)) {
212      cache_t *cache;      cache_t *cache;
213      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);
# Line 587  void cachelist_dialog(appdata_t *appdata Line 593  void cachelist_dialog(appdata_t *appdata
593    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
594    
595    appdata->cur_gpx = gpx;    appdata->cur_gpx = gpx;
596    char *title = g_strdup_printf("GPXView - %s", gpx->name);    char *title = g_strdup_printf("%s - GPXView", gpx->name);
597    gtk_window_set_title(GTK_WINDOW(window), title);    gtk_window_set_title(GTK_WINDOW(window), title);
598    g_free(title);    g_free(title);
599    
# Line 713  static void gpxlist_view_onRowActivated( Line 719  static void gpxlist_view_onRowActivated(
719    GtkTreeIter   iter;    GtkTreeIter   iter;
720    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
721    
722    #ifdef USE_MAEMO
723      /* check if a cache is already selected and ignore click if yes */
724      /* (was probably a double click) */
725      if(appdata->cur_gpx) return;
726    #endif
727    
728    if (gtk_tree_model_get_iter(model, &iter, path)) {    if (gtk_tree_model_get_iter(model, &iter, path)) {
729      gpx_t *gpx;      gpx_t *gpx;
730      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);
# Line 1017  static void gpxlist_add(appdata_t *appda Line 1029  static void gpxlist_add(appdata_t *appda
1029    
1030  /******************** begin of menu *********************/  /******************** begin of menu *********************/
1031    
1032    typedef struct {
1033      appdata_t *appdata;
1034      GtkWidget *dialog;
1035    } about_context_t;
1036    
1037    #ifdef ENABLE_BROWSER_INTERFACE
1038    void on_paypal_button_clicked(GtkButton *button, about_context_t *context) {
1039      gtk_dialog_response(GTK_DIALOG(context->dialog), GTK_RESPONSE_ACCEPT);
1040      browser_url(context->appdata,
1041                  "https://www.paypal.com/cgi-bin/webscr"
1042                  "?cmd=_s-xclick&hosted_button_id=7400558");
1043    }
1044    #endif
1045    
1046  static void  static void
1047  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1048    GtkAboutDialog *about = GTK_ABOUT_DIALOG(gtk_about_dialog_new());    about_context_t context;
1049    
1050    gtk_about_dialog_set_name(about, "GPXView");    context.appdata = (appdata_t *)data;
   gtk_about_dialog_set_version(about, VERSION);  
1051    
1052  #ifdef ENABLE_LIBLOCATION  #ifdef ENABLE_LIBLOCATION
1053    char *uses = "uses liblocation";    char *uses = "uses liblocation";
# Line 1032  cb_menu_about(GtkWidget *window, gpointe Line 1057  cb_menu_about(GtkWidget *window, gpointe
1057    char *uses = "uses gpsd";    char *uses = "uses gpsd";
1058  #endif  #endif
1059    
1060    char *str = g_strdup_printf("%s\n\n(%s)",    const gchar *authors[] = {
1061                        _("GPXView (c) 2008-2009 by\n"      "Till Harbaum <till@harbaum.org>",
1062                          "Till Harbaum <till@harbaum.org>\n"      "John Stowers <john.stowers@gmail.com>",
1063                          "Mailing list: gpxview-users@garage.maemo.org"),      NULL };
1064                        _(uses)  
1065                        );    context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,
1066                            "name", "GPXView",
1067    gtk_about_dialog_set_copyright(about, str);                          "version", VERSION,
1068    g_free(str);                          "copyright", _("Copyright 2008-2009"),
1069                            "authors", authors,
1070    gtk_about_dialog_set_website(about,                          "website", _("http://www.harbaum.org/till/maemo"),
1071         _("http://www.harbaum.org/till/maemo"));                          "comments", _(uses),
1072                            NULL);
1073    gtk_about_dialog_set_comments(about,  
1074         _("Geocaching.com GPX file viewer"));  #ifdef ENABLE_BROWSER_INTERFACE
1075      /* add a way to donate to the project */
1076    gtk_widget_show_all(GTK_WIDGET(about));    GtkWidget *alignment = gtk_alignment_new(0.5, 0, 0, 0);
1077    gtk_dialog_run(GTK_DIALOG(about));  
1078    gtk_widget_destroy(GTK_WIDGET(about));    GtkWidget *hbox = gtk_hbox_new(FALSE, 8);
1079      gtk_box_pack_start(GTK_BOX(hbox),
1080                         gtk_label_new(_("Do you like GPXView?")),
1081                         FALSE, FALSE, 0);
1082    
1083      GtkWidget *button = gtk_button_new();
1084      gtk_button_set_image(GTK_BUTTON(button),
1085                           icon_get_widget(ICON_MISC, 8));
1086      gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1087      g_signal_connect(button, "clicked",
1088                       G_CALLBACK(on_paypal_button_clicked), &context);
1089      gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1090    
1091      gtk_container_add(GTK_CONTAINER(alignment), hbox);
1092      gtk_box_pack_start_defaults(GTK_BOX((GTK_DIALOG(context.dialog))->vbox),
1093                                  alignment);
1094    
1095      gtk_widget_show_all(alignment);
1096    #endif
1097    
1098      gtk_dialog_run(GTK_DIALOG(context.dialog));
1099      gtk_widget_destroy(context.dialog);
1100  }  }
1101    
1102  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1433  cb_menu_search(GtkWidget *window, gpoint Line 1479  cb_menu_search(GtkWidget *window, gpoint
1479      gtk_widget_destroy(dialog);      gtk_widget_destroy(dialog);
1480  }  }
1481    
1482  void on_window_destroy (GtkWidget *widget, gpointer data);  static void on_window_destroy (GtkWidget *widget, gpointer data);
1483    
1484  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1485  static void  static void
# Line 1493  static void Line 1539  static void
1539  cb_menu_export_log(GtkWidget *widget, gpointer data) {  cb_menu_export_log(GtkWidget *widget, gpointer data) {
1540    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1541    notes_log_export(appdata);    notes_log_export(appdata);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1542  }  }
1543    
1544  #ifdef USE_MAEMO  #ifdef USE_MAEMO
# Line 1503  static void Line 1546  static void
1546  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1547    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1548    mmpoi_export(appdata);    mmpoi_export(appdata);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1549  }  }
1550  #endif  #endif
1551    
# Line 1513  static void Line 1553  static void
1553  cb_menu_export_garmin(GtkWidget *widget, gpointer data) {  cb_menu_export_garmin(GtkWidget *widget, gpointer data) {
1554    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1555    garmin_export(appdata);    garmin_export(appdata);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1556  }  }
1557    
1558    #ifdef ENABLE_OSM_GPS_MAP
1559    static void
1560    cb_menu_map(GtkWidget *window, gpointer data) {
1561      map((appdata_t *)data);
1562    }
1563    #endif
1564    
1565  static void  static void
1566  cb_menu_geomath(GtkWidget *window, gpointer data) {  cb_menu_geomath(GtkWidget *window, gpointer data) {
1567    geomath_dialog((appdata_t *)data);    geomath_dialog((appdata_t *)data);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1568  }  }
1569    
1570  static void  static void
1571  cb_menu_geotext(GtkWidget *window, gpointer data) {  cb_menu_geotext(GtkWidget *window, gpointer data) {
1572    geotext_dialog((appdata_t *)data);    geotext_dialog((appdata_t *)data);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1573  }  }
1574    
1575  static void  static void
1576  cb_menu_precpos(GtkWidget *window, gpointer data) {  cb_menu_precpos(GtkWidget *window, gpointer data) {
1577    precise_position((appdata_t *)data);    precise_position((appdata_t *)data);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1578  }  }
1579    
1580  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1581  static GtkWidget *export_menu_create(appdata_t *appdata) {  typedef struct {
1582    GtkWidget *button;    char *label, *desc;
1583    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    GtkSignalFunc activate_cb;
1584    } menu_entry_t;
   button = hildon_button_new_with_text(  
             HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,  
             HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
             _("Export to Maemo Mapper"),  
             _("Save a Maemo Mapper POI file"));  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_export_mmpoi), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1585    
1586    button = hildon_button_new_with_text(  typedef struct {
1587              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    const char *title;
1588              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    const menu_entry_t *menu;
1589              _("Export Field Notes"),    int len;
1590              _("Save a Garmin Field Notes file"));  } submenu_t;
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_export_log), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1591    
1592    button = hildon_button_new_with_text(  #define COLUMNS  1
             HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,  
             HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
             _("Export Garmin GPX"),  
             _("Save modified waypoints in GPX file"));  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_export_garmin), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1593    
1594    gtk_widget_show_all(GTK_WIDGET(menu));  void on_submenu_entry_clicked(GtkButton *button, GtkWidget *menu) {
1595    
1596    return GTK_WIDGET(menu);    /* force closing of submenu dialog */
1597      gtk_dialog_response(GTK_DIALOG(menu), GTK_RESPONSE_NONE);
1598      gtk_widget_hide(menu);
1599    
1600      /* let gtk clean up */
1601      while(gtk_events_pending())
1602        gtk_main_iteration();
1603  }  }
1604    
1605  /* the export submenu */  static GtkWidget *app_submenu_create(appdata_t *appdata,
1606  void on_export_clicked(GtkButton *button, appdata_t *appdata) {                                       const submenu_t *submenu) {
   if(!appdata->export_menu)  
     appdata->export_menu = export_menu_create(appdata);  
1607    
1608    /* draw a popup menu */    /* create a oridinary dialog box */
1609    hildon_app_menu_popup(HILDON_APP_MENU(appdata->export_menu),    GtkWidget *dialog = gtk_dialog_new();
1610                          GTK_WINDOW(hildon_window_stack_peek(    gtk_window_set_title(GTK_WINDOW(dialog), _(submenu->title));
1611                      hildon_window_stack_get_default())));    gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
1612  }    gtk_window_set_transient_for(GTK_WINDOW(dialog),
1613                                   GTK_WINDOW(appdata->window));
1614      gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
1615    
1616  static GtkWidget *tools_menu_create(appdata_t *appdata) {    GtkWidget *table = gtk_table_new(submenu->len/COLUMNS, COLUMNS, TRUE);
1617    GtkWidget *button;    int x = 0, y = 0;
1618    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());  
1619      const menu_entry_t *menu_entries = submenu->menu;
1620      while(menu_entries->label) {
1621        GtkWidget *button = NULL;
1622    
1623    button = hildon_button_new_with_text(      button = hildon_button_new_with_text(
1624              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1625              HILDON_BUTTON_ARRANGEMENT_VERTICAL,              HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1626              _("Geomath"),              _(menu_entries->label), _(menu_entries->desc));
             _("Geocoordinate calculation"));  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_geomath), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1627    
1628        /* try to center both texts */
1629        hildon_button_set_title_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1630        hildon_button_set_value_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1631    
1632    button = hildon_button_new_with_text(      g_signal_connect(button, "clicked",
1633              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,                       G_CALLBACK(on_submenu_entry_clicked), dialog);
1634              HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
1635              _("Geotext"),      g_signal_connect(button, "clicked",
1636              _("Text analysis"));                       menu_entries->activate_cb, appdata);
1637    g_signal_connect(button, "clicked",  
1638                     G_CALLBACK(cb_menu_geotext), appdata);      gtk_table_attach_defaults(GTK_TABLE(table),  button, x, x+1, y, y+1);
1639    hildon_app_menu_append(menu, GTK_BUTTON(button));  
1640        x++;
1641        if(x == COLUMNS) { x = 0; y++; }
1642    
1643    button = hildon_button_new_with_text(      menu_entries++;
1644              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    }
             HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
             _("Precise Position"),  
             _("Calculate a precise GPS position"));  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_precpos), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1645    
1646    gtk_widget_show_all(GTK_WIDGET(menu));    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);
1647    
1648    return GTK_WIDGET(menu);    return dialog;
1649  }  }
1650    
1651    /* popup the dialog shaped submenu */
1652    static void submenu_popup(GtkWidget *menu) {
1653      gtk_widget_show_all(menu);
1654      gtk_dialog_run(GTK_DIALOG(menu));
1655      gtk_widget_hide(menu);
1656    }
1657    
1658    static void submenu_cleanup(GtkWidget *menu) {
1659      gtk_widget_destroy(menu);
1660    }
1661    
1662    static const menu_entry_t submenu_export_entries[] = {
1663      { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1664        G_CALLBACK(cb_menu_export_mmpoi)  },
1665      { "Export Field Notes",      "Save a Garmin Field Notes file",
1666        G_CALLBACK(cb_menu_export_log)    },
1667      { "Export Garmin GPX",       "Save modified waypoints in GPX file",
1668        G_CALLBACK(cb_menu_export_garmin) },
1669      { NULL, NULL, NULL }
1670    };
1671    
1672    static const submenu_t submenu_export = {
1673      "Export", submenu_export_entries,
1674      sizeof(submenu_export_entries)/sizeof(menu_entry_t)-1
1675    };
1676    
1677    /* the export submenu */
1678    void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1679      if(!appdata->export_menu)
1680        appdata->export_menu = app_submenu_create(appdata, &submenu_export);
1681    
1682      submenu_popup(appdata->export_menu);
1683    }
1684    
1685    static const menu_entry_t submenu_tools_entries[] = {
1686      { "Geomath",          "Geocoordinate calculation",
1687        G_CALLBACK(cb_menu_geomath) },
1688      { "Geotext",          "Text analysis",
1689        G_CALLBACK(cb_menu_geotext) },
1690      { "Precise Position", "Calculate a precise GPS position",
1691        G_CALLBACK(cb_menu_precpos) },
1692      { NULL, NULL, NULL }
1693    };
1694    
1695    static const submenu_t submenu_tools = {
1696      "Tools", submenu_tools_entries,
1697      sizeof(submenu_tools_entries)/sizeof(menu_entry_t)-1
1698    };
1699    
1700  /* the tools submenu */  /* the tools submenu */
1701  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {
1702    if(!appdata->tools_menu)    if(!appdata->tools_menu)
1703      appdata->tools_menu = tools_menu_create(appdata);      appdata->tools_menu = app_submenu_create(appdata, &submenu_tools);
1704    
1705    /* draw a popup menu */    submenu_popup(appdata->tools_menu);
   hildon_app_menu_popup(HILDON_APP_MENU(appdata->tools_menu),  
                         GTK_WINDOW(hildon_window_stack_peek(  
                     hildon_window_stack_get_default())));  
1706  }  }
1707    
   
1708  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {
1709    GtkWidget *button;    GtkWidget *button;
1710    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
# Line 1665  HildonAppMenu *menu_create(appdata_t *ap Line 1730  HildonAppMenu *menu_create(appdata_t *ap
1730      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1731                             G_CALLBACK(cb_menu_adddir), appdata);                             G_CALLBACK(cb_menu_adddir), appdata);
1732      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
1733    
   if(mode == MENU_GPXLIST) {  
1734      button = gtk_button_new_with_label(_("Export"));      button = gtk_button_new_with_label(_("Export"));
1735      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1736                             G_CALLBACK(on_export_clicked), appdata);                             G_CALLBACK(on_export_clicked), appdata);
# Line 1684  HildonAppMenu *menu_create(appdata_t *ap Line 1747  HildonAppMenu *menu_create(appdata_t *ap
1747                           G_CALLBACK(on_tools_clicked), appdata);                           G_CALLBACK(on_tools_clicked), appdata);
1748    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1749    
1750    #ifdef ENABLE_OSM_GPS_MAP
1751      if((mode == MENU_GPXLIST) || (mode == MENU_CACHELIST)) {
1752        button = gtk_button_new_with_label(_("Map"));
1753        g_signal_connect_after(button, "clicked",
1754                               G_CALLBACK(cb_menu_map), appdata);
1755        hildon_app_menu_append(menu, GTK_BUTTON(button));
1756      }
1757    #endif
1758    
1759  #ifdef HILDON_HELP  #ifdef HILDON_HELP
1760    button = gtk_button_new_with_label(_("Help"));    button = gtk_button_new_with_label(_("Help"));
1761    g_signal_connect_after(button, "clicked",    g_signal_connect_after(button, "clicked",
# Line 1796  void menu_create(appdata_t *appdata) { Line 1868  void menu_create(appdata_t *appdata) {
1868    
1869    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1870    
1871    #ifdef ENABLE_OSM_GPS_MAP
1872      item = gtk_menu_item_new_with_label( _("Map") );
1873      gtk_menu_append(GTK_MENU_SHELL(menu), item);
1874      g_signal_connect(item, "activate",
1875                       GTK_SIGNAL_FUNC(cb_menu_map), appdata);
1876    #endif
1877    
1878    item = gtk_menu_item_new_with_label(_("Tools"));    item = gtk_menu_item_new_with_label(_("Tools"));
1879    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1880    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 1860  void cleanup(appdata_t *appdata) { Line 1939  void cleanup(appdata_t *appdata) {
1939    if(appdata->image_path) free(appdata->image_path);    if(appdata->image_path) free(appdata->image_path);
1940    if(appdata->search_str) free(appdata->search_str);    if(appdata->search_str) free(appdata->search_str);
1941    
1942    #ifdef USE_STACKABLE_WINDOW
1943      if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
1944      if(appdata->tools_menu)  submenu_cleanup(appdata->tools_menu);
1945    #endif
1946    
1947    gnome_vfs_shutdown();    gnome_vfs_shutdown();
1948    icons_free();    icons_free();
1949    gps_release(appdata);    gps_release(appdata);
# Line 1888  void cleanup(appdata_t *appdata) { Line 1972  void cleanup(appdata_t *appdata) {
1972    puts("everything is gone");    puts("everything is gone");
1973  }  }
1974    
1975  void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
1976    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1977    
1978    gconf_save_state(appdata);    gconf_save_state(appdata);
# Line 2231  int main(int argc, char *argv[]) { Line 2315  int main(int argc, char *argv[]) {
2315    
2316    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2317    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
   
2318  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
2319    menu_create(&appdata);    menu_create(&appdata);
2320  #else  #else
Legend:
Removed from v.20  
changed lines
  Added in v.63