2009-02-23 [colin] 3.7.0cvs70

	* src/stock_pixmap.c
	* src/gtk/colorlabel.c
		don't use g_return on normal checks

diff --git a/ChangeLog b/ChangeLog
index 8fb251f95b879708b1e21e59478a435bad731fd9..b462f14262de1f4c8a80c9eddce772353cc5db12 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-23 [colin]     3.7.0cvs70
+
+       * src/stock_pixmap.c
+       * src/gtk/colorlabel.c
+               don't use g_return on normal checks
+
 2009-02-22 [colin]     3.7.0cvs69
 
        * src/addressbook.c

diff --git a/PATCHSETS b/PATCHSETS
index 4e6acde083c219aba2edb12ab9a5151b5436f09a..1e9d9f86899736eb060f4404796d9635630ebe1e 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3731,3 +3731,4 @@
 ( cvs diff -u -r 1.382.2.499 -r 1.382.2.500 src/compose.c;  ) > 3.7.0cvs67.patchset
 ( cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/addrduplicates.c;  cvs diff -u -r 1.60.2.130 -r 1.60.2.131 src/addressbook.c;  cvs diff -u -r 1.6.10.20 -r 1.6.10.21 src/addrharvest.c;  cvs diff -u -r 1.65.2.66 -r 1.65.2.67 src/codeconv.c;  cvs diff -u -r 1.382.2.500 -r 1.382.2.501 src/compose.c;  cvs diff -u -r 1.60.2.50 -r 1.60.2.51 src/filtering.c;  cvs diff -u -r 1.213.2.188 -r 1.213.2.189 src/folder.c;  cvs diff -u -r 1.179.2.239 -r 1.179.2.240 src/imap.c;  cvs diff -u -r 1.1.2.62 -r 1.1.2.63 src/imap_gtk.c;  cvs diff -u -r 1.14.2.22 -r 1.14.2.23 src/importldif.c;  cvs diff -u -r 1.18.2.28 -r 1.18.2.29 src/jpilot.c;  cvs diff -u -r 1.274.2.298 -r 1.274.2.299 src/mainwindow.c;  cvs diff -u -r 1.75.2.63 -r 1.75.2.64 src/matcher.c;  cvs diff -u -r 1.28.2.46 -r 1.28.2.47 src/mbox.c;  cvs diff -u -r 1.94.2.198 -r 1.94.2.199 src/messageview.c;  cvs diff -u -r 1.2.2.35 -r 1.2.2.36 src/mh_gtk.c;  cvs diff -u -r 1.204.2.186 -r 1.204.2.187 src/prefs_common.c;  cvs diff -u -r 1.59.2.76 -r 1.59.2.77 src/prefs_filtering.c;  cvs diff -u -r 1.10.2.39 -r 1.10.2.40 src/prefs_gtk.c;  cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/printing.c;  cvs diff -u -r 1.10.2.20 -r 1.10.2.21 src/privacy.c;  cvs diff -u -r 1.49.2.124 -r 1.49.2.125 src/procmime.c;  cvs diff -u -r 1.150.2.112 -r 1.150.2.113 src/procmsg.c;  cvs diff -u -r 1.395.2.407 -r 1.395.2.408 src/summaryview.c;  cvs diff -u -r 1.96.2.215 -r 1.96.2.216 src/textview.c;  cvs diff -u -r 1.13.2.19 -r 1.13.2.20 src/undo.c;  cvs diff -u -r 1.1.2.78 -r 1.1.2.79 src/wizard.c;  cvs diff -u -r 1.2.2.8 -r 1.2.2.9 src/common/md5.c;  cvs diff -u -r 1.13.2.43 -r 1.13.2.44 src/common/socket.c;  cvs diff -u -r 1.2.4.29 -r 1.2.4.30 src/common/template.c;  cvs diff -u -r 1.1.4.109 -r 1.1.4.110 src/etpan/imap-thread.c;  cvs diff -u -r 1.9.2.65 -r 1.9.2.66 src/gtk/gtkaspell.c;  cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.4.54 -r 1.1.4.55 src/gtk/gtksctree.c;  cvs diff -u -r 1.2.2.36 -r 1.2.2.37 src/gtk/inputdialog.c;  cvs diff -u -r 1.1.2.62 -r 1.1.2.63 src/plugins/pgpcore/sgpgme.c;  cvs diff -u -r 1.1.2.53 -r 1.1.2.54 src/plugins/pgpmime/pgpmime.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/smime/smime.c;  cvs diff -u -r 1.18.2.62 -r 1.18.2.63 src/plugins/spamassassin/spamassassin.c;  ) > 3.7.0cvs68.patchset
 ( cvs diff -u -r 1.60.2.131 -r 1.60.2.132 src/addressbook.c;  cvs diff -u -r 1.49.2.125 -r 1.49.2.126 src/procmime.c;  ) > 3.7.0cvs69.patchset
+( cvs diff -u -r 1.25.2.64 -r 1.25.2.65 src/stock_pixmap.c;  cvs diff -u -r 1.2.2.25 -r 1.2.2.26 src/gtk/colorlabel.c;  ) > 3.7.0cvs70.patchset

diff --git a/configure.ac b/configure.ac
index e28a85917d0b1400ce926a17be033538a9e23ac3..07cc020fc49dc3468ace0454ebf458f76e0533cd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=69
+EXTRA_VERSION=70
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/colorlabel.c b/src/gtk/colorlabel.c
index ace677307017cd3c1629436ac823a5434df85c81..7d24e8b7b1cc4b529d8b74252592eb707f8ad699 100644 (file)
--- a/src/gtk/colorlabel.c
+++ b/src/gtk/colorlabel.c
@@ -130,7 +130,9 @@ static struct
 #define LABEL_COLORS_ELEMS (sizeof label_colors[0] / sizeof label_colors[0][0])
 
 #define G_RETURN_VAL_IF_INVALID_COLOR(color, val) \
-       g_return_val_if_fail((color) >= 0 && (color) < LABEL_COLORS_ELEMS, (val))
+       do if ((color) < 0 || (color) >= LABEL_COLORS_ELEMS) {  \
+               return val;                                     \
+       } while(0)
 
 #define INTCOLOR_TO_GDKCOLOR(intcolor, gdkcolor) \
        gdkcolor.red   = ((intcolor >> 16UL) & 0xFFUL) << 8UL; \

diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index cfe28903ae46d8082709482b2e32b539f8a72ddf..5a7e58ea081ca9de00398bb0d89294fcafe18741 100644 (file)
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -572,7 +572,8 @@ void stock_pixmap_themes_list_free(GList *list)
 
 gchar *stock_pixmap_get_name (StockPixmap icon)
 {
-       g_return_val_if_fail(icon >= 0 && icon < N_STOCK_PIXMAPS, NULL);
+       if (icon < 0 || icon >= N_STOCK_PIXMAPS)
+               return NULL;
        
        return pixmaps[icon].file;