* Renamed on_paste_msg by on_paste

pmo-trunk-r3131

diff --git a/src/maemo/modest-main-window-ui-dimming.h b/src/maemo/modest-main-window-ui-dimming.h
index 3a24805..ce718f0 100644 (file)
--- a/src/maemo/modest-main-window-ui-dimming.h
+++ b/src/maemo/modest-main-window-ui-dimming.h
@@ -57,7 +57,7 @@ static const ModestDimmingEntry modest_main_window_menu_dimming_entries [] = {
        { "/MenuBar/EditMenu", NULL },
        { "/MenuBar/EditMenu/EditCutMenu", G_CALLBACK(modest_ui_dimming_rules_on_cut) },
        { "/MenuBar/EditMenu/EditCopyMenu", G_CALLBACK(modest_ui_dimming_rules_on_copy) },
        { "/MenuBar/EditMenu", NULL },
        { "/MenuBar/EditMenu/EditCutMenu", G_CALLBACK(modest_ui_dimming_rules_on_cut) },
        { "/MenuBar/EditMenu/EditCopyMenu", G_CALLBACK(modest_ui_dimming_rules_on_copy) },

-       { "/MenuBar/EditMenu/EditPasteMenu", G_CALLBACK(modest_ui_dimming_rules_on_paste_msgs) },
+       { "/MenuBar/EditMenu/EditPasteMenu", G_CALLBACK(modest_ui_dimming_rules_on_paste) },

        { "/MenuBar/EditMenu/EditSelectAllMenu", G_CALLBACK(modest_ui_dimming_rules_on_select_all)},
        { "/MenuBar/EditMenu/EditMarkAsReadMenu", G_CALLBACK(modest_ui_dimming_rules_on_mark_as_read_msg) },
        { "/MenuBar/EditMenu/EditMarkAsUnreadMenu", G_CALLBACK(modest_ui_dimming_rules_on_mark_as_unread_msg) },
        { "/MenuBar/EditMenu/EditSelectAllMenu", G_CALLBACK(modest_ui_dimming_rules_on_select_all)},
        { "/MenuBar/EditMenu/EditMarkAsReadMenu", G_CALLBACK(modest_ui_dimming_rules_on_mark_as_read_msg) },
        { "/MenuBar/EditMenu/EditMarkAsUnreadMenu", G_CALLBACK(modest_ui_dimming_rules_on_mark_as_unread_msg) },

@@ -96,7 +96,7 @@ static const ModestDimmingEntry modest_main_window_menu_dimming_entries [] = {
        { "/HeaderViewCSM/HeaderViewCSMForward", G_CALLBACK(modest_ui_dimming_rules_on_reply_msg) },
        { "/HeaderViewCSM/HeaderViewCSMCut", NULL },
        { "/HeaderViewCSM/HeaderViewCSMCopy", NULL },
        { "/HeaderViewCSM/HeaderViewCSMForward", G_CALLBACK(modest_ui_dimming_rules_on_reply_msg) },
        { "/HeaderViewCSM/HeaderViewCSMCut", NULL },
        { "/HeaderViewCSM/HeaderViewCSMCopy", NULL },

-       { "/HeaderViewCSM/HeaderViewCSMPaste", G_CALLBACK(modest_ui_dimming_rules_on_paste_msgs) },
+       { "/HeaderViewCSM/HeaderViewCSMPaste", G_CALLBACK(modest_ui_dimming_rules_on_paste) },

        { "/HeaderViewCSM/HeaderViewCSMDelete", G_CALLBACK(modest_ui_dimming_rules_on_delete_msg) },
        { "/HeaderViewCSM/HeaderViewCSMCancelSending", G_CALLBACK(modest_ui_dimming_rules_on_cancel_sending) },
        { "/HeaderViewCSM/HeaderViewCSMHelp", NULL },
        { "/HeaderViewCSM/HeaderViewCSMDelete", G_CALLBACK(modest_ui_dimming_rules_on_delete_msg) },
        { "/HeaderViewCSM/HeaderViewCSMCancelSending", G_CALLBACK(modest_ui_dimming_rules_on_cancel_sending) },
        { "/HeaderViewCSM/HeaderViewCSMHelp", NULL },

@@ -104,7 +104,7 @@ static const ModestDimmingEntry modest_main_window_menu_dimming_entries [] = {
        /* Contextual Menus (Folder View) */
        { "/FolderViewCSM/FolderViewCSMNewFolder", G_CALLBACK(modest_ui_dimming_rules_on_new_folder) },
        { "/FolderViewCSM/FolderViewCSMRenameFolder", G_CALLBACK(modest_ui_dimming_rules_on_rename_folder) },
        /* Contextual Menus (Folder View) */
        { "/FolderViewCSM/FolderViewCSMNewFolder", G_CALLBACK(modest_ui_dimming_rules_on_new_folder) },
        { "/FolderViewCSM/FolderViewCSMRenameFolder", G_CALLBACK(modest_ui_dimming_rules_on_rename_folder) },

-       { "/FolderViewCSM/FolderViewCSMPasteMsgs", G_CALLBACK(modest_ui_dimming_rules_on_paste_msgs) },
+       { "/FolderViewCSM/FolderViewCSMPasteMsgs", G_CALLBACK(modest_ui_dimming_rules_on_paste) },

        { "/FolderViewCSM/FolderViewCSMDeleteFolder", G_CALLBACK(modest_ui_dimming_rules_on_delete_folder) },
        { "/FolderViewCSM/FolderViewCSMSearchMessages", NULL },
        { "/FolderViewCSM/FolderViewCSMHelp", NULL },
        { "/FolderViewCSM/FolderViewCSMDeleteFolder", G_CALLBACK(modest_ui_dimming_rules_on_delete_folder) },
        { "/FolderViewCSM/FolderViewCSMSearchMessages", NULL },
        { "/FolderViewCSM/FolderViewCSMHelp", NULL },

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index 2e639df..9bcf477 100644 (file)
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -1001,7 +1001,7 @@ modest_ui_dimming_rules_on_find_msg (ModestWindow *win, gpointer user_data)
 }
 
 gboolean 
 }
 
 gboolean 

-modest_ui_dimming_rules_on_paste_msgs (ModestWindow *win, gpointer user_data)
+modest_ui_dimming_rules_on_paste (ModestWindow *win, gpointer user_data)

 {
        ModestDimmingRule *rule = NULL;
        TnyFolderType types[3];
 {
        ModestDimmingRule *rule = NULL;
        TnyFolderType types[3];

@@ -1019,12 +1019,16 @@ modest_ui_dimming_rules_on_paste_msgs (ModestWindow *win, gpointer user_data)
        if (!dimmed) {
                dimmed = _clipboard_is_empty (win);
                if (dimmed)
        if (!dimmed) {
                dimmed = _clipboard_is_empty (win);
                if (dimmed)

-                       modest_dimming_rule_set_notification (rule, dgettext("hildon-common-strings", "ecoc_ib_edwin_nothing_to_paste"));
+                       modest_dimming_rule_set_notification (rule, 
+                                                             dgettext("hildon-common-strings", 
+                                                                      "ecoc_ib_edwin_nothing_to_paste"));

        }
        if (!dimmed) {
                dimmed = _selected_folder_is_any_of_type (win, types, 3);
                if (dimmed)
        }
        if (!dimmed) {
                dimmed = _selected_folder_is_any_of_type (win, types, 3);
                if (dimmed)

-                       modest_dimming_rule_set_notification (rule, dgettext("hildon-common-strings", "ckct_ib_unable_to_paste_here"));
+                       modest_dimming_rule_set_notification (rule, 
+                                                             dgettext("hildon-common-strings", 
+                                                                      "ckct_ib_unable_to_paste_here"));

        }
        if (!dimmed) {
                dimmed = !_folder_view_has_focus (win);
        }
        if (!dimmed) {
                dimmed = !_folder_view_has_focus (win);

@@ -1036,7 +1040,9 @@ modest_ui_dimming_rules_on_paste_msgs (ModestWindow *win, gpointer user_data)
        if (!dimmed) {
                dimmed = _selected_folder_not_writeable (MODEST_MAIN_WINDOW(win));
                if (dimmed) {
        if (!dimmed) {
                dimmed = _selected_folder_not_writeable (MODEST_MAIN_WINDOW(win));
                if (dimmed) {

-                       modest_dimming_rule_set_notification (rule, dgettext("hildon-common-strings", "ckct_ib_unable_to_paste_here"));
+                       modest_dimming_rule_set_notification (rule, 
+                                                             dgettext("hildon-common-strings", 
+                                                                      "ckct_ib_unable_to_paste_here"));

                }
        }
        if (!dimmed) {
                }
        }
        if (!dimmed) {

diff --git a/src/modest-ui-dimming-rules.h b/src/modest-ui-dimming-rules.h
index 5b74ebd..36888c5 100644 (file)
--- a/src/modest-ui-dimming-rules.h
+++ b/src/modest-ui-dimming-rules.h
@@ -57,7 +57,7 @@ gboolean modest_ui_dimming_rules_on_mark_as_unread_msg (ModestWindow *win, gpoin
 gboolean modest_ui_dimming_rules_on_move_to (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_main_window_move_to (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_view_window_move_to (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_move_to (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_main_window_move_to (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_view_window_move_to (ModestWindow *win, gpointer user_data);

-gboolean modest_ui_dimming_rules_on_paste_msgs (ModestWindow *win, gpointer user_data);
+gboolean modest_ui_dimming_rules_on_paste (ModestWindow *win, gpointer user_data);

 gboolean modest_ui_dimming_rules_on_delete_msgs (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_select_all (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_view_attachments (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_delete_msgs (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_select_all (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_view_attachments (ModestWindow *win, gpointer user_data);