Diff of /trunk/src/main.c

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

revision 223 by harbaum, Mon Jul 13 12:15:51 2009 UTC revision 224 by harbaum, Tue Jul 14 11:15:40 2009 UTC
# Line 1224  int main(int argc, char *argv[]) { Line 1224  int main(int argc, char *argv[]) {
1224    appdata.window = HILDON_WINDOW(hildon_window_new());    appdata.window = HILDON_WINDOW(hildon_window_new());
1225    hildon_program_add_window(appdata.program, appdata.window);    hildon_program_add_window(appdata.program, appdata.window);
1226    
1227  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 6
1228    unsigned long val;    unsigned long val;
1229    XChangeProperty(GDK_DISPLAY(),    XChangeProperty(GDK_DISPLAY(),
1230                    GDK_WINDOW_XID(GTK_WIDGET(appdata.window)->window),                    GDK_WINDOW_XID(GTK_WIDGET(appdata.window)->window),
# Line 1294  int main(int argc, char *argv[]) { Line 1294  int main(int argc, char *argv[]) {
1294    
1295    gtk_box_pack_start_defaults(GTK_BOX(zhbox), statusbar_new(&appdata));    gtk_box_pack_start_defaults(GTK_BOX(zhbox), statusbar_new(&appdata));
1296    
   /* ---- add zoom in button right of statusbar ---- */  
   appdata.btn_zoom_in = gtk_button_new();  
   gtk_button_set_image(GTK_BUTTON(appdata.btn_zoom_in),  
                        gtk_image_new_from_stock(GTK_STOCK_ZOOM_IN, GTK_ICON_SIZE_MENU));  
   g_signal_connect(appdata.btn_zoom_in, "clicked", G_CALLBACK(cb_menu_zoomin), &appdata);  
   gtk_box_pack_start(GTK_BOX(zhbox), appdata.btn_zoom_in, FALSE, FALSE, 0);  
   
1297    /* ---- add zoom out button right of statusbar ---- */    /* ---- add zoom out button right of statusbar ---- */
1298    appdata.btn_zoom_out = gtk_button_new();    appdata.btn_zoom_out = gtk_button_new();
1299    gtk_button_set_image(GTK_BUTTON(appdata.btn_zoom_out),    gtk_button_set_image(GTK_BUTTON(appdata.btn_zoom_out),
1300                         gtk_image_new_from_stock(GTK_STOCK_ZOOM_OUT, GTK_ICON_SIZE_MENU));          gtk_image_new_from_stock(GTK_STOCK_ZOOM_OUT, GTK_ICON_SIZE_MENU));
1301    g_signal_connect(appdata.btn_zoom_out, "clicked", G_CALLBACK(cb_menu_zoomout), &appdata);    g_signal_connect(appdata.btn_zoom_out, "clicked",
1302                       G_CALLBACK(cb_menu_zoomout), &appdata);
1303    gtk_box_pack_start(GTK_BOX(zhbox), appdata.btn_zoom_out, FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(zhbox), appdata.btn_zoom_out, FALSE, FALSE, 0);
1304    
1305      /* ---- add zoom in button right of statusbar ---- */
1306      appdata.btn_zoom_in = gtk_button_new();
1307      gtk_button_set_image(GTK_BUTTON(appdata.btn_zoom_in),
1308            gtk_image_new_from_stock(GTK_STOCK_ZOOM_IN, GTK_ICON_SIZE_MENU));
1309      g_signal_connect(appdata.btn_zoom_in, "clicked",
1310                       G_CALLBACK(cb_menu_zoomin), &appdata);
1311      gtk_box_pack_start(GTK_BOX(zhbox), appdata.btn_zoom_in, FALSE, FALSE, 0);
1312    
1313    
1314    gtk_box_pack_start(GTK_BOX(vbox), zhbox, FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(vbox), zhbox, FALSE, FALSE, 0);
1315  #else  #else
Legend:
Removed from v.223  
changed lines
  Added in v.224