Changeset 2067

Timestamp:

05/31/07 19:13:38

Author:

murrayc

Message:

2007-05-31 Murray Cumming <murrayc@murrayc.com>

• • • • libtinymail-maemo/tny-maemo-conic-device.c:
        

(tny_maemo_conic_device_connect): Block until the result is received by
the on_connection_event() signal handler. This always seems to indicate
failure on Maemo Bora, but maybe it works properly in later versions.
It is OK for this to block because the Maemo connection dialog is totally
modal anyway, and because most applications will not be able to do anything
sensible while waiting, because the user is already waiting for an operation
that he has initiated.

• • • • libtinymail/tny-folder.c: (tny_folder_get_all_count): Warn when this
        

is not implemented. Maybe not very necessary, but I seem to have had this
in my local checkout and maybe things crash without the check. Can be removed
later if you like.

Files:

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

trunk/ChangeLog

@@ +1 @@
+2007-05-31  Murray Cumming  <murrayc@murrayc.com>
+
+        * libtinymail-maemo/tny-maemo-conic-device.c:
+        (tny_maemo_conic_device_connect): Block until the result is received by  
+        the on_connection_event() signal handler. This always seems to indicate 
+        failure on Maemo Bora, but maybe it works properly in later versions.
+        It is OK for this to block because the Maemo connection dialog is totally 
+        modal anyway, and because most applications will not be able to do anything 
+        sensible while waiting, because the user is already waiting for an operation 
+        that he has initiated.
+
+        * libtinymail/tny-folder.c: (tny_folder_get_all_count): Warn when this 
+        is not implemented. Maybe not very necessary, but I seem to have had this 
+        in my local checkout and maybe things crash without the check. Can be removed 
+        later if you like.
+
-2007-05-29  Philip Van Hoof  <pvanhoof@gnome.org>
-

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

@@ -54 +54 @@
-        gboolean        forced; /* Whether the is_online value is forced rather than real. */
-        
+        /* When TRUE, we are waiting for the success or failure signal. */
+        gboolean attempting_connection;
+        
-#ifdef MAEMO_CONIC_DUMMY        
-        gint dummy_env_check_timeout;
@@ -117 +120 @@
-                priv->iap = g_strdup (con_ic_event_get_iap_id ((ConIcEvent*)(event)));
-                is_online = TRUE;
+                
+                /* Set this to FALSE to stop blocking 
+                 * tny_maemo_conic_device_connect(): */
+                if (priv->attempting_connection)
+                        priv->attempting_connection = FALSE;
+                        
-                g_message ("new status: CONNECTED (%s)", priv->iap);
-                break;
@@ -122 +131 @@
-                priv->iap = NULL;
-                is_online = FALSE;
+                
+                /* Set this to FALSE to stop blocking 
+                 * tny_maemo_conic_device_connect(): */
+                if (priv->attempting_connection)
+                        priv->attempting_connection = FALSE;
+                        
-                g_message ("new status: DISCONNECTED", priv->iap);
-                break;
@@ -134 +149 @@
-        priv->is_online = is_online;
-        priv->forced = FALSE; /* is_online is now accurate. */
-
+l
-        g_signal_emit (device, tny_device_signals [TNY_DEVICE_CONNECTION_CHANGED],
-                       0, is_online);
@@ -146 +161 @@
- * @iap_id: the id of the Internet Access Point (IAP), or NULL for 'any;
- * 
-
-
-
-
+
+
+
+
+
+
+
- **/
-gboolean
@@ -165 +183 @@
-        
-        if (iap_id) {
+                priv->attempting_connection = TRUE;
+                
-                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");
-                        return FALSE;
-                }
-
+
+
+
-                if (!con_ic_connection_connect (priv->cnx, CON_IC_CONNECT_FLAG_NONE)) {
-                        g_warning ("could not send connect dbus message");
-                        return FALSE;
-                }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

trunk/libtinymail/tny-folder.c

@@ -813 +813 @@
-#endif
-
+        if (TNY_FOLDER_GET_IFACE (self)->get_all_count_func == NULL) {
+                g_warning ("get_all_count_func() not implemented in %s", G_OBJECT_TYPE_NAME(self));
+        }
+
-        return TNY_FOLDER_GET_IFACE (self)->get_all_count_func (self);
-}