2011-06-21 [paul] 3.7.9cvs27

	* src/mainwindow.c
		revert 3.7.9cvs2, it does no good

diff --git a/ChangeLog b/ChangeLog
index d939449f078a6d302cb4256ae7dafad768367811..1fb9dba2d8d5ea57ac632db87232a5093c3b32d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-21 [paul]      3.7.9cvs27
+
+       * src/mainwindow.c
+               revert 3.7.9cvs2, it does no good
+
 2011-06-18 [mir]       3.7.9cvs26
 
        * configure.ac

diff --git a/PATCHSETS b/PATCHSETS
index 71f8b3babbd49f3673b6ea29f87bcf71a24e825b..a65371c3c8779b458a5fc73707d47ad8d09c326a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4178,3 +4178,4 @@
 ( cvs diff -u -r 1.12.2.65 -r 1.12.2.66 src/action.c;  ) > 3.7.9cvs24.patchset
 ( cvs diff -u -r 1.1.2.18 -r 1.1.2.19 po/ca.po;  cvs diff -u -r 1.9.2.21 -r 1.9.2.22 po/cs.po;  cvs diff -u -r 1.58.2.48 -r 1.58.2.49 po/de.po;  cvs diff -u -r 1.34.2.29 -r 1.34.2.30 po/it.po;  cvs diff -u -r 1.16.2.11 -r 1.16.2.12 po/ja.po;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 po/pt_PT.po;  cvs diff -u -r 1.2.2.32 -r 1.2.2.33 po/sk.po;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 po/uk.po;  cvs diff -u -r 1.43.2.122 -r 1.43.2.123 src/toolbar.c;  cvs diff -u -r 1.4.2.78 -r 1.4.2.79 src/gtk/about.c;  ) > 3.7.9cvs25.patchset
 ( cvs diff -u -r 1.654.2.4253 -r 1.654.2.4254 configure.ac;  ) > 3.7.9cvs26.patchset
+( cvs diff -u -r 1.274.2.324 -r 1.274.2.325 src/mainwindow.c;  ) > 3.7.9cvs27.patchset

diff --git a/configure.ac b/configure.ac
index e18acf0fdb1969c0c67fe7b322cb8cb8930877fc..b7f0e97bcf84306e34f037602d057b3c1eb0ed4e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=26
+EXTRA_VERSION=27
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 72cf6292951860ac7f59ab0fe192321f15d4752c..fe974fd419f38163ef41edca958f65628aa58638 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -3574,7 +3574,6 @@ void main_window_popup(MainWindow *mainwin)
        if (first_start) {
 #ifdef G_OS_UNIX
                gtk_window_deiconify(GTK_WINDOW(mainwin->window));
-               gtkut_window_popup(mainwin->window);
 #endif
                first_start = FALSE;
        } else {