( cvs diff -u -r 1.43.2.70 -r 1.43.2.71 src/toolbar.c; ) > 2.10.0cvs22.patchset
( cvs diff -u -r 1.43.2.71 -r 1.43.2.72 src/toolbar.c; ) > 2.10.0cvs23.patchset
( cvs diff -u -r 1.155.2.68 -r 1.155.2.69 src/Makefile.am; cvs diff -u -r 1.204.2.139 -r 1.204.2.140 src/prefs_common.c; cvs diff -u -r 1.25.2.40 -r 1.25.2.41 src/stock_pixmap.c; cvs diff -u -r 1.18.2.29 -r 1.18.2.30 src/stock_pixmap.h; cvs diff -u -r 1.43.2.72 -r 1.43.2.73 src/toolbar.c; diff -u /dev/null src/pixmaps/go_folders.xpm; ) > 2.10.0cvs24.patchset
+( cvs diff -u -r 1.274.2.196 -r 1.274.2.197 src/mainwindow.c; cvs diff -u -r 1.43.2.73 -r 1.43.2.74 src/toolbar.c; ) > 2.10.0cvs25.patchset
}
/* link window to mainwin->window to avoid gdk warnings */
mainwin->window = window;
+ mainwin_list = g_list_append(mainwin_list, mainwin);
#ifdef MAEMO
mainwin->toolbar = toolbar_create(TOOLBAR_MAIN,
statusbar = statusbar_create();
gtk_box_pack_start(GTK_BOX(hbox_stat), statusbar, TRUE, TRUE, 0);
+#ifndef MAEMO
progressbar = gtk_progress_bar_new();
gtk_widget_set_size_request(progressbar, 120, 1);
gtk_box_pack_start(GTK_BOX(hbox_stat), progressbar, FALSE, FALSE, 0);
-
+#endif
online_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_ONLINE);
offline_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_OFFLINE);
online_switch = gtk_button_new ();
mainwin->vbox_body = vbox_body;
mainwin->hbox_stat = hbox_stat;
mainwin->statusbar = statusbar;
+#ifndef MAEMO
mainwin->progressbar = progressbar;
+#endif
mainwin->statuslabel = statuslabel;
mainwin->online_switch = online_switch;
mainwin->online_pixmap = online_pixmap;
if (!hand_cursor)
hand_cursor = gdk_cursor_new(GDK_HAND2);
- mainwin_list = g_list_append(mainwin_list, mainwin);
-
/* init work_offline */
if (prefs_common.work_offline)
online_switch_clicked (GTK_BUTTON(online_switch), mainwin);
toolbar_data->toolbar = toolbar;
gtk_widget_show_all(toolbar);
- if (type == TOOLBAR_MAIN)
+ if (type == TOOLBAR_MAIN) {
+#ifdef MAEMO
+ MainWindow *mainwin = mainwindow_get_mainwindow();
+ GtkWidget *progressbar = gtk_progress_bar_new();
+ item = gtk_tool_item_new();
+ gtk_container_add (GTK_CONTAINER (item), progressbar);
+ gtk_widget_show(item);
+ gtk_widget_show(progressbar);
+ gtk_widget_set_size_request(progressbar, 70, -1);
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1); \
+ mainwin->progressbar = progressbar;
+#endif
activate_compose_button(toolbar_data,
prefs_common.toolbar_style,
toolbar_data->compose_btn_type);
+ }
if (type != TOOLBAR_COMPOSE)
activate_learn_button(toolbar_data, prefs_common.toolbar_style,
LEARN_SPAM);