Implement "search messages" action (fixes NB#57209).

[modest] / src / modest-ui-actions.c

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index b6f1bf3..7d1d4ef 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -738,8 +738,6 @@ reply_forward_cb (ModestMailOperation *mail_op,
        ModestWindow *msg_win;
        ModestEditType edit_type;
        gchar *from;
-       GError *err = NULL;
-       TnyFolder *folder = NULL;
        TnyAccount *account = NULL;
        ModestWindowMgr *mgr;
        gchar *signature = NULL;
@@ -796,20 +794,6 @@ reply_forward_cb (ModestMailOperation *mail_op,
                goto cleanup;
        }
 
-       folder = modest_tny_account_get_special_folder (account, TNY_FOLDER_TYPE_DRAFTS);
-       if (!folder) {
-               g_printerr ("modest: failed to find Drafts folder\n");
-               goto cleanup;
-       }
-       
-       tny_folder_add_msg (folder, msg, &err);
-       if (err) {
-               g_printerr ("modest: error adding msg to Drafts folder: %s",
-                           err->message);
-               g_error_free (err);
-               goto cleanup;
-       }       
-
        /* Create and register the windows */
        msg_win = modest_msg_edit_window_new (new_msg, rf_helper->account_name);
        mgr = modest_runtime_get_window_mgr ();
@@ -828,8 +812,6 @@ reply_forward_cb (ModestMailOperation *mail_op,
 cleanup:
        if (new_msg)
                g_object_unref (G_OBJECT (new_msg));
-       if (folder)
-               g_object_unref (G_OBJECT (folder));
        if (account)
                g_object_unref (G_OBJECT (account));
        g_object_unref (msg);
@@ -1251,9 +1233,6 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view,
                set_active_account_from_tny_account (TNY_ACCOUNT (folder_store), MODEST_WINDOW (main_window));
                /* Show account details */
                modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS);
-       } else if (modest_tny_folder_store_is_virtual_local_folders  (folder_store )) {
-               //TODO: Set the virtual folder store as the "active account" somehow:
-               modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS);
        } else {
                if (TNY_IS_FOLDER (folder_store) && selected) {
                        
@@ -3024,3 +3003,11 @@ modest_ui_actions_check_toolbar_dimming_rules (ModestWindow *window)
        /* Update dimmed */     
        modest_window_check_dimming_rules_group (window, "ModestToolbarDimmingRules");  
 }
+
+void
+modest_ui_actions_on_search_messages (GtkAction *action, ModestWindow *window)
+{
+       g_return_if_fail (MODEST_IS_WINDOW (window));
+
+       modest_platform_show_search_messages (GTK_WINDOW (window));
+}