don't crash when no or invalid sender

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 8fe2f077887dae953c62cad2fd5db8e2503a85ef..c03e288c3ecaf3ddf85f131d3830d723110569b1 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2001-05-31 [alfons]
+
+       * src/summaryview.c:
+
+               (add_sender_to_cb): don't crash when no or invalid sender; the add 
+               sender to address book menu item is disabled.
+
 2001-05-30 [hoa]
 
        * src/filtering.[ch]

diff --git a/src/summaryview.c b/src/summaryview.c
index aceea4107186c0b2f6c8d21aafc0a84d4d7db492..8aa41fe9c3b108c0f6e055f92bcb97c851202d58 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -3154,15 +3154,19 @@ static void summary_add_sender_to_cb (SummaryView                       *summaryview,
        /* get the address info from the summary view */
        msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
                                                                                                   summaryview->selected);
-       g_return_if_fail(msginfo != NULL);
-
-       from_address = g_strdup(msginfo->from);
-       eliminate_address_comment(from_address);
-       extract_address(from_address);
-       log_message("adding %s %s\n", msginfo->fromname, from_address);
-       addressbook_add_contact_by_menu(submenu, msginfo->fromname, from_address, NULL);
-       g_free(from_address);
-       
+
+       if (msginfo != NULL && msginfo->fromname != NULL && msginfo->from != NULL) {
+               gtk_widget_set_sensitive(GTK_WIDGET(submenu), TRUE);
+               from_address = g_strdup(msginfo->from);
+               eliminate_address_comment(from_address);
+               extract_address(from_address);
+               log_message("adding %s %s\n", msginfo->fromname, from_address);
+               addressbook_add_contact_by_menu(submenu, msginfo->fromname, from_address, NULL);
+               g_free(from_address);
+       }               
+       else {
+               gtk_widget_set_sensitive(GTK_WIDGET(submenu), FALSE);
+       }
 }
 
 static void summary_num_clicked(GtkWidget *button, SummaryView *summaryview)