From 3102b4225a3139d50c26316857fa9206d5afafd6 Mon Sep 17 00:00:00 2001 From: Tristan Chabredier Date: Wed, 31 Jan 2007 22:42:09 +0000 Subject: [PATCH] 2007-01-31 [wwp] 2.7.2cvs9 * src/plugins/trayicon/trayicon.c fix buggy hiding of main window when closing if close-to-tray is not set (bad logics in the trayicon hook code). Changed the quit confirmation message too. --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/plugins/trayicon/trayicon.c | 6 ++++-- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5ee9b2a45..68c744f9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-01-31 [wwp] 2.7.2cvs9 + + * src/plugins/trayicon/trayicon.c + fix buggy hiding of main window when closing if close-to-tray + is not set (bad logics in the trayicon hook code). + Changed the quit confirmation message too. + 2007-01-30 [colin] 2.7.2cvs8 * src/main.c diff --git a/PATCHSETS b/PATCHSETS index 49e8c787d..c2e25bf67 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2326,3 +2326,4 @@ ( cvs diff -u -r 1.3.2.13 -r 1.3.2.14 src/prefs_ext_prog.c; ) > 2.7.2cvs6.patchset ( cvs diff -u -r 1.115.2.130 -r 1.115.2.131 src/main.c; cvs diff -u -r 1.382.2.355 -r 1.382.2.356 src/compose.c; ) > 2.7.2cvs7.patchset ( cvs diff -u -r 1.115.2.131 -r 1.115.2.132 src/main.c; ) > 2.7.2cvs8.patchset +( cvs diff -u -r 1.14.2.49 -r 1.14.2.50 src/plugins/trayicon/trayicon.c; ) > 2.7.2cvs9.patchset diff --git a/configure.ac b/configure.ac index 17dd44837..42ac0fa40 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=7 MICRO_VERSION=2 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=8 +EXTRA_VERSION=9 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/plugins/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c index a91784abc..a9581fbed 100644 --- a/src/plugins/trayicon/trayicon.c +++ b/src/plugins/trayicon/trayicon.c @@ -251,13 +251,15 @@ static gboolean trayicon_close_hook(gpointer source, gpointer data) { if (source) { gboolean *close_allowed = (gboolean*)source; + + if (trayicon_prefs.close_to_tray) { MainWindow *mainwin = mainwindow_get_mainwindow(); - if (trayicon_prefs.close_to_tray) *close_allowed = FALSE; if (GTK_WIDGET_VISIBLE(GTK_WIDGET(mainwin->window))) main_window_hide(mainwin); } + } return FALSE; } @@ -513,7 +515,7 @@ static void trayicon_toggle_offline_cb( gpointer data, guint action, GtkWidget * static void app_exit_cb(MainWindow *mainwin, guint action, GtkWidget *widget) { if (prefs_common.confirm_on_exit) { - if (alertpanel(_("Exit"), _("Exit this program?"), + if (alertpanel(_("Exit"), _("Exit Claws Mail?"), GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL) != G_ALERTALTERNATE) { return; -- 2.25.1