Remove (harmless) GLIB CRITICAL

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

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index b637877..56c3baa 100644 (file)
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -33,6 +33,7 @@
 
 #include <string.h>
 #include "modest-ui-dimming-rules.h"
+#include "modest-ui-actions.h"
 #include "modest-dimming-rule.h"
 #include "modest-debug.h"
 #include "modest-tny-folder.h"
@@ -319,7 +320,6 @@ modest_ui_dimming_rules_define_dimming_state (ModestWindow *window)
        return state;
 }
 
-
 gboolean 
 modest_ui_dimming_rules_on_new_msg (ModestWindow *win, gpointer user_data)
 {
@@ -600,8 +600,11 @@ modest_ui_dimming_rules_on_open_msg (ModestWindow *win, gpointer user_data)
        }
        if (!dimmed) {
                dimmed = state->any_marked_as_deleted;
-               if (dimmed)
-                       modest_dimming_rule_set_notification (rule, _("mcen_ib_message_already_deleted"));
+               if (dimmed) {
+                       gchar *msg = modest_ui_actions_get_msg_already_deleted_error_msg (win);
+                       modest_dimming_rule_set_notification (rule, msg);
+                       g_free (msg);
+               }
        }
        if (!dimmed) {
                dimmed = _selected_msg_sent_in_progress (win);
@@ -622,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)
@@ -737,7 +741,9 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data)
                if (!dimmed) {
                        dimmed = state->any_marked_as_deleted;
                        if (dimmed) {
-                               modest_dimming_rule_set_notification (rule, _("mcen_ib_message_already_deleted"));
+                               gchar *msg = modest_ui_actions_get_msg_already_deleted_error_msg (win);
+                               modest_dimming_rule_set_notification (rule, msg);
+                               g_free (msg);
                        }
                }
                if (!dimmed) {
@@ -754,8 +760,11 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data)
                }
                if (!dimmed) {
                        dimmed = state->any_marked_as_deleted;
-                       if (dimmed)
-                               modest_dimming_rule_set_notification (rule, _("mcen_ib_message_already_deleted"));
+                       if (dimmed) {
+                               gchar *msg = modest_ui_actions_get_msg_already_deleted_error_msg (win);
+                               modest_dimming_rule_set_notification (rule, msg);
+                               g_free (msg);
+                       }
                }
                if (!dimmed) {
                        dimmed = state->sent_in_progress;
@@ -950,7 +959,7 @@ modest_ui_dimming_rules_on_main_window_move_to (ModestWindow *win, gpointer user
 
        
        /* Check diming rules for folders transfer  */
-       if (gtk_widget_is_focus (folder_view)) {
+       if (folder_view && gtk_widget_is_focus (folder_view)) {
                TnyFolderType types[5];
                
                types[0] = TNY_FOLDER_TYPE_DRAFTS; 
@@ -963,12 +972,12 @@ modest_ui_dimming_rules_on_main_window_move_to (ModestWindow *win, gpointer user
                if (!dimmed) {
                        dimmed = _selected_folder_not_moveable (MODEST_MAIN_WINDOW(win));
                        if (dimmed)
-                               modest_dimming_rule_set_notification (rule, _("emev_bd_unabletomove_items"));
+                               modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items"));
                }
                if (!dimmed) {
                        dimmed = _selected_folder_is_any_of_type (win, types, 5);
                        if (dimmed)
-                               modest_dimming_rule_set_notification (rule, _("emev_bd_unabletomove_itemsr"));
+                               modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items"));
                }
        }
        
@@ -976,14 +985,14 @@ modest_ui_dimming_rules_on_main_window_move_to (ModestWindow *win, gpointer user
        if (!dimmed) {
                dimmed = (state->already_opened_msg > 0) ? TRUE : FALSE;
                if (dimmed) {
-                       gchar *message = g_strdup_printf(_("emev_bd_unabletomove_items"), 
+                       gchar *message = g_strdup_printf(_("emev_nc_unabletomove_items"),
                                                         state->already_opened_msg);
                        modest_dimming_rule_set_notification (rule, message);
                        g_free(message);
                }
        }
        if (!dimmed) {
-               if (!gtk_widget_is_focus (folder_view))
+               if (!(folder_view && gtk_widget_is_focus (folder_view)))
                        dimmed = _invalid_msg_selected (MODEST_MAIN_WINDOW(win), FALSE, user_data);
                
        }
@@ -1348,17 +1357,17 @@ modest_ui_dimming_rules_on_cut (ModestWindow *win, gpointer user_data)
                        if (!dimmed) {
                                dimmed = _selected_folder_not_deletable (MODEST_MAIN_WINDOW(win));
                                if (dimmed)
-                                       modest_dimming_rule_set_notification (rule, _("emev_bd_unabletomove_items"));
+                                       modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items"));
                        }
                        if (!dimmed) {
                                dimmed = _selected_folder_is_root_or_inbox (MODEST_MAIN_WINDOW(win));
                                if (dimmed)
-                                       modest_dimming_rule_set_notification (rule, _("emev_bd_unabletomove_itemsr"));
+                                       modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items"));
                        }
                        if (!dimmed) {
                                dimmed = _selected_folder_is_any_of_type (win, types, 3);
                                if (dimmed)
-                                       modest_dimming_rule_set_notification (rule, _("emev_bd_unabletomove_itemsr"));
+                                       modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items"));
                        }
                }
        }
@@ -1549,7 +1558,7 @@ modest_ui_dimming_rules_on_editor_remove_attachment (ModestWindow *win, gpointer
                n_att_selected = tny_list_get_length (selected_attachments);
                g_object_unref (selected_attachments);
 
-               dimmed = (n_att_selected != 1);
+               dimmed = (n_att_selected < 1);
        }
        
        return dimmed;
@@ -1803,10 +1812,13 @@ modest_ui_dimming_rules_on_add_to_contacts (ModestWindow *win, gpointer user_dat
                        gint start, end;
                        if (gtk_label_get_selection_bounds (GTK_LABEL (focused), &start, &end)) {
                                const gchar *start_offset;
+                               const gchar *end_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);
+                               end_offset = gtk_label_get_text (GTK_LABEL (focused));
+                               end_offset = g_utf8_offset_to_pointer (end_offset, end);
+                               selection = g_strndup (start_offset, end_offset - start_offset);
+                               g_message (selection);
                        }
                } else {
                        gboolean do_check = TRUE;
@@ -2239,7 +2251,8 @@ _selected_folder_is_any_of_type (ModestWindow *win,
 
 
        /* free */
-       g_object_unref (folder);
+       if (folder)
+               g_object_unref (folder);
 
        return result;  
 }