Changeset 3577

Timestamp:

04/14/08 16:28:37

Author:

djcb

Message:

* add some extra debugging information
* really disconnect, also in the iap = NULL case. the note in the code was wrong.

Files:

• trunk/libtinymail-maemo/tny-maemo-conic-device.c (modified) (9 diffs)

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

@@ -86 +86 @@
-        info  = (EmitStatusInfo *) user_data;
-
+        g_debug ("%s: destroying %p (idle)", __FUNCTION__, user_data);
+
-        /* We lock the gdk thread because tinymail wants implementations to do
-         * this before emitting signals from within a g_idle_add_full callback.
-         * See http://www.tinymail.org/trac/tinymail/wiki/HowTnyLockable */
-
-        gdk_threads_enter ();
-        g_signal_emit (info->self, tny_device_signals [TNY_DEVICE_CONNECTION_CHANGED],
@@ -95 +96 @@
-        gdk_threads_leave ();
-
+        g_debug ("%s: emitted tny-device-connection-changed signal", __FUNCTION__);
+
-        return FALSE;
-}
@@ -107 +110 @@
-        info = (EmitStatusInfo *) user_data;
-        
+        g_debug ("%s: destroying status info (%p)", __FUNCTION__, user_data);
+
-        if (G_IS_OBJECT(info->self))
-                g_object_unref (info->self);
-        
-        g_slice_free (EmitStatusInfo, info);
+
+        g_debug ("%s: destroyed %p", __FUNCTION__, user_data);
-}
-
@@ -129 +136 @@
-        if (!dnsmasq_has_resolv())
-                time = 5000;
+
+        g_debug ("%s: emitting status (%s, %s) in %d ms", 
+                   __FUNCTION__, info, status ? "true" : "false", time);
-
-        g_timeout_add_full (G_PRIORITY_DEFAULT, time, conic_emit_status_idle,
@@ -212 +222 @@
-} HandleConnInfo;
-
-/* FIXME: this function will always return FALSE, is that correct? */
+
-handle_con_idle (gpointer data)
-{
@@ -418 +428 @@
-        if (iap_id) {
-                if (!con_ic_connection_disconnect_by_id (priv->cnx, iap_id)) {
-
+
+
-                        return FALSE;
-                }
-{
-/* don't try to disconnect if iap_id==NULL, or conic will crash... */
-
+
+if (!con_ic_connection_disconnect (priv->cnx))
+       
-                return FALSE;
-        }
@@ -594 +605 @@
-        priv->cnx = con_ic_connection_new ();
-
-
-
+
+
+
+
-
-        /* This might be necessary to make the connection object actually emit 
@@ -609 +622 @@
-         * 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))
-
-
-
+
+
-}
-
@@ -632 +644 @@
-
-        g_return_if_fail (obj && G_IS_OBJECT(obj));
+
+        g_debug ("%s", __FUNCTION__);
-        
-        priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (obj);
+
-        if (g_signal_handler_is_connected (priv->cnx, priv->signal1))
-                g_signal_handler_disconnect (priv->cnx, priv->signal1);
-
-        if (priv->cnx && CON_IC_IS_CONNECTION(priv->cnx)) {
-
+
+
-                g_object_unref (priv->cnx);
-                priv->cnx = NULL;