small compile fixes

pmo-trunk-r1560

diff --git a/src/maemo/modest-main-window-ui.h b/src/maemo/modest-main-window-ui.h
index 6412cdf..ce50796 100644 (file)
--- a/src/maemo/modest-main-window-ui.h
+++ b/src/maemo/modest-main-window-ui.h
@@ -36,12 +36,6 @@
 
 G_BEGIN_DECLS
 
-
-#ifndef GTK_STOCK_FULLSCREEN
-#define GTK_STOCK_FULLSCREEN NULL
-#endif /*GTK_STOCK_FULLSCREEN*/
-
-
 /* Action entries */
 static const GtkActionEntry modest_action_entries [] = {
 

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index c0bf798..b496141 100644 (file)
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -301,6 +301,8 @@ update_folders_cb (TnyFolderStore *folder_store, TnyList *list, GError **err, gp
        self  = MODEST_MAIL_OPERATION (user_data);
        priv  = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
 
+       g_message (__FUNCTION__);
+       
        if (*err) {
                priv->error = g_error_copy (*err);
                priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
@@ -376,10 +378,11 @@ modest_mail_operation_update_account (ModestMailOperation *self,
        priv->total = 0;
        priv->done  = 0;
        priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
-
+       
        /* Get subscribed folders & refresh them */
        folders = TNY_LIST (tny_simple_list_new ());
 
+       g_message ("tny_folder_store_get_folders_async");
        tny_folder_store_get_folders_async (TNY_FOLDER_STORE (store_account),
                                            folders, update_folders_cb, NULL, self);
        

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index d24e0d4..3ea4a8b 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -633,6 +633,7 @@ action_receive (const gchar* account_name)
        mail_op = modest_mail_operation_new ();
        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
        modest_mail_operation_update_account (mail_op, TNY_STORE_ACCOUNT(tny_account));
+
        g_object_unref (G_OBJECT(tny_account));
        g_object_unref (G_OBJECT (mail_op));
                

diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c
index 9044e1e..945ca2c 100644 (file)
--- a/src/modest-widget-memory.c
+++ b/src/modest-widget-memory.c
@@ -196,11 +196,11 @@ restore_settings_window (ModestConf *conf, GtkWindow *win, const gchar *name)
                ModestMainWindowStyle style;
 
                key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_WINDOW_STYLE);
-               if (modest_conf_key_exists (conf, key, NULL))
-                       style = (ModestMainWindowStyle) modest_conf_get_int (conf, key, NULL);  
-               g_free (key);
-
-               modest_main_window_set_style (MODEST_MAIN_WINDOW (win), style);
+               if (modest_conf_key_exists (conf, key, NULL)) {
+                       style = (ModestMainWindowStyle) modest_conf_get_int (conf, key, NULL);          
+                       modest_main_window_set_style (MODEST_MAIN_WINDOW (win), style);
+                       g_free (key);
+               }
        }
 
        return TRUE;

diff --git a/src/widgets/modest-window.h b/src/widgets/modest-window.h
index 1868382..4ea979b 100644 (file)
--- a/src/widgets/modest-window.h
+++ b/src/widgets/modest-window.h
@@ -55,6 +55,10 @@ typedef HildonWindow      ModestWindowParent;
 typedef HildonWindowClass ModestWindowParentClass;
 #endif /*MODEST_PLATFORM_MAEMO */
 
+#ifndef GTK_STOCK_FULLSCREEN
+#define GTK_STOCK_FULLSCREEN ""
+#endif /*GTK_STOCK_FULLSCREEN*/
+
 /* convenience macros */
 #define MODEST_TYPE_WINDOW             (modest_window_get_type())
 #define MODEST_WINDOW(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj),MODEST_TYPE_WINDOW,ModestWindow))