Changeset 2057

Timestamp:

05/28/07 13:11:11

Author:

murrayc

Message:

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

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

(tny_maemo_conic_device_get_current_iap_id),
(on_dummy_connection_check),
(tny_maemo_conic_device_instance_init),
(tny_maemo_conic_device_finalize): Use a file (/home/murrayc/maemo_conic_dummy_id)
instead of an environment variable to set the dummy ID when using
scratchbox so we can check it for changes every 1 second.

Files:

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

trunk/ChangeLog

@@ +1 @@
+2007-05-28  Murray Cumming  <murrayc@murrayc.com>
+
+        * libtinymail-maemo/tny-maemo-conic-device.c:
+        (tny_maemo_conic_device_get_current_iap_id),
+        (on_dummy_connection_check),
+        (tny_maemo_conic_device_instance_init),
+        (tny_maemo_conic_device_finalize): Use a file ($HOME/maemo_conic_dummy_id) 
+        instead of an environment variable to set the dummy ID when using 
+        scratchbox so we can check it for changes every 1 second.
+        
-2007-05-28  Philip Van Hoof  <pvanhoof@gnome.org>
-

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

@@ -39 +39 @@
-        gchar *bearer;
-};
+
+#define MAEMO_CONIC_DUMMY_IAP_ID_FILENAME "maemo_conic_dummy_id"
+static gboolean on_dummy_connection_check (gpointer user_data);
-#endif /* MAEMO_CONIC_DUMMY */
-
@@ -50 +53 @@
-        gchar     *iap;
-        gboolean        forced; /* Whether the is_online value is forced rather than real. */
+        
+#ifdef MAEMO_CONIC_DUMMY        
+        gint dummy_env_check_timeout;
+#endif /* MAEMO_CONIC_DUMMY */
-} TnyMaemoConicDevicePriv;
-
@@ -89 +96 @@
-
-        g_message (__FUNCTION__);
-
-
-
-
-
-
-
-
-
+
-        switch (con_ic_connection_event_get_error(event)) {
-        case CON_IC_CONNECTION_ERROR_NONE:
@@ -238 +237 @@
-        g_return_val_if_fail (tny_maemo_conic_device_is_online(TNY_DEVICE(self)), NULL);
-
+        TnyMaemoConicDevicePriv *priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
-        
-        #ifdef MAEMO_CONIC_DUMMY
-
-
-
-
-
-
-
-
+
+
+
+
+
-        return priv->iap;
-
-
+
+
-
-
@@ -430 +427 @@
-}
-
+#ifdef MAEMO_CONIC_DUMMY
+static gboolean on_dummy_connection_check (gpointer user_data)
+{
+        TnyMaemoConicDevice *self = TNY_MAEMO_CONIC_DEVICE (user_data);
+        TnyMaemoConicDevicePriv *priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
+                
+        /* Check whether the enviroment variable has changed, 
+         * so we can fake a connection change: */
+        gchar *filename = g_build_filename (
+                g_get_home_dir (), 
+                MAEMO_CONIC_DUMMY_IAP_ID_FILENAME,
+                NULL);
+                
+        gchar *contents = 0;
+        GError* error = 0;
+        gboolean test = g_file_get_contents (filename, &contents, NULL, &error);
+        if(error) {
+                /* printf("%s: error from g_file_get_contents(): %s\n", __FUNCTION__, error->message); */
+                g_error_free (error);
+                error = NULL;
+        }
+        
+        if (!test || !contents) {
+                /* Default to the first debug connection: */
+                contents = g_strdup ("debug id0");
+        }
+
+        if (!(priv->iap) || (strcmp (contents, priv->iap) != 0)) {
+                priv->iap = g_strdup (contents);
+                
+                printf ("DEBUG: TnyMaemoConicDevice: %s:\n  Dummy connection changing to %s\n", __FUNCTION__, priv->iap);
+                g_signal_emit (self, tny_device_signals [TNY_DEVICE_CONNECTION_CHANGED],
+                       0, TRUE);
+        }
+        
+        g_free (contents);
+        g_free (filename);
+        
+        return TRUE;
+}
+#endif /* MAEMO_CONIC_DUMMY */
+
+
-
-static void
@@ -455 +495 @@
-        priv->is_online     = FALSE; 
-        priv->forced = FALSE;
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -483 +532 @@
-        }
-
+        #ifdef MAEMO_CONIC_DUMMY
+        if (priv->dummy_env_check_timeout) {
+                g_source_remove (priv->dummy_env_check_timeout);
+                priv->dummy_env_check_timeout = 0;
+        }
+        #endif /* MAEMO_CONIC_DUMMY */
+        
-        if (priv->iap) {
-                g_free (priv->iap);
-                priv->iap = NULL;
-        }
+        
-
-        (*parent_class->finalize) (obj);