From: Tristan Chabredier Date: Tue, 21 Aug 2007 14:29:58 +0000 (+0000) Subject: 2007-08-21 [wwp] 2.10.0cvs144 X-Git-Tag: rel_3_0_0~49 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=769dde0030d0183fcb71d92aa8cf918a5615e878 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 09346cab9..21eb17ba2 100644 --- 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 04f306b47..e095d6317 100644 --- 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 8d1e1e71e..09dcb17a8 100644 --- 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 01c6c2f81..9d8f268ff 100644 --- 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);