2010-09-19 [pawel] 3.7.6cvs40

[claws.git] / src / mainwindow.c

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 7c99e2457b38add4f367fe87444b2f9b7a1c57d6..a608ae34e083f268f559b83e2007ffcdf733e69e 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -2012,8 +2012,6 @@ MainWindow *main_window_create()
        g_signal_connect(G_OBJECT(warning_btn), "button-press-event", 
                         G_CALLBACK(warning_icon_pressed),
                         (gpointer) mainwin);
-       g_signal_connect(G_OBJECT(warning_btn), "visibility-notify-event",
-                        G_CALLBACK(warning_visi_notify), mainwin);
        g_signal_connect(G_OBJECT(warning_btn), "motion-notify-event",
                         G_CALLBACK(warning_visi_notify), mainwin);
        g_signal_connect(G_OBJECT(warning_btn), "leave-notify-event",
@@ -2037,6 +2035,7 @@ MainWindow *main_window_create()
        online_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_ONLINE);
        offline_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_OFFLINE);
        online_switch = gtk_button_new ();
+       GTK_WIDGET_UNSET_FLAGS(online_switch, GTK_CAN_FOCUS);
        CLAWS_SET_TIP(online_switch, 
                             _("You are online. Click the icon to go offline"));
        offline_switch = gtk_button_new ();
@@ -2812,7 +2811,7 @@ void main_window_toggle_message_view(MainWindow *mainwin)
        SummaryView *summaryview = mainwin->summaryview;
        GtkWidget *ppaned = NULL;
        GtkWidget *container = NULL;
-       
+
        switch (prefs_common.layout_mode) {
        case NORMAL_LAYOUT:
        case VERTICAL_LAYOUT:
@@ -3349,10 +3348,13 @@ void main_create_mailing_list_menu (MainWindow *mainwin, MsgInfo *msginfo)
        
        if (msginfo) 
                is_menu = mailing_list_create_submenu (mainwin, msginfo);
-       if (is_menu)
+       if (is_menu) {
                cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/Message/MailingList", TRUE);
-       else
+               cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/Message/ReplyTo/List", TRUE);
+       } else {
                cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/Message/MailingList", FALSE);
+               cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/Message/ReplyTo/List", FALSE);
+       }       
 }
 
 static gint mailing_list_create_submenu (MainWindow *mainwin, MsgInfo *msginfo)