X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-maemo-global-settings-dialog.c;h=7f3d2ca99d716b1d8cc1bd8a624ab297a2586ee3;hp=b44f141892b9be74d9e1ddead283ce386ac69218;hb=aa9d45d56b19fdee314fc0610d6a510100650f87;hpb=1a52ee76c28766d3926dfa23a3981df2d6c3794f

diff --git a/src/maemo/modest-maemo-global-settings-dialog.c b/src/maemo/modest-maemo-global-settings-dialog.c
index b44f141..7f3d2ca 100644
--- a/src/maemo/modest-maemo-global-settings-dialog.c
+++ b/src/maemo/modest-maemo-global-settings-dialog.c
@@ -252,7 +252,12 @@ modest_maemo_global_settings_dialog_finalize (GObject *obj)
 	priv = MODEST_MAEMO_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (obj);
 	ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (obj);
 
-	if (priv->switch_handler) {
+	if (priv->switch_handler && ppriv->notebook) {
+		/* TODO: This causes a g_warning:
+		 modest[13409]: GLIB WARNING ** GLib-GObject - invalid unclassed pointer in cast to `GObject'
+		modest[13409]: GLIB WARNING ** GLib-GObject - instance with invalid (NULL) class pointer
+		modest[13409]: GLIB CRITICAL ** GLib-GObject - g_signal_handler_disconnect: assertion `G_TYPE_CHECK_INSTANCE (instance)' failed
+		 */
 		g_signal_handler_disconnect (G_OBJECT (ppriv->notebook), priv->switch_handler);
 		priv->switch_handler = 0;
 	}