Changes to disable cut/copy with images (fixes NB#80355).

[modest] / src / modest-ui-dimming-rules.c

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index 5229f5c..7ab6ff0 100644 (file)
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -625,19 +625,20 @@ modest_ui_dimming_rules_on_reply_msg (ModestWindow *win, gpointer user_data)
        g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE);
        rule = MODEST_DIMMING_RULE (user_data);
 
+       types[0] = TNY_FOLDER_TYPE_DRAFTS;
+       types[1] = TNY_FOLDER_TYPE_OUTBOX;
+       types[2] = TNY_FOLDER_TYPE_ROOT;
+
+       /* Check dimmed rule */
+       if (!dimmed) {
+               dimmed = _selected_folder_is_any_of_type (win, types, 3);
+               if (dimmed)
+                       modest_dimming_rule_set_notification (rule, _("mcen_ib_unable_to_reply"));
+       }
+
        /* main window dimming rules */
        if (MODEST_IS_MAIN_WINDOW(win)) {
                
-               types[0] = TNY_FOLDER_TYPE_DRAFTS; 
-               types[1] = TNY_FOLDER_TYPE_OUTBOX;
-               types[2] = TNY_FOLDER_TYPE_ROOT;
-               
-               /* Check dimmed rule */ 
-               if (!dimmed) {
-                       dimmed = _selected_folder_is_any_of_type (win, types, 3);                       
-                       if (dimmed)
-                               modest_dimming_rule_set_notification (rule, _("mcen_ib_unable_to_reply"));
-               }
                if (!dimmed) {
                        dimmed = _selected_folder_is_empty (MODEST_MAIN_WINDOW(win));                   
                        if (dimmed)
@@ -1808,14 +1809,7 @@ modest_ui_dimming_rules_on_add_to_contacts (ModestWindow *win, gpointer user_dat
                                selection = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
                        }
                } else if (GTK_IS_LABEL (focused)) {
-                       gint start, end;
-                       if (gtk_label_get_selection_bounds (GTK_LABEL (focused), &start, &end)) {
-                               const gchar *start_offset;
-                               start_offset = gtk_label_get_text (GTK_LABEL (focused));
-                               start_offset = g_utf8_offset_to_pointer (start_offset, start);
-                               selection = g_new0 (gchar, end - start + 1);
-                               g_utf8_strncpy (selection, start_offset, end - start);
-                       }
+                       selection = modest_text_utils_label_get_selection (GTK_LABEL (focused));
                } else {
                        gboolean do_check = TRUE;
                        GtkClipboard *clipboard;
@@ -2247,7 +2241,8 @@ _selected_folder_is_any_of_type (ModestWindow *win,
 
 
        /* free */
-       g_object_unref (folder);
+       if (folder)
+               g_object_unref (folder);
 
        return result;  
 }
@@ -2309,7 +2304,7 @@ _invalid_clipboard_selected (ModestWindow *win,
                if (GTK_IS_TEXT_VIEW (focused)) {
                        GtkTextBuffer *buffer = NULL;
                        buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused));
-                       has_selection = gtk_text_buffer_get_has_selection (GTK_TEXT_BUFFER (buffer));
+                       has_selection = modest_text_utils_buffer_selection_is_valid (buffer);
                } else if (GTK_IS_EDITABLE (focused)) {
                        has_selection = gtk_editable_get_selection_bounds (GTK_EDITABLE (focused), NULL, NULL);
                }