* src/modest-tny-msg.c:

        * Prevent a crash when we didn't get a message in the body.
* src/modest-ui-dimming-rules.c:
        * In main window, if focus is on folder view, and no folder is
          selected, details should be dimmed (fixes NB#64991).

pmo-trunk-r3352

diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c
index 051f5e8..56fe1e1 100644 (file)
--- a/src/modest-tny-msg.c
+++ b/src/modest-tny-msg.c
@@ -431,7 +431,7 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from,
 
 
        /* if we don't have a text-part */
-       no_text_part = (strcmp (tny_mime_part_get_content_type (body), "text/html")==0);
+       no_text_part = (!body) || (strcmp (tny_mime_part_get_content_type (body), "text/html")==0);
        
        /* when we're reply, include the text part if we have it, or nothing otherwise. */
        if (is_reply)

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index f874ec2..f435e9c 100644 (file)
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -799,6 +799,9 @@ modest_ui_dimming_rules_on_details (ModestWindow *win, gpointer user_data)
                                        }
 
                                        g_object_unref (folder_store);
+                               } else {
+                                       dimmed = TRUE;
+                                       modest_dimming_rule_set_notification (rule, "");
                                }
                                if (!dimmed) {
                                        dimmed = _msg_download_in_progress (win);