New dimming rule system, to allow dimming buttons in the UI

[modest] / src / dbus_api / modest-dbus-callbacks.c

diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c
index 4c46a6a..cdce41d 100644 (file)
--- a/src/dbus_api/modest-dbus-callbacks.c
+++ b/src/dbus_api/modest-dbus-callbacks.c
@@ -59,6 +59,7 @@
 #include <hildon/hildon.h>
 #include <modest-accounts-window.h>
 #include <modest-folder-window.h>
+#include <modest-mailboxes-window.h>
 #endif
 
 #include <tny-list.h>
@@ -451,8 +452,8 @@ find_msg_async_cb (TnyFolder *folder,
                    GError *err, 
                    gpointer user_data)
 {
-        TnyHeader *header;
-        gchar *msg_uid;
+        TnyHeader *header = NULL;
+        gchar *msg_uid = NULL;
         ModestWindowMgr *win_mgr;
         ModestWindow *msg_view = NULL;
         gboolean is_draft = FALSE;
@@ -465,8 +466,7 @@ find_msg_async_cb (TnyFolder *folder,
         }
 
         header = tny_msg_get_header (msg);
-        if (header && (tny_header_get_flags (header) & TNY_HEADER_FLAG_DELETED)) {
-                g_object_unref (header);
+        if (!header || (tny_header_get_flags (header) & TNY_HEADER_FLAG_DELETED)) {
                modest_platform_run_information_dialog (NULL, _("mail_ni_ui_folder_get_msg_folder_error"), TRUE);
                g_idle_add (notify_error_in_dbus_callback, NULL);
                 goto end;
@@ -495,30 +495,33 @@ find_msg_async_cb (TnyFolder *folder,
                 } else {
                         modest_account_name = NULL;
                 }
-                        
+
                 /* Drafts will be opened in the editor, and others will be opened in the viewer */
                 if (is_draft) {
                        gchar *modest_account_name = NULL;
+                       gchar *mailbox = NULL;
                        gchar *from_header;
-                       
+
                        /* we cannot edit without a valid account... */
                        if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr (), TRUE)) {
                                if (!modest_ui_actions_run_account_setup_wizard(NULL)) {
                                        modest_window_mgr_unregister_header (win_mgr, 
                                                                             header);
-                                       goto cleanup;
+                                       goto end;
                                }
                        }
                
                        from_header = tny_header_dup_from (header);
-                       modest_account_name = modest_utils_get_account_name_from_recipient (from_header);
+                       modest_account_name = modest_utils_get_account_name_from_recipient (from_header, &mailbox);
                        g_free (from_header);
                        
                        if (modest_account_name == NULL) {
                                ModestAccountMgr *mgr = modest_runtime_get_account_mgr ();
                                modest_account_name = modest_account_mgr_get_default_account (mgr);
                        }
-                        msg_view = modest_msg_edit_window_new (msg, modest_account_name, TRUE);
+                        msg_view = modest_msg_edit_window_new (msg, modest_account_name, mailbox, TRUE);
+                       if (mailbox)
+                               g_free (mailbox);
                        g_free (modest_account_name);
                } else {
                         TnyHeader *header;
@@ -532,7 +535,7 @@ find_msg_async_cb (TnyFolder *folder,
                        }
 
                         header = tny_msg_get_header (msg);
-                        msg_view = modest_msg_view_window_new_for_search_result (msg, modest_account_name, msg_uid);
+                        msg_view = modest_msg_view_window_new_for_search_result (msg, modest_account_name, NULL, msg_uid);
                         if (! (tny_header_get_flags (header) & TNY_HEADER_FLAG_SEEN)) {
                                ModestMailOperation *mail_op;
                                
@@ -556,10 +559,11 @@ find_msg_async_cb (TnyFolder *folder,
                }
         }
 
-cleanup:
-        g_object_unref (header);
-
 end:
+       if (header)
+               g_object_unref (header);
+       if (msg_uid)
+               g_free (msg_uid);
         on_find_msg_async_destroy (info);
 }
 
@@ -1179,27 +1183,49 @@ on_idle_open_account (gpointer user_data)
 
 #ifdef MODEST_TOOLKIT_HILDON2
        if (MODEST_IS_ACCOUNTS_WINDOW (top)) {
-               GtkWidget *folder_window;
+               GtkWidget *new_window;
+               ModestProtocolType store_protocol;
+               gboolean mailboxes_protocol;
+
+               store_protocol = modest_account_mgr_get_store_protocol (modest_runtime_get_account_mgr (), 
+                                                                       acc_name);
+               mailboxes_protocol = 
+                       modest_protocol_registry_protocol_type_has_tag (modest_runtime_get_protocol_registry (),
+                                                                       store_protocol,
+                                                                       MODEST_PROTOCOL_REGISTRY_MULTI_MAILBOX_PROVIDER_PROTOCOLS);
 
-               folder_window = (GtkWidget *) modest_folder_window_new (NULL);
-               modest_folder_window_set_account (MODEST_FOLDER_WINDOW (folder_window),
+#ifdef MODEST_TOOLKIT_HILDON2
+               if (mailboxes_protocol) {
+                       new_window = GTK_WIDGET (modest_mailboxes_window_new (acc_name));
+               } else {
+                       new_window = GTK_WIDGET (modest_folder_window_new (NULL));
+                       modest_folder_window_set_account (MODEST_FOLDER_WINDOW (new_window),
+                                                         acc_name);
+               }
+#else
+               new_window = GTK_WIDGET (modest_folder_window_new (NULL));
+               modest_folder_window_set_account (MODEST_FOLDER_WINDOW (new_window),
                                                  acc_name);
-               if (modest_window_mgr_register_window (mgr, MODEST_WINDOW (folder_window), NULL)) {
-                       gtk_widget_show (folder_window);
+#endif
+
+               if (modest_window_mgr_register_window (mgr, MODEST_WINDOW (new_window), NULL)) {
+                       gtk_widget_show (new_window);
                } else {
-                       gtk_widget_destroy (folder_window);
-                       folder_window = NULL;
+                       gtk_widget_destroy (new_window);
+                       new_window = NULL;
                }
        }
 #else
        if (MODEST_IS_MAIN_WINDOW (top)) {
                gchar *server_name;
+               GtkWidget *folder_view;
+
                folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (top),
                                                                   MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
-               server_name = modest_account_mgr_get_server_account_name (mgr, acc_name,
-                                                                         TNY_ACCOUNT_TYPE_STORE);
+               server_name = modest_account_mgr_get_server_account_name (modest_runtime_get_account_mgr (), 
+                                                                         acc_name, TNY_ACCOUNT_TYPE_STORE);
                if (server_name) {
-                       modest_folder_view_set_account_id_of_visible_server_account (folder_view,
+                       modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (folder_view),
                                                                                     server_name);
                        g_free (server_name);
                }