2011-04-10 [colin] 3.7.9cvs2

[claws.git] / src / mainwindow.c

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 7c99e2457b38add4f367fe87444b2f9b7a1c57d6..6f1f3259ac0f56f9c90aadece95472357e9db65b 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1,6 +1,6 @@
 /*
    Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
-   Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail team
+   Copyright (C) 1999-2011 Hiroyuki Yamamoto and the Claws Mail team
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -643,8 +643,8 @@ static GtkActionEntry mainwin_entries[] =
        {"Message/Mark/UnwatchThread",          NULL, N_("Unwatch thread"), NULL, NULL, G_CALLBACK(unwatch_thread_cb) },
        /* separation */
 
-       {"Message/Mark/MarkSpam",               NULL, N_("Mark as spam"), NULL, NULL, G_CALLBACK(mark_as_spam_cb) },
-       {"Message/Mark/MarkHam",                NULL, N_("Mark as ham"), NULL, NULL, G_CALLBACK(mark_as_ham_cb) },
+       {"Message/Mark/MarkSpam",               NULL, N_("Mark as _spam"), NULL, NULL, G_CALLBACK(mark_as_spam_cb) },
+       {"Message/Mark/MarkHam",                NULL, N_("Mark as _ham"), NULL, NULL, G_CALLBACK(mark_as_ham_cb) },
        /* separation */
 
        {"Message/Mark/Lock",                   NULL, N_("Lock"), NULL, NULL, G_CALLBACK(lock_msgs_cb) },
@@ -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 ();
+       gtkut_widget_set_can_focus(online_switch, FALSE);
        CLAWS_SET_TIP(online_switch, 
                             _("You are online. Click the icon to go offline"));
        offline_switch = gtk_button_new ();
@@ -2056,7 +2055,7 @@ MainWindow *main_window_create()
 
        ac_button = gtk_button_new();
        CLAWS_SET_TIP(ac_button, _("Select account"));
-       GTK_WIDGET_UNSET_FLAGS(ac_button, GTK_CAN_FOCUS);
+       gtkut_widget_set_can_focus(ac_button, FALSE);
        gtk_widget_set_size_request(ac_button, -1, 0);
        gtk_box_pack_end(GTK_BOX(hbox_stat), ac_button, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(ac_button), "button_press_event",
@@ -2251,7 +2250,9 @@ MainWindow *main_window_create()
        ADD_MENU_ACCEL_GROUP_TO_WINDOW(summaryview->popupmenu, mainwin->window);
        
 #ifndef GENERIC_UMPC
+#ifdef G_OS_UNIX
        gtk_window_iconify(GTK_WINDOW(mainwin->window));
+#endif
 #endif
 
        g_signal_connect(G_OBJECT(window), "window_state_event",
@@ -2812,7 +2813,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:
@@ -3570,7 +3571,10 @@ void main_window_popup(MainWindow *mainwin)
                gtk_window_maximize(GTK_WINDOW(mainwin->window));
 
        if (first_start) {
+#ifdef G_OS_UNIX
                gtk_window_deiconify(GTK_WINDOW(mainwin->window));
+               gtkut_window_popup(mainwin->window);
+#endif
                first_start = FALSE;
        } else {
                gtkut_window_popup(mainwin->window);