2004-11-17 [colin] 0.9.12cvs149.1

	* src/procmsg.c
		Sync with HEAD (coding style fixes)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index e5104db3a8d2f6243c1ab09eee077ad6f1dc2bf8..377b13b7812bba293b2c06a6e89d9828ba8caf58 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-11-17 [colin]     0.9.12cvs149.1
+
+       * src/procmsg.c
+               Sync with HEAD (coding style fixes)
+
 2004-11-16 [colin]     0.9.12cvs148.1
 
        * src/procmsg.c

diff --git a/PATCHSETS b/PATCHSETS
index 2f166932fc7e522fe0ea6f59cb5f124db40ec131..74ec376aa01052f8c09da85193a165bc26546704 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -241,3 +241,4 @@
 ( cvs diff -u -r 1.382.2.66 -r 1.382.2.67 src/compose.c; ) > 0.9.12cvs146.14.patchset
 ( cvs diff -u -r 1.150.2.12 -r 1.150.2.13 src/procmsg.c; ) > 0.9.12cvs147.1.patchset
 ( cvs diff -u -r 1.150.2.13 -r 1.150.2.14 src/procmsg.c; ) > 0.9.12cvs148.1.patchset
+( cvs diff -u -r 1.150.2.14 -r 1.150.2.15 src/procmsg.c; ) > 0.9.12cvs149.1.patchset

diff --git a/configure.ac b/configure.ac
index e3735deb0b8f74fa9c2e11c7e15a905a9b6ba459..a0fa0574512cfcca4c0bb19629b2daf6a1225833 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=148
+EXTRA_VERSION=149
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/procmsg.c b/src/procmsg.c
index 1803e57b8a6a4cb6435a31425344d03375b7fc79..e4f70dd17de12fd85635071c3c4f618616f8af07 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -1082,10 +1082,12 @@ gint procmsg_send_message_queue(const gchar *file)
 
                switch (hnum) {
                case Q_SENDER:
-                       if (!from) from = g_strdup(p);
+                       if (from == NULL) 
+                               from = g_strdup(p);
                        break;
                case Q_SMTPSERVER:
-                       if (!smtpserver) smtpserver = g_strdup(p);
+                       if (smtpserver == NULL) 
+                               smtpserver = g_strdup(p);
                        break;
                case Q_RECIPIENTS:
                        to_list = address_list_append(to_list, p);
@@ -1100,22 +1102,28 @@ gint procmsg_send_message_queue(const gchar *file)
                        newsac = account_find_from_id(atoi(p));
                        break;
                case Q_SAVE_COPY_FOLDER:
-                       if (!savecopyfolder) savecopyfolder = g_strdup(p);
+                       if (savecopyfolder == NULL) 
+                               savecopyfolder = g_strdup(p);
                        break;
                case Q_REPLY_MESSAGE_ID:
-                       if (!replymessageid) replymessageid = g_strdup(p);
+                       if (replymessageid == NULL) 
+                               replymessageid = g_strdup(p);
                        break;
                case Q_FWD_MESSAGE_ID:
-                       if (!fwdmessageid) fwdmessageid = g_strdup(p);
+                       if (fwdmessageid == NULL) 
+                               fwdmessageid = g_strdup(p);
                        break;
                case Q_PRIVACY_SYSTEM:
-                       if (!privacy_system) privacy_system = g_strdup(p);
+                       if (privacy_system == NULL) 
+                               privacy_system = g_strdup(p);
                        break;
                case Q_ENCRYPT:
-                       if (p[0] == '1') encrypt = TRUE;
+                       if (p[0] == '1') 
+                               encrypt = TRUE;
                        break;
                case Q_ENCRYPT_DATA:
-                       if (!encrypt_data) encrypt_data = g_strdup(p);
+                       if (encrypt_data == NULL) 
+                               encrypt_data = g_strdup(p);
                        break;
                }
        }