Changeset 2933

Timestamp:

11/09/07 12:12:26

Author:

svillar

Message:

• New async API for connect into a maemo conic device
  
• Fixed a linking error
  

Files:

• trunk/ChangeLog (modified) (2 diffs)
• trunk/libtinymail-maemo/Makefile.am (modified) (2 diffs)
• trunk/libtinymail-maemo/tny-maemo-conic-device.c (modified) (31 diffs)
• trunk/libtinymail-maemo/tny-maemo-conic-device.h (modified) (1 diff)
• trunk/libtinymail-maemo/tny-maemo-conic-dummy-device.c (added)

trunk/ChangeLog

@@ +1 @@
+2007-11-09  Sergio Villar Senin  <svillar@igalia.com>
+
+        * libtinymail-maemo/tny-maemo-conic-device.c: 
+        Added a new API to allow asynchronous connections
+        in the Maemo conic device. This patch is a new version of an initial
+        patch developed by pvanhoof with some changes.
+        Splitted the Maemo connic device in two files, one for the actual
+        device and the other one for a dummy device (useful for sbox devel)
+        Fixed a problem when linking the maemo conic device 
+                                                        
-2007-11-08  Jose Dapena Paz  <jdapena@igalia.com>
-
@@ -150 +160 @@
-        * priv->folder_name in TnyCamelFolder sometimes is NULL, which
-        doesn't seem right (and is racy).
+        * Improvements for the IDLE support. The Nonblocking read is now
+        actually used correctly, various racy situations should be fixed now
+        and instant event throwing is put in place (during IDLE state).
+        * Removed the (*read_idle) funcptr from CamelTcpStream, as this is no longer
+        required. This to reduce the complexity of the IDLE patch so that we
+        can later, perhaps, more easily bring this feature to upstream Camel.
-
-2007-10-19  Philip Van Hoof  <pvanhoof@gnome.org>

trunk/libtinymail-maemo/Makefile.am

@@ -10 +10 @@
-        -I$(top_srcdir)/libtinymail-gnomevfs \
-        -DDBUS_API_SUBJECT_TO_CHANGE
-
-
-lib_LTLIBRARIES = libtinymail-maemo-1.0.la
@@ -26 +25 @@
-        tny-maemo-platform-factory.c
-
-
-
-
+
+
+
+
+
+
-libtinymail_maemo_1_0_la_LIBADD = \
-        $(LIBTINYMAIL_MAEMO_LIBS) \
-        $(LIBTINYMAIL_MAEMO_CONIC_LIBS) \
-        @MAEMO_DEVICE@ \
-        $(top_builddir)/libtinymail/libtinymail-$(API_VERSION).la \
-        $(top_builddir)/libtinymailui/libtinymailui-$(API_VERSION).la \
-        $(top_builddir)/libtinymailui-gtk/libtinymailui-gtk-$(API_VERSION).la \
-        $(top_builddir)/libtinymail-camel/libtinymail-camel-$(API_VERSION).la
-
-libtinymail_maemo_1_0_la_DEPENDENCIES=\
-        @MAEMO_DEVICE@
-
-libtinymail_maemo_1_0_la_LDFLAGS = -export-dynamic \

trunk/libtinymail-maemo/tny-maemo-conic-device.c

@@ -1 @@
-Camel
+Maemo
- * Copyright (C) 2006-2007 Philip Van Hoof <pvanhoof@gnome.org>
- *
@@ -26 +26 @@
-#include <conicconnection.h>
-#include <conicconnectionevent.h>
+#include <string.h>
+#include <tny-error.h>
-#include <gdk/gdk.h> /* For GDK_THREAD_ENTER/LEAVE */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-static gboolean tny_maemo_conic_device_is_online (TnyDevice *self);
-
-static GObjectClass *parent_class = NULL;
+
+typedef struct {
+        TnyMaemoConicDevice *self;
+        gchar* iap_id;
+        gpointer user_data;
+        TnyMaemoConicDeviceConnectCallback callback;
+} ConnectInfo;
-
-typedef struct {
@@ -79 +48 @@
-        gchar *iap;
-        gboolean forced; /* Whether the is_online value is forced rather than real. */
+        ConnectInfo *connect_slot;
-        /* When non-NULL, we are waiting for the success or failure signal. */
-        GMainLoop *loop;
-#ifdef MAEMO_CONIC_DUMMY
-        gint dummy_env_check_timeout;
-#endif /* MAEMO_CONIC_DUMMY */
-} TnyMaemoConicDevicePriv;
+
-
-#define TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE(o)   \
@@ -95 +63 @@
-
-static gboolean
+dnsmasq_has_resolv (void)
+{
+        /* This is because silly Conic does not have a blocking API that tells
+         * us immediately when the device is online. */
+
+        if (!g_file_test ("/var/run/resolv.conf", G_FILE_TEST_EXISTS))
+                if (!g_file_test ("/tmp/resolv.conf.wlan0", G_FILE_TEST_EXISTS))
+                        if (!g_file_test ("/tmp/resolv.conf.ppp0", G_FILE_TEST_EXISTS))
+                                return FALSE;
+
+        return TRUE;
+}
+
+static gboolean
-conic_emit_status_idle (gpointer user_data)
-{
-        EmitStatusInfo *info = (EmitStatusInfo *) user_data;
-
- this 
-before emitting _any_ signals
+
+this before emitting signals from within a g_idle_add_full callback
-         * See http://www.tinymail.org/trac/tinymail/wiki/HowTnyLockable */
-
@@ -123 +105 @@
-conic_emit_status (TnyDevice *self, gboolean status)
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-        return;
@@ -186 +141 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-static void 
-
-
-TnyMaemoConicDevicePriv *priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self)
-if (priv->loop)
-       g_main_loop_quit (priv->loop);
-
-
+
+ 
+HandleConnInfo *info = (HandleConnInfo *) data
+g_object_unref (info->self);
+g_slice_free (HandleConnInfo, data); 
+
+
-
-static void
@@ -204 +223 @@
-        gboolean is_online = FALSE;
-        gboolean emit = FALSE;
+        HandleConnInfo *iinfo;
+        int con_err, con_state;
-
-        /* Don't emit nor make any changes in case of forced state */
+
-        if (priv->forced)
-                return;
-
-
-
-
-
-
-
-
-
+
+
+
+
-                case CON_IC_CONNECTION_ERROR_NONE:
-                        break;
@@ -232 +250 @@
-        }
-
-
-
+
-                case CON_IC_STATUS_CONNECTED:
-                        if (priv->iap)
@@ -262 +279 @@
-        priv->is_online = is_online;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        if (emit)
@@ -272 +301 @@
-        return;
-}
-#endif /* MAEMO_CONIC_DUMMY */
-
-#ifdef MAEMO_CONIC_DUMMY
-
-static gchar*
-get_dummy_filename ()
-{
-        gchar *filename = g_build_filename (
-                g_get_home_dir (), 
-                MAEMO_CONIC_DUMMY_IAP_ID_FILENAME,
-                NULL);
-        return filename;
-}
-
-static gboolean 
-dummy_con_ic_connection_connect_by_id (TnyMaemoConicDevice *self, const gchar* iap_id)
-{
-        int response = 0;
-
-        /* Show a dialog, because libconic would show a dialog here,
-         * and give the user a chance to refuse a new connection, because libconic would allow that too.
-         * This allows us to see roughly similar behaviour in scratchbox as on the device. */
-        GtkDialog *dialog = GTK_DIALOG (gtk_message_dialog_new( NULL, GTK_DIALOG_MODAL,
-                        GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, 
-                        "TnyMaemoConicDevice fake scratchbox implementation:\nThe application requested a connection. Make a fake connection?"));
-
-        response = gtk_dialog_run (dialog);
-        gtk_widget_hide (GTK_WIDGET (dialog));
-        gtk_widget_destroy (GTK_WIDGET (dialog));
-        
-        if (response == GTK_RESPONSE_OK) {
-                GError* error = NULL;
-                /* Make a connection, by setting a name in our dummy text file,
-                 * which will be read later: */
-                gchar *filename = get_dummy_filename ();
-
-                g_file_set_contents (filename, "debug id0", -1, &error);
-                if(error) {
-                        g_warning("%s: error from g_file_set_contents(): %s\n", __FUNCTION__, error->message);
-                        g_error_free (error);
-                        error = NULL;
-                }
-
-                g_free (filename);
-
-                return TRUE;
-        }
-        else
-                return FALSE;
-}
-
-#endif /* MAEMO_CONIC_DUMMY */
-
-
@@ -330 +307 @@
- * @self: a #TnyDevice object
- * @iap_id: the id of the Internet Access Point (IAP), or NULL for 'any;
+ * @callback: a #TnyMaemoConicDeviceConnectCallback
+ * @user_data: user data for @callback
- * 
- * Try to connect to a specific IAP, or to any if @iap_id == NULL
- * this calls con_ic_connection_connect(_by_id).
- * This may show a dialog to allow the user to select a connection, or 
-
-
-
-
+
- **/
-
- (TnyMaemoConicDevice *self, const gchar* iap_id)
-
-#ifdef MAEMO_CONIC_DUMMY
-return dummy_con_ic_connection_connect_by_id (self, iap_id);
-
+
+_async (TnyMaemoConicDevice *self, 
+
+                                     TnyMaemoConicDeviceConnectCallback callback,
+                             gpointer user_data)
+
-        TnyMaemoConicDevicePriv *priv = NULL;
-        gboolean request_failed = FALSE;
-
-g_return_val_if_fail (TNY_IS_DEVICE(self), FALSE)
-
-
-
-
-
-g_message (__FUNCTION__)
-g_message ("connecting to %s", iap_id ? iap_id : "<any>")
-
-
-loop = g_main_loop_new(NULL, FALSE /* not running immediately. */)
+
+GError *err = NULL
+
+
+
+
+
+info->callback = callback
+info->user_data = user_data
+
+
+connect_slot = info
-
-        if (iap_id) {
-                if (!con_ic_connection_connect_by_id (priv->cnx, iap_id, CON_IC_CONNECT_FLAG_NONE)) {
-
+
+
-                        request_failed = TRUE;
-                }
-        } else {
-                if (!con_ic_connection_connect (priv->cnx, CON_IC_CONNECT_FLAG_NONE)) {
-
+
+
-                        request_failed = TRUE;
-                }
@@ -373 +351 @@
-
-        if (request_failed) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-}
-
@@ -407 +376 @@
-tny_maemo_conic_device_disconnect (TnyMaemoConicDevice *self, const gchar* iap_id)
-{
-/* don't try to disconnect if we're in dummy mode, as we're not "really"
- * connected in that case either
- */
-#ifndef MAEMO_CONIC_DUMMY 
-        TnyMaemoConicDevicePriv *priv = NULL;
-
@@ -417 +382 @@
-        priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
-        g_return_val_if_fail (priv->cnx, FALSE);
-
-#ifdef DEBUG
-        g_message (__FUNCTION__);
-        g_message ("disconnecting from %s", iap_id ? iap_id : "<any>");
-#endif
-
-        if (iap_id) {
-                if (!con_ic_connection_disconnect_by_id (priv->cnx, iap_id)) {
-c
+C
-                        return FALSE;
-                }
-        } else {
-                /* don't try to disconnect if iap_id==NULL, or conic will crash... */
-c
+C
-                return FALSE;
-        }
-#endif /* MAEMO_CONIC_DUMMY*/
-
-        return TRUE;
@@ -439 +398 @@
-
-
-#ifdef MAEMO_CONIC_DUMMY
-static gboolean
-on_dummy_connection_check (gpointer user_data)
-{
-        TnyMaemoConicDevice *self = NULL;
-        TnyMaemoConicDevicePriv *priv = NULL;
-        gchar *filename = NULL;
-        gchar *contents = NULL;
-        GError* error = NULL;
-        gboolean test = FALSE;
-                
-        self = TNY_MAEMO_CONIC_DEVICE (user_data);
-
-        priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
-        
-        /* Check whether the enviroment variable has changed, 
-         * so we can fake a connection change: */
-        filename = get_dummy_filename ();
-        
-        test = g_file_get_contents (filename, &contents, NULL, &error);
-
-        if(error) {
-                /* g_debug("%s: error from g_file_get_contents(): %s\n", __FUNCTION__, error->message); */
-                g_error_free (error);
-                error = NULL;
-        }
-        
-        if (!test || !contents) {
-                /* g_debug ("DEBUG1: %s: priv->iap = %s\n", priv->iap); */
-                /* Default to the first debug connection: */
-                contents = g_strdup ("debug id0");
-        }
-        
-        if (contents)
-                g_strstrip(contents);
-
-        if ((priv->iap == NULL) || (strcmp (contents, priv->iap) != 0)) {
-                if (priv->iap) {
-                        g_free (priv->iap);
-                        priv->iap = NULL;
-                }
-                        
-                /* We store even the special "none" text, so we can detect changes. */
-                priv->iap = g_strdup (contents);
-                
-                if (strcmp (priv->iap, MAEMO_CONIC_DUMMY_IAP_ID_NONE) == 0) {
-                        priv->is_online = FALSE;
-                        g_debug ("DEBUG: TnyMaemoConicDevice: %s:\n  Dummy connection changed to no connection.\n", __FUNCTION__);
-                } else {
-                        priv->is_online = TRUE;
-                        g_debug ("DEBUG: TnyMaemoConicDevice: %s:\n  Dummy connection changed to '%s\n", __FUNCTION__, priv->iap);
-                }
-                
-                g_debug ("DEBUG1: %s: emitting is_online=%d\n", __FUNCTION__, priv->is_online);
-
-                conic_emit_status (TNY_DEVICE (self), priv->is_online);
-
-        }
-        
-        g_free (contents);
-        g_free (filename);
-        
-        return TRUE;
-}
-#endif /* MAEMO_CONIC_DUMMY */
-
-/**
@@ -524 +418 @@
-        priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
-
-#ifdef MAEMO_CONIC_DUMMY
-        on_dummy_connection_check (self);
-        /* Handle the special "none" text: */
-        if (priv->iap && (strcmp (priv->iap, MAEMO_CONIC_DUMMY_IAP_ID_NONE) == 0))
-                return NULL;
-#endif
-
-        return priv->iap;
-}
@@ -551 +438 @@
-tny_maemo_conic_device_get_iap (TnyMaemoConicDevice *self, const gchar *iap_id)
-{
-#ifdef MAEMO_CONIC_DUMMY
-        ConIcIap *iap = NULL;
-#else
-        TnyMaemoConicDevicePriv *priv = NULL;
-#endif
-
-        g_return_val_if_fail (TNY_IS_MAEMO_CONIC_DEVICE(self), NULL);
-        g_return_val_if_fail (iap_id, NULL);
-
-#ifdef MAEMO_CONIC_DUMMY 
-        /* Note that we have re-declared the private struct so that we 
-         * can do this, which is very bad and fragile: */
-        iap = g_object_new (CON_IC_TYPE_IAP, NULL);
-        iap->id = g_strdup(iap_id);
-        iap->name = g_strdup_printf("%s name", iap->id);
-        return iap;
-#else
-        priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
-        g_return_val_if_fail (priv->cnx, NULL);
-
-function, 
-but we must do so because that mistake has already been made i
-con_ic_connection_get_iap().
-If we just unref immediately then libconic might destroy the object.
-
+
+function, but we must do so because that mistake has already bee
+made in con_ic_connection_get_iap (). If we just unref immediately 
+then libconic might destroy the object. */
+
-        return con_ic_connection_get_iap (priv->cnx, iap_id);
-#endif
-}
-
@@ -594 +466 @@
-tny_maemo_conic_device_get_iap_list (TnyMaemoConicDevice *self)
-{
-#ifdef MAEMO_CONIC_DUMMY
-        GSList* result = NULL;
-        int i = 0;
-#else
-        TnyMaemoConicDevicePriv *priv = NULL;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
-        g_return_val_if_fail (priv->cnx, NULL);
-
-        return con_ic_connection_get_all_iaps (priv->cnx);
-#endif
-}
-
@@ -641 +478 @@
- * tny_maemo_conic_device_free_iap_list:
- * @self: a #TnyDevice object
-
+
+
- * free a  list of IAP objects retrieved from tny_maemo_conic_device_get_iap_list
- *  
- **/
-void
@@ -654 +491 @@
-        }
-        g_slist_free (cnx_list);
-
-
+
+
-
-
@@ -667 +504 @@
-        self = TNY_MAEMO_CONIC_DEVICE (device);
-        priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
-
+
-        already_online = tny_maemo_conic_device_is_online (device);
-
-#ifdef DEBUG
-        g_message (__FUNCTION__);
-        g_message ("force online, current status is: %s", already_online ? "online" : "offline");
-#endif
-
-        priv->forced = TRUE;
+        priv->is_online = TRUE;
-
-        /* Signal if it changed: */
-        if (!already_online)
-
-
+
-}
-
@@ -689 +521 @@
-        TnyMaemoConicDevice *self;
-        TnyMaemoConicDevicePriv *priv;
-#ifndef MAEMO_CONIC_DUMMY
-        gboolean already_offline = FALSE;
-#endif
-
-        g_return_if_fail (TNY_IS_DEVICE(device));
@@ -697 +527 @@
-        priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
-
-#ifdef MAEMO_CONIC_DUMMY
-        return;
-#else
-        already_offline = !tny_maemo_conic_device_is_online (device);
-        priv->forced = TRUE;
+        priv->is_online = FALSE;
+
-        /* Signal if it changed: */
-        if (!already_offline)
-                conic_emit_status (device, FALSE);
-
-
+
+
-}
-
@@ -714 +543 @@
-        g_return_val_if_fail (TNY_IS_DEVICE(self), FALSE);
-
-#ifdef MAEMO_CONIC_DUMMY
-        on_dummy_connection_check (self);
-#endif /* MAEMO_CONIC_DUMMY */
-
-        return TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self)->is_online;
-}
@@ -729 +554 @@
-
-        /* We should not have a real is_online, based on what libconic has told us: */
+
-        priv->forced = FALSE;
-        priv->iap = NULL;
-        priv->is_online = dnsmasq_has_resolv ();
-
-
-#ifndef MAEMO_CONIC_DUMMY
-        priv->cnx = con_ic_connection_new ();
-
+
+
-                g_warning ("con_ic_connection_new failed. The TnyMaemoConicDevice will be useless.");
-        }
-
-        /* This might be necessary to make the connection object actually emit 
@@ -744 +568 @@
-         * even when this is not set, when we explicitly try to connect. The 
-         * signal still does not seem to be emitted. */
-
-        g_object_set (priv->cnx, "automatic-connection-events", TRUE, NULL);
-
-        g_signal_connect (priv->cnx, "connection-event",
-                          G_CALLBACK(on_connection_event), self);
-
+
-        /* This will get us in connected state only if there is already a connection.
-         * thus, this will setup our state correctly when we receive the signals. */
-
-        if (!con_ic_connection_connect (priv->cnx, CON_IC_CONNECT_FLAG_AUTOMATICALLY_TRIGGERED))
-                g_warning ("could not send connect dbus message");
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-}
-
@@ -780 +591 @@
-{
-        TnyMaemoConicDevice *self = g_object_new (TNY_TYPE_MAEMO_CONIC_DEVICE, NULL);
+
-        return TNY_DEVICE (self);
-}
@@ -788 +600 @@
-        TnyMaemoConicDevicePriv *priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (obj);
-
-#ifndef MAEMO_CONIC_DUMMY
-        if (priv->cnx && CON_IC_IS_CONNECTION(priv->cnx)) {
-
-
+
-                g_object_unref (priv->cnx);
-                priv->cnx = NULL;
-        }
-#else
-        if (priv->dummy_env_check_timeout) {
-                g_source_remove (priv->dummy_env_check_timeout);
-                priv->dummy_env_check_timeout = 0;
-        }
-#endif /* MAEMO_CONIC_DUMMY */
-
-        if (priv->iap) {
@@ -806 +610 @@
-                priv->iap = NULL;
-        }
-        
-
-        (*parent_class->finalize) (obj);
@@ -822 +625 @@
-        klass->force_online_func  = tny_maemo_conic_device_force_online;
-}
-
-
-
@@ -875 +677 @@
-        return type;
-}
+
+static void 
+stop_loop (TnyMaemoConicDevice *self)
+{
+        TnyMaemoConicDevicePriv *priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
+        if (priv->loop)
+                g_main_loop_quit (priv->loop);
+        return;
+}
+
+
+/**
+ * tny_maemo_conic_device_connect:
+ * @self: a #TnyDevice object
+ * @iap_id: the id of the Internet Access Point (IAP), or NULL for 'any;
+ * 
+ * Try to connect to a specific IAP, or to any if @iap_id == NULL
+ * this calls con_ic_connection_connect(_by_id).
+ * This may show a dialog to allow the user to select a connection, or 
+ * may otherwise take a significant amount of time. This function blocks until 
+ * the connection has either succeeded or failed.
+ * 
+ * Returns TRUE if a connection was made, FALSE otherwise.
+ **/
+gboolean
+tny_maemo_conic_device_connect (TnyMaemoConicDevice *self, const gchar* iap_id)
+{
+        TnyMaemoConicDevicePriv *priv = NULL;
+        gboolean request_failed = FALSE;
+
+        g_return_val_if_fail (TNY_IS_DEVICE(self), FALSE);
+        priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
+
+        g_return_val_if_fail (priv->cnx, FALSE);
+        priv->loop = g_main_loop_new(NULL, FALSE /* not running immediately. */);
+
+        if (iap_id) {
+                if (!con_ic_connection_connect_by_id (priv->cnx, iap_id, CON_IC_CONNECT_FLAG_NONE)) {
+                        g_warning ("could not send connect_by_id dbus message");
+                        request_failed = TRUE;
+                }
+        } else {
+                if (!con_ic_connection_connect (priv->cnx, CON_IC_CONNECT_FLAG_NONE)) {
+                        g_warning ("could not send connect dbus message");
+                        request_failed = TRUE;
+                }
+        }
+
+        if (request_failed) {
+                g_object_unref (priv->loop);
+                priv->loop = NULL;
+        }
+        
+        /* Wait for the CON_IC_STATUS_CONNECTED (succeeded) or 
+         * CON_IC_STATUS_DISCONNECTED event: */
+         
+        /* This is based on code found in gtk_dialog_run(): */
+        GDK_THREADS_LEAVE();
+        /* Run until g_main_loop_quit() is called by our signal handler. */
+        if (priv->loop)
+                g_main_loop_run (priv->loop);
+        GDK_THREADS_ENTER();
+
+        g_main_loop_unref (priv->loop);
+        priv->loop = NULL;
+
+        return priv->is_online;
+}

trunk/libtinymail-maemo/tny-maemo-conic-device.h

@@ -56 +56 @@
-
-gboolean tny_maemo_conic_device_connect (TnyMaemoConicDevice *self, const gchar* iap_id);
+typedef void (*TnyMaemoConicDeviceConnectCallback) (TnyMaemoConicDevice *self, const gchar* iap_id, gboolean canceled, GError *err, gpointer user_data);
+void tny_maemo_conic_device_connect_async (TnyMaemoConicDevice *self, 
+                                           const gchar* iap_id, 
+