X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-maemo-global-settings-dialog.c;h=ad4e4c5167178feb4830c5f3f64c07dd8a8641c1;hb=71d0d1844cae21a33bc5c6528fba2b844fb7b3ec;hp=2c71d021c543c5293df1a37117d5be1bb299144a;hpb=f437bc152701d9a9b7cb75988ef04b30bbb0c8b4;p=modest

diff --git a/src/maemo/modest-maemo-global-settings-dialog.c b/src/maemo/modest-maemo-global-settings-dialog.c
index 2c71d02..ad4e4c5 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
@@ -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;
 	}
 
@@ -508,6 +507,7 @@ current_connection (void)
 	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) {
@@ -524,6 +524,9 @@ current_connection (void)
 	
 		g_object_unref (iap);
 	}
+#else
+	retval = MODEST_CONNECTED_VIA_WLAN; /* assume WLAN (fast) internet */  
+#endif /* MODEST_HAVE_CONIC */
 	
 	g_object_unref (device);