Changeset 2627

Timestamp:

08/14/07 17:23:34

Author:

murrayc

Message:

2007-08-14 Murray Cumming <murrayc@murrayc.com>

* libtinymail-camel/tny-camel-folder.c:
(tny_camel_folder_transfer_msgs_default): Remove unused err variable
to fix a compiler warning.
* libtinymail-maemo/tny-maemo-conic-device.c: Formatting/syntax
changes requested by Philip.

Files:

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

trunk/ChangeLog

@@ +1 @@
+2007-08-14  Murray Cumming  <murrayc@murrayc.com>
+
+        * libtinymail-camel/tny-camel-folder.c:
+        (tny_camel_folder_transfer_msgs_default): Remove unused err variable 
+        to fix a compiler warning.
+        * libtinymail-maemo/tny-maemo-conic-device.c: Formatting/syntax 
+        changes requested by Philip.
+
-2007-08-14  Philip Van Hoof  <pvanhoof@gnome.org>
-

trunk/libtinymail-camel/tny-camel-folder.c

@@ -4001 +4001 @@
-        gint from = 0, to = 0, ufrom = 0, uto = 0;
-        TnyCamelFolderPriv *priv_src, *priv_dst;
-        gboolean on_err = FALSE;
-
-        priv_src = TNY_CAMEL_FOLDER_GET_PRIVATE (self);

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

@@ -28 +28 @@
-#include <gdk/gdk.h> /* For GDK_THREAD_ENTER/LEAVE */
-#include <string.h> /* For strcmp() */
-#include <stdio.h> /* for printf */
-
-#ifdef MAEMO_CONIC_DUMMY 
@@ -124 +123 @@
-        TnyMaemoConicDevice *self;
-        TnyMaemoConicDevicePriv *priv;
+        gboolean status_before = FALSE;
+        
-        g_return_if_fail (TNY_IS_DEVICE(device));
-        self = TNY_MAEMO_CONIC_DEVICE (device);
-        priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
-
-const gboolean 
+
-
-        priv->forced = FALSE;
@@ -234 +235 @@
-dummy_con_ic_connection_connect_by_id (TnyMaemoConicDevice *self, const gchar* iap_id)
-{
+        int response = 0;
+        
-        /* 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.
@@ -240 +243 @@
-                        GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, 
-                        "TnyMaemoConicDevice fake scratchbox implementation:\nThe application requested a connection. Make a fake connection?"));
-
-
-
+
+
-        gtk_widget_hide (GTK_WIDGET (dialog));
-        gtk_widget_destroy (GTK_WIDGET (dialog));
-        
-        if (response == GTK_RESPONSE_OK) {
+                GError* error = NULL;
-                /* Make a connection, by setting a name in our dummy text file,
-                 * which will be read later: */
-                gchar *filename = get_dummy_filename ();
-                
-                GError* error = 0;
-                g_file_set_contents (filename, "debug id0", -1, &error);
-                if(error) {
-printf
+g_warning
-                        g_error_free (error);
-                        error = NULL;
@@ -288 +290 @@
-        #ifdef MAEMO_CONIC_DUMMY 
-        return dummy_con_ic_connection_connect_by_id (self, iap_id);
-ndif /* MAEMO_CONIC_DUMMY */
-
-TnyMaemoConicDevicePriv *priv
+lse
+TnyMaemoConicDevicePriv *priv = NULL;
+gboolean request_failed = FALSE
-
-        g_return_val_if_fail (TNY_IS_DEVICE(self), FALSE);
@@ -302 +304 @@
-        priv->loop = g_main_loop_new(NULL, FALSE /* not running immediately. */);
-
-        gboolean request_failed = FALSE;
-        if (iap_id) {
-                if (!con_ic_connection_connect_by_id (priv->cnx, iap_id, CON_IC_CONNECT_FLAG_NONE)) {
@@ -333 +334 @@
-
-        return priv->is_online;
+        #endif /* MAEMO_CONIC_DUMMY */
-}
-
@@ -375 +377 @@
-#endif /* MAEMO_CONIC_DUMMY*/
-
-        printf ("DEBUG: %s: end.\n", __FUNCTION__);
-        return TRUE;
-}
@@ -384 +385 @@
-static gboolean on_dummy_connection_check (gpointer user_data)
-{
-
-
+
+
+
+
+
+
+
+
+
+
+
-        /* Check whether the enviroment variable has changed, 
-         * so we can fake a connection change: */
-
-
-
-
+
+
+
-
-        if(error) {
-printf
+g_debug
-                g_error_free (error);
-                error = NULL;
@@ -400 +409 @@
-        
-        if (!test || !contents) {
-printf
+g_debug
-                /* Default to the first debug connection: */
-                contents = g_strdup ("debug id0");
@@ -419 +428 @@
-                if (strcmp (priv->iap, MAEMO_CONIC_DUMMY_IAP_ID_NONE) == 0) {
-                        priv->is_online = FALSE;
-printf
+g_debug
-                } else {
-                        priv->is_online = TRUE;
-printf
+g_debug
-                }
-                
-printf
+g_debug
-
-                conic_emit_status (TNY_DEVICE (self), priv->is_online);
@@ -484 +493 @@
-tny_maemo_conic_device_get_iap (TnyMaemoConicDevice *self, const gchar *iap_id)
-{
+        #ifdef MAEMO_CONIC_DUMMY
+        ConIcIap *iap = NULL;
+        #else
+        TnyMaemoConicDevicePriv *priv = NULL;
+        #endif
+        
-        g_return_val_if_fail (TNY_IS_MAEMO_CONIC_DEVICE(self), NULL);
-        g_return_val_if_fail (iap_id, NULL);
@@ -490 +505 @@
-        /* Note that we have re-declared the private struct so that we 
-         * can do this, which is very bad and fragile: */
-ConIcIap *
+
-        iap->id = g_strdup(iap_id);
-        iap->name = g_strdup_printf("%s name", iap->id);
@@ -521 +536 @@
-tny_maemo_conic_device_get_iap_list (TnyMaemoConicDevice *self)
-{
+#ifdef MAEMO_CONIC_DUMMY
+        GSList* result = NULL;
+        int i = 0;
+#else
+        TnyMaemoConicDevicePriv *priv = NULL;
+#endif /* MAEMO_CONIC_DUMMY */
+        
-        g_return_val_if_fail (TNY_IS_MAEMO_CONIC_DEVICE(self), NULL);
-
@@ -529 +551 @@
-         * 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 
@@ -586 +605 @@
-        TnyMaemoConicDevice *self;
-        TnyMaemoConicDevicePriv *priv;
+        gboolean already_online = FALSE;
-        g_return_if_fail (TNY_IS_DEVICE(device));
-        self = TNY_MAEMO_CONIC_DEVICE (device);
-        priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
-        
-const gboolean 
+
-
-        g_message (__FUNCTION__);
@@ -609 +629 @@
-        TnyMaemoConicDevice *self;
-        TnyMaemoConicDevicePriv *priv;
+        gboolean already_offline = FALSE;
-        g_return_if_fail (TNY_IS_DEVICE(device));
-        self = TNY_MAEMO_CONIC_DEVICE (device);
@@ -617 +638 @@
-#endif /*MAEMO_CONIC_DUMMY*/
-
-const gboolean 
+
-
-        priv->forced = TRUE;
@@ -632 +653 @@
-
-        #ifdef MAEMO_CONIC_DUMMY
-
+ 
-        #endif /* MAEMO_CONIC_DUMMY */
-        
@@ -703 +724 @@
-tny_maemo_conic_device_finalize (GObject *obj)
-{
-
-
-
-
+
-        
-        #ifndef MAEMO_CONIC_DUMMY