talons

commit d4d2d540b9ecc9fc9a0b1a748a38aea4e5bb0962
parent 41b9e356b0875aaa69c1d4be4df61da204a09792
Author: Colin Leroy <colin@colino.net>
Date:   Fri,  7 Mar 2008 20:05:21 +0000

2008-03-07 [colin]	3.3.1cvs18

	* src/mainwindow.c
		MAEMO: Fix bug 1494, 'Trayicon
		plugin breaks UI...'

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/mainwindow.c
 | 
3
++-

4 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-07 [colin]	3.3.1cvs18
+
+	* src/mainwindow.c
+		MAEMO: Fix bug 1494, 'Trayicon 
+		plugin breaks UI...'
+
 2008-03-07 [paul]	3.3.1cvs17
 
 	* src/gtk/authors.h
diff --git a/PATCHSETS b/PATCHSETS
@@ -3252,3 +3252,4 @@
 ( cvs diff -u -r 1.8.2.31 -r 1.8.2.32 src/quote_fmt.c;  ) > 3.3.1cvs15.patchset
 ( cvs diff -u -r 1.274.2.233 -r 1.274.2.234 src/mainwindow.c;  cvs diff -u -r 1.39.2.43 -r 1.39.2.44 src/mainwindow.h;  cvs diff -u -r 1.395.2.357 -r 1.395.2.358 src/summaryview.c;  cvs diff -u -r 1.68.2.44 -r 1.68.2.45 src/summaryview.h;  cvs diff -u -r 1.43.2.95 -r 1.43.2.96 src/toolbar.c;  ) > 3.3.1cvs16.patchset
 ( cvs diff -u -r 1.1.2.46 -r 1.1.2.47 src/gtk/authors.h;  ) > 3.3.1cvs17.patchset
+( cvs diff -u -r 1.274.2.234 -r 1.274.2.235 src/mainwindow.c;  ) > 3.3.1cvs18.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=17
+EXTRA_VERSION=18
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -3153,7 +3153,7 @@ void main_window_show(MainWindow *mainwin)
 {
 	gtk_widget_show(mainwin->window);
 	gtk_widget_show(mainwin->vbox_body);
-
+#ifndef MAEMO
         gtk_widget_set_uposition(mainwin->window,
                                  prefs_common.mainwin_x,
                                  prefs_common.mainwin_y);
@@ -3167,6 +3167,7 @@ void main_window_show(MainWindow *mainwin)
 	gtk_widget_set_size_request(GTK_WIDGET_PTR(mainwin->messageview),
 			     prefs_common.msgview_width,
 			     prefs_common.msgview_height);
+#endif
 }
 
 void main_window_hide(MainWindow *mainwin)