2007-02-01 [wwp] 2.7.2cvs11

	* src/plugins/trayicon/trayicon.c
		Fix a raising issue within KDE.

diff --git a/ChangeLog b/ChangeLog
index 3b6d566436e12f9148631b1ba2636b8717f55e18..09edb0ba3681b548b9981bea15876e36e1497c65 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-01 [wwp]       2.7.2cvs11
+
+       * src/plugins/trayicon/trayicon.c
+               Fix a raising issue within KDE.
+
 2007-02-01 [colin]     2.7.2cvs10
 
        * src/codeconv.c

diff --git a/PATCHSETS b/PATCHSETS
index 9d88ec3bbcf9662c115d880da69e60e2a240fa04..d5a1501ace3c931194c0d1ca33c1f04456838b1c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2328,3 +2328,4 @@
 ( 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
 ( cvs diff -u -r 1.9.2.11 -r 1.9.2.12 src/addressadd.c;  cvs diff -u -r 1.65.2.55 -r 1.65.2.56 src/codeconv.c;  cvs diff -u -r 1.96.2.166 -r 1.96.2.167 src/textview.c;  ) > 2.7.2cvs10.patchset
+( cvs diff -u -r 1.14.2.50 -r 1.14.2.51 src/plugins/trayicon/trayicon.c;  ) > 2.7.2cvs11.patchset

diff --git a/configure.ac b/configure.ac
index 4c9dfdd35e2e3de7508acc579b081cad492a385a..3e9c3c2e1cf2369e52937cc2a272dc8f8643db03 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=10
+EXTRA_VERSION=11
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c
index a9581fbed4b76b7c91703b4840ed26a30a45de34..4112717c28610920fb19bc101fb48f8a88e1cfbb 100644 (file)
--- a/src/plugins/trayicon/trayicon.c
+++ b/src/plugins/trayicon/trayicon.c
@@ -287,12 +287,14 @@ static gboolean click_cb(GtkWidget * widget,
                                        || mainwindow_is_obscured()) {
                                gtk_window_deiconify(GTK_WINDOW(mainwin->window));
                                main_window_show(mainwin);
+                               gtk_window_present(GTK_WINDOW(mainwin->window));
                        } else {
                                main_window_hide(mainwin);
                        }
                } else {
                        gtk_window_deiconify(GTK_WINDOW(mainwin->window));
                        main_window_show(mainwin);
+                       gtk_window_present(GTK_WINDOW(mainwin->window));
         }
                break;
        case 3: