Changeset 1998

Timestamp:

05/17/07 14:47:26

Author:

murrayc

Message:

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

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

(tny_maemo_conic_device_get_iap_list): When MAEMO_CONIC_DUMMY
hack together a list of fake debug* connection IDs as the result,
so we can simulate libconic in scratchbox.

(tny_maemo_conic_device_get_current_iap_id): When MAEMO_CONIC_DUMMY,
return a fake debug* connection ID based on the value of a
MAEMO_CONIC_DUMMY_IAP_ID environment variable, so we can fake a
connection change (though the signal will not be emitted when the
environment variable changes.)

Files:

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

trunk/ChangeLog

@@ +1 @@
+2007-05-17  Murray Cumming  <murrayc@murrayc.com>
+
+        * libtinymail-maemo/tny-maemo-conic-device.c:
+        (tny_maemo_conic_device_get_iap_list): When MAEMO_CONIC_DUMMY 
+        hack together a list of fake debug* connection IDs as the result, 
+        so we can simulate libconic in scratchbox.
+        
+        (tny_maemo_conic_device_get_current_iap_id): When MAEMO_CONIC_DUMMY, 
+        return a fake debug* connection ID based on the value of a 
+        MAEMO_CONIC_DUMMY_IAP_ID environment variable, so we can fake a 
+        connection change (though the signal will not be emitted when the 
+        environment variable changes.)
+        
-2007-05-16  Philip Van Hoof  <pvanhoof@gnome.org>
-

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

@@ -23 +23 @@
-#include <tny-maemo-conic-device.h>
-
+#ifdef MAEMO_CONIC_DUMMY
+/* #include "coniciap-private.h"
+ * This is not installed, so we predeclare 
+ * the struct instead.
+ * Of course, this is a hack and could break if the private API 
+ * changes.
+ * It would be better for libconic to support scratchbox.
+ */
+struct _ConIcIap 
+{
+        GObject parent_instance;
+        gboolean dispose_has_run;
+        gchar *id;
+        gchar *name;
+        gchar *bearer;
+};
+#endif /* MAEMO_CONIC_DUMMY */
+
-static gboolean tny_maemo_conic_device_is_online (TnyDevice *self);
-
@@ -207 +225 @@
-tny_maemo_conic_device_get_current_iap_id (TnyMaemoConicDevice *self)
-{
-TnyMaemoConicDevicePriv *priv;
+
-        
-        g_return_val_if_fail (TNY_IS_MAEMO_CONIC_DEVICE(self), NULL);
-        g_return_val_if_fail (tny_maemo_conic_device_is_online(TNY_DEVICE(self)), NULL);
-
-
-
+
+
+
+
+
+
+
+
+
+
-        return priv->iap;
+        #endif
-}
-
@@ -267 +294 @@
-        g_return_val_if_fail (TNY_IS_MAEMO_CONIC_DEVICE(self), NULL);
-
+#ifdef MAEMO_CONIC_DUMMY
+        /* libconic does not return a list of connections when running 
+         * in scratchbox, though it might do this in future when 
+         * "ethernet support" is implemented.
+         * So we return a fake list so we can exercise funcationality 
+         * that uses connections: */
+         GSList* result = NULL;
+         
+         int i = 0;
+         for (i = 0; i < 10; ++i) {
+                /* con_ic_iap_new (id) would checkc for a gconf dir and 
+                 * fails, though _new() functions should just call g_object_new().
+                 *
+                gchar *id = g_strdup_printf("debug id%d", i);
+                ConIcIap *iap = con_ic_iap_new (id);
+                g_free (id);
+                */
+                
+                /* Note that we have re-declared the private struct so that we 
+                 * can do this, which is very bad and fragile: */
+                ConIcIap *iap = g_object_new (CON_IC_TYPE_IAP, NULL);
+                iap->id = g_strdup_printf("debug id%d", i);
+                iap->name = g_strdup_printf("debug name%d", i);
+
+                result = g_slist_append (result, iap);  
+         }
+         
+         return result;
+#else
-        priv   = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
-        g_return_val_if_fail (priv->cnx, NULL);
-
-        return con_ic_connection_get_all_iaps (priv->cnx);
+#endif
-}
-