Changeset 2373

Timestamp:

07/04/07 12:44:19

Author:

murrayc

Message:

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

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

(on_dummy_connection_check): Move this to before the first use.
(tny_maemo_conic_device_is_online): Put use of on_dummy_connection_check()
in an ifdef to avoid a linker failure.

Files:

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

trunk/ChangeLog

@@ +1 @@
+2007-07-04  Murray Cumming  <murrayc@murrayc.com>
+
+        * libtinymail-maemo/tny-maemo-conic-device.c:
+        (on_dummy_connection_check): Move this to before the first use.
+        (tny_maemo_conic_device_is_online): Put use of on_dummy_connection_check() 
+        in an ifdef to avoid a linker failure.
+
-2007-07-04  Murray Cumming  <murrayc@murrayc.com>
-

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

@@ -336 +336 @@
-
-
+#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 = get_dummy_filename ();
+                
+        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 (contents)
+                g_strstrip(contents);
+
+        if (!(priv->iap) || (strcmp (contents, priv->iap) != 0)) {
+                if (priv->iap) {
+                        g_free (priv->iap);
+                        priv->iap = NULL;
+                }
+                        
+                /* We store even the special "none" text, so we can detect changes. */
+                priv->iap = g_strdup (contents);
+                
+                if (strcmp (priv->iap, MAEMO_CONIC_DUMMY_IAP_ID_NONE) == 0) {
+                        priv->is_online = FALSE;
+                        printf ("DEBUG: TnyMaemoConicDevice: %s:\n  Dummy connection changed to no connection.\n", __FUNCTION__);
+                } else {
+                        priv->is_online = TRUE;
+                        printf ("DEBUG: TnyMaemoConicDevice: %s:\n  Dummy connection changed to '%s\n", __FUNCTION__, priv->iap);
+                }
+                
+                g_signal_emit (self, tny_device_signals [TNY_DEVICE_CONNECTION_CHANGED],
+                       0, priv->is_online);
+        }
+        
+        g_free (contents);
+        g_free (filename);
+        
+        return TRUE;
+}
+#endif /* MAEMO_CONIC_DUMMY */
-
-/**
@@ -530 +585 @@
-}
-
-
-#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 = get_dummy_filename ();
-                
-        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 (contents)
-                g_strstrip(contents);
-
-        if (!(priv->iap) || (strcmp (contents, priv->iap) != 0)) {
-                if (priv->iap) {
-                        g_free (priv->iap);
-                        priv->iap = NULL;
-                }
-                        
-                /* We store even the special "none" text, so we can detect changes. */
-                priv->iap = g_strdup (contents);
-                
-                if (strcmp (priv->iap, MAEMO_CONIC_DUMMY_IAP_ID_NONE) == 0) {
-                        priv->is_online = FALSE;
-                        printf ("DEBUG: TnyMaemoConicDevice: %s:\n  Dummy connection changed to no connection.\n", __FUNCTION__);
-                } else {
-                        priv->is_online = TRUE;
-                        printf ("DEBUG: TnyMaemoConicDevice: %s:\n  Dummy connection changed to '%s\n", __FUNCTION__, priv->iap);
-                }
-                
-                g_signal_emit (self, tny_device_signals [TNY_DEVICE_CONNECTION_CHANGED],
-                       0, priv->is_online);
-        }
-        
-        g_free (contents);
-        g_free (filename);
-        
-        return TRUE;
-}
-#endif /* MAEMO_CONIC_DUMMY */
-
-static gboolean
-tny_maemo_conic_device_is_online (TnyDevice *self)
@@ -592 +590 @@
-        g_return_val_if_fail (TNY_IS_DEVICE(self), FALSE);      
-
+        #ifdef MAEMO_CONIC_DUMMY
-        on_dummy_connection_check(self);
+        #endif /* MAEMO_CONIC_DUMMY */
-        
-        return TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self)->is_online;