2008-11-21 [colin] 3.6.1cvs38

	* src/mimeview.h
	* src/toolbar.h
	* src/common/session.h
	* src/common/smtp.h
		Move conditional-compilation members to
		end of structs

diff --git a/ChangeLog b/ChangeLog
index 7bbd84d3b0c7885e4114811b880a0b720bde730c..3162584364a3fa16c82c076f3f14ef52e190fe44 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-11-21 [colin]     3.6.1cvs38
+
+       * src/mimeview.h
+       * src/toolbar.h
+       * src/common/session.h
+       * src/common/smtp.h
+               Move conditional-compilation members to
+               end of structs
+
 2008-11-19 [wwp]       3.6.1cvs37
 
        * src/prefs_actions.c

diff --git a/PATCHSETS b/PATCHSETS
index 9ca4a57d40af968bc356e0e96970b8fbfda49b80..c5b371d2bff90cdff877481efa2310d33af0603c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3619,3 +3619,4 @@
 ( cvs diff -u -r 1.382.2.484 -r 1.382.2.485 src/compose.c;  cvs diff -u -r 1.204.2.182 -r 1.204.2.183 src/prefs_common.c;  cvs diff -u -r 1.103.2.117 -r 1.103.2.118 src/prefs_common.h;  ) > 3.6.1cvs35.patchset
 ( cvs diff -u -r 1.382.2.485 -r 1.382.2.486 src/compose.c;  cvs diff -u -r 1.75.2.61 -r 1.75.2.62 src/matcher.c;  cvs diff -u -r 1.94.2.191 -r 1.94.2.192 src/messageview.c;  cvs diff -u -r 1.83.2.147 -r 1.83.2.148 src/mimeview.c;  cvs diff -u -r 1.60.2.64 -r 1.60.2.65 src/prefs_actions.c;  cvs diff -u -r 1.1.4.57 -r 1.1.4.58 src/prefs_filtering_action.c;  cvs diff -u -r 1.150.2.109 -r 1.150.2.110 src/procmsg.c;  cvs diff -u -r 1.395.2.400 -r 1.395.2.401 src/summaryview.c;  cvs diff -u -r 1.96.2.210 -r 1.96.2.211 src/textview.c;  cvs diff -u -r 1.36.2.154 -r 1.36.2.155 src/common/utils.c;  ) > 3.6.1cvs36.patchset
 ( cvs diff -u -r 1.60.2.65 -r 1.60.2.66 src/prefs_actions.c;  ) > 3.6.1cvs37.patchset
+( cvs diff -u -r 1.20.2.27 -r 1.20.2.28 src/mimeview.h;  cvs diff -u -r 1.19.2.29 -r 1.19.2.30 src/toolbar.h;  cvs diff -u -r 1.8.2.14 -r 1.8.2.15 src/common/session.h;  cvs diff -u -r 1.6.2.15 -r 1.6.2.16 src/common/smtp.h;  ) > 3.6.1cvs38.patchset

diff --git a/configure.ac b/configure.ac
index 1e055a67ba8887387760275ba30b8a7ddcdafe0d..52420faf09dad90af47e0abde211069c761b66d3 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=37
+EXTRA_VERSION=38
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/session.h b/src/common/session.h
index 772493d8330e521edb8b1e9420b65968fd1b2ad8..64c32ba1470524d96b6ba782403164180c4b05a5 100644 (file)
--- a/src/common/session.h
+++ b/src/common/session.h
@@ -92,10 +92,6 @@ struct _Session
        gchar *server;
        gushort port;
 
-#ifdef USE_GNUTLS
-       SSLType ssl_type;
-#endif
-
        gboolean nonblocking;
 
        SessionState state;
@@ -157,6 +153,10 @@ struct _Session
        
        const void *account;
        gboolean is_smtp;
+
+#ifdef USE_GNUTLS
+       SSLType ssl_type;
+#endif
 };
 
 void session_init              (Session        *session, 

diff --git a/src/common/smtp.h b/src/common/smtp.h
index ff7155ba1e5562bbccdf10f1f46cdeedad619905..201c09f985efef8ff2e505bab74f2ee97ba9dbce 100644 (file)
--- a/src/common/smtp.h
+++ b/src/common/smtp.h
@@ -90,10 +90,6 @@ struct _SMTPSession
 
        SMTPState state;
 
-#ifdef USE_GNUTLS
-       gboolean tls_init_done;
-#endif
-
        gchar *hostname;
 
        gchar *user;
@@ -118,6 +114,10 @@ struct _SMTPSession
        ESMTPFlag esmtp_flags;
        
        void *dialog;
+
+#ifdef USE_GNUTLS
+       gboolean tls_init_done;
+#endif
 };
 
 Session *smtp_session_new      (void *prefs_account);

diff --git a/src/mimeview.h b/src/mimeview.h
index b4da128a66f15a97a1a326be110dcd15dee17683..5dbd76953ac5bb21a87d3cddb554d642f5e78ba9 100644 (file)
--- a/src/mimeview.h
+++ b/src/mimeview.h
@@ -97,12 +97,12 @@ struct _MimeView
 
        NoticeView *siginfoview;
        MimeInfo *siginfo;
-#ifdef USE_PTHREAD
-       SigCheckData *check_data;
-#endif
        MimeInfo *spec_part;
        GtkUIManager *ui_manager;
        GtkActionGroup *action_group;
+#ifdef USE_PTHREAD
+       SigCheckData *check_data;
+#endif
 };
 
 struct _MimeViewerFactory

diff --git a/src/toolbar.h b/src/toolbar.h
index 98bd87bdb845d6738e060fe09e35bd13ead799a9..a3ffa0d250541935c1b1ce67831c6776d9988f8e 100644 (file)
--- a/src/toolbar.h
+++ b/src/toolbar.h
@@ -91,9 +91,6 @@ struct _Toolbar {
        GtkWidget *linewrap_current_btn;
        GtkWidget *linewrap_all_btn;
        GtkWidget *addrbook_btn;
-#ifdef USE_ENCHANT
-       GtkWidget *spellcheck_btn;
-#endif
 
        GtkWidget *open_mail_btn;
        GtkWidget *close_window_btn;
@@ -103,6 +100,9 @@ struct _Toolbar {
        GSList    *action_list;
        GSList    *item_list;
 
+#ifdef USE_ENCHANT
+       GtkWidget *spellcheck_btn;
+#endif
 #if !GTK_CHECK_VERSION(2,12,0)
        GtkTooltips *tooltips;
 #endif