2007-07-31 [paul] 2.10.0cvs81

	* src/setup.c
	* src/gtk/gtkutils.c
		fix crash on maemo on first launch

diff --git a/ChangeLog b/ChangeLog
index 943e9433ed4e6b93391133f654c09db5db6be79b..364e737ac65eecfaf9c797be00561e05d1e33936 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-31 [paul]      2.10.0cvs81
+
+       * src/setup.c
+       * src/gtk/gtkutils.c
+               fix crash on maemo on first launch
+
 2007-07-30 [paul]      2.10.0cvs80
 
        * src/prefs_matcher.c

diff --git a/PATCHSETS b/PATCHSETS
index d2e8970d2bac563eb9163c95f227d4ab9aa9c51d..2c20db5e027d5e1c1495d19aeff586582d464a43 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2734,3 +2734,4 @@
 ( cvs diff -u -r 1.105.2.103 -r 1.105.2.104 src/prefs_account.c;  ) > 2.10.0cvs78.patchset
 ( cvs diff -u -r 1.115.2.161 -r 1.115.2.162 src/main.c;  ) > 2.10.0cvs79.patchset
 ( cvs diff -u -r 1.43.2.60 -r 1.43.2.61 src/prefs_matcher.c;  ) > 2.10.0cvs80.patchset
+( cvs diff -u -r 1.5.2.13 -r 1.5.2.14 src/setup.c;  cvs diff -u -r 1.5.2.62 -r 1.5.2.63 src/gtk/gtkutils.c;  ) > 2.10.0cvs81.patchset

diff --git a/configure.ac b/configure.ac
index 1b8e8658bf2bd36bdbafe983af9e0309e23fcb2a..4e901d123f306e6001d48f50a986e708a2653d1e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=80
+EXTRA_VERSION=81
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index 5f5942a4387f34514e5638f21397c1e9879a04ec..0e65e0d36b25a776868480b9c85534f0651ffca6 100644 (file)
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -786,7 +786,7 @@ void gtkut_widget_get_uposition(GtkWidget *widget, gint *px, gint *py)
 
 void gtkut_widget_draw_now(GtkWidget *widget)
 {
-       if (GTK_WIDGET_VISIBLE(widget) && GTK_WIDGET_DRAWABLE(widget))
+       if (widget && GTK_WIDGET_VISIBLE(widget) && GTK_WIDGET_DRAWABLE(widget))
                gdk_window_process_updates(widget->window, FALSE);
 }
 

diff --git a/src/setup.c b/src/setup.c
index a24029c19709ff0e20332a2bf6e41fbedfd7496c..87f23bd7ce9d26d89e56e2a552818c63f8027000 100644 (file)
--- a/src/setup.c
+++ b/src/setup.c
@@ -95,10 +95,14 @@ static void scan_tree_func(Folder *folder, FolderItem *item, gpointer data)
                str = g_strdup_printf(_("Scanning folder %s ..."),
                                      LOCAL_FOLDER(folder)->rootpath);
 
-       gtk_statusbar_push(GTK_STATUSBAR(mainwin->statusbar),
+       if (mainwin->statusbar)
+               gtk_statusbar_push(GTK_STATUSBAR(mainwin->statusbar),
                           mainwin->mainwin_cid, str);
-       gtkut_widget_draw_now(mainwin->hbox_stat);
-       gtk_statusbar_pop(GTK_STATUSBAR(mainwin->statusbar),
+       if (mainwin->hbox_stat)
+               gtkut_widget_draw_now(mainwin->hbox_stat);
+       
+       if (mainwin->statusbar)
+               gtk_statusbar_pop(GTK_STATUSBAR(mainwin->statusbar),
                          mainwin->mainwin_cid);
        g_free(str);
 }