2004-11-17 [colin] 0.9.12cvs149
authorColin Leroy <colin@colino.net>
Wed, 17 Nov 2004 08:44:43 +0000 (08:44 +0000)
committerColin Leroy <colin@colino.net>
Wed, 17 Nov 2004 08:44:43 +0000 (08:44 +0000)
* src/procmsg.c
< Reboot_> don't compare pointers to NULL with !
So, use the other form to bring consistency.
Also fix coding style.

ChangeLog.claws
PATCHSETS
configure.ac
src/procmsg.c

index 7c04cfe..33caab3 100644 (file)
@@ -1,3 +1,10 @@
+2004-11-17 [colin]     0.9.12cvs149
+
+       * src/procmsg.c
+               < Reboot_> don't compare pointers to NULL with !
+               So, use the other form to bring consistency.
+               Also fix coding style.
+
 2004-11-16 [colin]     0.9.12cvs148
 
        * src/procmsg.c
index 20a410c..1409364 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.119 -r 1.120 src/prefs_account.c; cvs diff -u -r 1.91 -r 1.92 src/procmime.c; cvs diff -u -r 1.32 -r 1.33 src/procmime.h; ) > 0.9.12cvs146.patchset
 ( cvs diff -u -r 1.170 -r 1.171 src/procmsg.c; ) > 0.9.12cvs147.patchset
 ( cvs diff -u -r 1.171 -r 1.172 src/procmsg.c; ) > 0.9.12cvs148.patchset
+( cvs diff -u -r 1.172 -r 1.173 src/procmsg.c; ) > 0.9.12cvs149.patchset
index ba7ec0a..90bcff7 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=148
+EXTRA_VERSION=149
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
index 25ecebd..8b00c36 100644 (file)
@@ -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;
                }
        }