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 5229f5c..56c3baa 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)
@@ -1811,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;
@@ -2247,7 +2251,8 @@ _selected_folder_is_any_of_type (ModestWindow *win,
 
 
        /* free */
-       g_object_unref (folder);
+       if (folder)
+               g_object_unref (folder);
 
        return result;  
 }