X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-maemo-global-settings-dialog.c;h=7f3d2ca99d716b1d8cc1bd8a624ab297a2586ee3;hb=99e438caf4679a1daf2060f73fb5a97408fca388;hp=5b967bb38f4f543531d7b38fd7c871af7b88e01e;hpb=c04e24ad16b9a570a1152ec2c05c953fe39a3c3c;p=modest

diff --git a/src/maemo/modest-maemo-global-settings-dialog.c b/src/maemo/modest-maemo-global-settings-dialog.c
index 5b967bb..7f3d2ca 100644
--- a/src/maemo/modest-maemo-global-settings-dialog.c
+++ b/src/maemo/modest-maemo-global-settings-dialog.c
@@ -151,8 +151,6 @@ typedef struct {
 static gboolean
 idle_select_default_focus (gpointer data) 
 {
-	gdk_threads_enter ();
-
 	ModestGlobalSettingsDialogPrivate *ppriv;
 	ModestMaemoGlobalSettingsDialogPrivate *priv;
 	SwitchPageHelper *helper;
@@ -164,13 +162,12 @@ idle_select_default_focus (gpointer data)
 	/* Grab focus, we need to block in order to prevent a
 	   recursive call to this callback */
 	g_signal_handler_block (G_OBJECT (ppriv->notebook), priv->switch_handler);
+	gdk_threads_enter ();
 	gtk_widget_grab_focus (helper->focus_widget);
+	gdk_threads_leave ();
 	g_signal_handler_unblock (G_OBJECT (ppriv->notebook), priv->switch_handler);
-
 	g_free (helper);
 
-	gdk_threads_leave ();
-
 	return FALSE;
 }
 
@@ -255,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;
 	}
@@ -440,7 +442,7 @@ on_range_error (HildonNumberEditor *editor,
 #else
 	case HILDON_NUMBER_EDITOR_ERROR_MAXIMUM_VALUE_EXCEED:
 #endif
-		msg = g_strdup_printf (_("ckct_ib_maximum_value"), MSG_SIZE_MAX_VAL);
+		msg = g_strdup_printf (dgettext("hildon-libs", "ckct_ib_maximum_value"), MSG_SIZE_MAX_VAL);
 		new_val = MSG_SIZE_MAX_VAL;
 		break;
 #ifdef MODEST_HAVE_HILDON0_WIDGETS
@@ -448,7 +450,7 @@ on_range_error (HildonNumberEditor *editor,
 #else
 	case HILDON_NUMBER_EDITOR_ERROR_MINIMUM_VALUE_EXCEED:
 #endif
-		msg = g_strdup_printf (_("ckct_ib_minimum_value"), MSG_SIZE_MIN_VAL);
+		msg = g_strdup_printf (dgettext("hildon-libs", "ckct_ib_minimum_value"), MSG_SIZE_MIN_VAL);
 		new_val = MSG_SIZE_MIN_VAL;
 		break;
 #ifdef MODEST_HAVE_HILDON0_WIDGETS
@@ -456,7 +458,7 @@ on_range_error (HildonNumberEditor *editor,
 #else
 	case HILDON_NUMBER_EDITOR_ERROR_ERRONEOUS_VALUE:
 #endif
-		msg = g_strdup_printf (_("ckct_ib_set_a_value_within_range"), 
+		msg = g_strdup_printf (dgettext("hildon-libs", "ckct_ib_set_a_value_within_range"), 
 				       MSG_SIZE_MIN_VAL, 
 				       MSG_SIZE_MAX_VAL);
 		/* FIXME: use the previous */
@@ -481,8 +483,8 @@ on_range_error (HildonNumberEditor *editor,
 static ModestConnectedVia
 current_connection (void)
 {
-	TnyAccountStore *account_store;
-	TnyDevice *device;
+	TnyAccountStore *account_store = NULL;
+	TnyDevice *device = NULL;
 	ModestConnectedVia retval = MODEST_CONNECTED_VIA_ANY;
 	
 	account_store = TNY_ACCOUNT_STORE (modest_runtime_get_account_store ());
@@ -497,15 +499,17 @@ current_connection (void)
 		ConIcIap *iap = tny_maemo_conic_device_get_iap (
 			TNY_MAEMO_CONIC_DEVICE (device), iap_id);
 		const gchar *bearer_type = con_ic_iap_get_bearer_type (iap);
-			
-		if (!strcmp (bearer_type, CON_IC_BEARER_WLAN_INFRA) ||
-		    !strcmp (bearer_type, CON_IC_BEARER_WLAN_ADHOC))
-			retval = MODEST_CONNECTED_VIA_WLAN;
-		else
-			retval = MODEST_CONNECTED_VIA_ANY;
+		if (bearer_type) {
+			if (!strcmp (bearer_type, CON_IC_BEARER_WLAN_INFRA) ||
+			    !strcmp (bearer_type, CON_IC_BEARER_WLAN_ADHOC))
+				retval = MODEST_CONNECTED_VIA_WLAN;
+			else
+				retval = MODEST_CONNECTED_VIA_ANY;
+		}
 	
 		g_object_unref (iap);
 	}
+	
 	g_object_unref (device);
 
 	return retval;