talons

commit 93540fbdfb5b64a9e2567578cecb6f80dab6da06
parent 5c08ed5d4f30f6449160ac4760b02b6b75b91524
Author: Colin Leroy <colin@colino.net>
Date:   Tue, 18 Nov 2008 18:07:21 +0000

2008-11-18 [colin]	3.6.1cvs33

	* src/mainwindow.h
		Put back conditional at the end of struct

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/mainwindow.h
 | 
7
++++---

4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-18 [colin]	3.6.1cvs33
+
+	* src/mainwindow.h
+		Put back conditional at the end of struct
+
 2008-11-18 [colin]	3.6.1cvs32
 
 	* src/procmime.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3614,3 +3614,4 @@
 ( cvs diff -u -r 1.382.2.482 -r 1.382.2.483 src/compose.c;  ) > 3.6.1cvs30.patchset
 ( cvs diff -u -r 1.382.2.483 -r 1.382.2.484 src/compose.c;  ) > 3.6.1cvs31.patchset
 ( cvs diff -u -r 1.49.2.119 -r 1.49.2.120 src/procmime.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/common/w32_reg.c;  ) > 3.6.1cvs32.patchset
+( cvs diff -u -r 1.39.2.53 -r 1.39.2.54 src/mainwindow.h;  ) > 3.6.1cvs33.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=32
+EXTRA_VERSION=33
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mainwindow.h b/src/mainwindow.h
@@ -136,12 +136,13 @@ struct _MainWindow
 	GtkWidget	*warning_btn;
 	GtkWidget 	*tags_menu;
 	
-#ifdef HAVE_LIBSM
-	gpointer smc_conn;
-#endif
 	gboolean	 in_folder;
 	GtkActionGroup	*action_group;
 	GtkUIManager	*ui_manager;
+
+#ifdef HAVE_LIBSM
+	gpointer smc_conn;
+#endif
 };
 
 MainWindow *main_window_create		(void);