Changeset 2339

Timestamp:

07/02/07 11:48:09

Author:

murrayc

Message:

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

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

(tny_maemo_conic_device_connect): When using scratchbox, show an OK/Cancel dialog
and write a fake connection name to the text file, to simulate what libconic does on
the device.
(on_dummy_connection_check): Interpret 'none' in the text file as meaning no connection.
This leaves an empty file as defaulting to a meaning of connection debugid0.
(tny_maemo_conic_device_get_current_iap_id): Return NULL if the iap is 'none', when in
scratchbox.

Files:

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

trunk/ChangeLog

@@ +1 @@
+2007-07-02  Murray Cumming  <murrayc@murrayc.com>
+
+        * libtinymail-maemo/tny-maemo-conic-device.c:
+        (tny_maemo_conic_device_connect): When using scratchbox, show an OK/Cancel dialog
+        and write a fake connection name to the text file, to simulate what libconic does on 
+        the device.
+        (on_dummy_connection_check): Interpret 'none' in the text file as meaning no connection.
+        This leaves an empty file as defaulting to a meaning of connection debugid0.
+        (tny_maemo_conic_device_get_current_iap_id): Return NULL if the iap is 'none', when in 
+        scratchbox.
+
-2007-07-02  Philip Van Hoof  <pvanhoof@gnome.org>
-

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

@@ -30 +30 @@
-#include <stdio.h> /* for printf */
-
+#ifdef MAEMO_CONIC_DUMMY 
+#include <gtk/gtkmessagedialog.h>
+#endif
+
-#ifdef MAEMO_CONIC_DUMMY
-/* #include "coniciap-private.h"
@@ -48 +52 @@
-
-#define MAEMO_CONIC_DUMMY_IAP_ID_FILENAME "maemo_conic_dummy_id"
+#define MAEMO_CONIC_DUMMY_IAP_ID_NONE "none"
-static gboolean on_dummy_connection_check (gpointer user_data);
-#endif /* MAEMO_CONIC_DUMMY */
@@ -170 +175 @@
-}
-
+#ifdef MAEMO_CONIC_DUMMY
+
+static gchar*
+get_dummy_filename ()
+{
+        gchar *filename = g_build_filename (
+                g_get_home_dir (), 
+                MAEMO_CONIC_DUMMY_IAP_ID_FILENAME,
+                NULL);
+        return filename;
+}
+
+static gboolean dummy_con_ic_connection_connect_by_id (TnyMaemoConicDevice *self, const gchar* iap_id)
+{
+        /* Show a dialog, because libconic would show a dialog here,
+         * and give the user a chance to refuse a new connection, because libconic would allow that too.
+         * This allows us to see roughly similar behaviour in scratchbox as on the device. */
+        GtkDialog *dialog = GTK_DIALOG (gtk_message_dialog_new( NULL, GTK_DIALOG_MODAL,
+                        GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, 
+                        "TnyMaemoConicDevice fake scratchbox implementation:\nThe application requested a connection. Make a fake connection?"));
+        const int response = gtk_dialog_run (dialog);
+        gtk_widget_hide (GTK_WIDGET (dialog));
+        gtk_widget_destroy (GTK_WIDGET (dialog));
+        
+        if (response == GTK_RESPONSE_OK) {
+                /* Make a connection, by setting a name in our dummy text file,
+                 * which will be read later: */
+                gchar *filename = get_dummy_filename ();
+                
+                gchar *contents = 0;
+                GError* error = 0;
+                g_file_set_contents (filename, "debug id0", -1, &error);
+                if(error) {
+                        printf("%s: error from g_file_set_contents(): %s\n", __FUNCTION__, error->message);
+                        g_error_free (error);
+                        error = NULL;
+                }
+                
+                g_free (filename);
+                
+                return TRUE;
+        }
+        else
+                return FALSE;
+}
+
+#endif /* MAEMO_CONIC_DUMMY */
+        
-/**
- * tny_maemo_conic_device_connect:
@@ -186 +239 @@
-tny_maemo_conic_device_connect (TnyMaemoConicDevice *self, const gchar* iap_id)
-{
+        #ifdef MAEMO_CONIC_DUMMY 
+        return dummy_con_ic_connection_connect_by_id (self, iap_id);
+        #endif /* MAEMO_CONIC_DUMMY */
+        
-        TnyMaemoConicDevicePriv *priv;
-
@@ -299 +356 @@
-                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;
-        #endif
-        
@@ -483 +544 @@
-
-#ifdef MAEMO_CONIC_DUMMY
+
-static gboolean on_dummy_connection_check (gpointer user_data)
-{
@@ -490 +552 @@
-        /* Check whether the enviroment variable has changed, 
-         * so we can fake a connection change: */
-
-
-
-
+
-                
-        gchar *contents = 0;
@@ -513 +572 @@
-
-        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);
-                
-
-
+
+
+
+
+
+
+
-                       0, TRUE);
+                }
-        }
-