Changeset 2372

Timestamp:

07/04/07 11:26:55

Author:

murrayc

Message:

2007-07-04 Murray Cumming <murrayc@murrayc.com>

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

(on_dummy_connection_check): Set is_online here instead of waiting for it to be
set in the signal, becacuse this is used to do a quick check without waiting for the timout
to check the file.
(tny_maemo_conic_device_is_online): In the dummy scratchbox implementation, call
on_dummy_connection_check() before returning is_online, so that it is accurate.

(tny_maemo_conic_device_instance_init),
(tny_maemo_conic_device_finalize): Don't use libconic at all if we are in scratchbox,
because it signals that there is no connection, which confuses our dummy implementation.

Files:

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

trunk/ChangeLog

@@ +1 @@
+2007-07-04  Murray Cumming  <murrayc@murrayc.com>
+
+        * libtinymail-maemo/tny-maemo-conic-device.c:
+        (on_dummy_connection_check): Set is_online here instead of waiting for it to be 
+        set in the signal, becacuse this is used to do a quick check without waiting for the timout 
+        to check the file.
+        (tny_maemo_conic_device_is_online): In the dummy scratchbox implementation, call 
+        on_dummy_connection_check() before returning is_online, so that it is accurate.
+
+        (tny_maemo_conic_device_instance_init),
+        (tny_maemo_conic_device_finalize): Don't use libconic at all if we are in scratchbox, 
+        because it signals that there is no connection, which confuses our dummy implementation.
+
-2007-07-04  Philip Van Hoof  <pvanhoof@gnome.org>
-

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

@@ -195 +195 @@
-                        GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, 
-                        "TnyMaemoConicDevice fake scratchbox implementation:\nThe application requested a connection. Make a fake connection?"));
+        printf ("DEBUG: %s before gtk_dialog_run()\n", __FUNCTION__);
-        const int response = gtk_dialog_run (dialog);
+        printf ("DEBUG: %s after gtk_dialog_run()\n", __FUNCTION__);
-        gtk_widget_hide (GTK_WIDGET (dialog));
-        gtk_widget_destroy (GTK_WIDGET (dialog));
@@ -353 +355 @@
-        
-        #ifdef MAEMO_CONIC_DUMMY
-
-
-
+
-        
-        /* Handle the special "none" text: */
@@ -531 +531 @@
-
-
-static gboolean
-tny_maemo_conic_device_is_online (TnyDevice *self)
-{
-#ifdef MAEMO_CONIC_DUMMY
-        return TRUE;
-#endif /*MAEMO_CONIC_DUMMY*/
-        
-        g_return_val_if_fail (TNY_IS_DEVICE(self), FALSE);      
-
-        return TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self)->is_online;
-}
-
-#ifdef MAEMO_CONIC_DUMMY
-
@@ -580 +568 @@
-                priv->iap = g_strdup (contents);
-                
-
-
-
-
+
+
+
-                } else {
-
-
-
+
+
-                }
+                
+                g_signal_emit (self, tny_device_signals [TNY_DEVICE_CONNECTION_CHANGED],
+                       0, priv->is_online);
-        }
-        
@@ -598 +587 @@
-#endif /* MAEMO_CONIC_DUMMY */
-
+static gboolean
+tny_maemo_conic_device_is_online (TnyDevice *self)
+{
+        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;
+}
-
-
@@ -607 +605 @@
-        TnyMaemoConicDevicePriv *priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
-        priv->iap = NULL;
+        
+        #ifndef MAEMO_CONIC_DUMMY
-        priv->cnx = con_ic_connection_new ();
-        if (!priv->cnx) {
@@ -629 +629 @@
-        if (!con_ic_connection_connect (priv->cnx, CON_IC_CONNECT_FLAG_AUTOMATICALLY_TRIGGERED))
-                g_warning ("could not send connect dbus message");
-
+
+
-        
-        priv->is_online     = FALSE; 
@@ -665 +666 @@
-        TnyMaemoConicDevicePriv *priv;
-        priv   = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (obj);
+        
+        #ifndef MAEMO_CONIC_DUMMY
-        if (priv->cnx && CON_IC_IS_CONNECTION(priv->cnx)) {
-                if (!tny_maemo_conic_device_disconnect (TNY_MAEMO_CONIC_DEVICE(obj),priv->iap))
@@ -671 +674 @@
-                priv->cnx = NULL;
-        }
+        #endif /* MAEMO_CONIC_DUMMY */
-
-        #ifdef MAEMO_CONIC_DUMMY