2008-11-18 [colin] 3.6.1cvs33

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

diff --git a/ChangeLog b/ChangeLog
index 512824e51fca87d7c4631a7e6f8fc9d0574049df..94a8cd91abcfb8342c2fc05666a8299a3655782b 100644 (file)
--- 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
index 24142ddc82fd5da68a5f3f232658caa4871b9739..77ebc1b76ff8987a11cd3e43883866b8971ba466 100644 (file)
--- 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
index e3b3e624b7ad41a0e8794d2ee056de1f0ea6e030..ad4f78b48997acf2b64e9a821225fffceb8345c9 100644 (file)
--- 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
index 0e74cc323ad0449775ca017a78ae70c4378b1245..a16c182a254154649813ad67fb69ab2c1a8b7b0e 100644 (file)
--- 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);