X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-maemo-global-settings-dialog.c;h=4d6286f802910b065659df717c1d179cca495b4c;hb=d55b4a5e61e0e58d861bb4c5efa007b81963fdb6;hp=8499fb9781b5dd8b5f5d540ab0cfea48b45e6526;hpb=1881edeebc36271aba89cb1b35e09567a2904731;p=modest

diff --git a/src/maemo/modest-maemo-global-settings-dialog.c b/src/maemo/modest-maemo-global-settings-dialog.c
index 8499fb9..4d6286f 100644
--- a/src/maemo/modest-maemo-global-settings-dialog.c
+++ b/src/maemo/modest-maemo-global-settings-dialog.c
@@ -31,6 +31,10 @@
 #include <config.h>
 #endif /*HAVE_CONFIG_H*/
 
+#ifdef MODEST_HAVE_CONIC
+#include <coniciap.h>
+#endif /*MODEST_HAVE_CONIC*/
+
 #include <modest-hildon-includes.h>
 #include <modest-maemo-utils.h>
 
@@ -51,7 +55,6 @@
 #include <tny-maemo-conic-device.h>
 
 
-
 #define MSG_SIZE_MAX_VAL 5000
 #define MSG_SIZE_DEF_VAL 1000
 #define MSG_SIZE_MIN_VAL 1
@@ -230,7 +233,7 @@ modest_maemo_global_settings_dialog_init (ModestMaemoGlobalSettingsDialog *self)
 	gtk_container_add (GTK_CONTAINER (GTK_DIALOG (self)->vbox), ppriv->notebook);
 	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (self)->vbox), MODEST_MARGIN_HALF);
 
-	gtk_window_set_default_size (GTK_WINDOW (self), -1, 300);
+	gtk_window_set_default_size (GTK_WINDOW (self), 700, 300);
 
 	g_signal_connect (G_OBJECT (self), "key-press-event",
 			  G_CALLBACK (on_inner_tabs_key_pressed), self);
@@ -257,12 +260,8 @@ modest_maemo_global_settings_dialog_finalize (GObject *obj)
 	ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (obj);
 
 	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);
+		/* TODO: This causes a g_warning and a valgrind mem error: */
+		/* g_signal_handler_disconnect (G_OBJECT (ppriv->notebook), priv->switch_handler);*/
 		priv->switch_handler = 0;
 	}
 
@@ -498,40 +497,7 @@ on_size_notify         (HildonNumberEditor *editor,
 static ModestConnectedVia
 current_connection (void)
 {
-	TnyAccountStore *account_store = NULL;
-	TnyDevice *device = NULL;
-	ModestConnectedVia retval = MODEST_CONNECTED_VIA_ANY;
-	
-	account_store = TNY_ACCOUNT_STORE (modest_runtime_get_account_store ());
-	device = tny_account_store_get_device (account_store);
-
-	if (!tny_device_is_online (device))
-		return MODEST_CONNECTED_VIA_ANY;
-
-#ifdef MODEST_HAVE_CONIC
-	/* Get iap id */
-	const gchar *iap_id = tny_maemo_conic_device_get_current_iap_id (TNY_MAEMO_CONIC_DEVICE (device));
-	if (iap_id) {
-		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 (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);
-	}
-#else
-	retval = MODEST_CONNECTED_VIA_WLAN; /* assume WLAN (fast) internet */  
-#endif /* MODEST_HAVE_CONIC */
-	
-	g_object_unref (device);
-
-	return retval;
+	return modest_platform_get_current_connection ();
 }
 
 static gboolean