Changeset 3599

Timestamp:

04/18/08 11:45:57

Author:

jdapena

Message:

* libtinymail-maemo/tny-maemo-conic-device.c: add a simple hack to

detect when we cancel the connection dialog (and then report this
properly)

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-maemo/tny-maemo-conic-device.c (modified) (4 diffs)

trunk/ChangeLog

@@ +1 @@
+2008-04-18  Jose Dapena Paz  <jose@gondomar.wired.citic.igalia.com>
+
+        * libtinymail-maemo/tny-maemo-conic-device.c: add a simple hack to
+        detect when we cancel the connection dialog (and then report this
+        properly).
+
-2008-04-18  Philip Van Hoof <pvanhoof@gnome.org>
-

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

@@ -265 +265 @@
-        HandleConnInfo *iinfo;
-        int con_err, con_state;
+        const gchar *event_iap_id;
-        
-        /* we don't need cnx in this function */
@@ -280 +281 @@
-        con_err = con_ic_connection_event_get_error (event);
-        con_state = con_ic_connection_event_get_status (event);
+        event_iap_id = con_ic_event_get_iap_id ((ConIcEvent *) event);
-
-        switch (con_err) {
@@ -300 +302 @@
-                case CON_IC_STATUS_CONNECTED:
-                        g_free (priv->iap);
-con_ic_event_get_iap_id ((ConIcEvent*)(event))
+event_iap_id
-                        if (!priv->is_online)
-                                emit = TRUE;
@@ -313 +315 @@
-                        if (priv->is_online)
-                                emit = TRUE;
+                        /* if iap is "" then connection attempt has been canceled */
+                        if ((con_err == CON_IC_CONNECTION_ERROR_NONE) &&
+                            (!event_iap_id || (strlen (event_iap_id)== 0)))
+                                con_err = CON_IC_CONNECTION_ERROR_USER_CANCELED;
-                        is_online = FALSE;
-                        /* Stop blocking tny_maemo_conic_device_connect(), if we are: */