Changeset 2643

Timestamp:

08/15/07 14:38:47

Author:

pvanhoof

Message:

2007-08-15 Philip Van Hoof <pvanhoof@gnome.org>

• • • • Improved the TnyMaemoConicDevice? a bit
        

Files:

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

trunk/ChangeLog

@@ +1 @@
+2007-08-15  Philip Van Hoof  <pvanhoof@gnome.org>
+
+        * Improved the TnyMaemoConicDevice a bit
+
-2007-08-15  Murray Cumming  <murrayc@murrayc.com>
-

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

@@ -34 +34 @@
-
-#ifdef MAEMO_CONIC_DUMMY
+
-/* #include "coniciap-private.h"
-
-
-
-
-
-
+
+
+
+
-struct _ConIcIap 
-{
@@ -61 +60 @@
-typedef struct {
-        ConIcConnection *cnx;
-
-
-
-
+
+
+
-        /* When non-NULL, we are waiting for the success or failure signal. */
-        GMainLoop *loop;
-
-
+
-        gint dummy_env_check_timeout;
-#endif /* MAEMO_CONIC_DUMMY */
@@ -75 +72 @@
-#define TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE(o)   \
-        (G_TYPE_INSTANCE_GET_PRIVATE ((o), TNY_TYPE_MAEMO_CONIC_DEVICE, TnyMaemoConicDevicePriv))
-
-
-typedef struct {
@@ -89 +85 @@
-        /* We lock the gdk thread because tinymail wants implementations to do this 
-         * before emitting _any_ signals.
-
-
+ */
+
-        gdk_threads_enter ();
-        g_signal_emit (info->self, tny_device_signals [TNY_DEVICE_CONNECTION_CHANGED],
@@ -117 +113 @@
-         * about this - it would be nice if libconic documented that).
-         * But if there is no mainloop, then just emit it, as tinymail 
-
-
+ */
+
-         /* TODO: We have no way to check for this now, and 
-          * at this time it's not even clear whether tinymail should/can really 
-
-
+ */
+
-        if (TRUE) /* TODO: But NULL is not allowed here: g_main_loop_is_running (NULL)) */
-        {
-                /* Emit it in an idle handler: */
-                EmitStatusInfo *info = g_slice_new (EmitStatusInfo);
-        
-                info->self = g_object_ref (self);
-                info->status = status;
-        
-                g_idle_add_full (G_PRIORITY_DEFAULT, conic_emit_status_idle,
-                        info, conic_emit_status_destroy);
+
-        } else {
-                /* Emit it directly: */
-
- to do this 
-
-
-
+
+
+ to do this 
+ */
+
-                gdk_threads_enter ();
-                g_signal_emit (self, tny_device_signals [TNY_DEVICE_CONNECTION_CHANGED],
@@ -155 +150 @@
-        TnyMaemoConicDevicePriv *priv;
-        gboolean status_before = FALSE;
-
+
-        g_return_if_fail (TNY_IS_DEVICE(device));
-        self = TNY_MAEMO_CONIC_DEVICE (device);
@@ -161 +156 @@
-
-        status_before = tny_maemo_conic_device_is_online (device);
-
-        priv->forced = FALSE;
-
-        if (status_before != tny_maemo_conic_device_is_online (device))
-                conic_emit_status (device, !status_before);
+
+        return;
-}
-
@@ -171 +167 @@
-
-static void 
-
-
-
-
-
-
+
+
+
+
-                g_main_loop_quit (priv->loop);
-}
+return;
-}
-
@@ -184 +178 @@
-on_connection_event (ConIcConnection *cnx, ConIcConnectionEvent *event, gpointer user_data)
-{
-; 
-
+ = TNY_MAEMO_CONIC_DEVICE (user_data);
+ = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (device)
-        gboolean is_online = FALSE;
+        gboolean emit = FALSE;
+
+        /* Don't emit nor make any changes in case of forced state */
+        if (priv->forced)
+                return;
-
-        g_return_if_fail (CON_IC_IS_CONNECTION(cnx));
-
-
-
-
-
+
+
-        g_message (__FUNCTION__);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-        priv->is_online = is_online;
-
+
+
-        g_message ("DEBUG: %s: emitting signal CONNECTION_CHANGED: %s", 
-                   __FUNCTION__, is_online ? "online" : "offline");
-
-
-
+
+
+
+
+
+
-}
-#endif /* MAEMO_CONIC_DUMMY */
@@ -284 +285 @@
-                 * which will be read later: */
-                gchar *filename = get_dummy_filename ();
-
+
-                g_file_set_contents (filename, "debug id0", -1, &error);
-                if(error) {
@@ -291 +292 @@
-                        error = NULL;
-                }
-
+
-                g_free (filename);
-
+
-                return TRUE;
-        }
@@ -319 +320 @@
-tny_maemo_conic_device_connect (TnyMaemoConicDevice *self, const gchar* iap_id)
-{
-       
+
-        return dummy_con_ic_connection_connect_by_id (self, iap_id);
-       
+
-        TnyMaemoConicDevicePriv *priv = NULL;
-        gboolean request_failed = FALSE;
@@ -365 +366 @@
-
-        return priv->is_online;
-       
+
-}
-
@@ -413 +414 @@
-
-#ifdef MAEMO_CONIC_DUMMY
-
-static gboolean
-on_dummy_connection_check (gpointer user_data)
@@ -498 +498 @@
-        priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
-
-       
+
-        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;
-       
+
-
-        return priv->iap;
@@ -525 +525 @@
-tny_maemo_conic_device_get_iap (TnyMaemoConicDevice *self, const gchar *iap_id)
-{
-       
+
-        ConIcIap *iap = NULL;
-       
+
-        TnyMaemoConicDevicePriv *priv = NULL;
-       
-
+
+
-        g_return_val_if_fail (TNY_IS_MAEMO_CONIC_DEVICE(self), NULL);
-        g_return_val_if_fail (iap_id, NULL);
-
-       
+
-        /* Note that we have re-declared the private struct so that we 
-         * can do this, which is very bad and fragile: */
- 
- 
- 
- 
-       
+
+
+
+
+
-        priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
-        g_return_val_if_fail (priv->cnx, NULL);
@@ -551 +551 @@
-         */
-        return con_ic_connection_get_iap (priv->cnx, iap_id);
-       
+
-}
-
@@ -578 +578 @@
-
-#ifdef MAEMO_CONIC_DUMMY
+
-        /* libconic does not return a list of connections when running 
-         * in scratchbox, though it might do this in future when 
@@ -583 +584 @@
-         * So we return a fake list so we can exercise funcationality 
-         * that uses connections: */
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-
- 
- 
- 
- 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#else
-        priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
@@ -667 +668 @@
-#ifdef MAEMO_CONIC_DUMMY
-        return;
-
-
+
-        already_offline = !tny_maemo_conic_device_is_online (device);
-
-        priv->forced = TRUE;
-
-        /* Signal if it changed: */
-        if (!already_offline)
-                conic_emit_status (device, FALSE);
+        return;
+#endif
-}
-
@@ -683 +683 @@
-        g_return_val_if_fail (TNY_IS_DEVICE(self), FALSE);
-
-       
+
-        on_dummy_connection_check (self);
-       
-
+
+
-        return TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self)->is_online;
-}
@@ -695 +695 @@
-{
-        TnyMaemoConicDevice *self = (TnyMaemoConicDevice *)instance;
-
-        TnyMaemoConicDevicePriv *priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
+
+        /* We should not have a real is_online, based on what libconic has told us: */
+        priv->forced = FALSE;
-        priv->iap = NULL;
-        /* priv->is_online = FALSE; */
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        priv->is_online = TRUE; 
-
-
+
+
+
-        priv->cnx = con_ic_connection_new ();
-        if (!priv->cnx) {
@@ -716 +718 @@
-        }
-
-
-
-
-
-
-
+
+
+
+
+
-        g_object_set (priv->cnx, "automatic-connection-events", TRUE, NULL);
-
@@ -727 +728 @@
-                          G_CALLBACK(on_connection_event), self);
-        
-
-
-
-
+
+
+
-        if (!con_ic_connection_connect (priv->cnx, CON_IC_CONNECT_FLAG_AUTOMATICALLY_TRIGGERED))
-                g_warning ("could not send connect dbus message");
-                
-
-
-
-
-
-
+
+
+
+
+
-        /* Allow debuggers to fake a connection change by setting an environment 
-
-
-
-
+
+
+
-        priv->dummy_env_check_timeout = 
-                g_timeout_add (1000, on_dummy_connection_check, self);
-       
+
-}
-
@@ -767 +765 @@
-{
-        TnyMaemoConicDevicePriv *priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (obj);
-
-       
+
+
-        if (priv->cnx && CON_IC_IS_CONNECTION(priv->cnx)) {
-                if (!tny_maemo_conic_device_disconnect (TNY_MAEMO_CONIC_DEVICE(obj),priv->iap))
@@ -775 +773 @@
-                priv->cnx = NULL;
-        }
-
-
-
+
-        if (priv->dummy_env_check_timeout) {
-                g_source_remove (priv->dummy_env_check_timeout);
-                priv->dummy_env_check_timeout = 0;
-        }
-       
-
+
+
-        if (priv->iap) {
-                g_free (priv->iap);