2007-08-21 [wwp] 2.10.0cvs144

	* src/prefs_account.c
		Don't return a value in a void function().

diff --git a/ChangeLog b/ChangeLog
index 09346cab904a79af7cf1646fa294abdeec3b3f78..21eb17ba2b3fad06ce528a518eaf786d45c9b3fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-21 [wwp]       2.10.0cvs144
+
+       * src/prefs_account.c
+               Don't return a value in a void function().
+
 2007-08-21 [paul]      2.10.0cvs143
 
        * src/messageview.c

diff --git a/PATCHSETS b/PATCHSETS
index 04f306b473911fadbdea8509332f21390840ff7d..e095d6317c6e8cf1203fcd909e537c3515180f18 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2798,3 +2798,4 @@
 ( cvs diff -u -r 1.27.2.39 -r 1.27.2.40 src/addr_compl.c;  cvs diff -u -r 1.22.2.15 -r 1.22.2.16 src/addrbook.c;  cvs diff -u -r 1.15.2.13 -r 1.15.2.14 src/addrcache.c;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/addrcindex.c;  cvs diff -u -r 1.60.2.94 -r 1.60.2.95 src/addressbook.c;  cvs diff -u -r 1.28.2.29 -r 1.28.2.30 src/addrindex.c;  cvs diff -u -r 1.2.4.18 -r 1.2.4.19 src/browseldap.c;  cvs diff -u -r 1.23.2.25 -r 1.23.2.26 src/crash.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/editaddress_other_attributes_ldap.c;  cvs diff -u -r 1.5.2.21 -r 1.5.2.22 src/exporthtml.c;  cvs diff -u -r 1.213.2.156 -r 1.213.2.157 src/folder.c;  cvs diff -u -r 1.207.2.175 -r 1.207.2.176 src/folderview.c;  cvs diff -u -r 1.179.2.183 -r 1.179.2.184 src/imap.c;  cvs diff -u -r 1.18.2.25 -r 1.18.2.26 src/jpilot.c;  cvs diff -u -r 1.4.2.12 -r 1.4.2.13 src/ldapserver.c;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/ldapupdate.c;  cvs diff -u -r 1.12.2.14 -r 1.12.2.15 src/ldif.c;  cvs diff -u -r 1.115.2.163 -r 1.115.2.164 src/main.c;  cvs diff -u -r 1.274.2.206 -r 1.274.2.207 src/mainwindow.c;  cvs diff -u -r 1.75.2.46 -r 1.75.2.47 src/matcher.c;  cvs diff -u -r 1.79.2.60 -r 1.79.2.61 src/mh.c;  cvs diff -u -r 1.16.2.58 -r 1.16.2.59 src/msgcache.c;  cvs diff -u -r 1.6.10.12 -r 1.6.10.13 src/mutt.c;  cvs diff -u -r 1.6.2.11 -r 1.6.2.12 src/pine.c;  cvs diff -u -r 1.56.2.53 -r 1.56.2.54 src/pop.c;  cvs diff -u -r 1.16.2.27 -r 1.16.2.28 src/prefs_customheader.c;  cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/prefs_msg_colors.c;  cvs diff -u -r 1.49.2.95 -r 1.49.2.96 src/procmime.c;  cvs diff -u -r 1.96.2.181 -r 1.96.2.182 src/textview.c;  cvs diff -u -r 1.14.2.10 -r 1.14.2.11 src/vcard.c;  cvs diff -u -r 1.1.2.59 -r 1.1.2.60 src/wizard.c;  cvs diff -u -r 1.6.2.14 -r 1.6.2.15 src/common/log.c;  cvs diff -u -r 1.13.2.34 -r 1.13.2.35 src/common/socket.c;  cvs diff -u -r 1.4.2.19 -r 1.4.2.20 src/common/ssl_certificate.c;  cvs diff -u -r 1.36.2.109 -r 1.36.2.110 src/common/utils.c;  cvs diff -u -r 1.20.2.49 -r 1.20.2.50 src/common/utils.h;  cvs diff -u -r 1.5.2.22 -r 1.5.2.23 src/gtk/description_window.c;  cvs diff -u -r 1.13.2.16 -r 1.13.2.17 src/plugins/demo/demo.c;  cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/plugins/pgpcore/prefs_gpg.c;  cvs diff -u -r 1.4.2.6 -r 1.4.2.7 src/plugins/spamassassin/libspamc.c;  ) > 2.10.0cvs141.patchset
 ( cvs diff -u -r 1.8.2.25 -r 1.8.2.26 src/editldap.c;  cvs diff -u -r 1.2.2.13 -r 1.2.2.14 src/ldapctrl.c;  cvs diff -u -r 1.1.4.12 -r 1.1.4.13 src/ldapctrl.h;  cvs diff -u -r 1.3.2.21 -r 1.3.2.22 src/ldapquery.c;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/ldapupdate.c;  ) > 2.10.0cvs142.patchset
 ( cvs diff -u -r 1.94.2.146 -r 1.94.2.147 src/messageview.c;  ) > 2.10.0cvs143.patchset
+( cvs diff -u -r 1.105.2.108 -r 1.105.2.109 src/prefs_account.c;  ) > 2.10.0cvs144.patchset

diff --git a/configure.ac b/configure.ac
index 8d1e1e71eb1b6fea2e0684d602c131518801bc1a..09dcb17a8585d86966cc18ab33c7b5da815e42a5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=143
+EXTRA_VERSION=144
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 01c6c2f810d0bc87dbcc5c975ba8319a49d36a93..9d8f268ffdb1b16121773882db18629e23728d13 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -3599,8 +3599,8 @@ static void prefs_account_set_string_from_combobox(PrefParam *pparam)
        g_return_if_fail(*pparam->widget != NULL);
 
        combobox = *pparam->widget;
-       g_return_val_if_fail(gtk_combo_box_get_active_iter(
-                               GTK_COMBO_BOX(combobox), &iter), FALSE);
+       g_return_if_fail(gtk_combo_box_get_active_iter(
+                               GTK_COMBO_BOX(combobox), &iter));
 
        str = (gchar **)pparam->data;
        g_free(*str);