commit 49a81f6a9c835b42bab774f7e7780b1d904f45fe
parent 78a6caf3f3ae6d0dc11d0a17c192ff659f72a9ce
Author: Colin Leroy <colin@colino.net>
Date: Mon, 23 Feb 2009 16:55:51 +0000
2009-02-23 [cleroy] 3.7.0cvs73
* src/account.c
* src/action.c
* src/addr_compl.c
* src/addrbook.c
* src/addrcache.c
* src/addrcindex.c
* src/addrclip.c
* src/addrduplicates.c
* src/addressadd.c
* src/addressbook.c
* src/addressbook_foldersel.c
* src/addrharvest.c
* src/addrindex.c
* src/addritem.c
* src/addrquery.c
* src/addrselect.c
* src/codeconv.c
* src/compose.c
* src/customheader.c
* src/editaddress.c
* src/editaddress_other_attributes_ldap.c
* src/editgroup.c
* src/editldap.c
* src/enriched.c
* src/exporthtml.c
* src/exportldif.c
* src/filtering.c
* src/folder.c
* src/foldersel.c
* src/folderutils.c
* src/folderview.c
* src/gedit-print.c
* src/html.c
* src/imap.c
* src/imap_gtk.c
* src/inc.c
* src/jpilot.c
* src/ldapctrl.c
* src/ldapquery.c
* src/ldapserver.c
* src/ldapupdate.c
* src/ldif.c
* src/localfolder.c
* src/main.c
* src/mainwindow.c
* src/matcher.c
* src/mbox.c
* src/messageview.c
* src/mh.c
* src/mh_gtk.c
* src/mimeview.c
* src/msgcache.c
* src/mutt.c
* src/news.c
* src/news_gtk.c
* src/noticeview.c
* src/pine.c
* src/pop.c
* src/prefs_account.c
* src/prefs_actions.c
* src/prefs_common.c
* src/prefs_filtering.c
* src/prefs_filtering_action.c
* src/prefs_folder_column.c
* src/prefs_folder_item.c
* src/prefs_gtk.c
* src/prefs_matcher.c
* src/prefs_quote.c
* src/prefs_send.c
* src/prefs_summaries.c
* src/prefs_summary_column.c
* src/prefs_template.c
* src/prefs_themes.c
* src/prefs_toolbar.c
* src/printing.c
* src/privacy.c
* src/procheader.c
* src/procmime.c
* src/procmsg.c
* src/quote_fmt.c
* src/remotefolder.c
* src/send_message.c
* src/sourcewindow.c
* src/statusbar.c
* src/stock_pixmap.c
* src/summary_search.c
* src/summaryview.c
* src/textview.c
* src/toolbar.c
* src/undo.c
* src/uri_opener.c
* src/vcard.c
* src/common/base64.c
* src/common/claws.c
* src/common/hooks.c
* src/common/plugin.c
* src/common/prefs.c
* src/common/session.c
* src/common/smtp.c
* src/common/socket.c
* src/common/string_match.c
* src/common/stringtable.c
* src/common/utils.c
* src/common/utils.h
* src/common/xml.c
* src/common/xmlprops.c
* src/gtk/colorlabel.c
* src/gtk/combobox.c
* src/gtk/foldersort.c
* src/gtk/gtkaspell.c
* src/gtk/gtkcmclist.c
* src/gtk/gtkcmctree.c
* src/gtk/gtkcmoptionmenu.c
* src/gtk/gtksctree.c
* src/gtk/gtkshruler.c
* src/gtk/gtksourceprintjob.c
* src/gtk/gtkutils.c
* src/gtk/gtkvscrollbutton.c
* src/gtk/logwindow.c
* src/gtk/menu.c
* src/gtk/pluginwindow.c
* src/gtk/prefswindow.c
* src/gtk/quicksearch.c
* src/gtk/spell_entry.c
* src/plugins/pgpcore/select-keys.c
* src/plugins/pgpinline/pgpinline.c
* src/plugins/pgpmime/pgpmime.c
* src/plugins/smime/smime.c
* src/plugins/spamassassin/spamassassin_gtk.c
Mass commit changing g_return_* to cm_return_*
and making these more interesting
Diffstat:
132 files changed, 2224 insertions(+), 2003 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,137 @@
+2009-02-23 [cleroy] 3.7.0cvs73
+
+ * src/account.c
+ * src/action.c
+ * src/addr_compl.c
+ * src/addrbook.c
+ * src/addrcache.c
+ * src/addrcindex.c
+ * src/addrclip.c
+ * src/addrduplicates.c
+ * src/addressadd.c
+ * src/addressbook.c
+ * src/addressbook_foldersel.c
+ * src/addrharvest.c
+ * src/addrindex.c
+ * src/addritem.c
+ * src/addrquery.c
+ * src/addrselect.c
+ * src/codeconv.c
+ * src/compose.c
+ * src/customheader.c
+ * src/editaddress.c
+ * src/editaddress_other_attributes_ldap.c
+ * src/editgroup.c
+ * src/editldap.c
+ * src/enriched.c
+ * src/exporthtml.c
+ * src/exportldif.c
+ * src/filtering.c
+ * src/folder.c
+ * src/foldersel.c
+ * src/folderutils.c
+ * src/folderview.c
+ * src/gedit-print.c
+ * src/html.c
+ * src/imap.c
+ * src/imap_gtk.c
+ * src/inc.c
+ * src/jpilot.c
+ * src/ldapctrl.c
+ * src/ldapquery.c
+ * src/ldapserver.c
+ * src/ldapupdate.c
+ * src/ldif.c
+ * src/localfolder.c
+ * src/main.c
+ * src/mainwindow.c
+ * src/matcher.c
+ * src/mbox.c
+ * src/messageview.c
+ * src/mh.c
+ * src/mh_gtk.c
+ * src/mimeview.c
+ * src/msgcache.c
+ * src/mutt.c
+ * src/news.c
+ * src/news_gtk.c
+ * src/noticeview.c
+ * src/pine.c
+ * src/pop.c
+ * src/prefs_account.c
+ * src/prefs_actions.c
+ * src/prefs_common.c
+ * src/prefs_filtering.c
+ * src/prefs_filtering_action.c
+ * src/prefs_folder_column.c
+ * src/prefs_folder_item.c
+ * src/prefs_gtk.c
+ * src/prefs_matcher.c
+ * src/prefs_quote.c
+ * src/prefs_send.c
+ * src/prefs_summaries.c
+ * src/prefs_summary_column.c
+ * src/prefs_template.c
+ * src/prefs_themes.c
+ * src/prefs_toolbar.c
+ * src/printing.c
+ * src/privacy.c
+ * src/procheader.c
+ * src/procmime.c
+ * src/procmsg.c
+ * src/quote_fmt.c
+ * src/remotefolder.c
+ * src/send_message.c
+ * src/sourcewindow.c
+ * src/statusbar.c
+ * src/stock_pixmap.c
+ * src/summary_search.c
+ * src/summaryview.c
+ * src/textview.c
+ * src/toolbar.c
+ * src/undo.c
+ * src/uri_opener.c
+ * src/vcard.c
+ * src/common/base64.c
+ * src/common/claws.c
+ * src/common/hooks.c
+ * src/common/plugin.c
+ * src/common/prefs.c
+ * src/common/session.c
+ * src/common/smtp.c
+ * src/common/socket.c
+ * src/common/string_match.c
+ * src/common/stringtable.c
+ * src/common/utils.c
+ * src/common/utils.h
+ * src/common/xml.c
+ * src/common/xmlprops.c
+ * src/gtk/colorlabel.c
+ * src/gtk/combobox.c
+ * src/gtk/foldersort.c
+ * src/gtk/gtkaspell.c
+ * src/gtk/gtkcmclist.c
+ * src/gtk/gtkcmctree.c
+ * src/gtk/gtkcmoptionmenu.c
+ * src/gtk/gtksctree.c
+ * src/gtk/gtkshruler.c
+ * src/gtk/gtksourceprintjob.c
+ * src/gtk/gtkutils.c
+ * src/gtk/gtkvscrollbutton.c
+ * src/gtk/logwindow.c
+ * src/gtk/menu.c
+ * src/gtk/pluginwindow.c
+ * src/gtk/prefswindow.c
+ * src/gtk/quicksearch.c
+ * src/gtk/spell_entry.c
+ * src/plugins/pgpcore/select-keys.c
+ * src/plugins/pgpinline/pgpinline.c
+ * src/plugins/pgpmime/pgpmime.c
+ * src/plugins/smime/smime.c
+ * src/plugins/spamassassin/spamassassin_gtk.c
+ Mass commit changing g_return_* to cm_return_*
+ and making these more interesting
+
2009-02-23 [colin] 3.7.0cvs72
* src/imap.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3734,3 +3734,4 @@
( 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
( cvs diff -u -r 1.179.2.240 -r 1.179.2.241 src/imap.c; ) > 3.7.0cvs71.patchset
( cvs diff -u -r 1.179.2.241 -r 1.179.2.242 src/imap.c; ) > 3.7.0cvs72.patchset
+( cvs diff -u -r 1.61.2.93 -r 1.61.2.94 src/account.c; cvs diff -u -r 1.12.2.56 -r 1.12.2.57 src/action.c; cvs diff -u -r 1.27.2.44 -r 1.27.2.45 src/addr_compl.c; cvs diff -u -r 1.22.2.22 -r 1.22.2.23 src/addrbook.c; cvs diff -u -r 1.15.2.15 -r 1.15.2.16 src/addrcache.c; cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/addrcindex.c; cvs diff -u -r 1.5.2.9 -r 1.5.2.10 src/addrclip.c; cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/addrduplicates.c; cvs diff -u -r 1.9.2.28 -r 1.9.2.29 src/addressadd.c; cvs diff -u -r 1.60.2.132 -r 1.60.2.133 src/addressbook.c; cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/addressbook_foldersel.c; cvs diff -u -r 1.6.10.21 -r 1.6.10.22 src/addrharvest.c; cvs diff -u -r 1.28.2.41 -r 1.28.2.42 src/addrindex.c; cvs diff -u -r 1.13.2.19 -r 1.13.2.20 src/addritem.c; cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/addrquery.c; cvs diff -u -r 1.3.2.9 -r 1.3.2.10 src/addrselect.c; cvs diff -u -r 1.65.2.67 -r 1.65.2.68 src/codeconv.c; cvs diff -u -r 1.382.2.501 -r 1.382.2.502 src/compose.c; cvs diff -u -r 1.5.2.10 -r 1.5.2.11 src/customheader.c; cvs diff -u -r 1.14.2.55 -r 1.14.2.56 src/editaddress.c; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/editaddress_other_attributes_ldap.c; cvs diff -u -r 1.11.2.21 -r 1.11.2.22 src/editgroup.c; cvs diff -u -r 1.8.2.34 -r 1.8.2.35 src/editldap.c; cvs diff -u -r 1.3.2.6 -r 1.3.2.7 src/enriched.c; cvs diff -u -r 1.5.2.27 -r 1.5.2.28 src/exporthtml.c; cvs diff -u -r 1.1.4.19 -r 1.1.4.20 src/exportldif.c; cvs diff -u -r 1.60.2.51 -r 1.60.2.52 src/filtering.c; cvs diff -u -r 1.213.2.189 -r 1.213.2.190 src/folder.c; cvs diff -u -r 1.26.2.42 -r 1.26.2.43 src/foldersel.c; cvs diff -u -r 1.3.2.18 -r 1.3.2.19 src/folderutils.c; cvs diff -u -r 1.207.2.212 -r 1.207.2.213 src/folderview.c; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/gedit-print.c; cvs diff -u -r 1.12.2.27 -r 1.12.2.28 src/html.c; cvs diff -u -r 1.179.2.242 -r 1.179.2.243 src/imap.c; cvs diff -u -r 1.1.2.63 -r 1.1.2.64 src/imap_gtk.c; cvs diff -u -r 1.149.2.99 -r 1.149.2.100 src/inc.c; cvs diff -u -r 1.18.2.29 -r 1.18.2.30 src/jpilot.c; cvs diff -u -r 1.2.2.18 -r 1.2.2.19 src/ldapctrl.c; cvs diff -u -r 1.3.2.30 -r 1.3.2.31 src/ldapquery.c; cvs diff -u -r 1.4.2.17 -r 1.4.2.18 src/ldapserver.c; cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/ldapupdate.c; cvs diff -u -r 1.12.2.19 -r 1.12.2.20 src/ldif.c; cvs diff -u -r 1.3.4.6 -r 1.3.4.7 src/localfolder.c; cvs diff -u -r 1.115.2.220 -r 1.115.2.221 src/main.c; cvs diff -u -r 1.274.2.299 -r 1.274.2.300 src/mainwindow.c; cvs diff -u -r 1.75.2.64 -r 1.75.2.65 src/matcher.c; cvs diff -u -r 1.28.2.47 -r 1.28.2.48 src/mbox.c; cvs diff -u -r 1.94.2.199 -r 1.94.2.200 src/messageview.c; cvs diff -u -r 1.79.2.68 -r 1.79.2.69 src/mh.c; cvs diff -u -r 1.2.2.36 -r 1.2.2.37 src/mh_gtk.c; cvs diff -u -r 1.83.2.153 -r 1.83.2.154 src/mimeview.c; cvs diff -u -r 1.16.2.64 -r 1.16.2.65 src/msgcache.c; cvs diff -u -r 1.6.10.16 -r 1.6.10.17 src/mutt.c; cvs diff -u -r 1.101.2.59 -r 1.101.2.60 src/news.c; cvs diff -u -r 1.2.2.30 -r 1.2.2.31 src/news_gtk.c; cvs diff -u -r 1.5.2.22 -r 1.5.2.23 src/noticeview.c; cvs diff -u -r 1.6.2.15 -r 1.6.2.16 src/pine.c; cvs diff -u -r 1.56.2.65 -r 1.56.2.66 src/pop.c; cvs diff -u -r 1.105.2.150 -r 1.105.2.151 src/prefs_account.c; cvs diff -u -r 1.60.2.68 -r 1.60.2.69 src/prefs_actions.c; cvs diff -u -r 1.204.2.187 -r 1.204.2.188 src/prefs_common.c; cvs diff -u -r 1.59.2.77 -r 1.59.2.78 src/prefs_filtering.c; cvs diff -u -r 1.1.4.59 -r 1.1.4.60 src/prefs_filtering_action.c; cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/prefs_folder_column.c; cvs diff -u -r 1.52.2.73 -r 1.52.2.74 src/prefs_folder_item.c; cvs diff -u -r 1.10.2.40 -r 1.10.2.41 src/prefs_gtk.c; cvs diff -u -r 1.43.2.79 -r 1.43.2.80 src/prefs_matcher.c; cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/prefs_quote.c; cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/prefs_send.c; cvs diff -u -r 1.1.2.59 -r 1.1.2.60 src/prefs_summaries.c; cvs diff -u -r 1.10.2.24 -r 1.10.2.25 src/prefs_summary_column.c; cvs diff -u -r 1.12.2.68 -r 1.12.2.69 src/prefs_template.c; cvs diff -u -r 1.3.2.63 -r 1.3.2.64 src/prefs_themes.c; cvs diff -u -r 1.30.2.55 -r 1.30.2.56 src/prefs_toolbar.c; cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/printing.c; cvs diff -u -r 1.10.2.21 -r 1.10.2.22 src/privacy.c; cvs diff -u -r 1.47.2.50 -r 1.47.2.51 src/procheader.c; cvs diff -u -r 1.49.2.126 -r 1.49.2.127 src/procmime.c; cvs diff -u -r 1.150.2.113 -r 1.150.2.114 src/procmsg.c; cvs diff -u -r 1.8.2.38 -r 1.8.2.39 src/quote_fmt.c; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/remotefolder.c; cvs diff -u -r 1.17.2.53 -r 1.17.2.54 src/send_message.c; cvs diff -u -r 1.9.2.24 -r 1.9.2.25 src/sourcewindow.c; cvs diff -u -r 1.5.2.24 -r 1.5.2.25 src/statusbar.c; cvs diff -u -r 1.25.2.65 -r 1.25.2.66 src/stock_pixmap.c; cvs diff -u -r 1.15.2.57 -r 1.15.2.58 src/summary_search.c; cvs diff -u -r 1.395.2.408 -r 1.395.2.409 src/summaryview.c; cvs diff -u -r 1.96.2.216 -r 1.96.2.217 src/textview.c; cvs diff -u -r 1.43.2.106 -r 1.43.2.107 src/toolbar.c; cvs diff -u -r 1.13.2.20 -r 1.13.2.21 src/undo.c; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/uri_opener.c; cvs diff -u -r 1.14.2.17 -r 1.14.2.18 src/vcard.c; cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/common/base64.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/common/claws.c; cvs diff -u -r 1.10.2.8 -r 1.10.2.9 src/common/hooks.c; cvs diff -u -r 1.13.2.36 -r 1.13.2.37 src/common/plugin.c; cvs diff -u -r 1.5.2.14 -r 1.5.2.15 src/common/prefs.c; cvs diff -u -r 1.23.2.22 -r 1.23.2.23 src/common/session.c; cvs diff -u -r 1.11.2.27 -r 1.11.2.28 src/common/smtp.c; cvs diff -u -r 1.13.2.44 -r 1.13.2.45 src/common/socket.c; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/common/string_match.c; cvs diff -u -r 1.2.2.8 -r 1.2.2.9 src/common/stringtable.c; cvs diff -u -r 1.36.2.165 -r 1.36.2.166 src/common/utils.c; cvs diff -u -r 1.20.2.67 -r 1.20.2.68 src/common/utils.h; cvs diff -u -r 1.1.4.25 -r 1.1.4.26 src/common/xml.c; cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/common/xmlprops.c; cvs diff -u -r 1.2.2.26 -r 1.2.2.27 src/gtk/colorlabel.c; cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/gtk/combobox.c; cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/gtk/foldersort.c; cvs diff -u -r 1.9.2.66 -r 1.9.2.67 src/gtk/gtkaspell.c; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/gtk/gtkcmclist.c; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/gtk/gtkcmctree.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/gtk/gtkcmoptionmenu.c; cvs diff -u -r 1.1.4.55 -r 1.1.4.56 src/gtk/gtksctree.c; cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/gtk/gtkshruler.c; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/gtk/gtksourceprintjob.c; cvs diff -u -r 1.5.2.87 -r 1.5.2.88 src/gtk/gtkutils.c; cvs diff -u -r 1.5.2.16 -r 1.5.2.17 src/gtk/gtkvscrollbutton.c; cvs diff -u -r 1.1.4.34 -r 1.1.4.35 src/gtk/logwindow.c; cvs diff -u -r 1.5.2.40 -r 1.5.2.41 src/gtk/menu.c; cvs diff -u -r 1.5.2.57 -r 1.5.2.58 src/gtk/pluginwindow.c; cvs diff -u -r 1.12.2.52 -r 1.12.2.53 src/gtk/prefswindow.c; cvs diff -u -r 1.1.2.86 -r 1.1.2.87 src/gtk/quicksearch.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/gtk/spell_entry.c; cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/plugins/pgpcore/select-keys.c; cvs diff -u -r 1.1.2.43 -r 1.1.2.44 src/plugins/pgpinline/pgpinline.c; cvs diff -u -r 1.1.2.54 -r 1.1.2.55 src/plugins/pgpmime/pgpmime.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/smime/smime.c; cvs diff -u -r 1.23.2.53 -r 1.23.2.54 src/plugins/spamassassin/spamassassin_gtk.c; ) > 3.7.0cvs73.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=72
+EXTRA_VERSION=73
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/account.c b/src/account.c
@@ -282,8 +282,8 @@ PrefsAccount *account_find_from_smtp_server(const gchar *address,
GList *cur;
PrefsAccount *ac;
- g_return_val_if_fail(address != NULL, NULL);
- g_return_val_if_fail(smtp_server != NULL, NULL);
+ cm_return_val_if_fail(address != NULL, NULL);
+ cm_return_val_if_fail(smtp_server != NULL, NULL);
for (cur = account_list; cur != NULL; cur = cur->next) {
ac = (PrefsAccount *)cur->data;
@@ -308,7 +308,7 @@ PrefsAccount *account_find_from_address(const gchar *address, gboolean newsgroup
GList *cur;
PrefsAccount *ac;
- g_return_val_if_fail(address != NULL, NULL);
+ cm_return_val_if_fail(address != NULL, NULL);
for (cur = account_list; cur != NULL; cur = cur->next) {
ac = (PrefsAccount *)cur->data;
@@ -338,7 +338,7 @@ PrefsAccount *account_find_from_item(FolderItem *item)
{
PrefsAccount *ac;
- g_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
ac = item->account;
if (!ac) {
@@ -445,7 +445,7 @@ void account_open(PrefsAccount *ac_prefs)
gchar *ac_name;
gboolean account_dirty = FALSE;
- g_return_if_fail(ac_prefs != NULL);
+ cm_return_if_fail(ac_prefs != NULL);
prev_default = ac_prefs->is_default;
Xstrdup_a(ac_name, ac_prefs->account_name ? ac_prefs->account_name : "",
@@ -564,7 +564,7 @@ FolderItem *account_get_special_folder(PrefsAccount *ac_prefs,
{
FolderItem *item = NULL;
- g_return_val_if_fail(ac_prefs != NULL, NULL);
+ cm_return_val_if_fail(ac_prefs != NULL, NULL);
switch (type) {
case F_INBOX:
@@ -638,7 +638,7 @@ FolderItem *account_get_special_folder(PrefsAccount *ac_prefs,
void account_destroy(PrefsAccount *ac_prefs)
{
- g_return_if_fail(ac_prefs != NULL);
+ cm_return_if_fail(ac_prefs != NULL);
folder_unref_account_all(ac_prefs);
@@ -662,7 +662,7 @@ void account_destroy(PrefsAccount *ac_prefs)
static void account_size_allocate_cb(GtkWidget *widget,
GtkAllocation *allocation)
{
- g_return_if_fail(allocation != NULL);
+ cm_return_if_fail(allocation != NULL);
prefs_common.accountswin_width = allocation->width;
prefs_common.accountswin_height = allocation->height;
@@ -853,7 +853,7 @@ static gboolean account_delete_references_func(GNode *node, gpointer data)
FolderItem *item;
gint account;
- g_return_val_if_fail(node->data != NULL, FALSE);
+ cm_return_val_if_fail(node->data != NULL, FALSE);
item = FOLDER_ITEM(node->data);
account = GPOINTER_TO_INT(data);
@@ -1792,7 +1792,7 @@ gchar *account_get_signature_str(PrefsAccount *account)
gchar *sig_str = NULL;
gchar *utf8_sig_str = NULL;
- g_return_val_if_fail(account != NULL, NULL);
+ cm_return_val_if_fail(account != NULL, NULL);
if (!account->sig_path)
return NULL;
diff --git a/src/action.c b/src/action.c
@@ -196,8 +196,8 @@ ActionType action_get_type(const gchar *action_str)
const gchar *p;
ActionType action_type = ACTION_NONE;
- g_return_val_if_fail(action_str, ACTION_ERROR);
- g_return_val_if_fail(*action_str, ACTION_ERROR);
+ cm_return_val_if_fail(action_str, ACTION_ERROR);
+ cm_return_val_if_fail(*action_str, ACTION_ERROR);
p = action_str;
@@ -365,7 +365,7 @@ static gboolean parse_append_filename(GString *cmd, MsgInfo *msginfo)
gchar *p, *q;
gchar escape_ch[] = "\\ ";
- g_return_val_if_fail(msginfo, FALSE);
+ cm_return_val_if_fail(msginfo, FALSE);
filename = procmsg_get_message_file(msginfo);
@@ -570,12 +570,12 @@ static void compose_actions_execute(Compose *compose, guint action_nb, GtkWidget
gchar *buf, *action;
ActionType action_type;
- g_return_if_fail(action_nb < g_slist_length(prefs_common.actions_list));
+ cm_return_if_fail(action_nb < g_slist_length(prefs_common.actions_list));
buf = (gchar *)g_slist_nth_data(prefs_common.actions_list, action_nb);
- g_return_if_fail(buf != NULL);
+ cm_return_if_fail(buf != NULL);
action = strstr(buf, ": ");
- g_return_if_fail(action != NULL);
+ cm_return_if_fail(action != NULL);
/* Point to the beginning of the command-line */
action += 2;
@@ -638,12 +638,12 @@ static void message_actions_execute(MessageView *msgview, guint action_nb,
guint body_pos = 0;
ActionType action_type;
- g_return_if_fail(action_nb < g_slist_length(prefs_common.actions_list));
+ cm_return_if_fail(action_nb < g_slist_length(prefs_common.actions_list));
buf = (gchar *)g_slist_nth_data(prefs_common.actions_list, action_nb);
- g_return_if_fail(buf);
- g_return_if_fail((action = strstr(buf, ": ")));
+ cm_return_if_fail(buf);
+ cm_return_if_fail((action = strstr(buf, ": ")));
/* Point to the beginning of the command-line */
action += 2;
@@ -751,7 +751,7 @@ static gboolean execute_actions(gchar *action, GSList *msg_list,
GtkTextIter start_iter, end_iter;
gboolean is_selection = FALSE;
- g_return_val_if_fail(action && *action, FALSE);
+ cm_return_val_if_fail(action && *action, FALSE);
action_type = action_get_type(action);
diff --git a/src/addr_compl.c b/src/addr_compl.c
@@ -160,7 +160,7 @@ static gboolean addr_compl_defer_select_destruct(CompletionWindow *window);
*/
static gchar *completion_func(gpointer data)
{
- g_return_val_if_fail(data != NULL, NULL);
+ cm_return_val_if_fail(data != NULL, NULL);
return ((completion_entry *)data)->string;
}
@@ -171,7 +171,7 @@ static gchar *completion_func(gpointer data)
static void init_all(void)
{
g_completion = g_completion_new(completion_func);
- g_return_if_fail(g_completion != NULL);
+ cm_return_if_fail(g_completion != NULL);
}
static void free_all_addresses(void)
@@ -267,7 +267,7 @@ static gint add_address(const gchar *name, const gchar *address,
ae = g_new0(address_entry, 1);
- g_return_val_if_fail(ae != NULL, -1);
+ cm_return_val_if_fail(ae != NULL, -1);
ae->name = g_strdup(name);
ae->address = g_strdup(address);
@@ -499,7 +499,7 @@ guint complete_address(const gchar *str)
guint cpl = 0;
completion_entry *ce = NULL;
- g_return_val_if_fail(str != NULL, 0);
+ cm_return_val_if_fail(str != NULL, 0);
/* g_completion is case sensitive */
d = g_utf8_strdown(str, -1);
@@ -549,7 +549,7 @@ guint complete_matches_found(const gchar *str)
GList *result = NULL;
gchar *d = NULL;
- g_return_val_if_fail(str != NULL, 0);
+ cm_return_val_if_fail(str != NULL, 0);
/* g_completion is case sensitive */
d = g_utf8_strdown(str, -1);
@@ -815,7 +815,7 @@ static void completion_window_advance_selection(GtkTreeView *list_view, gboolean
GtkTreeIter iter;
GtkTreeModel *model;
- g_return_if_fail(list_view != NULL);
+ cm_return_if_fail(list_view != NULL);
selection = gtk_tree_view_get_selection(list_view);
if (!gtk_tree_selection_get_selected(selection, &model, &iter))
@@ -1081,8 +1081,8 @@ static void completion_window_apply_selection(GtkTreeView *list_view,
GtkTreeModel *model;
GtkTreeIter iter;
gboolean is_group = FALSE;
- g_return_if_fail(list_view != NULL);
- g_return_if_fail(entry != NULL);
+ cm_return_if_fail(list_view != NULL);
+ cm_return_if_fail(entry != NULL);
GList *grp_emails = NULL;
selection = gtk_tree_view_get_selection(list_view);
@@ -1140,8 +1140,8 @@ void address_completion_start(GtkWidget *mainwindow)
*/
void address_completion_register_entry(GtkEntry *entry, gboolean allow_commas)
{
- g_return_if_fail(entry != NULL);
- g_return_if_fail(GTK_IS_ENTRY(entry));
+ cm_return_if_fail(entry != NULL);
+ cm_return_if_fail(GTK_IS_ENTRY(entry));
/* add hooked property */
g_object_set_data(G_OBJECT(entry), ENTRY_DATA_TAB_HOOK, entry);
@@ -1164,12 +1164,12 @@ void address_completion_unregister_entry(GtkEntry *entry)
{
GtkObject *entry_obj;
- g_return_if_fail(entry != NULL);
- g_return_if_fail(GTK_IS_ENTRY(entry));
+ cm_return_if_fail(entry != NULL);
+ cm_return_if_fail(GTK_IS_ENTRY(entry));
entry_obj = g_object_get_data(G_OBJECT(entry), ENTRY_DATA_TAB_HOOK);
- g_return_if_fail(entry_obj);
- g_return_if_fail(G_OBJECT(entry_obj) == G_OBJECT(entry));
+ cm_return_if_fail(entry_obj);
+ cm_return_if_fail(G_OBJECT(entry_obj) == G_OBJECT(entry));
/* has the hooked property? */
g_object_set_data(G_OBJECT(entry), ENTRY_DATA_TAB_HOOK, NULL);
@@ -1264,7 +1264,7 @@ static gboolean address_completion_complete_address_in_entry(GtkEntry *entry,
gint ncount, cursor_pos;
gchar *searchTerm, *new = NULL;
- g_return_val_if_fail(entry != NULL, FALSE);
+ cm_return_val_if_fail(entry != NULL, FALSE);
if (!GTK_WIDGET_HAS_FOCUS(entry)) return FALSE;
@@ -1399,10 +1399,10 @@ static gboolean completion_window_button_press(GtkWidget *widget,
gint cursor_pos;
gboolean restore = TRUE;
- g_return_val_if_fail(compWin != NULL, FALSE);
+ cm_return_val_if_fail(compWin != NULL, FALSE);
entry = compWin->entry;
- g_return_val_if_fail(entry != NULL, FALSE);
+ cm_return_val_if_fail(entry != NULL, FALSE);
/* Test where mouse was clicked */
event_widget = gtk_get_event_widget((GdkEvent *)event);
@@ -1447,11 +1447,11 @@ static gboolean completion_window_key_press(GtkWidget *widget,
gint cursor_pos;
GtkWidget *list_view;
GtkWidget *parent;
- g_return_val_if_fail(compWin != NULL, FALSE);
+ cm_return_val_if_fail(compWin != NULL, FALSE);
entry = compWin->entry;
list_view = compWin->list_view;
- g_return_val_if_fail(entry != NULL, FALSE);
+ cm_return_val_if_fail(entry != NULL, FALSE);
/* allow keyboard navigation in the alternatives tree view */
if (event->keyval == GDK_Up || event->keyval == GDK_Down ||
diff --git a/src/addrbook.c b/src/addrbook.c
@@ -76,13 +76,13 @@ AddressBookFile *addrbook_create_book()
*/
void addrbook_set_name(AddressBookFile *book, const gchar *value)
{
- g_return_if_fail(book != NULL);
+ cm_return_if_fail(book != NULL);
addrcache_set_name(book->addressCache, value);
}
gchar *addrbook_get_name(AddressBookFile *book)
{
- g_return_val_if_fail(book != NULL, NULL);
+ cm_return_val_if_fail(book != NULL, NULL);
return addrcache_get_name(book->addressCache);
}
@@ -93,7 +93,7 @@ gchar *addrbook_get_name(AddressBookFile *book)
*/
void addrbook_set_path(AddressBookFile *book, const gchar *value)
{
- g_return_if_fail(book != NULL);
+ cm_return_if_fail(book != NULL);
book->path = mgu_replace_string(book->path, value);
addrcache_set_dirty(book->addressCache, TRUE);
}
@@ -105,20 +105,20 @@ void addrbook_set_path(AddressBookFile *book, const gchar *value)
*/
void addrbook_set_file(AddressBookFile *book, const gchar *value)
{
- g_return_if_fail(book != NULL);
+ cm_return_if_fail(book != NULL);
book->fileName = mgu_replace_string(book->fileName, value);
addrcache_set_dirty(book->addressCache, TRUE);
}
gboolean addrbook_get_modified(AddressBookFile *book)
{
- g_return_val_if_fail(book != NULL, FALSE);
+ cm_return_val_if_fail(book != NULL, FALSE);
return book->addressCache->modified;
}
gboolean addrbook_get_accessed(AddressBookFile *book)
{
- g_return_val_if_fail(book != NULL, FALSE);
+ cm_return_val_if_fail(book != NULL, FALSE);
return book->addressCache->accessFlag;
}
@@ -129,43 +129,43 @@ gboolean addrbook_get_accessed(AddressBookFile *book)
*/
void addrbook_set_accessed(AddressBookFile *book, const gboolean value)
{
- g_return_if_fail(book != NULL);
+ cm_return_if_fail(book != NULL);
book->addressCache->accessFlag = value;
}
gboolean addrbook_get_read_flag(AddressBookFile *book)
{
- g_return_val_if_fail(book != NULL, FALSE);
+ cm_return_val_if_fail(book != NULL, FALSE);
return book->addressCache->dataRead;
}
gint addrbook_get_status(AddressBookFile *book)
{
- g_return_val_if_fail(book != NULL, -1);
+ cm_return_val_if_fail(book != NULL, -1);
return book->retVal;
}
ItemFolder *addrbook_get_root_folder(AddressBookFile *book)
{
- g_return_val_if_fail(book != NULL, NULL);
+ cm_return_val_if_fail(book != NULL, NULL);
return addrcache_get_root_folder(book->addressCache);
}
GList *addrbook_get_list_folder(AddressBookFile *book)
{
- g_return_val_if_fail(book != NULL, NULL);
+ cm_return_val_if_fail(book != NULL, NULL);
return addrcache_get_list_folder(book->addressCache);
}
GList *addrbook_get_list_person(AddressBookFile *book)
{
- g_return_val_if_fail(book != NULL, NULL);
+ cm_return_val_if_fail(book != NULL, NULL);
return addrcache_get_list_person(book->addressCache);
}
gboolean addrbook_get_dirty(AddressBookFile *book)
{
- g_return_val_if_fail(book != NULL, FALSE);
+ cm_return_val_if_fail(book != NULL, FALSE);
return addrcache_get_dirty(book->addressCache);
}
@@ -176,7 +176,7 @@ gboolean addrbook_get_dirty(AddressBookFile *book)
*/
void addrbook_set_dirty(AddressBookFile *book, const gboolean value)
{
- g_return_if_fail(book != NULL);
+ cm_return_if_fail(book != NULL);
addrcache_set_dirty(book->addressCache, value);
}
@@ -186,7 +186,7 @@ void addrbook_set_dirty(AddressBookFile *book, const gboolean value)
*/
void addrbook_free_book(AddressBookFile *book)
{
- g_return_if_fail(book != NULL);
+ cm_return_if_fail(book != NULL);
/* Clear cache */
addrcache_free(book->addressCache);
@@ -216,7 +216,7 @@ void addrbook_free_book(AddressBookFile *book)
*/
static void addrbook_print_book(AddressBookFile *book, FILE *stream)
{
- g_return_if_fail(book != NULL);
+ cm_return_if_fail(book != NULL);
fprintf(stream, "AddressBook:\n");
fprintf(stream, "\tpath : '%s'\n", book->path);
@@ -234,7 +234,7 @@ void addrbook_dump_book(AddressBookFile *book, FILE *stream)
{
ItemFolder *folder;
- g_return_if_fail(book != NULL);
+ cm_return_if_fail(book != NULL);
addrbook_print_book(book, stream);
folder = book->addressCache->rootFolder;
@@ -252,7 +252,7 @@ void addrbook_dump_book(AddressBookFile *book, FILE *stream)
*/
ItemGroup *addrbook_remove_group(AddressBookFile *book, ItemGroup *group)
{
- g_return_val_if_fail(book != NULL, NULL);
+ cm_return_val_if_fail(book != NULL, NULL);
return addrcache_remove_group(book->addressCache, group);
}
@@ -265,7 +265,7 @@ ItemGroup *addrbook_remove_group(AddressBookFile *book, ItemGroup *group)
*/
ItemPerson *addrbook_remove_person(AddressBookFile *book, ItemPerson *person)
{
- g_return_val_if_fail(book != NULL, NULL);
+ cm_return_val_if_fail(book != NULL, NULL);
return addrcache_remove_person(book->addressCache, person);
}
@@ -280,7 +280,7 @@ ItemPerson *addrbook_remove_person(AddressBookFile *book, ItemPerson *person)
ItemEMail *addrbook_person_remove_email(AddressBookFile *book,
ItemPerson *person, ItemEMail *email)
{
- g_return_val_if_fail(book != NULL, NULL);
+ cm_return_val_if_fail(book != NULL, NULL);
return addrcache_person_remove_email(book->addressCache, person, email);
}
@@ -919,7 +919,7 @@ gint addrbook_read_data(AddressBookFile *book)
XMLFile *file = NULL;
gchar *fileSpec = NULL;
- g_return_val_if_fail(book != NULL, -1);
+ cm_return_val_if_fail(book != NULL, -1);
/*
g_print( "...addrbook_read_data :%s:\t:%s:\n", book->fileName,
@@ -1273,8 +1273,8 @@ static gint addrbook_write_to(AddressBookFile *book, gchar *newFile)
PrefFile *pfile;
#endif
- g_return_val_if_fail(book != NULL, -1);
- g_return_val_if_fail(newFile != NULL, -1);
+ cm_return_val_if_fail(book != NULL, -1);
+ cm_return_val_if_fail(newFile != NULL, -1);
fileSpec = g_strconcat(book->path, G_DIR_SEPARATOR_S, newFile, NULL);
@@ -1355,7 +1355,7 @@ fail:
*/
gint addrbook_save_data(AddressBookFile *book)
{
- g_return_val_if_fail(book != NULL, -1);
+ cm_return_val_if_fail(book != NULL, -1);
book->retVal = MGU_NO_FILE;
if (book->fileName == NULL || *book->fileName == '\0')
@@ -1407,8 +1407,8 @@ void addrbook_update_address_list(AddressBookFile *book, ItemPerson *person,
GList *listDelete;
GList *listGroup;
- g_return_if_fail(book != NULL);
- g_return_if_fail(person != NULL);
+ cm_return_if_fail(book != NULL);
+ cm_return_if_fail(person != NULL);
/* Get groups where person's existing email addresses are listed */
listGroup = addrcache_get_group_for_person(book->addressCache, person);
@@ -1562,7 +1562,7 @@ ItemPerson *addrbook_add_address_list(AddressBookFile *book, ItemFolder *folder,
ItemFolder *f = folder;
GList *node;
- g_return_val_if_fail(book != NULL, NULL);
+ cm_return_val_if_fail(book != NULL, NULL);
if (!f)
f = book->addressCache->rootFolder;
@@ -1626,7 +1626,7 @@ GList *addrbook_get_available_email_list(AddressBookFile *book, ItemGroup *group
GList *list = NULL;
GHashTable *table;
- g_return_val_if_fail(book != NULL, NULL);
+ cm_return_val_if_fail(book != NULL, NULL);
/* Load hash table with group email entries */
table = g_hash_table_new(g_str_hash, g_str_equal);
@@ -1671,8 +1671,8 @@ void addrbook_update_group_list(AddressBookFile *book, ItemGroup *group,
{
GList *oldData;
- g_return_if_fail(book != NULL);
- g_return_if_fail(group != NULL);
+ cm_return_if_fail(book != NULL);
+ cm_return_if_fail(group != NULL);
addrcache_set_dirty(book->addressCache, TRUE);
@@ -1702,7 +1702,7 @@ ItemGroup *addrbook_add_group_list(AddressBookFile *book, ItemFolder *folder,
ItemGroup *group = NULL;
ItemFolder *f = folder;
- g_return_val_if_fail(book != NULL, NULL);
+ cm_return_val_if_fail(book != NULL, NULL);
if (!f)
f = book->addressCache->rootFolder;
@@ -1723,7 +1723,7 @@ ItemGroup *addrbook_add_group_list(AddressBookFile *book, ItemFolder *folder,
*/
ItemFolder *addrbook_add_new_folder(AddressBookFile *book, ItemFolder *parent)
{
- g_return_val_if_fail(book != NULL, NULL);
+ cm_return_val_if_fail(book != NULL, NULL);
return addrcache_add_new_folder( book->addressCache, parent );
}
@@ -1742,8 +1742,8 @@ void addrbook_update_attrib_list(AddressBookFile *book, ItemPerson *person,
GList *node;
GList *oldData;
- g_return_if_fail(book != NULL);
- g_return_if_fail(person != NULL);
+ cm_return_if_fail(book != NULL);
+ cm_return_if_fail(person != NULL);
/* Remember old list */
oldData = person->listAttrib;
@@ -1776,8 +1776,8 @@ void addrbook_update_attrib_list(AddressBookFile *book, ItemPerson *person,
void addrbook_add_attrib_list( AddressBookFile *book, ItemPerson *person, GList *listAttrib ) {
GList *node;
- g_return_if_fail( book != NULL );
- g_return_if_fail( person != NULL );
+ cm_return_if_fail( book != NULL );
+ cm_return_if_fail( person != NULL );
node = listAttrib;
while( node ) {
@@ -1810,7 +1810,7 @@ GList *addrbook_get_bookfile_list(AddressBookFile *book) {
long int val, maxval;
GList *fileList = NULL;
- g_return_val_if_fail(book != NULL, NULL);
+ cm_return_val_if_fail(book != NULL, NULL);
if (book->path == NULL || *book->path == '\0') {
book->retVal = MGU_NO_PATH;
@@ -2150,7 +2150,7 @@ gint addrbook_test_read_file(AddressBookFile *book, gchar *fileName)
XMLFile *file = NULL;
gchar *fileSpec = NULL;
- g_return_val_if_fail(book != NULL, -1);
+ cm_return_val_if_fail(book != NULL, -1);
fileSpec = g_strconcat(book->path, G_DIR_SEPARATOR_S, fileName, NULL);
book->retVal = MGU_OPEN_FILE;
@@ -2181,13 +2181,13 @@ gint addrbook_test_read_file(AddressBookFile *book, gchar *fileName)
*/
GList *addrbook_get_all_persons(AddressBookFile *book)
{
- g_return_val_if_fail(book != NULL, NULL);
+ cm_return_val_if_fail(book != NULL, NULL);
return addrcache_get_all_persons(book->addressCache);
}
GList *addrbook_get_all_groups(AddressBookFile *book)
{
- g_return_val_if_fail(book != NULL, NULL);
+ cm_return_val_if_fail(book != NULL, NULL);
return addrcache_get_all_groups(book->addressCache);
}
@@ -2208,7 +2208,7 @@ ItemPerson *addrbook_add_contact(AddressBookFile *book, ItemFolder *folder,
{
ItemPerson *person;
- g_return_val_if_fail(book != NULL, NULL);
+ cm_return_val_if_fail(book != NULL, NULL);
person = addrcache_add_contact(
book->addressCache, folder, name, address, remarks );
return person;
diff --git a/src/addrcache.c b/src/addrcache.c
@@ -84,31 +84,31 @@ AddressCache *addrcache_create() {
* Properties.
*/
ItemFolder *addrcache_get_root_folder( AddressCache *cache ) {
- g_return_val_if_fail( cache != NULL, NULL );
+ cm_return_val_if_fail( cache != NULL, NULL );
return cache->rootFolder;
}
GList *addrcache_get_list_folder( AddressCache *cache ) {
- g_return_val_if_fail( cache != NULL, NULL );
+ cm_return_val_if_fail( cache != NULL, NULL );
return cache->rootFolder->listFolder;
}
GList *addrcache_get_list_person( AddressCache *cache ) {
- g_return_val_if_fail( cache != NULL, NULL );
+ cm_return_val_if_fail( cache != NULL, NULL );
return cache->rootFolder->listPerson;
}
gboolean addrcache_get_dirty( AddressCache *cache ) {
- g_return_val_if_fail( cache != NULL, FALSE );
+ cm_return_val_if_fail( cache != NULL, FALSE );
return cache->dirtyFlag;
}
void addrcache_set_dirty( AddressCache *cache, const gboolean value ) {
- g_return_if_fail( cache != NULL );
+ cm_return_if_fail( cache != NULL );
cache->dirtyFlag = value;
}
gchar *addrcache_get_name( AddressCache *cache ) {
- g_return_val_if_fail( cache != NULL, NULL );
+ cm_return_val_if_fail( cache != NULL, NULL );
return cache->name;
}
void addrcache_set_name( AddressCache *cache, const gchar *value ) {
- g_return_if_fail( cache != NULL );
+ cm_return_if_fail( cache != NULL );
cache->name = mgu_replace_string( cache->name, value );
g_strstrip( cache->name );
cache->dirtyFlag = TRUE;
@@ -118,7 +118,7 @@ void addrcache_set_name( AddressCache *cache, const gchar *value ) {
* Generate next ID.
*/
static void addrcache_next_id( AddressCache *cache ) {
- g_return_if_fail( cache != NULL );
+ cm_return_if_fail( cache != NULL );
cache->nextID++;
}
@@ -159,7 +159,7 @@ static gint addrcache_free_item_vis( gpointer key, gpointer value, gpointer data
* Free hash table of address cache items.
*/
static void addrcache_free_item_hash( GHashTable *table ) {
- g_return_if_fail( table != NULL );
+ cm_return_if_fail( table != NULL );
g_hash_table_foreach_remove( table, addrcache_free_item_vis, NULL );
}
@@ -190,7 +190,7 @@ static void addrcache_free_all_folders( ItemFolder *parent ) {
* Clear the address cache.
*/
void addrcache_clear( AddressCache *cache ) {
- g_return_if_fail( cache != NULL );
+ cm_return_if_fail( cache != NULL );
/* g_print( "...addrcache_clear :%s:\n", cache->name ); */
/* Free up folders and hash table */
@@ -217,7 +217,7 @@ void addrcache_clear( AddressCache *cache ) {
* Free address cache.
*/
void addrcache_free( AddressCache *cache ) {
- g_return_if_fail( cache != NULL );
+ cm_return_if_fail( cache != NULL );
cache->dirtyFlag = FALSE;
addrcache_free_all_folders( cache->rootFolder );
@@ -272,7 +272,7 @@ gboolean addrcache_mark_file( AddressCache *cache, gchar *path ) {
* Dump entire address cache hash table contents.
*/
void addrcache_print( AddressCache *cache, FILE *stream ) {
- g_return_if_fail( cache != NULL );
+ cm_return_if_fail( cache != NULL );
fprintf( stream, "AddressCache:\n" );
fprintf( stream, "cache id : %s\n", cache->cacheID );
fprintf( stream, "next id : %d\n", cache->nextID );
@@ -286,8 +286,8 @@ void addrcache_print( AddressCache *cache, FILE *stream ) {
* Allocate ID for person.
*/
void addrcache_id_person( AddressCache *cache, ItemPerson *person ) {
- g_return_if_fail( cache != NULL );
- g_return_if_fail( person != NULL );
+ cm_return_if_fail( cache != NULL );
+ cm_return_if_fail( person != NULL );
if( ADDRITEM_ID(person) ) return;
addrcache_next_id( cache );
ADDRITEM_ID(person) = g_strdup_printf( "%d", cache->nextID );
@@ -297,8 +297,8 @@ void addrcache_id_person( AddressCache *cache, ItemPerson *person ) {
* Allocate ID for group.
*/
void addrcache_id_group( AddressCache *cache, ItemGroup *group ) {
- g_return_if_fail( cache != NULL );
- g_return_if_fail( group != NULL );
+ cm_return_if_fail( cache != NULL );
+ cm_return_if_fail( group != NULL );
if( ADDRITEM_ID(group) ) return;
addrcache_next_id( cache );
ADDRITEM_ID(group) = g_strdup_printf( "%d", cache->nextID );
@@ -308,8 +308,8 @@ void addrcache_id_group( AddressCache *cache, ItemGroup *group ) {
* Allocate ID for folder.
*/
void addrcache_id_folder( AddressCache *cache, ItemFolder *folder ) {
- g_return_if_fail( cache != NULL );
- g_return_if_fail( folder != NULL );
+ cm_return_if_fail( cache != NULL );
+ cm_return_if_fail( folder != NULL );
if( ADDRITEM_ID(folder) ) return;
addrcache_next_id( cache );
ADDRITEM_ID(folder) = g_strdup_printf( "%d", cache->nextID );
@@ -319,8 +319,8 @@ void addrcache_id_folder( AddressCache *cache, ItemFolder *folder ) {
* Allocate ID for email address.
*/
void addrcache_id_email( AddressCache *cache, ItemEMail *email ) {
- g_return_if_fail( cache != NULL );
- g_return_if_fail( email != NULL );
+ cm_return_if_fail( cache != NULL );
+ cm_return_if_fail( email != NULL );
if( ADDRITEM_ID(email) ) return;
addrcache_next_id( cache );
ADDRITEM_ID(email) = g_strdup_printf( "%d", cache->nextID );
@@ -330,8 +330,8 @@ void addrcache_id_email( AddressCache *cache, ItemEMail *email ) {
* Allocate ID for user attribute.
*/
void addrcache_id_attribute( AddressCache *cache, UserAttribute *attrib ) {
- g_return_if_fail( cache != NULL );
- g_return_if_fail( attrib != NULL );
+ cm_return_if_fail( cache != NULL );
+ cm_return_if_fail( attrib != NULL );
if( attrib->uid ) return;
addrcache_next_id( cache );
attrib->uid = g_strdup_printf( "%d", cache->nextID );
@@ -366,8 +366,8 @@ static gboolean addrcache_hash_add_email( AddressCache *cache, ItemEMail *email
* return: TRUE if item added.
*/
gboolean addrcache_hash_add_group( AddressCache *cache, ItemGroup *group ) {
- g_return_val_if_fail( cache != NULL, FALSE );
- g_return_val_if_fail( group != NULL, FALSE );
+ cm_return_val_if_fail( cache != NULL, FALSE );
+ cm_return_val_if_fail( group != NULL, FALSE );
if( g_hash_table_lookup( cache->itemHash, ADDRITEM_ID(group) ) ) {
return FALSE;
@@ -381,8 +381,8 @@ gboolean addrcache_hash_add_group( AddressCache *cache, ItemGroup *group ) {
* return: TRUE if item added.
*/
gboolean addrcache_hash_add_folder( AddressCache *cache, ItemFolder *folder ) {
- g_return_val_if_fail( cache != NULL, FALSE );
- g_return_val_if_fail( folder != NULL, FALSE );
+ cm_return_val_if_fail( cache != NULL, FALSE );
+ cm_return_val_if_fail( folder != NULL, FALSE );
if( g_hash_table_lookup( cache->itemHash, ADDRITEM_ID(folder) ) ) {
return FALSE;
@@ -397,9 +397,9 @@ gboolean addrcache_hash_add_folder( AddressCache *cache, ItemFolder *folder ) {
gboolean addrcache_folder_add_person( AddressCache *cache, ItemFolder *folder, ItemPerson *item ) {
gboolean retVal = FALSE;
- g_return_val_if_fail( cache != NULL, FALSE );
- g_return_val_if_fail( folder != NULL, FALSE );
- g_return_val_if_fail( item != NULL, FALSE );
+ cm_return_val_if_fail( cache != NULL, FALSE );
+ cm_return_val_if_fail( folder != NULL, FALSE );
+ cm_return_val_if_fail( item != NULL, FALSE );
retVal = addrcache_hash_add_person( cache, item );
if( retVal ) {
@@ -415,9 +415,9 @@ gboolean addrcache_folder_add_person( AddressCache *cache, ItemFolder *folder, I
gboolean addrcache_folder_add_folder( AddressCache *cache, ItemFolder *folder, ItemFolder *item ) {
gboolean retVal = FALSE;
- g_return_val_if_fail( cache != NULL, FALSE );
- g_return_val_if_fail( folder != NULL, FALSE );
- g_return_val_if_fail( item != NULL, FALSE );
+ cm_return_val_if_fail( cache != NULL, FALSE );
+ cm_return_val_if_fail( folder != NULL, FALSE );
+ cm_return_val_if_fail( item != NULL, FALSE );
retVal = addrcache_hash_add_folder( cache, item );
if( retVal ) {
@@ -433,9 +433,9 @@ gboolean addrcache_folder_add_folder( AddressCache *cache, ItemFolder *folder, I
gboolean addrcache_folder_add_group( AddressCache *cache, ItemFolder *folder, ItemGroup *item ) {
gboolean retVal = FALSE;
- g_return_val_if_fail( cache != NULL, FALSE );
- g_return_val_if_fail( folder != NULL, FALSE );
- g_return_val_if_fail( item != NULL, FALSE );
+ cm_return_val_if_fail( cache != NULL, FALSE );
+ cm_return_val_if_fail( folder != NULL, FALSE );
+ cm_return_val_if_fail( item != NULL, FALSE );
retVal = addrcache_hash_add_group( cache, item );
if( retVal ) {
@@ -452,8 +452,8 @@ gboolean addrcache_folder_add_group( AddressCache *cache, ItemFolder *folder, It
gboolean addrcache_add_person( AddressCache *cache, ItemPerson *person ) {
gboolean retVal = FALSE;
- g_return_val_if_fail( cache != NULL, FALSE );
- g_return_val_if_fail( person != NULL, FALSE );
+ cm_return_val_if_fail( cache != NULL, FALSE );
+ cm_return_val_if_fail( person != NULL, FALSE );
retVal = addrcache_hash_add_person( cache, person );
if( retVal ) {
@@ -470,9 +470,9 @@ gboolean addrcache_add_person( AddressCache *cache, ItemPerson *person ) {
gboolean addrcache_person_add_email( AddressCache *cache, ItemPerson *person, ItemEMail *email ) {
gboolean retVal = FALSE;
- g_return_val_if_fail( cache != NULL, FALSE );
- g_return_val_if_fail( person != NULL, FALSE );
- g_return_val_if_fail( email != NULL, FALSE );
+ cm_return_val_if_fail( cache != NULL, FALSE );
+ cm_return_val_if_fail( person != NULL, FALSE );
+ cm_return_val_if_fail( email != NULL, FALSE );
retVal = addrcache_hash_add_email( cache, email );
if( retVal ) {
@@ -489,8 +489,8 @@ gboolean addrcache_person_add_email( AddressCache *cache, ItemPerson *person, It
gboolean addrcache_add_group( AddressCache *cache, ItemGroup *group ) {
gboolean retVal = FALSE;
- g_return_val_if_fail( cache != NULL, FALSE );
- g_return_val_if_fail( group != NULL, FALSE );
+ cm_return_val_if_fail( cache != NULL, FALSE );
+ cm_return_val_if_fail( group != NULL, FALSE );
retVal = addrcache_hash_add_group( cache, group );
if( retVal ) {
@@ -505,9 +505,9 @@ gboolean addrcache_add_group( AddressCache *cache, ItemGroup *group ) {
* return: TRUE if item added.
*/
gboolean addrcache_group_add_email( AddressCache *cache, ItemGroup *group, ItemEMail *email ) {
- g_return_val_if_fail( cache != NULL, FALSE );
- g_return_val_if_fail( group != NULL, FALSE );
- g_return_val_if_fail( email != NULL, FALSE );
+ cm_return_val_if_fail( cache != NULL, FALSE );
+ cm_return_val_if_fail( group != NULL, FALSE );
+ cm_return_val_if_fail( email != NULL, FALSE );
addritem_group_add_email( group, email );
cache->dirtyFlag = TRUE;
@@ -521,8 +521,8 @@ gboolean addrcache_group_add_email( AddressCache *cache, ItemGroup *group, ItemE
gboolean addrcache_add_folder( AddressCache *cache, ItemFolder *folder ) {
gboolean retVal = FALSE;
- g_return_val_if_fail( cache != NULL, FALSE );
- g_return_val_if_fail( folder != NULL, FALSE );
+ cm_return_val_if_fail( cache != NULL, FALSE );
+ cm_return_val_if_fail( folder != NULL, FALSE );
retVal = addrcache_hash_add_folder( cache, folder );
if( retVal ) {
@@ -543,8 +543,8 @@ void addrcache_folder_move_person(
{
ItemFolder *parent;
- g_return_if_fail( cache != NULL );
- g_return_if_fail( person != NULL );
+ cm_return_if_fail( cache != NULL );
+ cm_return_if_fail( person != NULL );
parent = ( ItemFolder * ) ADDRITEM_PARENT(person);
if( ! parent ) parent = cache->rootFolder;
@@ -565,8 +565,8 @@ void addrcache_folder_move_group(
{
ItemFolder *parent;
- g_return_if_fail( cache != NULL );
- g_return_if_fail( group != NULL );
+ cm_return_if_fail( cache != NULL );
+ cm_return_if_fail( group != NULL );
parent = ( ItemFolder * ) ADDRITEM_PARENT(group);
if( ! parent ) parent = cache->rootFolder;
@@ -587,8 +587,8 @@ void addrcache_folder_move_folder(
{
ItemFolder *parent;
- g_return_if_fail( cache != NULL );
- g_return_if_fail( folder != NULL );
+ cm_return_if_fail( cache != NULL );
+ cm_return_if_fail( folder != NULL );
parent = ( ItemFolder * ) ADDRITEM_PARENT(folder);
if( ! parent ) parent = cache->rootFolder;
@@ -607,7 +607,7 @@ AddrItemObject *addrcache_get_object( AddressCache *cache, const gchar *uid ) {
AddrItemObject *obj = NULL;
gchar *uidH;
- g_return_val_if_fail( cache != NULL, NULL );
+ cm_return_val_if_fail( cache != NULL, NULL );
if( uid == NULL || *uid == '\0' ) return NULL;
obj = ( AddrItemObject * ) g_hash_table_lookup( cache->itemHash, uid );
@@ -646,7 +646,7 @@ ItemEMail *addrcache_get_email( AddressCache *cache, const gchar *eid ) {
ItemGroup *addrcache_remove_group( AddressCache *cache, ItemGroup *group ) {
AddrItemObject *obj = NULL;
- g_return_val_if_fail( cache != NULL, NULL );
+ cm_return_val_if_fail( cache != NULL, NULL );
if( group ) {
gchar *uid = ADDRITEM_ID(group);
@@ -675,7 +675,7 @@ ItemGroup *addrcache_remove_group( AddressCache *cache, ItemGroup *group ) {
ItemEMail *addrcache_remove_email( AddressCache *cache, ItemEMail *email ) {
AddrItemObject *obj = NULL;
- g_return_val_if_fail( cache != NULL, NULL );
+ cm_return_val_if_fail( cache != NULL, NULL );
if( email ) {
gchar *eid = ADDRITEM_ID(email);
@@ -719,7 +719,7 @@ ItemPerson *addrcache_remove_person( AddressCache *cache, ItemPerson *person ) {
AddrItemObject *obj = NULL;
gchar *uid;
- g_return_val_if_fail( cache != NULL, NULL );
+ cm_return_val_if_fail( cache != NULL, NULL );
if( person ) {
uid = ADDRITEM_ID(person);
@@ -767,7 +767,7 @@ ItemPerson *addrcache_remove_person( AddressCache *cache, ItemPerson *person ) {
ItemEMail *addrcache_person_remove_email( AddressCache *cache, ItemPerson *person, ItemEMail *email ) {
ItemEMail *found = NULL;
- g_return_val_if_fail( cache != NULL, NULL );
+ cm_return_val_if_fail( cache != NULL, NULL );
if( person && email ) {
found = addritem_person_remove_email( person, email );
@@ -817,7 +817,7 @@ static void addrcache_get_grp_person_vis( gpointer key, gpointer value, gpointer
GList *addrcache_get_group_for_person( AddressCache *cache, ItemPerson *person ) {
GList *list = NULL;
- g_return_val_if_fail( cache != NULL, NULL );
+ cm_return_val_if_fail( cache != NULL, NULL );
cache->tempList = NULL;
cache->tempList = g_list_append( cache->tempList, person );
@@ -849,7 +849,7 @@ static void addrcache_get_all_persons_vis( gpointer key, gpointer value, gpointe
GList *addrcache_get_all_persons( AddressCache *cache ) {
GList *list = NULL;
- g_return_val_if_fail( cache != NULL, NULL );
+ cm_return_val_if_fail( cache != NULL, NULL );
cache->tempList = NULL;
g_hash_table_foreach( cache->itemHash, addrcache_get_all_persons_vis, cache );
@@ -879,7 +879,7 @@ static void addrcache_get_all_groups_vis( gpointer key, gpointer value, gpointer
GList *addrcache_get_all_groups( AddressCache *cache ) {
GList *list = NULL;
- g_return_val_if_fail( cache != NULL, NULL );
+ cm_return_val_if_fail( cache != NULL, NULL );
cache->tempList = NULL;
g_hash_table_foreach( cache->itemHash, addrcache_get_all_groups_vis, cache );
@@ -896,7 +896,7 @@ GList *addrcache_get_all_groups( AddressCache *cache ) {
ItemFolder *addrcache_remove_folder( AddressCache *cache, ItemFolder *folder ) {
AddrItemObject *obj = NULL;
- g_return_val_if_fail( cache != NULL, NULL );
+ cm_return_val_if_fail( cache != NULL, NULL );
if( folder ) {
gchar *uid = ADDRITEM_ID(folder);
@@ -950,7 +950,7 @@ ItemFolder *addrcache_remove_folder( AddressCache *cache, ItemFolder *folder ) {
ItemFolder *addrcache_remove_folder_delete( AddressCache *cache, ItemFolder *folder ) {
AddrItemObject *obj = NULL;
- g_return_val_if_fail( cache != NULL, NULL );
+ cm_return_val_if_fail( cache != NULL, NULL );
if( folder ) {
gchar *uid = ADDRITEM_ID(folder);
@@ -1019,7 +1019,7 @@ ItemPerson *addrcache_add_contact(
ItemEMail *email = NULL;
ItemFolder *f = folder;
- g_return_val_if_fail( cache != NULL, NULL );
+ cm_return_val_if_fail( cache != NULL, NULL );
if( ! f ) f = cache->rootFolder;
@@ -1053,7 +1053,7 @@ ItemFolder *addrcache_add_new_folder( AddressCache *cache, ItemFolder *parent )
ItemFolder *folder;
ItemFolder *p = parent;
- g_return_val_if_fail( cache != NULL, NULL );
+ cm_return_val_if_fail( cache != NULL, NULL );
if( !p ) p = cache->rootFolder;
folder = addritem_create_item_folder();
diff --git a/src/addrcindex.c b/src/addrcindex.c
@@ -102,7 +102,7 @@ void addrcindex_free( AddrCacheIndex *index ) {
* \param index Address completion index.
*/
void addrcindex_invalidate( AddrCacheIndex *index ) {
- g_return_if_fail( index != NULL );
+ cm_return_if_fail( index != NULL );
index->invalid = TRUE;
}
@@ -111,7 +111,7 @@ void addrcindex_invalidate( AddrCacheIndex *index ) {
* \param index Address completion index.
*/
void addrcindex_validate( AddrCacheIndex *index ) {
- g_return_if_fail( index != NULL );
+ cm_return_if_fail( index != NULL );
index->invalid = FALSE;
}
@@ -147,8 +147,8 @@ void addrcindex_add_email( AddrCacheIndex *index, ItemEMail *email ) {
GSList *node;
gboolean flag;
- g_return_if_fail( index != NULL );
- g_return_if_fail( email != NULL );
+ cm_return_if_fail( index != NULL );
+ cm_return_if_fail( email != NULL );
flag = FALSE;
uniqName = NULL;
@@ -257,8 +257,8 @@ void addrcindex_add_person( AddrCacheIndex *index, ItemPerson *person ) {
GList *listEMail;
ItemEMail *email;
- g_return_if_fail( index != NULL );
- g_return_if_fail( person != NULL );
+ cm_return_if_fail( index != NULL );
+ cm_return_if_fail( person != NULL );
/* Build list of all unique names in person's name fields */
uniqName = NULL;
@@ -321,7 +321,7 @@ void addrcindex_print( AddrCacheIndex *index, FILE *stream ) {
AddrIndexEntry *entry;
ItemEMail *email;
- g_return_if_fail( index != NULL );
+ cm_return_if_fail( index != NULL );
fprintf( stream, "AddressSearchIndex:\n" );
node = index->addressList;
while( node ) {
@@ -346,8 +346,8 @@ GList *addrcindex_search( AddrCacheIndex *index, const gchar *search ) {
GList *node;
GList *listEMail;
- g_return_if_fail( index != NULL );
- g_return_if_fail( search != NULL );
+ cm_return_if_fail( index != NULL );
+ cm_return_if_fail( search != NULL );
listEMail = NULL;
if( index->addressList != NULL ) {
diff --git a/src/addrclip.c b/src/addrclip.c
@@ -76,7 +76,7 @@ void addrclip_clear( AddressClipboard *clipBoard ) {
GList *node;
AddrSelectItem *item;
- g_return_if_fail( clipBoard != NULL );
+ cm_return_if_fail( clipBoard != NULL );
node = clipBoard->objectList;
while( node ) {
item = node->data;
@@ -92,7 +92,7 @@ void addrclip_clear( AddressClipboard *clipBoard ) {
* Free up a clipboard.
*/
void addrclip_free( AddressClipboard *clipBoard ) {
- g_return_if_fail( clipBoard != NULL );
+ cm_return_if_fail( clipBoard != NULL );
addrclip_clear( clipBoard );
clipBoard->cutFlag = FALSE;
@@ -104,8 +104,8 @@ void addrclip_free( AddressClipboard *clipBoard ) {
void addrclip_set_index(
AddressClipboard *clipBoard, AddressIndex *addrIndex )
{
- g_return_if_fail( clipBoard != NULL );
- g_return_if_fail( addrIndex != NULL );
+ cm_return_if_fail( clipBoard != NULL );
+ cm_return_if_fail( addrIndex != NULL );
clipBoard->addressIndex = addrIndex;
}
@@ -131,8 +131,8 @@ gboolean addrclip_is_empty( AddressClipboard *clipBoard ) {
void addrclip_add( AddressClipboard *clipBoard, AddrSelectList *asl ) {
GList *node;
- g_return_if_fail( clipBoard != NULL );
- g_return_if_fail( asl != NULL );
+ cm_return_if_fail( clipBoard != NULL );
+ cm_return_if_fail( asl != NULL );
node = asl->listSelect;
while( node ) {
AddrSelectItem *item, *itemCopy;
@@ -155,7 +155,7 @@ void addrclip_list_show( AddressClipboard *clipBoard, FILE *stream ) {
AddrItemObject *aio;
AddressCache *cache;
- g_return_if_fail( clipBoard != NULL );
+ cm_return_if_fail( clipBoard != NULL );
node = clipBoard->objectList;
while( node != NULL ) {
AddrSelectItem *item;
@@ -398,8 +398,8 @@ static gboolean addrclip_is_subfolder_of(ItemFolder *is_parent, ItemFolder *is_c
ItemFolder *folder;
AddrItemObject *obj;
- g_return_val_if_fail(is_parent != NULL, FALSE);
- g_return_val_if_fail(is_child != NULL, FALSE);
+ cm_return_val_if_fail(is_parent != NULL, FALSE);
+ cm_return_val_if_fail(is_child != NULL, FALSE);
if (is_parent == is_child)
return TRUE;
@@ -631,7 +631,7 @@ GList *addrclip_paste_copy(
GList *itemList;
GList *folderGroup;
- g_return_val_if_fail( clipBoard != NULL, NULL );
+ cm_return_val_if_fail( clipBoard != NULL, NULL );
cache = book->addressCache;
if( folder == NULL ) folder = cache->rootFolder;
@@ -727,7 +727,7 @@ GList *addrclip_paste_cut(
GList *itemList;
GList *folderGroup;
- g_return_val_if_fail( clipBoard != NULL, NULL );
+ cm_return_val_if_fail( clipBoard != NULL, NULL );
cache = book->addressCache;
if( folder == NULL ) folder = cache->rootFolder;
diff --git a/src/addrduplicates.c b/src/addrduplicates.c
@@ -767,7 +767,7 @@ static void cb_edit_btn_clicked(GtkButton *button, gpointer data)
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(detail_view));
selected = gtk_tree_selection_get_selected_rows(selection,&model);
- g_return_if_fail(selected);
+ cm_return_if_fail(selected);
/* we are guaranteed to have exactly one row selected */
gtk_tree_view_row_activated(GTK_TREE_VIEW(detail_view),(GtkTreePath*)selected->data,
diff --git a/src/addressadd.c b/src/addressadd.c
@@ -128,7 +128,7 @@ static gboolean addressadd_tree_button( GtkCMCTree *ctree, GdkEventButton *event
static void addressadd_size_allocate_cb(GtkWidget *widget,
GtkAllocation *allocation)
{
- g_return_if_fail(allocation != NULL);
+ cm_return_if_fail(allocation != NULL);
prefs_common.addressaddwin_width = allocation->width;
prefs_common.addressaddwin_height = allocation->height;
diff --git a/src/addressbook.c b/src/addressbook.c
@@ -710,7 +710,7 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data
static void addressbook_size_allocate_cb(GtkWidget *widget,
GtkAllocation *allocation)
{
- g_return_if_fail(allocation != NULL);
+ cm_return_if_fail(allocation != NULL);
prefs_common.addressbookwin_width = allocation->width;
prefs_common.addressbookwin_height = allocation->height;
@@ -1459,7 +1459,7 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
gboolean refreshList = FALSE;
pobj = gtk_cmctree_node_get_row_data(ctree, addrbook.opened );
- g_return_if_fail(pobj != NULL);
+ cm_return_if_fail(pobj != NULL);
/* Test whether anything selected for deletion */
nodeList = addrbook.listSelected;
@@ -2902,7 +2902,7 @@ static void addressbook_treenode_delete_cb(GtkAction *action, gpointer data)
if( GTK_CMCTREE_ROW(node)->level == 1 ) return;
obj = gtk_cmctree_node_get_row_data( ctree, node );
- g_return_if_fail(obj != NULL);
+ cm_return_if_fail(obj != NULL);
if( obj->type == ADDR_DATASOURCE ) {
ads = ADAPTER_DSOURCE(obj);
@@ -3417,7 +3417,7 @@ static void addressbook_edit_address( gpointer data, guint action, GtkWidget *wi
if( addrbook.listSelected == NULL ) return;
obj = gtk_cmctree_node_get_row_data( clist, addrbook.listSelected );
- g_return_if_fail(obj != NULL);
+ cm_return_if_fail(obj != NULL);
ctree = GTK_CMCTREE( addrbook.ctree );
pobj = gtk_cmctree_node_get_row_data( ctree, addrbook.treeSelected );
@@ -3844,7 +3844,7 @@ static AddressDataSource *addressbook_find_datasource( GtkCMCTreeNode *node ) {
AddressDataSource *ds = NULL;
AddressObject *ao;
- g_return_val_if_fail(addrbook.ctree != NULL, NULL);
+ cm_return_val_if_fail(addrbook.ctree != NULL, NULL);
while( node ) {
if( GTK_CMCTREE_ROW(node)->level < 2 ) return NULL;
@@ -4228,11 +4228,11 @@ static GtkCMCTreeNode *addressbook_add_object(GtkCMCTreeNode *node,
AddressObjectType otype;
AddressTypeControlItem *atci = NULL;
- g_return_val_if_fail(node != NULL, NULL);
- g_return_val_if_fail(obj != NULL, NULL);
+ cm_return_val_if_fail(node != NULL, NULL);
+ cm_return_val_if_fail(obj != NULL, NULL);
pobj = gtk_cmctree_node_get_row_data(ctree, node);
- g_return_val_if_fail(pobj != NULL, NULL);
+ cm_return_val_if_fail(pobj != NULL, NULL);
/* Determine object type to be displayed */
if( obj->type == ADDR_DATASOURCE ) {
@@ -5166,7 +5166,7 @@ gchar *addressbook_folder_selection( const gchar *folderpath)
ItemFolder *folder = NULL;
gchar *path = NULL;
- g_return_val_if_fail( folderpath != NULL, NULL);
+ cm_return_val_if_fail( folderpath != NULL, NULL);
if ( addressbook_foldersel_selection( _addressIndex_, &book, &folder, folderpath )
&& book != NULL ) {
diff --git a/src/addressbook_foldersel.c b/src/addressbook_foldersel.c
@@ -133,7 +133,7 @@ static gboolean addressbook_foldersel_tree_button( GtkCMCTree *ctree, GdkEventBu
static void addressbook_foldersel_size_allocate_cb(GtkWidget *widget,
GtkAllocation *allocation)
{
- g_return_if_fail(allocation != NULL);
+ cm_return_if_fail(allocation != NULL);
prefs_common.addressbook_folderselwin_width = allocation->width;
prefs_common.addressbook_folderselwin_height = allocation->height;
diff --git a/src/addrharvest.c b/src/addrharvest.c
@@ -152,7 +152,7 @@ AddressHarvester *addrharvest_create( void ) {
* value Full directory path.
*/
void addrharvest_set_path( AddressHarvester* harvester, const gchar *value ) {
- g_return_if_fail( harvester != NULL );
+ cm_return_if_fail( harvester != NULL );
harvester->path = mgu_replace_string( harvester->path, value );
g_strstrip( harvester->path );
}
@@ -165,7 +165,7 @@ void addrharvest_set_path( AddressHarvester* harvester, const gchar *value ) {
void addrharvest_set_folder_size(
AddressHarvester* harvester, const gint value )
{
- g_return_if_fail( harvester != NULL );
+ cm_return_if_fail( harvester != NULL );
if( value > 0 ) {
harvester->folderSize = value;
}
@@ -179,7 +179,7 @@ void addrharvest_set_folder_size(
void addrharvest_set_recurse(
AddressHarvester* harvester, const gboolean value )
{
- g_return_if_fail( harvester != NULL );
+ cm_return_if_fail( harvester != NULL );
harvester->folderRecurse = value;
}
@@ -221,7 +221,7 @@ void addrharvest_set_header(
{
HeaderEntry *entry;
- g_return_if_fail( harvester != NULL );
+ cm_return_if_fail( harvester != NULL );
entry = addrharvest_find( harvester, name );
if( entry != NULL ) {
entry->selected = value;
@@ -239,7 +239,7 @@ gint addrharvest_get_count( AddressHarvester* harvester, const gchar *name ) {
gint count;
count = -1;
- g_return_val_if_fail( harvester != NULL, count );
+ cm_return_val_if_fail( harvester != NULL, count );
entry = addrharvest_find( harvester, name );
if( entry != NULL ) {
count = entry->count;
@@ -252,7 +252,7 @@ gint addrharvest_get_count( AddressHarvester* harvester, const gchar *name ) {
* Enter: harvester Harvester.
*/
void addrharvest_free( AddressHarvester *harvester ) {
- g_return_if_fail( harvester != NULL );
+ cm_return_if_fail( harvester != NULL );
/* Free internal stuff */
addrharvest_free_table( harvester );
@@ -788,9 +788,9 @@ gint addrharvest_harvest(
GList *listHdr;
retVal = MGU_BAD_ARGS;
- g_return_val_if_fail( harvester != NULL, retVal );
- g_return_val_if_fail( cache != NULL, retVal );
- g_return_val_if_fail( harvester->path != NULL, retVal );
+ cm_return_val_if_fail( harvester != NULL, retVal );
+ cm_return_val_if_fail( cache != NULL, retVal );
+ cm_return_val_if_fail( harvester->path != NULL, retVal );
/* Clear cache */
addrcache_clear( cache );
@@ -840,7 +840,7 @@ gboolean addrharvest_check_header( AddressHarvester *harvester ) {
GList *node;
retVal = FALSE;
- g_return_val_if_fail( harvester != NULL, retVal );
+ cm_return_val_if_fail( harvester != NULL, retVal );
node = harvester->headerTable;
while( node ) {
diff --git a/src/addrindex.c b/src/addrindex.c
@@ -398,7 +398,7 @@ AddressDataSource *addrindex_create_datasource( AddressIfType ifType ) {
void addrindex_free_datasource( AddressDataSource *ds ) {
AddressInterface *iface;
- g_return_if_fail( ds != NULL );
+ cm_return_if_fail( ds != NULL );
iface = ds->interface;
if( ds->rawDataSource != NULL ) {
@@ -512,8 +512,8 @@ gchar *addrindex_get_cache_id( AddressIndex *addrIndex, AddressDataSource *ds )
AddrBookBase *adbase;
AddressCache *cache;
- g_return_val_if_fail( addrIndex != NULL, NULL );
- g_return_val_if_fail( ds != NULL, NULL );
+ cm_return_val_if_fail( addrIndex != NULL, NULL );
+ cm_return_val_if_fail( ds != NULL, NULL );
adbase = ( AddrBookBase * ) ds->rawDataSource;
if( adbase ) {
@@ -535,8 +535,8 @@ gchar *addrindex_get_cache_id( AddressIndex *addrIndex, AddressDataSource *ds )
static AddressDataSource *addrindex_get_datasource(
AddressIndex *addrIndex, const gchar *cacheID )
{
- g_return_val_if_fail( addrIndex != NULL, NULL );
- g_return_val_if_fail( cacheID != NULL, NULL );
+ cm_return_val_if_fail( addrIndex != NULL, NULL );
+ cm_return_val_if_fail( cacheID != NULL, NULL );
return ( AddressDataSource * ) g_hash_table_lookup( addrIndex->hashCache, cacheID );
}
@@ -551,8 +551,8 @@ AddressCache *addrindex_get_cache( AddressIndex *addrIndex, const gchar *cacheID
AddrBookBase *adbase;
AddressCache *cache;
- g_return_val_if_fail( addrIndex != NULL, NULL );
- g_return_val_if_fail( cacheID != NULL, NULL );
+ cm_return_val_if_fail( addrIndex != NULL, NULL );
+ cm_return_val_if_fail( cacheID != NULL, NULL );
cache = NULL;
ds = addrindex_get_datasource( addrIndex, cacheID );
@@ -653,7 +653,7 @@ AddressIndex *addrindex_create_index( void ) {
* \param value Path to index file.
*/
void addrindex_set_file_path( AddressIndex *addrIndex, const gchar *value ) {
- g_return_if_fail( addrIndex != NULL );
+ cm_return_if_fail( addrIndex != NULL );
addrIndex->filePath = mgu_replace_string( addrIndex->filePath, value );
}
@@ -663,7 +663,7 @@ void addrindex_set_file_path( AddressIndex *addrIndex, const gchar *value ) {
* \param value File name.
*/
void addrindex_set_file_name( AddressIndex *addrIndex, const gchar *value ) {
- g_return_if_fail( addrIndex != NULL );
+ cm_return_if_fail( addrIndex != NULL );
addrIndex->fileName = mgu_replace_string( addrIndex->fileName, value );
}
@@ -673,7 +673,7 @@ void addrindex_set_file_name( AddressIndex *addrIndex, const gchar *value ) {
* \return List of address interfaces.
*/
GList *addrindex_get_interface_list( AddressIndex *addrIndex ) {
- g_return_val_if_fail( addrIndex != NULL, NULL );
+ cm_return_val_if_fail( addrIndex != NULL, NULL );
return addrIndex->interfaceList;
}
@@ -700,7 +700,7 @@ void addrindex_teardown( void ) {
void addrindex_free_index( AddressIndex *addrIndex ) {
GList *node;
- g_return_if_fail( addrIndex != NULL );
+ cm_return_if_fail( addrIndex != NULL );
/* Search stuff */
g_list_free( addrIndex->searchOrder );
@@ -754,7 +754,7 @@ void addrindex_free_index( AddressIndex *addrIndex ) {
* \parem stream Stream to print.
*/
void addrindex_print_index( AddressIndex *addrIndex, FILE *stream ) {
- g_return_if_fail( addrIndex != NULL );
+ cm_return_if_fail( addrIndex != NULL );
fprintf( stream, "AddressIndex:\n" );
fprintf( stream, "\tfile path: '%s'\n", addrIndex->filePath );
fprintf( stream, "\tfile name: '%s'\n", addrIndex->fileName );
@@ -778,7 +778,7 @@ static AddressInterface *addrindex_get_interface(
AddressInterface *retVal = NULL;
GList *node;
- g_return_val_if_fail( addrIndex != NULL, NULL );
+ cm_return_val_if_fail( addrIndex != NULL, NULL );
node = addrIndex->interfaceList;
while( node ) {
@@ -808,8 +808,8 @@ AddressDataSource *addrindex_index_add_datasource(
AddressInterface *iface;
AddressDataSource *ds = NULL;
- g_return_val_if_fail( addrIndex != NULL, NULL );
- g_return_val_if_fail( dataSource != NULL, NULL );
+ cm_return_val_if_fail( addrIndex != NULL, NULL );
+ cm_return_val_if_fail( dataSource != NULL, NULL );
iface = addrindex_get_interface( addrIndex, ifType );
if( iface ) {
@@ -839,8 +839,8 @@ AddressDataSource *addrindex_index_remove_datasource(
AddressDataSource *retVal = FALSE;
AddressInterface *iface;
- g_return_val_if_fail( addrIndex != NULL, NULL );
- g_return_val_if_fail( dataSource != NULL, NULL );
+ cm_return_val_if_fail( addrIndex != NULL, NULL );
+ cm_return_val_if_fail( dataSource != NULL, NULL );
iface = addrindex_get_interface( addrIndex, dataSource->type );
if( iface ) {
@@ -1662,7 +1662,7 @@ static gint addrindex_read_file( AddressIndex *addrIndex ) {
XMLFile *file = NULL;
gchar *fileSpec = NULL;
- g_return_val_if_fail( addrIndex != NULL, -1 );
+ cm_return_val_if_fail( addrIndex != NULL, -1 );
fileSpec = g_strconcat( addrIndex->filePath, G_DIR_SEPARATOR_S, addrIndex->fileName, NULL );
addrIndex->retVal = MGU_NO_FILE;
@@ -1750,7 +1750,7 @@ static gint addrindex_write_to( AddressIndex *addrIndex, const gchar *newFile )
PrefFile *pfile;
#endif
- g_return_val_if_fail( addrIndex != NULL, -1 );
+ cm_return_val_if_fail( addrIndex != NULL, -1 );
fileSpec = g_strconcat( addrIndex->filePath, G_DIR_SEPARATOR_S, newFile, NULL );
addrIndex->retVal = MGU_OPEN_FILE;
@@ -1807,7 +1807,7 @@ gint addrindex_save_data( AddressIndex *addrIndex ) {
GList *nodeDS;
#endif
- g_return_val_if_fail( addrIndex != NULL, -1 );
+ cm_return_val_if_fail( addrIndex != NULL, -1 );
#ifdef USE_LDAP
nodeIf = addrIndex->interfaceList;
@@ -2337,7 +2337,7 @@ static gboolean addrindex_create_new_book( AddressIndex *addrIndex, gchar *displ
* "Gathered addresses" - a new address book.
*/
gint addrindex_read_data( AddressIndex *addrIndex ) {
- g_return_val_if_fail( addrIndex != NULL, -1 );
+ cm_return_val_if_fail( addrIndex != NULL, -1 );
addrIndex->conversionError = FALSE;
addrindex_read_file( addrIndex );
@@ -2368,7 +2368,7 @@ gint addrindex_read_data( AddressIndex *addrIndex ) {
gint addrindex_create_new_books( AddressIndex *addrIndex ) {
gboolean flg;
- g_return_val_if_fail( addrIndex != NULL, -1 );
+ cm_return_val_if_fail( addrIndex != NULL, -1 );
flg = addrindex_create_new_book( addrIndex, DISP_NEW_COMMON );
if( flg ) {
diff --git a/src/addritem.c b/src/addritem.c
@@ -113,7 +113,7 @@ void addritem_email_set_remarks( ItemEMail *email, const gchar *value ) {
* \param item E-Mail item to free.
*/
void addritem_free_item_email( ItemEMail *item ) {
- g_return_if_fail( item != NULL );
+ cm_return_if_fail( item != NULL );
/* Free internal stuff */
g_free( ADDRITEM_ID(item) );
@@ -166,7 +166,7 @@ UserAttribute *addritem_copy_attribute( UserAttribute *item ) {
* \param value ID.
*/
void addritem_attrib_set_id( UserAttribute *item, const gchar *value ) {
- g_return_if_fail( item != NULL );
+ cm_return_if_fail( item != NULL );
item->uid = mgu_replace_string( item->uid, value );
}
@@ -176,7 +176,7 @@ void addritem_attrib_set_id( UserAttribute *item, const gchar *value ) {
* \param value Name.
*/
void addritem_attrib_set_name( UserAttribute *item, const gchar *value ) {
- g_return_if_fail( item != NULL );
+ cm_return_if_fail( item != NULL );
item->name = mgu_replace_string( item->name, value );
}
@@ -186,7 +186,7 @@ void addritem_attrib_set_name( UserAttribute *item, const gchar *value ) {
* \param value Value.
*/
void addritem_attrib_set_value( UserAttribute *item, const gchar *value ) {
- g_return_if_fail( item != NULL );
+ cm_return_if_fail( item != NULL );
item->value = mgu_replace_string( item->value, value );
}
@@ -195,7 +195,7 @@ void addritem_attrib_set_value( UserAttribute *item, const gchar *value ) {
* \param item Attribute object to free.
*/
void addritem_free_attribute( UserAttribute *item ) {
- g_return_if_fail( item != NULL );
+ cm_return_if_fail( item != NULL );
g_free( item->uid );
g_free( item->name );
g_free( item->value );
@@ -410,7 +410,7 @@ void addritem_free_list_attribute( GList *list ) {
* \param person Person object to free.
*/
void addritem_free_item_person( ItemPerson *person ) {
- g_return_if_fail( person != NULL );
+ cm_return_if_fail( person != NULL );
/* Free internal stuff */
g_free( ADDRITEM_ID(person) );
@@ -445,7 +445,7 @@ void addritem_free_item_person( ItemPerson *person ) {
* \param stream Output stream.
*/
void addritem_print_item_email( ItemEMail *item, FILE *stream ) {
- g_return_if_fail( item != NULL );
+ cm_return_if_fail( item != NULL );
fprintf( stream, "\t\tt/id: %d : '%s'\n", ADDRITEM_TYPE(item), ADDRITEM_ID(item) );
fprintf( stream, "\t\tsubty: %d\n", ADDRITEM_SUBTYPE(item) );
fprintf( stream, "\t\talis: '%s'\n", ADDRITEM_NAME(item) );
@@ -460,7 +460,7 @@ void addritem_print_item_email( ItemEMail *item, FILE *stream ) {
* \param stream Output stream.
*/
static void addritem_print_attribute( UserAttribute *item, FILE *stream ) {
- g_return_if_fail( item != NULL );
+ cm_return_if_fail( item != NULL );
fprintf( stream, "\t\tuid : '%s'\n", item->uid );
fprintf( stream, "\t\tname : '%s'\n", item->name );
fprintf( stream, "\t\tvalue: '%s'\n", item->value );
@@ -474,7 +474,7 @@ static void addritem_print_attribute( UserAttribute *item, FILE *stream ) {
*/
void addritem_print_item_person( ItemPerson *person, FILE *stream ) {
GList *node;
- g_return_if_fail( person != NULL );
+ cm_return_if_fail( person != NULL );
fprintf( stream, "Person:\n" );
fprintf( stream, "\tt/uid: %d : '%s'\n", ADDRITEM_TYPE(person), ADDRITEM_ID(person) );
fprintf( stream, "\tsubty: %d\n", ADDRITEM_SUBTYPE(person) );
@@ -521,8 +521,8 @@ void addritem_print_item_person( ItemPerson *person, FILE *stream ) {
gboolean addritem_person_add_email( ItemPerson *person, ItemEMail *email ) {
GList *node;
- g_return_val_if_fail( person != NULL, FALSE );
- g_return_val_if_fail( email != NULL, FALSE );
+ cm_return_val_if_fail( person != NULL, FALSE );
+ cm_return_val_if_fail( email != NULL, FALSE );
node = person->listEMail;
while( node ) {
@@ -545,7 +545,7 @@ ItemEMail *addritem_person_remove_email( ItemPerson *person, ItemEMail *email )
gboolean found = FALSE;
GList *node;
- g_return_val_if_fail( person != NULL, NULL );
+ cm_return_val_if_fail( person != NULL, NULL );
if( email == NULL ) return NULL;
/* Look for email */
@@ -579,7 +579,7 @@ ItemEMail *addritem_person_remove_email( ItemPerson *person, ItemEMail *email )
void addritem_person_add_attribute(
ItemPerson *person, UserAttribute *attrib )
{
- g_return_if_fail( person != NULL );
+ cm_return_if_fail( person != NULL );
person->listAttrib = g_list_append( person->listAttrib, attrib );
}
@@ -589,7 +589,7 @@ void addritem_person_add_attribute(
* \param attrib Attribute to remove.
*/
void addritem_person_remove_attribute( ItemPerson *person, const gchar *attrib ) {
- g_return_if_fail( person != NULL || attrib != NULL );
+ cm_return_if_fail( person != NULL || attrib != NULL );
GList *attrib_list;
attrib_list = person->listAttrib;
@@ -653,7 +653,7 @@ void addritem_group_set_name( ItemGroup *group, const gchar *value ) {
* \param group Group to free.
*/
void addritem_free_item_group( ItemGroup *group ) {
- g_return_if_fail( group != NULL );
+ cm_return_if_fail( group != NULL );
/* Free internal stuff */
g_free( ADDRITEM_ID(group) );
@@ -684,8 +684,8 @@ void addritem_free_item_group( ItemGroup *group ) {
gboolean addritem_group_add_email( ItemGroup *group, ItemEMail *email ) {
GList *node;
- g_return_val_if_fail( group != NULL, FALSE );
- g_return_val_if_fail( email != NULL, FALSE );
+ cm_return_val_if_fail( group != NULL, FALSE );
+ cm_return_val_if_fail( email != NULL, FALSE );
node = group->listEMail;
while( node ) {
@@ -728,7 +728,7 @@ void addritem_print_item_group( ItemGroup *group, FILE *stream ) {
GList *node;
ItemPerson *person;
ItemEMail *item;
- g_return_if_fail( group != NULL );
+ cm_return_if_fail( group != NULL );
fprintf( stream, "Group:\n" );
fprintf( stream, "\tt/u: %d : '%s'\n", ADDRITEM_TYPE(group), ADDRITEM_ID(group) );
fprintf( stream, "\tsub: %d\n", ADDRITEM_SUBTYPE(group) );
@@ -829,7 +829,7 @@ void addritem_folder_set_hidden( ItemFolder *folder, const gboolean value ) {
* \param folder Folder to free.
*/
void addritem_free_item_folder( ItemFolder *folder ) {
- g_return_if_fail( folder != NULL );
+ cm_return_if_fail( folder != NULL );
/* Free internal stuff */
g_free( ADDRITEM_ID(folder) );
@@ -863,8 +863,8 @@ void addritem_free_item_folder( ItemFolder *folder ) {
* \return <i>TRUE</i> if person added.
*/
gboolean addritem_folder_add_person( ItemFolder *folder, ItemPerson *item ) {
- g_return_val_if_fail( folder != NULL, FALSE );
- g_return_val_if_fail( item != NULL, FALSE );
+ cm_return_val_if_fail( folder != NULL, FALSE );
+ cm_return_val_if_fail( item != NULL, FALSE );
folder->listPerson = g_list_append( folder->listPerson, item );
ADDRITEM_PARENT(item) = ADDRITEM_OBJECT(folder);
@@ -878,8 +878,8 @@ gboolean addritem_folder_add_person( ItemFolder *folder, ItemPerson *item ) {
* \return <i>TRUE</i> if folder added.
*/
gboolean addritem_folder_add_folder( ItemFolder *folder, ItemFolder *item ) {
- g_return_val_if_fail( folder != NULL, FALSE );
- g_return_val_if_fail( item != NULL, FALSE );
+ cm_return_val_if_fail( folder != NULL, FALSE );
+ cm_return_val_if_fail( item != NULL, FALSE );
folder->listFolder = g_list_append( folder->listFolder, item );
ADDRITEM_PARENT(item) = ADDRITEM_OBJECT(folder);
@@ -893,8 +893,8 @@ gboolean addritem_folder_add_folder( ItemFolder *folder, ItemFolder *item ) {
* \return <i>TRUE</i> if group added.
*/
gboolean addritem_folder_add_group( ItemFolder *folder, ItemGroup *item ) {
- g_return_val_if_fail( folder != NULL, FALSE );
- g_return_val_if_fail( item != NULL, FALSE );
+ cm_return_val_if_fail( folder != NULL, FALSE );
+ cm_return_val_if_fail( item != NULL, FALSE );
folder->listGroup = g_list_append( folder->listGroup, item );
ADDRITEM_PARENT(item) = ADDRITEM_OBJECT(folder);
@@ -911,7 +911,7 @@ void addritem_print_item_folder( ItemFolder *folder, FILE *stream ) {
/* ItemPerson *person; */
ItemFolder *parent;
- g_return_if_fail( folder != NULL );
+ cm_return_if_fail( folder != NULL );
fprintf( stream, "Folder:\n" );
fprintf( stream, "\tt/u: %d : '%s'\n", ADDRITEM_TYPE(folder), ADDRITEM_ID(folder) );
@@ -989,7 +989,7 @@ GList *addritem_folder_get_person_list( ItemFolder *folder ) {
GList *list = NULL;
GList *node = NULL;
- g_return_val_if_fail( folder != NULL, NULL );
+ cm_return_val_if_fail( folder != NULL, NULL );
node = folder->listPerson;
while( node ) {
@@ -1012,7 +1012,7 @@ GList *addritem_folder_get_group_list( ItemFolder *folder ) {
GList *list = NULL;
GList *node = NULL;
- g_return_val_if_fail( folder != NULL, NULL );
+ cm_return_val_if_fail( folder != NULL, NULL );
node = folder->listGroup;
while( node ) {
@@ -1033,7 +1033,7 @@ void addritem_parse_first_last( ItemPerson *person ) {
gchar *p;
gint len, i;
- g_return_if_fail( person != NULL );
+ cm_return_if_fail( person != NULL );
name = ADDRITEM_NAME(person);
if( name == NULL ) return;
diff --git a/src/addrquery.c b/src/addrquery.c
@@ -28,6 +28,7 @@
#include "mgutils.h"
#include "addrquery.h"
+#include "utils.h"
/**
* Query list for tracking current queries.
@@ -51,7 +52,7 @@ static gint _currentQueryID_ = 0;
static void qryreq_clear( QueryRequest *req ) {
GList *node;
- g_return_if_fail( req != NULL );
+ cm_return_if_fail( req != NULL );
g_free( req->searchTerm );
req->queryID = 0;
req->searchType = ADDRSEARCH_NONE;
@@ -74,7 +75,7 @@ static void qryreq_clear( QueryRequest *req ) {
* \param req Request query object.
*/
static void qryreq_free( QueryRequest *req ) {
- g_return_if_fail( req != NULL );
+ cm_return_if_fail( req != NULL );
qryreq_clear( req );
g_free( req );
}
@@ -85,7 +86,7 @@ static void qryreq_free( QueryRequest *req ) {
* \param value Type.
*/
void qryreq_set_search_type( QueryRequest *req, const AddrSearchType value ) {
- g_return_if_fail( req != NULL );
+ cm_return_if_fail( req != NULL );
req->searchType = value;
}
@@ -95,8 +96,8 @@ void qryreq_set_search_type( QueryRequest *req, const AddrSearchType value ) {
* \param aqo Address query object that performs the search.
*/
void qryreq_add_query( QueryRequest *req, AddrQueryObject *aqo ) {
- g_return_if_fail( req != NULL );
- g_return_if_fail( aqo != NULL );
+ cm_return_if_fail( req != NULL );
+ cm_return_if_fail( aqo != NULL );
req->queryList = g_list_append( req->queryList, aqo );
}
diff --git a/src/addrselect.c b/src/addrselect.c
@@ -132,7 +132,7 @@ AddrSelectList *addrselect_list_create() {
void addrselect_list_clear( AddrSelectList *asl ) {
GList *node;
- g_return_if_fail( asl != NULL );
+ cm_return_if_fail( asl != NULL );
node = asl->listSelect;
while( node ) {
AddrSelectItem *item;
@@ -151,7 +151,7 @@ void addrselect_list_clear( AddrSelectList *asl ) {
* \param asl List to free.
*/
void addrselect_list_free( AddrSelectList *asl ) {
- g_return_if_fail( asl != NULL );
+ cm_return_if_fail( asl != NULL );
addrselect_list_clear( asl );
g_list_free( asl->listSelect );
@@ -165,7 +165,7 @@ void addrselect_list_free( AddrSelectList *asl ) {
* \return <i>TRUE</i> if list is empty.
*/
gboolean addrselect_test_empty( AddrSelectList *asl ) {
- g_return_val_if_fail( asl != NULL, TRUE );
+ cm_return_val_if_fail( asl != NULL, TRUE );
return ( asl->listSelect == NULL );
}
@@ -179,7 +179,7 @@ gboolean addrselect_test_empty( AddrSelectList *asl ) {
GList *addrselect_get_list( AddrSelectList *asl ) {
GList *node, *list;
- g_return_val_if_fail(asl != NULL, NULL);
+ cm_return_val_if_fail(asl != NULL, NULL);
list = NULL;
node = asl->listSelect;
while( node ) {
@@ -270,7 +270,7 @@ static AddrSelectItem *addrselect_list_find( GList *list, AddrItemObject *aio )
void addrselect_list_add_obj( AddrSelectList *asl, AddrItemObject *aio, gchar *cacheID ) {
AddrSelectItem *item;
- g_return_if_fail( asl != NULL );
+ cm_return_if_fail( asl != NULL );
if( aio == NULL ) return;
/* Check whether object is in list */
@@ -293,7 +293,7 @@ void addrselect_list_add_obj( AddrSelectList *asl, AddrItemObject *aio, gchar *c
* \param cacheID Cache ID. Should be g_free() after calling function.
*/
void addrselect_list_add( AddrSelectList *asl, AddrSelectItem *item, gchar *cacheID ) {
- g_return_if_fail( asl != NULL );
+ cm_return_if_fail( asl != NULL );
if( item == NULL ) return;
/* Check whether object is in list */
@@ -312,7 +312,7 @@ void addrselect_list_remove( AddrSelectList *asl, AddrItemObject *aio ) {
GList *node;
AddrSelectItem *item;
- g_return_if_fail( asl != NULL );
+ cm_return_if_fail( asl != NULL );
if( aio == NULL ) return;
node = asl->listSelect;
while( node ) {
@@ -338,7 +338,7 @@ GList *addrselect_build_list( AddrSelectList *asl ) {
GList *list;
GList *node;
- g_return_val_if_fail(asl != NULL, NULL);
+ cm_return_val_if_fail(asl != NULL, NULL);
list = NULL;
node = asl->listSelect;
while( node != NULL ) {
diff --git a/src/codeconv.c b/src/codeconv.c
@@ -1546,8 +1546,8 @@ void conv_encode_header_full(gchar *dest, gint len, const gchar *src,
guchar *destp = dest;
gboolean use_base64;
- g_return_if_fail(g_utf8_validate(src, -1, NULL) == TRUE);
- g_return_if_fail(destp != NULL);
+ cm_return_if_fail(g_utf8_validate(src, -1, NULL) == TRUE);
+ cm_return_if_fail(destp != NULL);
if (MB_CUR_MAX > 1) {
use_base64 = TRUE;
diff --git a/src/common/base64.c b/src/common/base64.c
@@ -134,9 +134,9 @@ gint base64_decoder_decode(Base64Decoder *decoder,
gint buf_len;
gchar buf[4];
- g_return_val_if_fail(decoder != NULL, -1);
- g_return_val_if_fail(in != NULL, -1);
- g_return_val_if_fail(out != NULL, -1);
+ cm_return_val_if_fail(decoder != NULL, -1);
+ cm_return_val_if_fail(in != NULL, -1);
+ cm_return_val_if_fail(out != NULL, -1);
buf_len = decoder->buf_len;
memcpy(buf, decoder->buf, sizeof(buf));
diff --git a/src/common/claws.c b/src/common/claws.c
@@ -58,8 +58,8 @@ static void parse_parameter(int *argc, char ***argv)
{
gint i, j, k;
- g_return_if_fail(argc != NULL);
- g_return_if_fail(argv != NULL);
+ cm_return_if_fail(argc != NULL);
+ cm_return_if_fail(argv != NULL);
for (i = 1; i < *argc;) {
if (strcmp("--debug", (*argv)[i]) == 0) {
diff --git a/src/common/hooks.c b/src/common/hooks.c
@@ -53,14 +53,14 @@ guint hooks_register_hook(const gchar *hooklist_name,
GHookList *hooklist;
GHook *hook;
- g_return_val_if_fail(hooklist_name != NULL, (guint)-1);
- g_return_val_if_fail(hook_func != NULL, (guint)-1);
+ cm_return_val_if_fail(hooklist_name != NULL, (guint)-1);
+ cm_return_val_if_fail(hook_func != NULL, (guint)-1);
hooklist = hooks_get_hooklist(hooklist_name);
- g_return_val_if_fail(hooklist != NULL, (guint)-1);
+ cm_return_val_if_fail(hooklist != NULL, (guint)-1);
hook = g_hook_alloc(hooklist);
- g_return_val_if_fail(hook != NULL, (guint)-1);
+ cm_return_val_if_fail(hook != NULL, (guint)-1);
hook->func = hook_func;
hook->data = userdata;
@@ -78,13 +78,13 @@ void hooks_unregister_hook(const gchar *hooklist_name,
GHookList *hooklist;
GHook *hook;
- g_return_if_fail(hooklist_name != NULL);
+ cm_return_if_fail(hooklist_name != NULL);
hooklist = hooks_get_hooklist(hooklist_name);
- g_return_if_fail(hooklist != NULL);
+ cm_return_if_fail(hooklist != NULL);
hook = g_hook_get(hooklist, hook_id);
- g_return_if_fail(hook != NULL);
+ cm_return_if_fail(hook != NULL);
debug_print("unregisted hook %lu in '%s'\n", hook->hook_id, hooklist_name);
@@ -114,10 +114,10 @@ gboolean hooks_invoke(const gchar *hooklist_name,
GHookList *hooklist;
struct MarshalData marshal_data;
- g_return_val_if_fail(hooklist_name != NULL, FALSE);
+ cm_return_val_if_fail(hooklist_name != NULL, FALSE);
hooklist = hooks_get_hooklist(hooklist_name);
- g_return_val_if_fail(hooklist != NULL, FALSE);
+ cm_return_val_if_fail(hooklist != NULL, FALSE);
marshal_data.source = source;
marshal_data.abort = FALSE;
diff --git a/src/common/plugin.c b/src/common/plugin.c
@@ -89,9 +89,9 @@ static gint list_find_by_plugin_filename(const Plugin *plugin, const gchar *file
different directory. I think it would be better to compare
only the basename of the filename here (case-insensitive on
W32). */
- g_return_val_if_fail(plugin, 1);
- g_return_val_if_fail(plugin->filename, 1);
- g_return_val_if_fail(filename, 1);
+ cm_return_val_if_fail(plugin, 1);
+ cm_return_val_if_fail(plugin->filename, 1);
+ cm_return_val_if_fail(filename, 1);
return strcmp(filename, plugin->filename);
}
@@ -311,8 +311,8 @@ Plugin *plugin_load(const gchar *filename, gchar **error)
struct PluginFeature *(*plugin_provides)(void);
gint ok;
START_TIMING((filename?filename:"NULL plugin"));
- g_return_val_if_fail(filename != NULL, NULL);
- g_return_val_if_fail(error != NULL, NULL);
+ cm_return_val_if_fail(filename != NULL, NULL);
+ cm_return_val_if_fail(error != NULL, NULL);
/* check duplicate plugin path name */
if (plugin_is_loaded(filename)) {
diff --git a/src/common/prefs.c b/src/common/prefs.c
@@ -42,7 +42,7 @@ PrefFile *prefs_read_open(const gchar *path)
PrefFile *pfile;
FILE *fp;
- g_return_val_if_fail(path != NULL, NULL);
+ cm_return_val_if_fail(path != NULL, NULL);
if ((fp = g_fopen(path, "rb")) == NULL) {
FILE_OP_ERROR(path, "fopen");
@@ -73,7 +73,7 @@ PrefFile *prefs_write_open(const gchar *path)
gchar *tmppath;
FILE *fp;
- g_return_val_if_fail(path != NULL, NULL);
+ cm_return_val_if_fail(path != NULL, NULL);
if (prefs_is_readonly(path)) {
g_warning("no permission - %s\n", path);
@@ -124,7 +124,7 @@ gint prefs_file_close(PrefFile *pfile)
gchar *bakpath = NULL;
gchar buf[BUFFSIZE];
- g_return_val_if_fail(pfile != NULL, -1);
+ cm_return_val_if_fail(pfile != NULL, -1);
fp = pfile->fp;
orig_fp = pfile->orig_fp;
@@ -214,7 +214,7 @@ gint prefs_file_close_revert(PrefFile *pfile)
{
gchar *tmppath = NULL;
- g_return_val_if_fail(pfile != NULL, -1);
+ cm_return_val_if_fail(pfile != NULL, -1);
if (pfile->orig_fp)
fclose(pfile->orig_fp);
diff --git a/src/common/session.c b/src/common/session.c
@@ -206,8 +206,8 @@ gint session_disconnect(Session *session)
*/
void session_destroy(Session *session)
{
- g_return_if_fail(session != NULL);
- g_return_if_fail(session->destroy != NULL);
+ cm_return_if_fail(session != NULL);
+ cm_return_if_fail(session->destroy != NULL);
session_close(session);
session->destroy(session);
@@ -318,7 +318,7 @@ void session_set_send_data_notify(Session *session, SendDataNotify notify_func,
*/
static gint session_close(Session *session)
{
- g_return_val_if_fail(session != NULL, -1);
+ cm_return_val_if_fail(session != NULL, -1);
#ifdef G_OS_UNIX
if (session->conn_id > 0) {
@@ -373,9 +373,9 @@ gint session_send_msg(Session *session, SessionMsgType type, const gchar *msg)
{
gboolean ret;
- g_return_val_if_fail(session->write_buf == NULL, -1);
- g_return_val_if_fail(msg != NULL, -1);
- g_return_val_if_fail(msg[0] != '\0', -1);
+ cm_return_val_if_fail(session->write_buf == NULL, -1);
+ cm_return_val_if_fail(msg != NULL, -1);
+ cm_return_val_if_fail(msg[0] != '\0', -1);
session->state = SESSION_SEND;
session->write_buf = g_strconcat(msg, "\r\n", NULL);
@@ -395,7 +395,7 @@ gint session_send_msg(Session *session, SessionMsgType type, const gchar *msg)
gint session_recv_msg(Session *session)
{
- g_return_val_if_fail(session->read_msg_buf->len == 0, -1);
+ cm_return_val_if_fail(session->read_msg_buf->len == 0, -1);
session->state = SESSION_RECV;
@@ -436,9 +436,9 @@ gint session_send_data(Session *session, const guchar *data, guint size)
{
gboolean ret;
- g_return_val_if_fail(session->write_data == NULL, -1);
- g_return_val_if_fail(data != NULL, -1);
- g_return_val_if_fail(size != 0, -1);
+ cm_return_val_if_fail(session->write_data == NULL, -1);
+ cm_return_val_if_fail(data != NULL, -1);
+ cm_return_val_if_fail(size != 0, -1);
session->state = SESSION_SEND;
@@ -461,7 +461,7 @@ gint session_send_data(Session *session, const guchar *data, guint size)
gint session_recv_data(Session *session, guint size, const gchar *terminator)
{
- g_return_val_if_fail(session->read_data_buf->len == 0, -1);
+ cm_return_val_if_fail(session->read_data_buf->len == 0, -1);
session->state = SESSION_RECV;
@@ -502,7 +502,7 @@ static gboolean session_read_msg_cb(SockInfo *source, GIOCondition condition,
gchar *msg;
gint ret;
- g_return_val_if_fail(condition == G_IO_IN, FALSE);
+ cm_return_val_if_fail(condition == G_IO_IN, FALSE);
session_set_timeout(session, session->timeout_interval);
@@ -597,7 +597,7 @@ static gboolean session_read_data_cb(SockInfo *source, GIOCondition condition,
guint data_len;
gint ret;
- g_return_val_if_fail(condition == G_IO_IN, FALSE);
+ cm_return_val_if_fail(condition == G_IO_IN, FALSE);
session_set_timeout(session, session->timeout_interval);
@@ -697,9 +697,9 @@ static gint session_write_buf(Session *session)
gint write_len;
gint to_write_len;
- g_return_val_if_fail(session->write_buf != NULL, -1);
- g_return_val_if_fail(session->write_buf_p != NULL, -1);
- g_return_val_if_fail(session->write_buf_len > 0, -1);
+ cm_return_val_if_fail(session->write_buf != NULL, -1);
+ cm_return_val_if_fail(session->write_buf_p != NULL, -1);
+ cm_return_val_if_fail(session->write_buf_len > 0, -1);
to_write_len = session->write_buf_len -
(session->write_buf_p - session->write_buf);
@@ -740,9 +740,9 @@ static gint session_write_data(Session *session)
gint write_len;
gint to_write_len;
- g_return_val_if_fail(session->write_data != NULL, -1);
- g_return_val_if_fail(session->write_data_p != NULL, -1);
- g_return_val_if_fail(session->write_data_len > 0, -1);
+ cm_return_val_if_fail(session->write_data != NULL, -1);
+ cm_return_val_if_fail(session->write_data_p != NULL, -1);
+ cm_return_val_if_fail(session->write_data_len > 0, -1);
to_write_len = session->write_data_len -
(session->write_data_p - session->write_data);
@@ -783,10 +783,10 @@ static gboolean session_write_msg_cb(SockInfo *source, GIOCondition condition,
Session *session = SESSION(data);
gint ret;
- g_return_val_if_fail(condition == G_IO_OUT, FALSE);
- g_return_val_if_fail(session->write_buf != NULL, FALSE);
- g_return_val_if_fail(session->write_buf_p != NULL, FALSE);
- g_return_val_if_fail(session->write_buf_len > 0, FALSE);
+ cm_return_val_if_fail(condition == G_IO_OUT, FALSE);
+ cm_return_val_if_fail(session->write_buf != NULL, FALSE);
+ cm_return_val_if_fail(session->write_buf_p != NULL, FALSE);
+ cm_return_val_if_fail(session->write_buf_len > 0, FALSE);
ret = session_write_buf(session);
@@ -813,10 +813,10 @@ static gboolean session_write_data_cb(SockInfo *source,
guint write_data_len;
gint ret;
- g_return_val_if_fail(condition == G_IO_OUT, FALSE);
- g_return_val_if_fail(session->write_data != NULL, FALSE);
- g_return_val_if_fail(session->write_data_p != NULL, FALSE);
- g_return_val_if_fail(session->write_data_len > 0, FALSE);
+ cm_return_val_if_fail(condition == G_IO_OUT, FALSE);
+ cm_return_val_if_fail(session->write_data != NULL, FALSE);
+ cm_return_val_if_fail(session->write_data_p != NULL, FALSE);
+ cm_return_val_if_fail(session->write_data_len > 0, FALSE);
write_data_len = session->write_data_len;
diff --git a/src/common/smtp.c b/src/common/smtp.c
@@ -127,7 +127,7 @@ gint smtp_from(SMTPSession *session)
gchar buf[MSGBUFSIZE];
gchar *mail_size = NULL;
- g_return_val_if_fail(session->from != NULL, SM_ERROR);
+ cm_return_val_if_fail(session->from != NULL, SM_ERROR);
session->state = SMTP_FROM;
@@ -156,7 +156,7 @@ gint smtp_from(SMTPSession *session)
static gint smtp_auth(SMTPSession *session)
{
- g_return_val_if_fail(session->user != NULL, SM_ERROR);
+ cm_return_val_if_fail(session->user != NULL, SM_ERROR);
session->state = SMTP_AUTH;
@@ -440,7 +440,7 @@ static gint smtp_rcpt(SMTPSession *session)
gchar buf[MSGBUFSIZE];
gchar *to;
- g_return_val_if_fail(session->cur_to != NULL, SM_ERROR);
+ cm_return_val_if_fail(session->cur_to != NULL, SM_ERROR);
session->state = SMTP_RCPT;
diff --git a/src/common/socket.c b/src/common/socket.c
@@ -427,7 +427,7 @@ static gint set_nonblocking_mode(gint fd, gboolean nonblock)
gint sock_set_nonblocking_mode(SockInfo *sock, gboolean nonblock)
{
- g_return_val_if_fail(sock != NULL, -1);
+ cm_return_val_if_fail(sock != NULL, -1);
return set_nonblocking_mode(sock->sock, nonblock);
}
@@ -451,7 +451,7 @@ static gboolean is_nonblocking_mode(gint fd)
gboolean sock_is_nonblocking_mode(SockInfo *sock)
{
- g_return_val_if_fail(sock != NULL, FALSE);
+ cm_return_val_if_fail(sock != NULL, FALSE);
return is_nonblocking_mode(sock->sock);
}
@@ -1409,7 +1409,7 @@ gint sock_read(SockInfo *sock, gchar *buf, gint len)
{
gint ret;
- g_return_val_if_fail(sock != NULL, -1);
+ cm_return_val_if_fail(sock != NULL, -1);
#ifdef USE_GNUTLS
if (sock->ssl)
@@ -1461,7 +1461,7 @@ gint sock_write(SockInfo *sock, const gchar *buf, gint len)
{
gint ret;
- g_return_val_if_fail(sock != NULL, -1);
+ cm_return_val_if_fail(sock != NULL, -1);
#ifdef USE_GNUTLS
if (sock->ssl)
@@ -1524,7 +1524,7 @@ gint sock_write_all(SockInfo *sock, const gchar *buf, gint len)
{
gint ret;
- g_return_val_if_fail(sock != NULL, -1);
+ cm_return_val_if_fail(sock != NULL, -1);
#ifdef USE_GNUTLS
if (sock->ssl)
diff --git a/src/common/string_match.c b/src/common/string_match.c
@@ -32,13 +32,14 @@
#include <string.h>
#include "string_match.h"
+#include "utils.h"
int string_match_precompile (gchar *rexp, regex_t *preg, int cflags)
{
int problem = 0;
- g_return_val_if_fail(rexp, -1);
- g_return_val_if_fail(*rexp, -1);
+ cm_return_val_if_fail(rexp, -1);
+ cm_return_val_if_fail(*rexp, -1);
problem = regcomp(preg, rexp, cflags);
diff --git a/src/common/stringtable.c b/src/common/stringtable.c
@@ -51,7 +51,7 @@ static StringEntry *string_entry_new(const gchar *str)
static void string_entry_free(StringEntry *entry)
{
- g_return_if_fail(entry != NULL);
+ cm_return_if_fail(entry != NULL);
g_free(entry->string);
g_free(entry);
@@ -62,9 +62,9 @@ StringTable *string_table_new(void)
StringTable *strtable;
strtable = g_new0(StringTable, 1);
- g_return_val_if_fail(strtable != NULL, NULL);
+ cm_return_val_if_fail(strtable != NULL, NULL);
strtable->hash_table = g_hash_table_new(g_str_hash, g_str_equal);
- g_return_val_if_fail(strtable->hash_table, NULL);
+ cm_return_val_if_fail(strtable->hash_table, NULL);
return strtable;
}
@@ -112,8 +112,8 @@ void string_table_free_string(StringTable *table, const gchar *str)
static gboolean string_table_remove_for_each_fn(gchar *key, StringEntry *entry,
gpointer user_data)
{
- g_return_val_if_fail(key != NULL, TRUE);
- g_return_val_if_fail(entry != NULL, TRUE);
+ cm_return_val_if_fail(key != NULL, TRUE);
+ cm_return_val_if_fail(entry != NULL, TRUE);
string_entry_free(entry);
@@ -122,8 +122,8 @@ static gboolean string_table_remove_for_each_fn(gchar *key, StringEntry *entry,
void string_table_free(StringTable *table)
{
- g_return_if_fail(table != NULL);
- g_return_if_fail(table->hash_table != NULL);
+ cm_return_if_fail(table != NULL);
+ cm_return_if_fail(table->hash_table != NULL);
g_hash_table_foreach_remove(table->hash_table,
(GHRFunc)string_table_remove_for_each_fn,
diff --git a/src/common/utils.c b/src/common/utils.c
@@ -293,7 +293,7 @@ void ptr_array_free_strings(GPtrArray *array)
gint i;
gchar *str;
- g_return_if_fail(array != NULL);
+ cm_return_if_fail(array != NULL);
for (i = 0; i < array->len; i++) {
str = g_ptr_array_index(array, i);
@@ -991,7 +991,7 @@ GList *add_history(GList *list, const gchar *str)
{
GList *old;
- g_return_val_if_fail(str != NULL, list);
+ cm_return_val_if_fail(str != NULL, list);
old = g_list_find_custom(list, (gpointer)str, (GCompareFunc)strcmp2);
if (old) {
@@ -1265,8 +1265,8 @@ gchar **strsplit_with_quote(const gchar *str, const gchar *delim,
gchar **str_array, *s, *new_str;
guint i, n = 1, len;
- g_return_val_if_fail(str != NULL, NULL);
- g_return_val_if_fail(delim != NULL, NULL);
+ cm_return_val_if_fail(str != NULL, NULL);
+ cm_return_val_if_fail(delim != NULL, NULL);
if (max_tokens < 1)
max_tokens = G_MAXINT;
@@ -1325,7 +1325,7 @@ gchar *get_abbrev_newsgroup_name(const gchar *group, gint len)
const gchar *p = group;
const gchar *last;
- g_return_val_if_fail(group != NULL, NULL);
+ cm_return_val_if_fail(group != NULL, NULL);
last = group + strlen(group);
abbrev_group = ap = g_malloc(strlen(group) + 1);
@@ -2759,6 +2759,9 @@ gint canonicalize_file(const gchar *src, const gchar *dest)
gboolean err = FALSE;
gboolean last_linebreak = FALSE;
+ if (src == NULL || dest == NULL)
+ return -1;
+
if ((src_fp = g_fopen(src, "rb")) == NULL) {
FILE_OP_ERROR(src, "g_fopen");
return -1;
@@ -3037,7 +3040,7 @@ FILE *str_open_as_stream(const gchar *str)
FILE *fp;
size_t len;
- g_return_val_if_fail(str != NULL, NULL);
+ cm_return_val_if_fail(str != NULL, NULL);
fp = my_tmpfile();
if (!fp) {
@@ -3063,8 +3066,8 @@ gint str_write_to_file(const gchar *str, const gchar *file)
FILE *fp;
size_t len;
- g_return_val_if_fail(str != NULL, -1);
- g_return_val_if_fail(file != NULL, -1);
+ cm_return_val_if_fail(str != NULL, -1);
+ cm_return_val_if_fail(file != NULL, -1);
if ((fp = g_fopen(file, "wb")) == NULL) {
FILE_OP_ERROR(file, "g_fopen");
@@ -3100,7 +3103,7 @@ static gchar *file_read_stream_to_str_full(FILE *fp, gboolean recode)
gint n_read;
gchar *str;
- g_return_val_if_fail(fp != NULL, NULL);
+ cm_return_val_if_fail(fp != NULL, NULL);
array = g_byte_array_new();
@@ -3146,7 +3149,7 @@ static gchar *file_read_to_str_full(const gchar *file, gboolean recode)
int fflags = 0;
#endif
- g_return_val_if_fail(file != NULL, NULL);
+ cm_return_val_if_fail(file != NULL, NULL);
if (g_stat(file, &s) != 0) {
FILE_OP_ERROR(file, "stat");
@@ -3266,7 +3269,7 @@ char *fgets_crlf(char *buf, int size, FILE *stream)
static gint execute_async(gchar *const argv[])
{
- g_return_val_if_fail(argv != NULL && argv[0] != NULL, -1);
+ cm_return_val_if_fail(argv != NULL && argv[0] != NULL, -1);
if (g_spawn_async(NULL, (gchar **)argv, NULL, G_SPAWN_SEARCH_PATH,
NULL, NULL, NULL, FALSE) == FALSE) {
@@ -3281,7 +3284,7 @@ static gint execute_sync(gchar *const argv[])
{
gint status;
- g_return_val_if_fail(argv != NULL && argv[0] != NULL, -1);
+ cm_return_val_if_fail(argv != NULL && argv[0] != NULL, -1);
if (g_spawn_sync(NULL, (gchar **)argv, NULL, G_SPAWN_SEARCH_PATH,
NULL, NULL, NULL, NULL, &status, NULL) == FALSE) {
@@ -3323,7 +3326,7 @@ gchar *get_command_output(const gchar *cmdline)
gchar *child_stdout;
gint status;
- g_return_val_if_fail(cmdline != NULL, NULL);
+ cm_return_val_if_fail(cmdline != NULL, NULL);
debug_print("get_command_output(): executing: %s\n", cmdline);
@@ -3379,7 +3382,7 @@ gint open_uri(const gchar *uri, const gchar *cmdline)
gchar buf[BUFFSIZE];
gchar *p;
gchar encoded_uri[BUFFSIZE];
- g_return_val_if_fail(uri != NULL, -1);
+ cm_return_val_if_fail(uri != NULL, -1);
/* an option to choose whether to use encode_uri or not ? */
encode_uri(encoded_uri, BUFFSIZE, uri);
@@ -3414,7 +3417,7 @@ gint open_txt_editor(const gchar *filepath, const gchar *cmdline)
gchar buf[BUFFSIZE];
gchar *p;
- g_return_val_if_fail(filepath != NULL, -1);
+ cm_return_val_if_fail(filepath != NULL, -1);
if (cmdline &&
(p = strchr(cmdline, '%')) && *(p + 1) == 's' &&
@@ -3918,8 +3921,8 @@ GNode *g_node_map(GNode *node, GNodeMapFunc func, gpointer data)
GNode *root;
GNodeMapData mapdata;
- g_return_val_if_fail(node != NULL, NULL);
- g_return_val_if_fail(func != NULL, NULL);
+ cm_return_val_if_fail(node != NULL, NULL);
+ cm_return_val_if_fail(func != NULL, NULL);
root = g_node_new(func(node->data, data));
@@ -4196,10 +4199,10 @@ gboolean get_uri_part(const gchar *start, const gchar *scanpos,
const gchar *ep_;
gint parenthese_cnt = 0;
- g_return_val_if_fail(start != NULL, FALSE);
- g_return_val_if_fail(scanpos != NULL, FALSE);
- g_return_val_if_fail(bp != NULL, FALSE);
- g_return_val_if_fail(ep != NULL, FALSE);
+ cm_return_val_if_fail(start != NULL, FALSE);
+ cm_return_val_if_fail(scanpos != NULL, FALSE);
+ cm_return_val_if_fail(bp != NULL, FALSE);
+ cm_return_val_if_fail(ep != NULL, FALSE);
*bp = scanpos;
@@ -4292,7 +4295,7 @@ static GHashTable *create_domain_tab(void)
gint n;
GHashTable *htab = g_hash_table_new(g_stricase_hash, g_stricase_equal);
- g_return_val_if_fail(htab, NULL);
+ cm_return_val_if_fail(htab, NULL);
for (n = 0; n < sizeof toplvl_domains / sizeof toplvl_domains[0]; n++)
g_hash_table_insert(htab, (gpointer) toplvl_domains[n], (gpointer) toplvl_domains[n]);
return htab;
@@ -4335,10 +4338,10 @@ gboolean get_email_part(const gchar *start, const gchar *scanpos,
gchar closure_stack[128];
gchar *ptr = closure_stack;
- g_return_val_if_fail(start != NULL, FALSE);
- g_return_val_if_fail(scanpos != NULL, FALSE);
- g_return_val_if_fail(bp != NULL, FALSE);
- g_return_val_if_fail(ep != NULL, FALSE);
+ cm_return_val_if_fail(start != NULL, FALSE);
+ cm_return_val_if_fail(scanpos != NULL, FALSE);
+ cm_return_val_if_fail(bp != NULL, FALSE);
+ cm_return_val_if_fail(ep != NULL, FALSE);
if (hdr) {
const gchar *start_quote = NULL;
@@ -4404,7 +4407,7 @@ search_again:
if (!dom_tab)
dom_tab = create_domain_tab();
- g_return_val_if_fail(dom_tab, FALSE);
+ cm_return_val_if_fail(dom_tab, FALSE);
/* scan start of address */
for (bp_ = scanpos - 1;
diff --git a/src/common/utils.h b/src/common/utils.h
@@ -24,6 +24,10 @@
# include "config.h"
#endif
+#ifdef HAVE_BACKTRACE
+#include <execinfo.h>
+#endif
+
#include <glib.h>
#include <glib-object.h>
#include <stdio.h>
@@ -179,6 +183,58 @@ typedef gint64 goffset;
#define IS_ASCII(c) (((guchar) c) <= 0177 ? 1 : 0)
+/* from NetworkManager */
+#if HAVE_BACKTRACE
+#define print_backtrace() \
+G_STMT_START \
+{ \
+ void *_call_stack[512]; \
+ int _call_stack_size; \
+ char **_symbols; \
+ _call_stack_size = backtrace (_call_stack, \
+ G_N_ELEMENTS (_call_stack)); \
+ _symbols = backtrace_symbols (_call_stack, _call_stack_size); \
+ if (_symbols != NULL) \
+ { \
+ int _i; \
+ _i = 0; \
+ g_print ("traceback:\n"); \
+ while (_i < _call_stack_size) \
+ { \
+ g_print ("%d:\t%s\n", _i, _symbols[_i]); \
+ _i++; \
+ } \
+ free (_symbols); \
+ } \
+} \
+G_STMT_END
+#else
+#define print_backtrace() \
+G_STMT_START \
+{ \
+} \
+G_STMT_END
+#endif
+
+
+#define cm_return_val_if_fail(expr,val) G_STMT_START { \
+ if (!(expr)) { \
+ g_print("%s:%d Condition %s failed\n", __FILE__, __LINE__, #expr);\
+ print_backtrace(); \
+ g_print("\n"); \
+ return val; \
+ } \
+} G_STMT_END
+
+#define cm_return_if_fail(expr) G_STMT_START { \
+ if (!(expr)) { \
+ g_print("%s:%d Condition %s failed\n", __FILE__, __LINE__, #expr);\
+ print_backtrace(); \
+ g_print("\n"); \
+ return; \
+ } \
+} G_STMT_END
+
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/src/common/xml.c b/src/common/xml.c
@@ -77,7 +77,7 @@ XMLFile *xml_open_file(const gchar *path)
{
XMLFile *newfile;
- g_return_val_if_fail(path != NULL, NULL);
+ cm_return_val_if_fail(path != NULL, NULL);
newfile = g_new(XMLFile, 1);
@@ -103,7 +103,7 @@ XMLFile *xml_open_file(const gchar *path)
void xml_close_file(XMLFile *file)
{
- g_return_if_fail(file != NULL);
+ cm_return_if_fail(file != NULL);
if (file->fp) fclose(file->fp);
@@ -153,7 +153,7 @@ GNode *xml_parse_file(const gchar *path)
GNode *node;
file = xml_open_file(path);
- g_return_val_if_fail(file != NULL, NULL);
+ cm_return_val_if_fail(file != NULL, NULL);
xml_get_dtd(file);
@@ -337,7 +337,7 @@ next:
static void xml_push_tag(XMLFile *file, XMLTag *tag)
{
- g_return_if_fail(tag != NULL);
+ cm_return_if_fail(tag != NULL);
file->tag_stack = g_list_prepend(file->tag_stack, tag);
file->level++;
@@ -577,7 +577,7 @@ gint xml_file_put_escape_str(FILE *fp, const gchar *str)
{
const gchar *p;
int result = 0;
- g_return_val_if_fail(fp != NULL, -1);
+ cm_return_val_if_fail(fp != NULL, -1);
if (!str) return 0;
@@ -608,7 +608,7 @@ gint xml_file_put_escape_str(FILE *fp, const gchar *str)
gint xml_file_put_xml_decl(FILE *fp)
{
- g_return_val_if_fail(fp != NULL, -1);
+ cm_return_val_if_fail(fp != NULL, -1);
XML_STRING_TABLE_CREATE();
return fprintf(fp, "<?xml version=\"1.0\" encoding=\"%s\"?>\n", CS_INTERNAL);
@@ -633,7 +633,7 @@ static gboolean xml_free_func(GNode *node, gpointer data)
void xml_free_tree(GNode *node)
{
- g_return_if_fail(node != NULL);
+ cm_return_if_fail(node != NULL);
g_node_traverse(node, G_PRE_ORDER, G_TRAVERSE_ALL, -1, xml_free_func,
NULL);
@@ -693,8 +693,8 @@ static int xml_write_tree_recursive(GNode *node, FILE *fp)
XMLTag *tag;
GList *cur;
- g_return_val_if_fail(node != NULL, -1);
- g_return_val_if_fail(fp != NULL, -1);
+ cm_return_val_if_fail(node != NULL, -1);
+ cm_return_val_if_fail(fp != NULL, -1);
depth = g_node_depth(node) - 1;
for (i = 0; i < depth; i++)
diff --git a/src/common/xmlprops.c b/src/common/xmlprops.c
@@ -40,6 +40,7 @@
#include "xml.h"
#include "mgutils.h"
#include "xmlprops.h"
+#include "utils.h"
/* Element tag names */
#define XMLS_ELTAG_PROP_LIST "property-list"
@@ -74,7 +75,7 @@ XmlProperty *xmlprops_create( void ) {
* Properties - file path.
*/
void xmlprops_set_path( XmlProperty *props, const gchar *value ) {
- g_return_if_fail( props != NULL );
+ cm_return_if_fail( props != NULL );
props->path = mgu_replace_string( props->path, value );
}
@@ -94,7 +95,7 @@ static gint xmlprops_free_entry_vis( gpointer key, gpointer value, gpointer data
* Enter: props Property object.
*/
static void xmlprops_clear( XmlProperty *props ) {
- g_return_if_fail( props != NULL );
+ cm_return_if_fail( props != NULL );
g_hash_table_foreach_remove(
props->propertyTable, xmlprops_free_entry_vis, NULL );
}
@@ -104,7 +105,7 @@ static void xmlprops_clear( XmlProperty *props ) {
* Enter: props Property object.
*/
void xmlprops_free( XmlProperty *props ) {
- g_return_if_fail( props != NULL );
+ cm_return_if_fail( props != NULL );
/* Clear property table */
xmlprops_clear( props );
@@ -235,7 +236,7 @@ out:
* return: Status code.
*/
gint xmlprops_save_file( XmlProperty *props ) {
- g_return_val_if_fail( props != NULL, -1 );
+ cm_return_val_if_fail( props != NULL, -1 );
props->retVal = MGU_NO_FILE;
if( props->path == NULL || *props->path == '\0' ) return props->retVal;
@@ -299,7 +300,7 @@ static void xmlprops_read_props( XmlProperty *props, XMLFile *file ) {
gint xmlprops_load_file( XmlProperty *props ) {
XMLFile *file = NULL;
- g_return_val_if_fail( props != NULL, -1 );
+ cm_return_val_if_fail( props != NULL, -1 );
props->retVal = MGU_NO_FILE;
file = xml_open_file( props->path );
if( file == NULL ) {
@@ -332,7 +333,7 @@ void xmlprops_set_property(
gchar *key = NULL;
gchar *val;
- g_return_if_fail( props != NULL );
+ cm_return_if_fail( props != NULL );
if( name == NULL || strlen( name ) == 0 ) return;
if( value == NULL || strlen( value ) == 0 ) return;
val = g_hash_table_lookup( props->propertyTable, name );
@@ -357,7 +358,7 @@ void xmlprops_set_property_i(
{
gchar buf[32];
- g_return_if_fail( props != NULL );
+ cm_return_if_fail( props != NULL );
sprintf( buf, "%d", value );
xmlprops_set_property( props, name, buf );
}
@@ -371,7 +372,7 @@ void xmlprops_set_property_i(
void xmlprops_set_property_b(
XmlProperty *props, const gchar *name, const gboolean value )
{
- g_return_if_fail( props != NULL );
+ cm_return_if_fail( props != NULL );
if( value ) {
xmlprops_set_property( props, name, "y" );
}
@@ -390,7 +391,7 @@ void xmlprops_get_property_s(
XmlProperty *props, const gchar *name, gchar *buffer ) {
gchar *val;
- g_return_if_fail( props != NULL );
+ cm_return_if_fail( props != NULL );
if( buffer == NULL ) return;
val = g_hash_table_lookup( props->propertyTable, name );
if( val ) {
@@ -410,7 +411,7 @@ gint xmlprops_get_property_i( XmlProperty *props, const gchar *name ) {
gint value;
value = 0;
- g_return_val_if_fail( props != NULL, value );
+ cm_return_val_if_fail( props != NULL, value );
val = g_hash_table_lookup( props->propertyTable, name );
if( val ) {
endptr = NULL;
@@ -430,7 +431,7 @@ gboolean xmlprops_get_property_b( XmlProperty *props, const gchar *name ) {
gboolean value;
value = FALSE;
- g_return_val_if_fail( props != NULL, value );
+ cm_return_val_if_fail( props != NULL, value );
val = g_hash_table_lookup( props->propertyTable, name );
if( val ) {
value = ( g_ascii_strcasecmp( val, "y" ) == 0 );
diff --git a/src/compose.c b/src/compose.c
@@ -954,7 +954,7 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
/* if no account prefs set, fallback to the current one */
if (!account) account = cur_account;
- g_return_val_if_fail(account != NULL, NULL);
+ cm_return_val_if_fail(account != NULL, NULL);
compose = compose_create(account, item, COMPOSE_NEW, FALSE);
@@ -1018,7 +1018,7 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
if (mailto && *mailto != '\0') {
compose_entries_set(compose, mailto, COMPOSE_TO);
- } else if (item && item->prefs->enable_default_to) {
+ } else if (item && item->prefs && item->prefs->enable_default_to) {
compose_entry_append(compose, item->prefs->default_to, COMPOSE_TO);
compose_entry_mark_default_to(compose, item->prefs->default_to);
}
@@ -1163,8 +1163,8 @@ static void compose_force_encryption(Compose *compose, PrefsAccount *account,
{
const gchar *privacy = NULL;
- g_return_if_fail(compose != NULL);
- g_return_if_fail(account != NULL);
+ cm_return_if_fail(compose != NULL);
+ cm_return_if_fail(account != NULL);
if (override_pref == FALSE && account->default_encrypt_reply == FALSE)
return;
@@ -1230,10 +1230,10 @@ static Compose *compose_reply_mode(ComposeMode mode, GSList *msginfo_list, gchar
guint list_len;
Compose *compose = NULL;
- g_return_val_if_fail(msginfo_list != NULL, NULL);
+ cm_return_val_if_fail(msginfo_list != NULL, NULL);
msginfo = (MsgInfo*)g_slist_nth_data(msginfo_list, 0);
- g_return_val_if_fail(msginfo != NULL, NULL);
+ cm_return_val_if_fail(msginfo != NULL, NULL);
list_len = g_slist_length(msginfo_list);
@@ -1435,12 +1435,12 @@ static Compose *compose_generic_reply(MsgInfo *msginfo,
const gchar *body_fmt = NULL;
gchar *s_system = NULL;
START_TIMING("");
- g_return_val_if_fail(msginfo != NULL, NULL);
- g_return_val_if_fail(msginfo->folder != NULL, NULL);
+ cm_return_val_if_fail(msginfo != NULL, NULL);
+ cm_return_val_if_fail(msginfo->folder != NULL, NULL);
account = account_get_reply_account(msginfo, prefs_common.reply_account_autosel);
- g_return_val_if_fail(account != NULL, NULL);
+ cm_return_val_if_fail(account != NULL, NULL);
compose = compose_create(account, msginfo->folder, COMPOSE_REPLY, FALSE);
@@ -1608,8 +1608,8 @@ Compose *compose_forward(PrefsAccount *account, MsgInfo *msginfo,
GtkTextBuffer *textbuf;
GtkTextIter iter;
- g_return_val_if_fail(msginfo != NULL, NULL);
- g_return_val_if_fail(msginfo->folder != NULL, NULL);
+ cm_return_val_if_fail(msginfo != NULL, NULL);
+ cm_return_val_if_fail(msginfo->folder != NULL, NULL);
if (!account &&
!(account = compose_guess_forward_account_from_msginfo
@@ -1798,7 +1798,7 @@ static Compose *compose_forward_multiple(PrefsAccount *account, GSList *msginfo_
gchar *msgfile;
gboolean single_mail = TRUE;
- g_return_val_if_fail(msginfo_list != NULL, NULL);
+ cm_return_val_if_fail(msginfo_list != NULL, NULL);
if (g_slist_length(msginfo_list) > 1)
single_mail = FALSE;
@@ -1813,7 +1813,7 @@ static Compose *compose_forward_multiple(PrefsAccount *account, GSList *msginfo_
(msginfo_list->data)))
account = cur_account;
- g_return_val_if_fail(account != NULL, NULL);
+ cm_return_val_if_fail(account != NULL, NULL);
for (msginfo = msginfo_list; msginfo != NULL; msginfo = msginfo->next) {
if (msginfo->data) {
@@ -2027,8 +2027,8 @@ Compose *compose_reedit(MsgInfo *msginfo, gboolean batch)
gboolean autowrap = prefs_common.autowrap;
gboolean autoindent = prefs_common.auto_indent;
- g_return_val_if_fail(msginfo != NULL, NULL);
- g_return_val_if_fail(msginfo->folder != NULL, NULL);
+ cm_return_val_if_fail(msginfo != NULL, NULL);
+ cm_return_val_if_fail(msginfo->folder != NULL, NULL);
if (compose_put_existing_to_front(msginfo)) {
return NULL;
@@ -2145,7 +2145,7 @@ Compose *compose_reedit(MsgInfo *msginfo, gboolean batch)
if (!account) {
account = cur_account;
}
- g_return_val_if_fail(account != NULL, NULL);
+ cm_return_val_if_fail(account != NULL, NULL);
compose = compose_create(account, msginfo->folder, COMPOSE_REEDIT, batch);
@@ -2267,12 +2267,12 @@ Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo,
gchar *filename;
FolderItem *item;
- g_return_val_if_fail(msginfo != NULL, NULL);
+ cm_return_val_if_fail(msginfo != NULL, NULL);
if (!account)
account = account_get_reply_account(msginfo,
prefs_common.reply_account_autosel);
- g_return_val_if_fail(account != NULL, NULL);
+ cm_return_val_if_fail(account != NULL, NULL);
compose = compose_create(account, msginfo->folder, COMPOSE_REDIRECT, batch);
@@ -2473,7 +2473,7 @@ void compose_toolbar_cb(gint action, gpointer data)
ToolbarItem *toolbar_item = (ToolbarItem*)data;
Compose *compose = (Compose*)toolbar_item->parent;
- g_return_if_fail(compose != NULL);
+ cm_return_if_fail(compose != NULL);
switch(action) {
case A_SEND:
@@ -2632,7 +2632,7 @@ static gint compose_parse_header(Compose *compose, MsgInfo *msginfo)
FILE *fp;
- g_return_val_if_fail(msginfo != NULL, -1);
+ cm_return_val_if_fail(msginfo != NULL, -1);
if ((fp = procmsg_open_message(msginfo)) == NULL) return -1;
procheader_get_header_fields(fp, hentry);
@@ -2985,8 +2985,8 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
gboolean reply_to_ml = FALSE;
gboolean default_reply_to = FALSE;
- g_return_if_fail(compose->account != NULL);
- g_return_if_fail(msginfo != NULL);
+ cm_return_if_fail(compose->account != NULL);
+ cm_return_if_fail(msginfo != NULL);
reply_to_ml = to_ml && compose->ml_post;
@@ -3179,7 +3179,7 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
static void compose_reedit_set_entry(Compose *compose, MsgInfo *msginfo)
{
- g_return_if_fail(msginfo != NULL);
+ cm_return_if_fail(msginfo != NULL);
SET_ENTRY(subject_entry, msginfo->subject);
SET_ENTRY(from_name, msginfo->from);
@@ -3209,7 +3209,7 @@ static void compose_insert_sig(Compose *compose, gboolean replace)
gboolean found = FALSE;
gboolean exists = FALSE;
- g_return_if_fail(compose->account != NULL);
+ cm_return_if_fail(compose->account != NULL);
BLOCK_WRAP();
@@ -3309,7 +3309,7 @@ static ComposeInsertResult compose_insert_file(Compose *compose, const gchar *fi
gboolean prev_autowrap;
gboolean badtxt = FALSE;
- g_return_val_if_fail(file != NULL, COMPOSE_INSERT_NO_FILE);
+ cm_return_val_if_fail(file != NULL, COMPOSE_INSERT_NO_FILE);
if ((fp = g_fopen(file, "rb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
@@ -4520,7 +4520,7 @@ static void compose_select_account(Compose *compose, PrefsAccount *account,
{
gchar *from = NULL;
- g_return_if_fail(account != NULL);
+ cm_return_if_fail(account != NULL);
compose->account = account;
@@ -4977,9 +4977,9 @@ static gint compose_redirect_write_headers(Compose *compose, FILE *fp)
/* struct utsname utsbuf; */
gboolean err = FALSE;
- g_return_val_if_fail(fp != NULL, -1);
- g_return_val_if_fail(compose->account != NULL, -1);
- g_return_val_if_fail(compose->account->address != NULL, -1);
+ cm_return_val_if_fail(fp != NULL, -1);
+ cm_return_val_if_fail(compose->account != NULL, -1);
+ cm_return_val_if_fail(compose->account->address != NULL, -1);
/* Resent-Date */
get_rfc822_date(buf, sizeof(buf));
@@ -5408,14 +5408,14 @@ static gint compose_remove_reedit_target(Compose *compose, gboolean force)
FolderItem *item;
MsgInfo *msginfo = compose->targetinfo;
- g_return_val_if_fail(compose->mode == COMPOSE_REEDIT, -1);
+ cm_return_val_if_fail(compose->mode == COMPOSE_REEDIT, -1);
if (!msginfo) return -1;
if (!force && MSG_IS_LOCKED(msginfo->flags))
return 0;
item = msginfo->folder;
- g_return_val_if_fail(item != NULL, -1);
+ cm_return_val_if_fail(item != NULL, -1);
if (procmsg_msg_exist(msginfo) &&
(folder_has_parent_of_type(item, F_QUEUE) ||
@@ -5489,7 +5489,7 @@ static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item,
gboolean err = FALSE;
debug_print("queueing message...\n");
- g_return_val_if_fail(compose->account != NULL, -1);
+ cm_return_val_if_fail(compose->account != NULL, -1);
lock = TRUE;
@@ -5881,8 +5881,8 @@ static gchar *compose_get_header(Compose *compose)
gchar *from_name = NULL, *from_address = NULL;
gchar *tmp;
- g_return_val_if_fail(compose->account != NULL, NULL);
- g_return_val_if_fail(compose->account->address != NULL, NULL);
+ cm_return_val_if_fail(compose->account != NULL, NULL);
+ cm_return_val_if_fail(compose->account->address != NULL, NULL);
header = g_string_sized_new(64);
@@ -6150,8 +6150,8 @@ static void compose_convert_header(Compose *compose, gchar *dest, gint len, gcha
gchar *tmpstr = NULL;
const gchar *out_codeset = NULL;
- g_return_if_fail(src != NULL);
- g_return_if_fail(dest != NULL);
+ cm_return_if_fail(src != NULL);
+ cm_return_if_fail(dest != NULL);
if (len < 1) return;
@@ -6211,7 +6211,7 @@ static void compose_add_to_addressbook_cb(GtkMenuItem *menuitem, gpointer user_d
{
gchar *address;
- g_return_if_fail(user_data != NULL);
+ cm_return_if_fail(user_data != NULL);
address = g_strdup(gtk_entry_get_text(GTK_ENTRY(user_data)));
g_strstrip(address);
@@ -6228,8 +6228,8 @@ static void compose_entry_popup_extend(GtkEntry *entry, GtkMenu *menu, gpointer
GtkWidget *menuitem;
gchar *address;
- g_return_if_fail(menu != NULL);
- g_return_if_fail(GTK_IS_MENU_SHELL(menu));
+ cm_return_if_fail(menu != NULL);
+ cm_return_if_fail(GTK_IS_MENU_SHELL(menu));
menuitem = gtk_separator_menu_item_new();
gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), menuitem);
@@ -6774,7 +6774,7 @@ static Compose *compose_create(PrefsAccount *account,
static GdkGeometry geometry;
- g_return_val_if_fail(account != NULL, NULL);
+ cm_return_val_if_fail(account != NULL, NULL);
debug_print("Creating compose window...\n");
compose = g_new0(Compose, 1);
@@ -7399,7 +7399,7 @@ static GtkWidget *compose_account_option_menu_create(Compose *compose)
gint num = 0, def_menu = 0;
accounts = account_get_list();
- g_return_val_if_fail(accounts != NULL, NULL);
+ cm_return_val_if_fail(accounts != NULL, NULL);
optmenubox = gtk_event_box_new();
optmenu = gtkut_sc_combobox_create(optmenubox, FALSE);
@@ -7477,7 +7477,7 @@ static void compose_reply_change_mode(Compose *compose,
gboolean all = FALSE, ml = FALSE, sender = FALSE, followup = FALSE;
- g_return_if_fail(compose->replyinfo != NULL);
+ cm_return_if_fail(compose->replyinfo != NULL);
if (action == COMPOSE_REPLY && prefs_common.default_reply_list)
ml = TRUE;
@@ -7549,7 +7549,7 @@ static void compose_set_privacy_system_cb(GtkWidget *widget, gpointer data)
gchar *systemid;
gboolean can_sign = FALSE, can_encrypt = FALSE;
- g_return_if_fail(GTK_IS_CHECK_MENU_ITEM(widget));
+ cm_return_if_fail(GTK_IS_CHECK_MENU_ITEM(widget));
if (!GTK_CHECK_MENU_ITEM(widget)->active)
return;
@@ -7582,7 +7582,7 @@ static void compose_update_privacy_system_menu_item(Compose * compose, gboolean
gchar *systemid;
menuitem = gtk_menu_item_get_submenu(GTK_MENU_ITEM(
gtk_ui_manager_get_widget(compose->ui_manager, branch_path)));
- g_return_if_fail(menuitem != NULL);
+ cm_return_if_fail(menuitem != NULL);
amenu = GTK_MENU_SHELL(menuitem)->children;
menuitem = NULL;
@@ -7772,7 +7772,7 @@ static const gchar *compose_quote_char_from_context(Compose *compose)
{
const gchar *qmark = NULL;
- g_return_val_if_fail(compose != NULL, NULL);
+ cm_return_val_if_fail(compose != NULL, NULL);
switch (compose->mode) {
/* use forward-specific quote char */
@@ -8558,7 +8558,7 @@ static gint compose_exec_ext_editor_real(const gchar *file)
gchar **cmdline;
pid_t pid;
- g_return_val_if_fail(file != NULL, -1);
+ cm_return_val_if_fail(file != NULL, -1);
if ((pid = fork()) < 0) {
perror("fork");
@@ -8819,7 +8819,7 @@ static void account_activated(GtkComboBox *optmenu, gpointer data)
gtk_tree_model_get(menu, &iter, 1, &account_id, -1);
ac = account_find_from_id(account_id);
- g_return_if_fail(ac != NULL);
+ cm_return_if_fail(ac != NULL);
if (ac != compose->account)
compose_select_account(compose, ac, FALSE);
@@ -8993,7 +8993,7 @@ gboolean compose_draft (gpointer data, guint action)
return TRUE;
draft = account_get_special_folder(compose->account, F_DRAFT);
- g_return_val_if_fail(draft != NULL, FALSE);
+ cm_return_val_if_fail(draft != NULL, FALSE);
if (!g_mutex_trylock(compose->mutex)) {
/* we don't want to lock the mutex once it's available,
@@ -9413,7 +9413,7 @@ static void compose_template_activate_cb(GtkWidget *widget, gpointer data)
AlertValue val;
tmpl = g_object_get_data(G_OBJECT(widget), "template");
- g_return_if_fail(tmpl != NULL);
+ cm_return_if_fail(tmpl != NULL);
msg = g_strdup_printf(_("Do you want to apply the template '%s' ?"),
tmpl->name);
@@ -9660,7 +9660,7 @@ static void textview_move_beginning_of_line (GtkTextView *text)
GtkTextMark *mark;
GtkTextIter ins;
- g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+ cm_return_if_fail(GTK_IS_TEXT_VIEW(text));
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
mark = gtk_text_buffer_get_insert(buffer);
@@ -9675,7 +9675,7 @@ static void textview_move_forward_character (GtkTextView *text)
GtkTextMark *mark;
GtkTextIter ins;
- g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+ cm_return_if_fail(GTK_IS_TEXT_VIEW(text));
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
mark = gtk_text_buffer_get_insert(buffer);
@@ -9690,7 +9690,7 @@ static void textview_move_backward_character (GtkTextView *text)
GtkTextMark *mark;
GtkTextIter ins;
- g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+ cm_return_if_fail(GTK_IS_TEXT_VIEW(text));
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
mark = gtk_text_buffer_get_insert(buffer);
@@ -9706,7 +9706,7 @@ static void textview_move_forward_word (GtkTextView *text)
GtkTextIter ins;
gint count;
- g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+ cm_return_if_fail(GTK_IS_TEXT_VIEW(text));
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
mark = gtk_text_buffer_get_insert(buffer);
@@ -9725,7 +9725,7 @@ static void textview_move_backward_word (GtkTextView *text)
GtkTextIter ins;
gint count;
- g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+ cm_return_if_fail(GTK_IS_TEXT_VIEW(text));
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
mark = gtk_text_buffer_get_insert(buffer);
@@ -9741,7 +9741,7 @@ static void textview_move_end_of_line (GtkTextView *text)
GtkTextMark *mark;
GtkTextIter ins;
- g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+ cm_return_if_fail(GTK_IS_TEXT_VIEW(text));
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
mark = gtk_text_buffer_get_insert(buffer);
@@ -9757,7 +9757,7 @@ static void textview_move_next_line (GtkTextView *text)
GtkTextIter ins;
gint offset;
- g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+ cm_return_if_fail(GTK_IS_TEXT_VIEW(text));
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
mark = gtk_text_buffer_get_insert(buffer);
@@ -9776,7 +9776,7 @@ static void textview_move_previous_line (GtkTextView *text)
GtkTextIter ins;
gint offset;
- g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+ cm_return_if_fail(GTK_IS_TEXT_VIEW(text));
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
mark = gtk_text_buffer_get_insert(buffer);
@@ -9794,7 +9794,7 @@ static void textview_delete_forward_character (GtkTextView *text)
GtkTextMark *mark;
GtkTextIter ins, end_iter;
- g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+ cm_return_if_fail(GTK_IS_TEXT_VIEW(text));
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
mark = gtk_text_buffer_get_insert(buffer);
@@ -9811,7 +9811,7 @@ static void textview_delete_backward_character (GtkTextView *text)
GtkTextMark *mark;
GtkTextIter ins, end_iter;
- g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+ cm_return_if_fail(GTK_IS_TEXT_VIEW(text));
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
mark = gtk_text_buffer_get_insert(buffer);
@@ -9828,7 +9828,7 @@ static void textview_delete_forward_word (GtkTextView *text)
GtkTextMark *mark;
GtkTextIter ins, end_iter;
- g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+ cm_return_if_fail(GTK_IS_TEXT_VIEW(text));
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
mark = gtk_text_buffer_get_insert(buffer);
@@ -9845,7 +9845,7 @@ static void textview_delete_backward_word (GtkTextView *text)
GtkTextMark *mark;
GtkTextIter ins, end_iter;
- g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+ cm_return_if_fail(GTK_IS_TEXT_VIEW(text));
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
mark = gtk_text_buffer_get_insert(buffer);
@@ -9862,7 +9862,7 @@ static void textview_delete_line (GtkTextView *text)
GtkTextMark *mark;
GtkTextIter ins, start_iter, end_iter;
- g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+ cm_return_if_fail(GTK_IS_TEXT_VIEW(text));
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
mark = gtk_text_buffer_get_insert(buffer);
@@ -9887,7 +9887,7 @@ static void textview_delete_to_line_end (GtkTextView *text)
GtkTextMark *mark;
GtkTextIter ins, end_iter;
- g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+ cm_return_if_fail(GTK_IS_TEXT_VIEW(text));
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
mark = gtk_text_buffer_get_insert(buffer);
@@ -10386,9 +10386,9 @@ static void compose_show_first_last_header(Compose *compose, gboolean show_first
{
GtkAdjustment *vadj;
- g_return_if_fail(compose);
- g_return_if_fail(GTK_IS_WIDGET(compose->header_table));
- g_return_if_fail(GTK_IS_VIEWPORT(compose->header_table->parent));
+ cm_return_if_fail(compose);
+ cm_return_if_fail(GTK_IS_WIDGET(compose->header_table));
+ cm_return_if_fail(GTK_IS_VIEWPORT(compose->header_table->parent));
vadj = gtk_viewport_get_vadjustment(GTK_VIEWPORT(compose->header_table->parent));
gtk_adjustment_set_value(vadj, (show_first ? vadj->lower : vadj->upper));
@@ -10402,7 +10402,7 @@ static void text_inserted(GtkTextBuffer *buffer, GtkTextIter *iter,
(G_OBJECT(compose->text), "paste_as_quotation"));
GtkTextMark *mark;
- g_return_if_fail(text != NULL);
+ cm_return_if_fail(text != NULL);
g_signal_handlers_block_by_func(G_OBJECT(buffer),
G_CALLBACK(text_inserted),
@@ -10568,9 +10568,9 @@ static PrefsAccount *compose_guess_forward_account_from_msginfo(MsgInfo *msginfo
{
PrefsAccount *account = NULL;
- g_return_val_if_fail(msginfo, NULL);
- g_return_val_if_fail(msginfo->folder, NULL);
- g_return_val_if_fail(msginfo->folder->prefs, NULL);
+ cm_return_val_if_fail(msginfo, NULL);
+ cm_return_val_if_fail(msginfo->folder, NULL);
+ cm_return_val_if_fail(msginfo->folder->prefs, NULL);
if (msginfo->folder->prefs->enable_default_account)
account = account_find_from_id(msginfo->folder->prefs->default_account);
@@ -10621,7 +10621,7 @@ gboolean compose_close(Compose *compose)
g_timeout_add (500, (GSourceFunc) compose_close, compose);
return FALSE;
}
- g_return_val_if_fail(compose, FALSE);
+ cm_return_val_if_fail(compose, FALSE);
gtkut_widget_get_uposition(compose->window, &x, &y);
if (!compose->batch) {
prefs_common.compose_x = x;
@@ -10659,9 +10659,9 @@ static void compose_reply_from_messageview_real(MessageView *msgview, GSList *ms
Compose *compose = NULL;
gchar *s_system = NULL;
- g_return_if_fail(msgview != NULL);
+ cm_return_if_fail(msgview != NULL);
- g_return_if_fail(msginfo_list != NULL);
+ cm_return_if_fail(msginfo_list != NULL);
if (g_slist_length(msginfo_list) == 1 && !opening_multiple) {
MimeInfo *mimeinfo = messageview_get_selected_mime_part(msgview);
@@ -10772,7 +10772,7 @@ static MsgInfo *compose_msginfo_new_from_compose(Compose *compose)
GSList *list;
gchar buf[BUFFSIZE];
- g_return_val_if_fail( compose != NULL, NULL );
+ cm_return_val_if_fail( compose != NULL, NULL );
newmsginfo = procmsg_msginfo_new();
@@ -10841,7 +10841,7 @@ static MsgInfo *compose_msginfo_new_from_compose(Compose *compose)
static void compose_set_dictionaries_from_folder_prefs(Compose *compose,
FolderItem *folder_item)
{
- g_return_if_fail(compose != NULL);
+ cm_return_if_fail(compose != NULL);
if (compose->gtkaspell && folder_item && folder_item->prefs) {
FolderItemPrefs *prefs = folder_item->prefs;
diff --git a/src/customheader.c b/src/customheader.c
@@ -101,7 +101,7 @@ void custom_header_free(CustomHeader *ch)
gboolean custom_header_is_allowed(const gchar *header)
{
- g_return_val_if_fail(header != NULL, FALSE);
+ cm_return_val_if_fail(header != NULL, FALSE);
if (g_ascii_strcasecmp(header, "Date") != 0 &&
g_ascii_strcasecmp(header, "From") != 0 &&
diff --git a/src/editaddress.c b/src/editaddress.c
@@ -215,7 +215,7 @@ static void edit_person_set_widgets_title( gchar *text )
{
gchar *label = NULL;
- g_return_if_fail( text != NULL );
+ cm_return_if_fail( text != NULL );
gtk_label_set_text(GTK_LABEL(personeditdlg.title), "");
label = g_markup_printf_escaped("<b>%s</b>", text);
@@ -632,7 +632,7 @@ static void edit_person_attrib_add( gpointer data ) {
static void edit_person_size_allocate_cb(GtkWidget *widget,
GtkAllocation *allocation)
{
- g_return_if_fail(allocation != NULL);
+ cm_return_if_fail(allocation != NULL);
prefs_common.addressbookeditpersonwin_width = allocation->width;
prefs_common.addressbookeditpersonwin_height = allocation->height;
diff --git a/src/editaddress_other_attributes_ldap.c b/src/editaddress_other_attributes_ldap.c
@@ -52,7 +52,7 @@ int get_attribute_index(const gchar *string_literal) {
/*int count = sizeof(ATTRIBUTE) / sizeof(*ATTRIBUTE);*/
const gchar **attribute = ATTRIBUTE;
- g_return_val_if_fail(string_literal != NULL, -1);
+ cm_return_val_if_fail(string_literal != NULL, -1);
while (*attribute) {
debug_print("Comparing %s to %s\n", *attribute, string_literal);
if (strcmp(*attribute++, string_literal) == 0)
@@ -115,7 +115,7 @@ static void edit_person_combo_box_changed(GtkComboBox *opt_menu, gpointer data)
gint option = gtk_combo_box_get_active(opt_menu);
const gchar *str = attrib ? attrib->name:"";
- g_return_if_fail (option < ATTRIBUTE_SIZE);
+ cm_return_if_fail (option < ATTRIBUTE_SIZE);
/* A corresponding attribute in contact does not match selected option */
if (strcmp(ATTRIBUTE[option], str) != 0) {
gtk_widget_set_sensitive(personEditDlg->attrib_add, TRUE);
diff --git a/src/editgroup.c b/src/editgroup.c
@@ -248,7 +248,7 @@ static gint edit_group_list_compare_func( GtkCMCList *clist, gconstpointer ptr1,
static void addressbook_edit_group_size_allocate_cb(GtkWidget *widget,
GtkAllocation *allocation)
{
- g_return_if_fail(allocation != NULL);
+ cm_return_if_fail(allocation != NULL);
prefs_common.addressbookeditgroupwin_width = allocation->width;
prefs_common.addressbookeditgroupwin_height = allocation->height;
diff --git a/src/editldap.c b/src/editldap.c
@@ -92,7 +92,7 @@ static gboolean editldap_validate_criteria( gchar *criteria ) {
gint i;
gboolean errorFlag;
- g_return_val_if_fail(criteria != NULL, TRUE);
+ cm_return_val_if_fail(criteria != NULL, TRUE);
errorFlag = TRUE;
diff --git a/src/enriched.c b/src/enriched.c
@@ -41,8 +41,8 @@ ERTFParser *ertf_parser_new(FILE *fp, CodeConverter *conv)
{
ERTFParser *parser;
- g_return_val_if_fail(fp != NULL, NULL);
- g_return_val_if_fail(conv != NULL, NULL);
+ cm_return_val_if_fail(fp != NULL, NULL);
+ cm_return_val_if_fail(conv != NULL, NULL);
parser = g_new0(ERTFParser, 1);
parser->fp = fp;
@@ -199,7 +199,7 @@ static void ertf_get_parenthesis(ERTFParser *parser, gchar *buf, gint len)
gchar *p;
buf[0] = '\0';
- g_return_if_fail(*parser->bufp == '<');
+ cm_return_if_fail(*parser->bufp == '<');
/* ignore params */
if (!g_ascii_strncasecmp(parser->bufp, "<param>", 4)) {
diff --git a/src/exporthtml.c b/src/exporthtml.c
@@ -160,7 +160,7 @@ void exporthtml_free( ExportHtmlCtl *ctl ) {
GList *node;
StylesheetEntry *entry;
- g_return_if_fail( ctl != NULL );
+ cm_return_if_fail( ctl != NULL );
/* Free stylesheet list */
node = ctl->listStyle;
@@ -222,23 +222,23 @@ static StylesheetEntry *exporthtml_find_stylesheet( ExportHtmlCtl *ctl ) {
}
void exporthtml_set_stylesheet( ExportHtmlCtl *ctl, const gint value ) {
- g_return_if_fail( ctl != NULL );
+ cm_return_if_fail( ctl != NULL );
ctl->stylesheet = value;
}
void exporthtml_set_name_format( ExportHtmlCtl *ctl, const gint value ) {
- g_return_if_fail( ctl != NULL );
+ cm_return_if_fail( ctl != NULL );
ctl->nameFormat = value;
}
void exporthtml_set_banding( ExportHtmlCtl *ctl, const gboolean value ) {
- g_return_if_fail( ctl != NULL );
+ cm_return_if_fail( ctl != NULL );
ctl->banding = value;
}
void exporthtml_set_link_email( ExportHtmlCtl *ctl, const gboolean value ) {
- g_return_if_fail( ctl != NULL );
+ cm_return_if_fail( ctl != NULL );
ctl->linkEMail = value;
}
void exporthtml_set_attributes( ExportHtmlCtl *ctl, const gboolean value ) {
- g_return_if_fail( ctl != NULL );
+ cm_return_if_fail( ctl != NULL );
ctl->showAttribs = value;
}
diff --git a/src/exportldif.c b/src/exportldif.c
@@ -90,7 +90,7 @@ ExportLdifCtl *exportldif_create( void ) {
* \return ctl Export control data.
*/
void exportldif_free( ExportLdifCtl *ctl ) {
- g_return_if_fail( ctl != NULL );
+ cm_return_if_fail( ctl != NULL );
g_free( ctl->path );
g_free( ctl->fileLdif );
@@ -119,7 +119,7 @@ void exportldif_free( ExportLdifCtl *ctl ) {
* \param value Suffix.
*/
void exportldif_set_suffix( ExportLdifCtl *ctl, const char *value ) {
- g_return_if_fail( ctl != NULL );
+ cm_return_if_fail( ctl != NULL );
ctl->suffix = mgu_replace_string( ctl->suffix, value );
g_strstrip( ctl->suffix );
}
@@ -135,7 +135,7 @@ void exportldif_set_suffix( ExportLdifCtl *ctl, const char *value ) {
* </ul>
*/
void exportldif_set_rdn( ExportLdifCtl *ctl, const gint value ) {
- g_return_if_fail( ctl != NULL );
+ cm_return_if_fail( ctl != NULL );
ctl->rdnIndex = value;
}
@@ -146,7 +146,7 @@ void exportldif_set_rdn( ExportLdifCtl *ctl, const gint value ) {
* \param value <i>TRUE</i> if DN should be used.
*/
void exportldif_set_use_dn( ExportLdifCtl *ctl, const gboolean value ) {
- g_return_if_fail( ctl != NULL );
+ cm_return_if_fail( ctl != NULL );
ctl->useDN = value;
}
@@ -156,7 +156,7 @@ void exportldif_set_use_dn( ExportLdifCtl *ctl, const gboolean value ) {
* \param value <i>TRUE</i> if records without E-Mail should be excluded.
*/
void exportldif_set_exclude_email( ExportLdifCtl *ctl, const gboolean value ) {
- g_return_if_fail( ctl != NULL );
+ cm_return_if_fail( ctl != NULL );
ctl->excludeEMail = value;
}
diff --git a/src/filtering.c b/src/filtering.c
@@ -87,7 +87,7 @@ FilteringAction * filteringaction_new(int type, int account_id,
void filteringaction_free(FilteringAction * action)
{
- g_return_if_fail(action);
+ cm_return_if_fail(action);
g_free(action->header);
g_free(action->destination);
g_free(action);
@@ -168,7 +168,7 @@ void filteringprop_free(FilteringProp * prop)
{
GSList * tmp;
- g_return_if_fail(prop);
+ cm_return_if_fail(prop);
matcherlist_free(prop->matchers);
for (tmp = prop->action_list ; tmp != NULL ; tmp = tmp->next) {
@@ -531,8 +531,8 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info)
gboolean filteringaction_apply_action_list(GSList *action_list, MsgInfo *info)
{
GSList *p;
- g_return_val_if_fail(action_list, FALSE);
- g_return_val_if_fail(info, FALSE);
+ cm_return_val_if_fail(action_list, FALSE);
+ cm_return_val_if_fail(info, FALSE);
for (p = action_list; p && p->data; p = g_slist_next(p)) {
FilteringAction *a = (FilteringAction *) p->data;
if (filteringaction_apply(a, info)) {
@@ -776,7 +776,7 @@ static gboolean filter_msginfo(GSList * filtering_list, MsgInfo * info, PrefsAcc
gboolean final;
gboolean apply_next;
- g_return_val_if_fail(info != NULL, TRUE);
+ cm_return_val_if_fail(info != NULL, TRUE);
for (l = filtering_list, final = FALSE, apply_next = FALSE; l != NULL; l = g_slist_next(l)) {
FilteringProp * filtering = (FilteringProp *) l->data;
@@ -1052,8 +1052,8 @@ static gboolean prefs_filtering_free_func(GNode *node, gpointer data)
{
FolderItem *item = node->data;
- g_return_val_if_fail(item, FALSE);
- g_return_val_if_fail(item->prefs, FALSE);
+ cm_return_val_if_fail(item, FALSE);
+ cm_return_val_if_fail(item->prefs, FALSE);
prefs_filtering_free(item->prefs->processing);
item->prefs->processing = NULL;
@@ -1083,8 +1083,8 @@ void prefs_filtering_clear(void)
void prefs_filtering_clear_folder(Folder *folder)
{
- g_return_if_fail(folder);
- g_return_if_fail(folder->node);
+ cm_return_if_fail(folder);
+ cm_return_if_fail(folder->node);
g_node_traverse(folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
prefs_filtering_free_func, NULL);
diff --git a/src/folder.c b/src/folder.c
@@ -174,7 +174,7 @@ Folder *folder_new(FolderClass *klass, const gchar *name, const gchar *path)
Folder *folder = NULL;
FolderItem *item;
- g_return_val_if_fail(klass != NULL, NULL);
+ cm_return_val_if_fail(klass != NULL, NULL);
name = name ? name : path;
folder = klass->new_folder(name, path);
@@ -193,7 +193,7 @@ Folder *folder_new(FolderClass *klass, const gchar *name, const gchar *path)
void folder_init(Folder *folder, const gchar *name)
{
- g_return_if_fail(folder != NULL);
+ cm_return_if_fail(folder != NULL);
folder_set_name(folder, name);
@@ -258,8 +258,8 @@ void folder_item_change_type(FolderItem *item, SpecialFolderItemType newtype)
void folder_destroy(Folder *folder)
{
- g_return_if_fail(folder != NULL);
- g_return_if_fail(folder->klass->destroy_folder != NULL);
+ cm_return_if_fail(folder != NULL);
+ cm_return_if_fail(folder->klass->destroy_folder != NULL);
folder_remove(folder);
@@ -333,7 +333,7 @@ FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path
{
FolderItem *item = NULL;
- g_return_val_if_fail(folder != NULL, NULL);
+ cm_return_val_if_fail(folder != NULL, NULL);
if (folder->klass->item_new) {
item = folder->klass->item_new(folder);
@@ -341,7 +341,7 @@ FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path
item = g_new0(FolderItem, 1);
}
- g_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
item->stype = F_NORMAL;
item->name = g_strdup(name);
@@ -385,10 +385,10 @@ FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path
void folder_item_append(FolderItem *parent, FolderItem *item)
{
- g_return_if_fail(parent != NULL);
- g_return_if_fail(parent->folder != NULL);
- g_return_if_fail(parent->node != NULL);
- g_return_if_fail(item != NULL);
+ cm_return_if_fail(parent != NULL);
+ cm_return_if_fail(parent->folder != NULL);
+ cm_return_if_fail(parent->node != NULL);
+ cm_return_if_fail(item != NULL);
item->folder = parent->folder;
g_node_append(parent->node, item->node);
@@ -400,9 +400,9 @@ void folder_item_remove(FolderItem *item)
FolderUpdateData hookdata;
gchar *tags_file = NULL;
- g_return_if_fail(item != NULL);
- g_return_if_fail(item->folder != NULL);
- g_return_if_fail(item->folder->node != NULL);
+ cm_return_if_fail(item != NULL);
+ cm_return_if_fail(item->folder != NULL);
+ cm_return_if_fail(item->folder->node != NULL);
start_node = node = item->node;
@@ -449,9 +449,9 @@ void folder_item_remove_children(FolderItem *item)
{
GNode *node, *next;
- g_return_if_fail(item != NULL);
- g_return_if_fail(item->folder != NULL);
- g_return_if_fail(item->node != NULL);
+ cm_return_if_fail(item != NULL);
+ cm_return_if_fail(item->folder != NULL);
+ cm_return_if_fail(item->node != NULL);
node = item->node->children;
while (node != NULL) {
@@ -465,7 +465,7 @@ void folder_item_destroy(FolderItem *item)
{
Folder *folder;
- g_return_if_fail(item != NULL);
+ cm_return_if_fail(item != NULL);
folder = item->folder;
if (folder) {
@@ -499,8 +499,8 @@ void folder_item_destroy(FolderItem *item)
FolderItem *folder_item_parent(FolderItem *item)
{
- g_return_val_if_fail(item != NULL, NULL);
- g_return_val_if_fail(item->node != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(item->node != NULL, NULL);
if (item->node->parent == NULL)
return NULL;
@@ -688,7 +688,7 @@ XMLTag *folder_item_get_xml(Folder *folder, FolderItem *item)
void folder_set_ui_func(Folder *folder, FolderUIFunc func, gpointer data)
{
- g_return_if_fail(folder != NULL);
+ cm_return_if_fail(folder != NULL);
folder->ui_func = func;
folder->ui_func_data = data;
@@ -696,7 +696,7 @@ void folder_set_ui_func(Folder *folder, FolderUIFunc func, gpointer data)
void folder_set_name(Folder *folder, const gchar *name)
{
- g_return_if_fail(folder != NULL);
+ cm_return_if_fail(folder != NULL);
g_free(folder->name);
folder->name = name ? g_strdup(name) : NULL;
@@ -710,7 +710,7 @@ void folder_set_name(Folder *folder, const gchar *name)
void folder_set_sort(Folder *folder, guint sort)
{
- g_return_if_fail(folder != NULL);
+ cm_return_if_fail(folder != NULL);
if (folder->sort != sort) {
folder_remove(folder);
@@ -730,7 +730,7 @@ void folder_tree_destroy(Folder *folder)
{
GNode *node;
- g_return_if_fail(folder != NULL);
+ cm_return_if_fail(folder != NULL);
node = folder->node;
@@ -751,7 +751,7 @@ void folder_add(Folder *folder)
gint i;
FolderUpdateData hookdata;
- g_return_if_fail(folder != NULL);
+ cm_return_if_fail(folder != NULL);
if ((FOLDER_TYPE(folder) == F_IMAP ||
FOLDER_TYPE(folder) == F_NEWS) &&
@@ -777,7 +777,7 @@ void folder_remove(Folder *folder)
{
FolderUpdateData hookdata;
- g_return_if_fail(folder != NULL);
+ cm_return_if_fail(folder != NULL);
folder_list = g_list_remove(folder_list, folder);
@@ -965,7 +965,7 @@ FolderItem *folder_create_folder(FolderItem *parent, const gchar *name)
{
FolderItem *new_item;
- g_return_val_if_fail(parent != NULL, NULL);
+ cm_return_val_if_fail(parent != NULL, NULL);
new_item = parent->folder->klass->create_folder(parent->folder, parent, name);
if (new_item) {
@@ -986,8 +986,8 @@ gint folder_item_rename(FolderItem *item, gchar *newname)
{
gint retval;
- g_return_val_if_fail(item != NULL, -1);
- g_return_val_if_fail(newname != NULL, -1);
+ cm_return_val_if_fail(item != NULL, -1);
+ cm_return_val_if_fail(newname != NULL, -1);
retval = item->folder->klass->rename_folder(item->folder, item, newname);
@@ -1034,10 +1034,10 @@ static gboolean folder_func_to_all_folders_func(GNode *node, gpointer data)
FolderItem *item;
struct FuncToAllFoldersData *function_data = (struct FuncToAllFoldersData *) data;
- g_return_val_if_fail(node->data != NULL, FALSE);
+ cm_return_val_if_fail(node->data != NULL, FALSE);
item = FOLDER_ITEM(node->data);
- g_return_val_if_fail(item != NULL, FALSE);
+ cm_return_val_if_fail(item != NULL, FALSE);
function_data->function(item, function_data->data);
@@ -1093,7 +1093,7 @@ static gboolean folder_get_status_full_all_func(GNode *node, gpointer data)
struct TotalMsgStatus *status = (struct TotalMsgStatus *)data;
gchar *id;
- g_return_val_if_fail(node->data != NULL, FALSE);
+ cm_return_val_if_fail(node->data != NULL, FALSE);
item = FOLDER_ITEM(node->data);
@@ -1268,7 +1268,7 @@ FolderItem *folder_find_item_from_path(const gchar *path)
folder = list ? list->data:NULL;
- g_return_val_if_fail(folder != NULL, NULL);
+ cm_return_val_if_fail(folder != NULL, NULL);
d[0] = (gpointer)path;
d[1] = NULL;
@@ -1305,7 +1305,7 @@ FolderItem *folder_find_item_from_real_path(const gchar *path)
folder = list ? list->data:NULL;
- g_return_val_if_fail(folder != NULL, NULL);
+ cm_return_val_if_fail(folder != NULL, NULL);
d[0] = (gpointer)path;
d[1] = NULL;
@@ -1351,7 +1351,7 @@ gchar *folder_get_identifier(Folder *folder)
{
gchar *type_str;
- g_return_val_if_fail(folder != NULL, NULL);
+ cm_return_val_if_fail(folder != NULL, NULL);
type_str = folder->klass->idstr;
return g_strconcat("#", type_str, "/", folder->name, NULL);
@@ -1362,7 +1362,7 @@ gchar *folder_item_get_identifier(FolderItem *item)
gchar *id = NULL;
gchar *folder_id = NULL;
- g_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
if (item->path == NULL)
return NULL;
@@ -1384,7 +1384,7 @@ FolderItem *folder_find_item_from_identifier(const gchar *identifier)
gchar *path;
FolderClass *class;
- g_return_val_if_fail(identifier != NULL, NULL);
+ cm_return_val_if_fail(identifier != NULL, NULL);
if (*identifier != '#')
return folder_find_item_from_path(identifier);
@@ -1431,7 +1431,7 @@ gchar *folder_item_get_name(FolderItem *item)
{
gchar *name = NULL;
- g_return_val_if_fail(item != NULL, g_strdup(""));
+ cm_return_val_if_fail(item != NULL, g_strdup(""));
switch (item->stype) {
case F_INBOX:
@@ -1714,7 +1714,7 @@ void folder_set_missing_folders(void)
folder = list->data;
if (FOLDER_TYPE(folder) != F_MH) continue;
rootitem = FOLDER_ITEM(folder->node->data);
- g_return_if_fail(rootitem != NULL);
+ cm_return_if_fail(rootitem != NULL);
if (folder->inbox && folder->outbox && folder->draft &&
folder->queue && folder->trash)
@@ -1767,9 +1767,9 @@ gchar *folder_item_get_path(FolderItem *item)
{
Folder *folder;
- g_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
folder = item->folder;
- g_return_val_if_fail(folder != NULL, NULL);
+ cm_return_val_if_fail(folder != NULL, NULL);
return folder->klass->item_get_path(folder, item);
}
@@ -1845,9 +1845,9 @@ static gint folder_item_syncronize_flags(FolderItem *item)
GSList *cur;
gint ret = 0;
- g_return_val_if_fail(item != NULL, -1);
- g_return_val_if_fail(item->folder != NULL, -1);
- g_return_val_if_fail(item->folder->klass != NULL, -1);
+ cm_return_val_if_fail(item != NULL, -1);
+ cm_return_val_if_fail(item->folder != NULL, -1);
+ cm_return_val_if_fail(item->folder->klass != NULL, -1);
if (item->no_select)
return -1;
@@ -1927,7 +1927,7 @@ gint folder_item_close(FolderItem *item)
GSList *mlist, *cur;
Folder *folder;
- g_return_val_if_fail(item != NULL, -1);
+ cm_return_val_if_fail(item != NULL, -1);
if (item->no_select)
return -1;
@@ -2018,13 +2018,13 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
gboolean update_flags = 0, old_uids_valid = FALSE;
GHashTable *subject_table = NULL;
- g_return_val_if_fail(item != NULL, -1);
+ cm_return_val_if_fail(item != NULL, -1);
if (item->path == NULL) return -1;
folder = item->folder;
- g_return_val_if_fail(folder != NULL, -1);
- g_return_val_if_fail(folder->klass->get_num_list != NULL, -1);
+ cm_return_val_if_fail(folder != NULL, -1);
+ cm_return_val_if_fail(folder->klass->get_num_list != NULL, -1);
item->scanning = ITEM_SCANNING_WITH_FLAGS;
@@ -2411,7 +2411,7 @@ static void folder_find_expired_caches(FolderItem *item, gpointer data)
gboolean folder_item_free_cache(FolderItem *item, gboolean force)
{
- g_return_val_if_fail(item != NULL, TRUE);
+ cm_return_val_if_fail(item != NULL, TRUE);
if (item->cache == NULL)
return TRUE;
@@ -2475,7 +2475,7 @@ static void folder_item_remove_cached_msg(FolderItem *item, MsgInfo *msginfo)
{
Folder *folder = item->folder;
- g_return_if_fail(folder != NULL);
+ cm_return_if_fail(folder != NULL);
if (folder->klass->remove_cached_msg == NULL)
return;
@@ -2485,8 +2485,8 @@ static void folder_item_remove_cached_msg(FolderItem *item, MsgInfo *msginfo)
static void folder_item_clean_local_files(FolderItem *item, gint days)
{
- g_return_if_fail(item != NULL);
- g_return_if_fail(item->folder != NULL);
+ cm_return_if_fail(item != NULL);
+ cm_return_if_fail(item->folder != NULL);
if (FOLDER_TYPE(item->folder) == F_IMAP ||
FOLDER_TYPE(item->folder) == F_NEWS) {
@@ -2507,7 +2507,7 @@ static void folder_item_read_cache(FolderItem *item)
{
gchar *cache_file, *mark_file, *tags_file;
START_TIMING("");
- g_return_if_fail(item != NULL);
+ cm_return_if_fail(item != NULL);
if (item->path != NULL) {
cache_file = folder_item_get_cache_file(item);
@@ -2629,7 +2629,7 @@ MsgInfo *folder_item_get_msginfo(FolderItem *item, gint num)
Folder *folder;
MsgInfo *msginfo = NULL;
- g_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
if (item->no_select)
return NULL;
folder = item->folder;
@@ -2653,8 +2653,8 @@ MsgInfo *folder_item_get_msginfo_by_msgid(FolderItem *item, const gchar *msgid)
Folder *folder;
MsgInfo *msginfo;
- g_return_val_if_fail(item != NULL, NULL);
- g_return_val_if_fail(msgid != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(msgid != NULL, NULL);
if (item->no_select)
return FALSE;
@@ -2670,14 +2670,14 @@ MsgInfo *folder_item_get_msginfo_by_msgid(FolderItem *item, const gchar *msgid)
GSList *folder_item_get_msg_list(FolderItem *item)
{
- g_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
if (item->no_select)
return FALSE;
if (item->cache == 0)
folder_item_read_cache(item);
- g_return_val_if_fail(item->cache != NULL, NULL);
+ cm_return_val_if_fail(item->cache != NULL, NULL);
return msgcache_get_msg_list(item->cache);
}
@@ -2725,11 +2725,11 @@ gchar *folder_item_fetch_msg(FolderItem *item, gint num)
gchar *msgfile;
MsgInfo *msginfo;
- g_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
folder = item->folder;
- g_return_val_if_fail(folder->klass->fetch_msg != NULL, NULL);
+ cm_return_val_if_fail(folder->klass->fetch_msg != NULL, NULL);
if (item->no_select)
return NULL;
@@ -2766,7 +2766,7 @@ gchar *folder_item_fetch_msg_full(FolderItem *item, gint num, gboolean headers,
gchar *msgfile;
MsgInfo *msginfo;
- g_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
if (item->no_select)
return NULL;
@@ -2986,8 +2986,8 @@ gint folder_item_add_msg(FolderItem *dest, const gchar *file,
GSList file_list;
MsgFileInfo fileinfo;
- g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(file != NULL, -1);
+ cm_return_val_if_fail(dest != NULL, -1);
+ cm_return_val_if_fail(file != NULL, -1);
fileinfo.msginfo = NULL;
fileinfo.file = (gchar *)file;
@@ -3008,9 +3008,9 @@ gint folder_item_add_msgs(FolderItem *dest, GSList *file_list,
MsgFileInfo *fileinfo = NULL;
gboolean folderscan = FALSE;
- g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(file_list != NULL, -1);
- g_return_val_if_fail(dest->folder != NULL, -1);
+ cm_return_val_if_fail(dest != NULL, -1);
+ cm_return_val_if_fail(file_list != NULL, -1);
+ cm_return_val_if_fail(dest->folder != NULL, -1);
if (dest->no_select)
return -1;
@@ -3246,12 +3246,12 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
gint total = 0, curmsg = 0;
MsgInfo *msginfo = NULL;
- g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(msglist != NULL, -1);
+ cm_return_val_if_fail(dest != NULL, -1);
+ cm_return_val_if_fail(msglist != NULL, -1);
folder = dest->folder;
- g_return_val_if_fail(folder->klass->copy_msg != NULL, -1);
+ cm_return_val_if_fail(folder->klass->copy_msg != NULL, -1);
if (dest->no_select)
return -1;
@@ -3404,6 +3404,8 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
MsgInfo *msginfo = (MsgInfo *) l->data;
GTuples *tuples;
+ if (!msginfo)
+ continue;
tuples = g_relation_select(relation, msginfo, 0);
if (tuples && tuples->len > 0) {
num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
@@ -3449,9 +3451,11 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
partial_mark_for_download(newmsginfo);
}
if (!MSG_IS_POSTFILTERED (msginfo->flags)) {
- procmsg_msginfo_set_flags ( msginfo, MSG_POSTFILTERED, 0);
- procmsg_msginfo_set_flags (newmsginfo, MSG_POSTFILTERED, 0);
- hooks_invoke (MAIL_POSTFILTERING_HOOKLIST, newmsginfo);
+ procmsg_msginfo_set_flags ( msginfo, MSG_POSTFILTERED, 0);
+ if (newmsginfo) {
+ procmsg_msginfo_set_flags (newmsginfo, MSG_POSTFILTERED, 0);
+ hooks_invoke (MAIL_POSTFILTERING_HOOKLIST, newmsginfo);
+ }
}
procmsg_msginfo_free(newmsginfo);
@@ -3482,8 +3486,8 @@ gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
{
GSList list;
- g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(msginfo != NULL, -1);
+ cm_return_val_if_fail(dest != NULL, -1);
+ cm_return_val_if_fail(msginfo != NULL, -1);
list.data = msginfo;
list.next = NULL;
@@ -3500,8 +3504,8 @@ gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
gint folder_item_move_msgs(FolderItem *dest, GSList *msglist)
{
gint result = -1;
- g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(msglist != NULL, -1);
+ cm_return_val_if_fail(dest != NULL, -1);
+ cm_return_val_if_fail(msglist != NULL, -1);
inc_lock();
result = do_copy_msgs(dest, msglist, TRUE);
inc_unlock();
@@ -3518,8 +3522,8 @@ gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
{
GSList list;
- g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(msginfo != NULL, -1);
+ cm_return_val_if_fail(dest != NULL, -1);
+ cm_return_val_if_fail(msginfo != NULL, -1);
list.data = msginfo;
list.next = NULL;
@@ -3536,8 +3540,8 @@ gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
gint folder_item_copy_msgs(FolderItem *dest, GSList *msglist)
{
gint result;
- g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(msglist != NULL, -1);
+ cm_return_val_if_fail(dest != NULL, -1);
+ cm_return_val_if_fail(msglist != NULL, -1);
inc_lock();
result = do_copy_msgs(dest, msglist, FALSE);
@@ -3552,9 +3556,9 @@ gint folder_item_remove_msg(FolderItem *item, gint num)
gint ret;
MsgInfo *msginfo;
- g_return_val_if_fail(item != NULL, -1);
+ cm_return_val_if_fail(item != NULL, -1);
folder = item->folder;
- g_return_val_if_fail(folder->klass->remove_msg != NULL, -1);
+ cm_return_val_if_fail(folder->klass->remove_msg != NULL, -1);
if (item->no_select)
return -1;
@@ -3581,9 +3585,9 @@ gint folder_item_remove_msgs(FolderItem *item, GSList *msglist)
gint ret = 0;
GSList *real_list = NULL, *cur = NULL;
- g_return_val_if_fail(item != NULL, -1);
+ cm_return_val_if_fail(item != NULL, -1);
folder = item->folder;
- g_return_val_if_fail(folder != NULL, -1);
+ cm_return_val_if_fail(folder != NULL, -1);
if (item->no_select)
return -1;
inc_lock();
@@ -3630,7 +3634,7 @@ gint folder_item_remove_all_msg(FolderItem *item)
Folder *folder;
gint result;
- g_return_val_if_fail(item != NULL, -1);
+ cm_return_val_if_fail(item != NULL, -1);
if (item->no_select)
return -1;
@@ -3672,8 +3676,8 @@ gint folder_item_remove_all_msg(FolderItem *item)
void folder_item_change_msg_flags(FolderItem *item, MsgInfo *msginfo, MsgPermFlags newflags)
{
- g_return_if_fail(item != NULL);
- g_return_if_fail(msginfo != NULL);
+ cm_return_if_fail(item != NULL);
+ cm_return_if_fail(msginfo != NULL);
if (item->no_select)
return;
@@ -3709,13 +3713,13 @@ gboolean folder_item_is_msg_changed(FolderItem *item, MsgInfo *msginfo)
{
Folder *folder;
- g_return_val_if_fail(item != NULL, FALSE);
+ cm_return_val_if_fail(item != NULL, FALSE);
if (item->no_select)
return FALSE;
folder = item->folder;
- g_return_val_if_fail(folder->klass->is_msg_changed != NULL, -1);
+ cm_return_val_if_fail(folder->klass->is_msg_changed != NULL, -1);
return folder->klass->is_msg_changed(folder, item, msginfo);
}
@@ -3750,11 +3754,11 @@ static gchar *folder_item_get_cache_file(FolderItem *item)
gchar *file;
gchar *old_file;
- g_return_val_if_fail(item != NULL, NULL);
- g_return_val_if_fail(item->path != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(item->path != NULL, NULL);
path = folder_item_get_path(item);
- g_return_val_if_fail(path != NULL, NULL);
+ cm_return_val_if_fail(path != NULL, NULL);
if (!is_dir_exist(path))
make_dir_hier(path);
file = g_strconcat(path, G_DIR_SEPARATOR_S, CACHE_FILE, NULL);
@@ -3774,11 +3778,11 @@ static gchar *folder_item_get_mark_file(FolderItem *item)
gchar *file;
gchar *old_file;
- g_return_val_if_fail(item != NULL, NULL);
- g_return_val_if_fail(item->path != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(item->path != NULL, NULL);
path = folder_item_get_path(item);
- g_return_val_if_fail(path != NULL, NULL);
+ cm_return_val_if_fail(path != NULL, NULL);
if (!is_dir_exist(path))
make_dir_hier(path);
file = g_strconcat(path, G_DIR_SEPARATOR_S, MARK_FILE, NULL);
@@ -3803,10 +3807,10 @@ static gchar *folder_item_get_tags_file(FolderItem *item)
* result when using another Claws mailbox from another install
* with different tags. */
- g_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
identifier = folder_item_get_identifier(item);
- g_return_val_if_fail(identifier != NULL, NULL);
+ cm_return_val_if_fail(identifier != NULL, NULL);
#ifdef G_OS_WIN32
while (strchr(identifier, '/'))
@@ -3835,8 +3839,8 @@ static gpointer xml_to_folder_item(gpointer nodedata, gpointer data)
Folder *folder = (Folder *) data;
FolderItem *item;
- g_return_val_if_fail(xmlnode != NULL, NULL);
- g_return_val_if_fail(folder != NULL, NULL);
+ cm_return_val_if_fail(xmlnode != NULL, NULL);
+ cm_return_val_if_fail(folder != NULL, NULL);
if (strcmp2(xmlnode->tag->tag, "folderitem") != 0) {
g_warning("tag name != \"folderitem\"\n");
@@ -3880,7 +3884,7 @@ static Folder *folder_get_from_xml(GNode *node)
FolderClass *klass = NULL;
GNode *cur;
- g_return_val_if_fail(node->data != NULL, NULL);
+ cm_return_val_if_fail(node->data != NULL, NULL);
xmlnode = node->data;
if (strcmp2(xmlnode->tag->tag, "folder") != 0) {
@@ -3899,7 +3903,7 @@ static Folder *folder_get_from_xml(GNode *node)
return NULL;
folder = folder_new(klass, "", "");
- g_return_val_if_fail(folder != NULL, NULL);
+ cm_return_val_if_fail(folder != NULL, NULL);
if (klass->set_xml)
klass->set_xml(folder, xmlnode->tag);
@@ -3935,7 +3939,7 @@ static gpointer folder_item_to_xml(gpointer nodedata, gpointer data)
FolderItem *item = (FolderItem *) nodedata;
XMLTag *tag;
- g_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
if (item->folder->klass->item_get_xml != NULL)
tag = item->folder->klass->item_get_xml(item->folder, item);
@@ -3951,7 +3955,7 @@ static GNode *folder_get_xml_node(Folder *folder)
XMLNode *xmlnode;
XMLTag *tag;
- g_return_val_if_fail(folder != NULL, NULL);
+ cm_return_val_if_fail(folder != NULL, NULL);
if (folder->klass->get_xml != NULL)
tag = folder->klass->get_xml(folder);
@@ -3964,7 +3968,7 @@ static GNode *folder_get_xml_node(Folder *folder)
node = g_node_new(xmlnode);
- g_return_val_if_fail (folder->node != NULL, NULL);
+ cm_return_val_if_fail (folder->node != NULL, NULL);
if (folder->node->children) {
GNode *cur;
@@ -4114,7 +4118,7 @@ static GHashTable *folder_persist_prefs_new(Folder *folder)
{
GHashTable *pptable;
- g_return_val_if_fail(folder, NULL);
+ cm_return_val_if_fail(folder, NULL);
pptable = g_hash_table_new(g_str_hash, g_str_equal);
folder_get_persist_prefs_recursive(folder->node, pptable);
return pptable;
@@ -4122,7 +4126,7 @@ static GHashTable *folder_persist_prefs_new(Folder *folder)
static void folder_persist_prefs_free(GHashTable *pptable)
{
- g_return_if_fail(pptable);
+ cm_return_if_fail(pptable);
g_hash_table_foreach_remove(pptable, persist_prefs_free, NULL);
g_hash_table_destroy(pptable);
}
@@ -4164,15 +4168,15 @@ static void folder_get_persist_prefs_recursive(GNode *node, GHashTable *pptable)
GNode *child, *cur;
gchar *id;
- g_return_if_fail(node != NULL);
- g_return_if_fail(item != NULL);
+ cm_return_if_fail(node != NULL);
+ cm_return_if_fail(item != NULL);
/* NOTE: item->path == NULL means top level folder; not interesting
* to store preferences of that one. */
if (item->path) {
id = folder_item_get_identifier(item);
pp = g_new0(PersistPrefs, 1);
- g_return_if_fail(pp != NULL);
+ cm_return_if_fail(pp != NULL);
pp->collapsed = item->collapsed;
pp->thread_collapsed = item->thread_collapsed;
pp->threaded = item->threaded;
@@ -4207,7 +4211,7 @@ void folder_item_apply_processing(FolderItem *item)
guint total = 0, curmsg = 0;
gint last_apply_per_account;
- g_return_if_fail(item != NULL);
+ cm_return_if_fail(item != NULL);
if (item->no_select)
return;
diff --git a/src/foldersel.c b/src/foldersel.c
@@ -201,7 +201,7 @@ FolderItem *foldersel_folder_sel(Folder *cur_folder, FolderSelectionType type,
static void foldersel_size_allocate_cb(GtkWidget *widget,
GtkAllocation *allocation)
{
- g_return_if_fail(allocation != NULL);
+ cm_return_if_fail(allocation != NULL);
prefs_common.folderselwin_width = allocation->width;
prefs_common.folderselwin_height = allocation->height;
@@ -449,9 +449,9 @@ static void foldersel_insert_gnode_in_store(GtkTreeStore *store, GNode *node,
GtkTreeIter child;
GNode *iter;
- g_return_if_fail(node != NULL);
- g_return_if_fail(node->data != NULL);
- g_return_if_fail(store != NULL);
+ cm_return_if_fail(node != NULL);
+ cm_return_if_fail(node->data != NULL);
+ cm_return_if_fail(store != NULL);
item = FOLDER_ITEM(node->data);
foldersel_append_item(store, item, &child, parent);
@@ -468,7 +468,7 @@ static void foldersel_set_tree(Folder *cur_folder, FolderSelectionType type)
for (list = folder_get_list(); list != NULL; list = list->next) {
folder = FOLDER(list->data);
- g_return_if_fail(folder != NULL);
+ cm_return_if_fail(folder != NULL);
if (type != FOLDER_SEL_ALL) {
if (FOLDER_TYPE(folder) == F_NEWS)
diff --git a/src/folderutils.c b/src/folderutils.c
@@ -125,7 +125,7 @@ void folderutils_mark_all_read(FolderItem *item)
MainWindow *mainwin = mainwindow_get_mainwindow();
int i = 0, m = 0;
debug_print("marking all read in item %s\n", (item==NULL)?"NULL":item->name);
- g_return_if_fail(item != NULL);
+ cm_return_if_fail(item != NULL);
folder_item_update_freeze();
diff --git a/src/folderview.c b/src/folderview.c
@@ -832,7 +832,7 @@ static void folderview_select_node(FolderView *folderview, GtkCMCTreeNode *node)
{
GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
- g_return_if_fail(node != NULL);
+ cm_return_if_fail(node != NULL);
if (folderview->open_folder) {
return;
@@ -1055,7 +1055,7 @@ void folderview_rescan_tree(Folder *folder, gboolean rebuild)
GtkAdjustment *pos = NULL;
gint height = 0;
- g_return_if_fail(folder != NULL);
+ cm_return_if_fail(folder != NULL);
if (!folder->klass->scan_tree) return;
@@ -1108,7 +1108,7 @@ void folderview_fast_rescan_tree(Folder *folder)
GtkAdjustment *pos = NULL;
gint height = 0;
- g_return_if_fail(folder != NULL);
+ cm_return_if_fail(folder != NULL);
if (!folder->klass->scan_tree) return;
@@ -1448,7 +1448,7 @@ static void folderview_update_node(FolderView *folderview, GtkCMCTreeNode *node)
SpecialFolderItemType stype;
item = gtk_cmctree_node_get_row_data(ctree, node);
- g_return_if_fail(item != NULL);
+ cm_return_if_fail(item != NULL);
if (!GTK_CMCTREE_ROW(node)->expanded)
mark = folderview_have_marked_children(folderview, item);
@@ -1676,7 +1676,7 @@ void folderview_update_search_icon(FolderItem *item, gboolean matches)
GtkCMCTree *ctree;
GtkCMCTreeNode *node;
- g_return_if_fail(item != NULL);
+ cm_return_if_fail(item != NULL);
for (list = folderview_list; list != NULL; list = list->next) {
folderview = (FolderView *)list->data;
@@ -1696,9 +1696,9 @@ static gboolean folderview_update_item_claws(gpointer source, gpointer data)
FolderView *folderview = (FolderView *)data;
GtkCMCTree *ctree;
GtkCMCTreeNode *node;
- g_return_val_if_fail(update_info != NULL, TRUE);
- g_return_val_if_fail(update_info->item != NULL, TRUE);
- g_return_val_if_fail(folderview != NULL, FALSE);
+ cm_return_val_if_fail(update_info != NULL, TRUE);
+ cm_return_val_if_fail(update_info->item != NULL, TRUE);
+ cm_return_val_if_fail(folderview != NULL, FALSE);
ctree = GTK_CMCTREE(folderview->ctree);
@@ -1725,7 +1725,7 @@ static gboolean folderview_gnode_func(GtkCMCTree *ctree, guint depth,
FolderView *folderview = (FolderView *)data;
FolderItem *item = FOLDER_ITEM(gnode->data);
- g_return_val_if_fail(item != NULL, FALSE);
+ cm_return_val_if_fail(item != NULL, FALSE);
gtk_cmctree_node_set_row_data(ctree, cnode, item);
folderview_update_node(folderview, cnode);
@@ -1741,7 +1741,7 @@ static void folderview_expand_func(GtkCMCTree *ctree, GtkCMCTreeNode *node,
if (GTK_CMCTREE_ROW(node)->children) {
item = gtk_cmctree_node_get_row_data(ctree, node);
- g_return_if_fail(item != NULL);
+ cm_return_if_fail(item != NULL);
if (!item->collapsed)
gtk_cmctree_expand(ctree, node);
@@ -1808,7 +1808,7 @@ static void folderview_append_folder(FolderView *folderview, Folder *folder)
GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
GtkCMCTreeNode *root;
- g_return_if_fail(folder != NULL);
+ cm_return_if_fail(folder != NULL);
root = gtk_sctree_insert_gnode(ctree, NULL, NULL, folder->node,
folderview_gnode_func, folderview);
@@ -1836,8 +1836,8 @@ static void folderview_set_sens_and_popup_menu(FolderView *folderview, gint row,
folderview->ui_manager = ui_manager;
item = folderview_get_selected_item(folderview);
- g_return_if_fail(item != NULL);
- g_return_if_fail(item->folder != NULL);
+ cm_return_if_fail(item != NULL);
+ cm_return_if_fail(item->folder != NULL);
folder = item->folder;
fpopup = g_hash_table_lookup(folderview_popups, folder->klass->idstr);
@@ -2244,7 +2244,7 @@ static void folderview_tree_expanded(GtkCMCTree *ctree, GtkCMCTreeNode *node,
FolderItem *item;
item = gtk_cmctree_node_get_row_data(ctree, node);
- g_return_if_fail(item != NULL);
+ cm_return_if_fail(item != NULL);
item->collapsed = FALSE;
folderview_update_node(folderview, node);
}
@@ -2255,7 +2255,7 @@ static void folderview_tree_collapsed(GtkCMCTree *ctree, GtkCMCTreeNode *node,
FolderItem *item;
item = gtk_cmctree_node_get_row_data(ctree, node);
- g_return_if_fail(item != NULL);
+ cm_return_if_fail(item != NULL);
item->collapsed = TRUE;
folderview_update_node(folderview, node);
}
@@ -2322,8 +2322,8 @@ static void folderview_empty_trash_cb(GtkAction *action, gpointer data)
if (!folderview->selected) return;
item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
- g_return_if_fail(item != NULL);
- g_return_if_fail(item->folder != NULL);
+ cm_return_if_fail(item != NULL);
+ cm_return_if_fail(item->folder != NULL);
if (NULL != (ac = account_find_from_item(item)))
special_trash = account_get_special_folder(ac, F_TRASH);
@@ -2365,8 +2365,8 @@ static void folderview_send_queue_cb(GtkAction *action, gpointer data)
if (!folderview->selected) return;
item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
- g_return_if_fail(item != NULL);
- g_return_if_fail(item->folder != NULL);
+ cm_return_if_fail(item != NULL);
+ cm_return_if_fail(item->folder != NULL);
if (NULL != (ac = account_find_from_item(item)))
special_queue = account_get_special_folder(ac, F_QUEUE);
@@ -2425,8 +2425,8 @@ static void folderview_run_processing_cb(GtkAction *action, gpointer data)
if (!folderview->selected) return;
item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
- g_return_if_fail(item != NULL);
- g_return_if_fail(item->folder != NULL);
+ cm_return_if_fail(item != NULL);
+ cm_return_if_fail(item->folder != NULL);
item->processing_pending = TRUE;
folder_item_apply_processing(item);
@@ -2442,8 +2442,8 @@ static void folderview_property_cb(GtkAction *action, gpointer data)
if (!folderview->selected) return;
item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
- g_return_if_fail(item != NULL);
- g_return_if_fail(item->folder != NULL);
+ cm_return_if_fail(item != NULL);
+ cm_return_if_fail(item->folder != NULL);
prefs_folder_item_open(item);
}
@@ -2477,9 +2477,9 @@ void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
gchar *buf;
gint status;
- g_return_if_fail(folderview != NULL);
- g_return_if_fail(from_folder != NULL);
- g_return_if_fail(to_folder != NULL);
+ cm_return_if_fail(folderview != NULL);
+ cm_return_if_fail(from_folder != NULL);
+ cm_return_if_fail(to_folder != NULL);
src_node = gtk_cmctree_find_by_row_data(GTK_CMCTREE(folderview->ctree), NULL, from_folder);
from_parent = folder_item_parent(from_folder);
@@ -2587,8 +2587,8 @@ static void folderview_processing_cb(GtkAction *action, gpointer data)
if (!folderview->selected) return;
item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
- g_return_if_fail(item != NULL);
- g_return_if_fail(item->folder != NULL);
+ cm_return_if_fail(item != NULL);
+ cm_return_if_fail(item->folder != NULL);
id = folder_item_get_identifier(item);
title = g_strdup_printf (_("Processing configuration for folder %s"), id);
@@ -2733,7 +2733,7 @@ static void folderview_start_drag(GtkWidget *widget, gint button, GdkEvent *even
{
GdkDragContext *context;
- g_return_if_fail(folderview != NULL);
+ cm_return_if_fail(folderview != NULL);
if (folderview->selected == NULL) return;
if (folderview->nodes_to_recollapse)
g_slist_free(folderview->nodes_to_recollapse);
@@ -2781,11 +2781,11 @@ static gboolean folderview_update_folder(gpointer source, gpointer userdata)
hookdata = source;
folderview = (FolderView *) userdata;
- g_return_val_if_fail(hookdata != NULL, FALSE);
- g_return_val_if_fail(folderview != NULL, FALSE);
+ cm_return_val_if_fail(hookdata != NULL, FALSE);
+ cm_return_val_if_fail(folderview != NULL, FALSE);
ctree = folderview->ctree;
- g_return_val_if_fail(ctree != NULL, FALSE);
+ cm_return_val_if_fail(ctree != NULL, FALSE);
if (hookdata->update_flags & FOLDER_ADD_FOLDERITEM)
folderview_create_folder_node(folderview, hookdata->item);
diff --git a/src/gedit-print.c b/src/gedit-print.c
@@ -104,7 +104,7 @@ gedit_print_job_info_destroy (GeditPrintJobInfo *pji, gboolean save_config)
{
gedit_debug (DEBUG_PRINT, "");
- g_return_if_fail (pji != NULL);
+ cm_return_if_fail (pji != NULL);
if (pji->pjob != NULL)
g_object_unref (pji->pjob);
@@ -122,14 +122,14 @@ get_print_dialog (GeditPrintJobInfo *pji, GtkWindow *parent)
gedit_debug (DEBUG_PRINT, "");
- g_return_val_if_fail (pji != NULL, NULL);
+ cm_return_val_if_fail (pji != NULL, NULL);
if (!gtk_text_buffer_get_selection_bounds (GTK_TEXT_BUFFER (pji->doc), NULL, NULL))
selection_flag = GNOME_PRINT_RANGE_SELECTION_UNSENSITIVE;
else
selection_flag = GNOME_PRINT_RANGE_SELECTION;
- g_return_val_if_fail(pji->pjob != NULL, NULL);
+ cm_return_val_if_fail(pji->pjob != NULL, NULL);
config = gtk_source_print_job_get_config (pji->pjob);
dialog = g_object_new (GNOME_TYPE_PRINT_DIALOG, "print_config", config, NULL);
@@ -171,7 +171,7 @@ gedit_print_dialog_response (GtkWidget *dialog, int response, GeditPrintJobInfo
break;
default:
- g_return_if_reached ();
+ cm_return_if_reached ();
}
switch (response)
@@ -331,7 +331,7 @@ gedit_print (GtkTextView *view)
gedit_debug (DEBUG_PRINT, "");
- g_return_if_fail (view != NULL);
+ cm_return_if_fail (view != NULL);
pji = gedit_print_job_info_new (view);
pji->preview = PREVIEW_NO;
@@ -405,13 +405,13 @@ gedit_print_job_info_new (GtkTextView* view)
gedit_debug (DEBUG_PRINT, "");
- g_return_val_if_fail (view != NULL, NULL);
+ cm_return_val_if_fail (view != NULL, NULL);
buffer = gtk_text_view_get_buffer (view);
- g_return_val_if_fail (buffer != NULL, NULL);
+ cm_return_val_if_fail (buffer != NULL, NULL);
config = gnome_print_config_default ();
- g_return_val_if_fail (config != NULL, NULL);
+ cm_return_val_if_fail (config != NULL, NULL);
gnome_print_config_set_int (config, GNOME_PRINT_KEY_NUM_COPIES, 1);
gnome_print_config_set_boolean (config, GNOME_PRINT_KEY_COLLATE, FALSE);
diff --git a/src/gtk/colorlabel.c b/src/gtk/colorlabel.c
@@ -250,7 +250,7 @@ static void colorlabel_recreate_color(gint color)
continue;
widget = colorlabel_create_color_widget(label_colors[i][color].color);
- g_return_if_fail(widget);
+ cm_return_if_fail(widget);
if (label_colors[i][color].widget)
gtk_widget_destroy(label_colors[i][color].widget);
diff --git a/src/gtk/combobox.c b/src/gtk/combobox.c
@@ -27,6 +27,7 @@
#include <gtk/gtk.h>
#include "gtkutils.h"
#include "combobox.h"
+#include "utils.h"
typedef struct _combobox_sel_by_data_ctx {
GtkComboBox *combobox;
@@ -80,7 +81,7 @@ void combobox_select_by_data(GtkComboBox *combobox, gint data)
{
GtkTreeModel *model;
ComboboxSelCtx *ctx = NULL;
- g_return_if_fail(combobox != NULL);
+ cm_return_if_fail(combobox != NULL);
model = gtk_combo_box_get_model(combobox);
@@ -115,11 +116,11 @@ void combobox_select_by_text(GtkComboBox *combobox, const gchar *data)
ComboboxSelCtx *ctx = NULL;
GtkComboBoxClass *class;
- g_return_if_fail(combobox != NULL);
+ cm_return_if_fail(combobox != NULL);
class = GTK_COMBO_BOX_GET_CLASS (combobox);
/* we can do that only with gtk_combo_box_new_text() combo boxes */
- g_return_if_fail(class->get_active_text != NULL);
+ cm_return_if_fail(class->get_active_text != NULL);
model = gtk_combo_box_get_model(combobox);
@@ -138,9 +139,9 @@ gint combobox_get_active_data(GtkComboBox *combobox)
GtkTreeIter iter;
gint data;
- g_return_val_if_fail(combobox != NULL, -1);
+ cm_return_val_if_fail(combobox != NULL, -1);
- g_return_val_if_fail(gtk_combo_box_get_active_iter(combobox, &iter), -1);
+ cm_return_val_if_fail(gtk_combo_box_get_active_iter(combobox, &iter), -1);
model = gtk_combo_box_get_model(combobox);
@@ -154,7 +155,7 @@ void combobox_unset_popdown_strings(GtkComboBox *combobox)
GtkTreeModel *model;
gint count, i;
- g_return_if_fail(combobox != NULL);
+ cm_return_if_fail(combobox != NULL);
model = gtk_combo_box_get_model(combobox);
count = gtk_tree_model_iter_n_children(model, NULL);
@@ -167,7 +168,7 @@ void combobox_set_popdown_strings(GtkComboBox *combobox,
{
GList *cur;
- g_return_if_fail(combobox != NULL);
+ cm_return_if_fail(combobox != NULL);
for (cur = list; cur != NULL; cur = g_list_next(cur))
gtk_combo_box_append_text(combobox, (const gchar*) cur->data);
@@ -193,7 +194,7 @@ gboolean combobox_set_value_from_arrow_key(GtkComboBox *combobox,
{
gboolean valid = FALSE;
- g_return_val_if_fail(combobox != NULL, FALSE);
+ cm_return_val_if_fail(combobox != NULL, FALSE);
/* reproduce the behaviour of old gtk_combo_box */
GtkTreeModel *model = gtk_combo_box_get_model(combobox);
diff --git a/src/gtk/foldersort.c b/src/gtk/foldersort.c
@@ -81,14 +81,14 @@ static void set_selected(FolderSortDialog *dialog, gint row)
static void moveup_clicked(GtkWidget *widget, FolderSortDialog *dialog)
{
- g_return_if_fail(dialog->selected > 0);
+ cm_return_if_fail(dialog->selected > 0);
gtk_cmclist_swap_rows(GTK_CMCLIST(dialog->folderlist), dialog->selected, dialog->selected - 1);
}
static void movedown_clicked(GtkWidget *widget, FolderSortDialog *dialog)
{
- g_return_if_fail(dialog->selected < (dialog->rows - 1));
+ cm_return_if_fail(dialog->selected < (dialog->rows - 1));
gtk_cmclist_swap_rows(GTK_CMCLIST(dialog->folderlist), dialog->selected, dialog->selected + 1);
}
diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c
@@ -202,10 +202,10 @@ static gint get_textview_buffer_charcount(GtkTextView *view)
{
GtkTextBuffer *buffer;
- g_return_val_if_fail(view, 0);
+ cm_return_val_if_fail(view, 0);
buffer = gtk_text_view_get_buffer(view);
- g_return_val_if_fail(buffer, 0);
+ cm_return_val_if_fail(buffer, 0);
return gtk_text_buffer_get_char_count(buffer);
}
@@ -215,13 +215,13 @@ static gint get_textview_buffer_offset(GtkTextView *view)
GtkTextMark * mark;
GtkTextIter iter;
- g_return_val_if_fail(view, 0);
+ cm_return_val_if_fail(view, 0);
buffer = gtk_text_view_get_buffer(view);
- g_return_val_if_fail(buffer, 0);
+ cm_return_val_if_fail(buffer, 0);
mark = gtk_text_buffer_get_insert(buffer);
- g_return_val_if_fail(mark, 0);
+ cm_return_val_if_fail(mark, 0);
gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
@@ -232,10 +232,10 @@ static void set_textview_buffer_offset(GtkTextView *view, gint offset)
GtkTextBuffer *buffer;
GtkTextIter iter;
- g_return_if_fail(view);
+ cm_return_if_fail(view);
buffer = gtk_text_view_get_buffer(view);
- g_return_if_fail(buffer);
+ cm_return_if_fail(buffer);
gtk_text_buffer_get_iter_at_offset(buffer, &iter, offset);
gtk_text_buffer_place_cursor(buffer, &iter);
@@ -298,13 +298,13 @@ static void gtkaspell_checkers_error_message (gchar *message)
const char *gtkaspell_checkers_strerror(void)
{
- g_return_val_if_fail(gtkaspellcheckers, "");
+ cm_return_val_if_fail(gtkaspellcheckers, "");
return gtkaspellcheckers->error_message;
}
void gtkaspell_checkers_reset_error(void)
{
- g_return_if_fail(gtkaspellcheckers);
+ cm_return_if_fail(gtkaspellcheckers);
g_free(gtkaspellcheckers->error_message);
@@ -330,7 +330,7 @@ GtkAspell *gtkaspell_new(const gchar *dictionary,
GtkAspeller *gtkaspeller;
GtkTextBuffer *buffer;
- g_return_val_if_fail(gtktext, NULL);
+ cm_return_val_if_fail(gtktext, NULL);
if (!dictionary || !*dictionary) {
gtkaspell_checkers_error_message(
g_strdup(_("No dictionary selected.")));
@@ -481,7 +481,7 @@ static void entry_insert_cb(GtkTextBuffer *textbuf,
{
guint pos;
- g_return_if_fail(gtkaspell->gtkaspeller->speller);
+ cm_return_if_fail(gtkaspell->gtkaspeller->speller);
if (!gtkaspell->check_while_typing)
return;
@@ -515,7 +515,7 @@ static void entry_delete_cb(GtkTextBuffer *textbuf,
int origpos;
gint start, end;
- g_return_if_fail(gtkaspell->gtkaspeller->speller);
+ cm_return_if_fail(gtkaspell->gtkaspeller->speller);
if (!gtkaspell->check_while_typing)
return;
@@ -607,15 +607,15 @@ static GtkAspeller *gtkaspeller_new(Dictionary *dictionary)
GtkAspeller *tmp;
Dictionary *dict;
- g_return_val_if_fail(gtkaspellcheckers, NULL);
+ cm_return_val_if_fail(gtkaspellcheckers, NULL);
- g_return_val_if_fail(dictionary, NULL);
+ cm_return_val_if_fail(dictionary, NULL);
if (dictionary->dictname == NULL)
gtkaspell_checkers_error_message(
g_strdup(_("No dictionary selected.")));
- g_return_val_if_fail(dictionary->fullname, NULL);
+ cm_return_val_if_fail(dictionary->fullname, NULL);
dict = dictionary_dup(dictionary);
@@ -652,8 +652,8 @@ static GtkAspeller *gtkaspeller_real_new(Dictionary *dict)
EnchantBroker *broker;
EnchantDict *speller;
- g_return_val_if_fail(gtkaspellcheckers, NULL);
- g_return_val_if_fail(dict, NULL);
+ cm_return_val_if_fail(gtkaspellcheckers, NULL);
+ cm_return_val_if_fail(dict, NULL);
gtkaspeller = g_new(GtkAspeller, 1);
@@ -681,7 +681,7 @@ static GtkAspeller *gtkaspeller_real_new(Dictionary *dict)
static GtkAspeller *gtkaspeller_delete(GtkAspeller *gtkaspeller)
{
- g_return_val_if_fail(gtkaspellcheckers, NULL);
+ cm_return_val_if_fail(gtkaspellcheckers, NULL);
gtkaspellcheckers->checkers =
g_slist_remove(gtkaspellcheckers->checkers,
@@ -700,8 +700,8 @@ static GtkAspeller *gtkaspeller_delete(GtkAspeller *gtkaspeller)
static GtkAspeller *gtkaspeller_real_delete(GtkAspeller *gtkaspeller)
{
- g_return_val_if_fail(gtkaspeller, NULL);
- g_return_val_if_fail(gtkaspeller->speller, NULL);
+ cm_return_val_if_fail(gtkaspeller, NULL);
+ cm_return_val_if_fail(gtkaspeller->speller, NULL);
enchant_broker_free_dict(gtkaspeller->broker, gtkaspeller->speller);
enchant_broker_free(gtkaspeller->broker);
@@ -721,8 +721,8 @@ static GtkAspeller *gtkaspeller_real_delete(GtkAspeller *gtkaspeller)
static EnchantDict *set_dictionary(EnchantBroker *broker, Dictionary *dict)
{
- g_return_val_if_fail(broker, FALSE);
- g_return_val_if_fail(dict, FALSE);
+ cm_return_val_if_fail(broker, FALSE);
+ cm_return_val_if_fail(dict, FALSE);
return enchant_broker_request_dict(broker, dict->dictname );
}
@@ -742,7 +742,7 @@ static GList *misspelled_suggest(GtkAspell *gtkaspell, gchar *word)
GList *list = NULL;
char **suggestions;
size_t num_sug, i;
- g_return_val_if_fail(word, NULL);
+ cm_return_val_if_fail(word, NULL);
if (*word == 0)
return NULL;
@@ -769,7 +769,7 @@ static GList *misspelled_suggest(GtkAspell *gtkaspell, gchar *word)
int gtkaspell_misspelled_test(GtkAspell *gtkaspell, char *word)
{
gint result = 0;
- g_return_val_if_fail(word, 0);
+ cm_return_val_if_fail(word, 0);
if (*word == 0)
return 0;
@@ -913,7 +913,7 @@ static gboolean check_at(GtkAspell *gtkaspell, gint from_pos)
char buf[GTKASPELLWORDSIZE];
GtkTextView *gtktext;
- g_return_val_if_fail(from_pos >= 0, FALSE);
+ cm_return_val_if_fail(from_pos >= 0, FALSE);
gtktext = gtkaspell->gtktext;
@@ -1061,8 +1061,8 @@ void gtkaspell_check_all(GtkAspell *gtkaspell)
GtkTextBuffer *buffer;
GtkTextIter startiter, enditer;
- g_return_if_fail(gtkaspell);
- g_return_if_fail(gtkaspell->gtktext);
+ cm_return_if_fail(gtkaspell);
+ cm_return_if_fail(gtkaspell->gtktext);
gtktext = gtkaspell->gtktext;
buffer = gtk_text_view_get_buffer(gtktext);
@@ -1107,7 +1107,7 @@ void gtkaspell_highlight_all(GtkAspell *gtkaspell)
guint len;
GtkTextView *gtktext;
- g_return_if_fail(gtkaspell->gtkaspeller->speller);
+ cm_return_if_fail(gtkaspell->gtkaspeller->speller);
gtktext = gtkaspell->gtktext;
@@ -1592,7 +1592,7 @@ GtkTreeModel *gtkaspell_dictionary_store_new_with_refresh(gboolean refresh)
Dictionary *dict;
dict_list = gtkaspell_get_dictionary_list(refresh);
- g_return_val_if_fail(dict_list, NULL);
+ cm_return_val_if_fail(dict_list, NULL);
store = gtk_list_store_new(SET_GTKASPELL_SIZE,
G_TYPE_STRING,
@@ -1642,8 +1642,8 @@ gchar *gtkaspell_get_dictionary_menu_active_item(GtkComboBox *combo)
GtkTreeModel *model;
gchar *dict_fullname = NULL;
- g_return_val_if_fail(GTK_IS_COMBO_BOX(combo), NULL);
- g_return_val_if_fail(gtk_combo_box_get_active_iter(combo, &iter), NULL);
+ cm_return_val_if_fail(GTK_IS_COMBO_BOX(combo), NULL);
+ cm_return_val_if_fail(gtk_combo_box_get_active_iter(combo, &iter), NULL);
model = gtk_combo_box_get_model(combo);
if(model == NULL)
@@ -1663,9 +1663,9 @@ gint gtkaspell_set_dictionary_menu_active_item(GtkComboBox *combo,
GtkTreeIter iter;
gchar *dict_name = NULL;
- g_return_val_if_fail(combo != NULL, 0);
- g_return_val_if_fail(dictionary != NULL, 0);
- g_return_val_if_fail(GTK_IS_COMBO_BOX(combo), 0);
+ cm_return_val_if_fail(combo != NULL, 0);
+ cm_return_val_if_fail(dictionary != NULL, 0);
+ cm_return_val_if_fail(GTK_IS_COMBO_BOX(combo), 0);
if((model = gtk_combo_box_get_model(combo)) == NULL)
return 0;
@@ -2061,8 +2061,8 @@ gboolean gtkaspell_change_dict(GtkAspell *gtkaspell, const gchar *dictionary,
Dictionary *dict;
GtkAspeller *gtkaspeller;
- g_return_val_if_fail(gtkaspell, FALSE);
- g_return_val_if_fail(dictionary, FALSE);
+ cm_return_val_if_fail(gtkaspell, FALSE);
+ cm_return_val_if_fail(dictionary, FALSE);
dict = g_new0(Dictionary, 1);
@@ -2117,8 +2117,8 @@ gboolean gtkaspell_change_alt_dict(GtkAspell *gtkaspell, const gchar *alt_dictio
Dictionary *dict;
GtkAspeller *gtkaspeller;
- g_return_val_if_fail(gtkaspell, FALSE);
- g_return_val_if_fail(alt_dictionary, FALSE);
+ cm_return_val_if_fail(gtkaspell, FALSE);
+ cm_return_val_if_fail(alt_dictionary, FALSE);
dict = g_new0(Dictionary, 1);
if (strrchr(alt_dictionary, '/')) {
@@ -2320,7 +2320,7 @@ static void free_checkers(gpointer elt, gpointer data)
{
GtkAspeller *gtkaspeller = elt;
- g_return_if_fail(gtkaspeller);
+ cm_return_if_fail(gtkaspeller);
gtkaspeller_real_delete(gtkaspeller);
}
diff --git a/src/gtk/gtkcmclist.c b/src/gtk/gtkcmclist.c
@@ -34,6 +34,7 @@
#include "claws-marshal.h"
#include "gtkcmclist.h"
#include <gdk/gdkkeysyms.h>
+#include "utils.h"
#if !GTK_CHECK_VERSION(2,10,0)
#define gdk_atom_intern_static_string(str) gdk_atom_intern(str, FALSE)
@@ -1215,9 +1216,9 @@ gtk_cmclist_set_hadjustment (GtkCMCList *clist,
{
GtkAdjustment *old_adjustment;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (adjustment)
- g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
+ cm_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
if (clist->hadjustment == adjustment)
return;
@@ -1257,7 +1258,7 @@ gtk_cmclist_set_hadjustment (GtkCMCList *clist,
GtkAdjustment *
gtk_cmclist_get_hadjustment (GtkCMCList *clist)
{
- g_return_val_if_fail (GTK_IS_CMCLIST (clist), NULL);
+ cm_return_val_if_fail (GTK_IS_CMCLIST (clist), NULL);
return clist->hadjustment;
}
@@ -1268,9 +1269,9 @@ gtk_cmclist_set_vadjustment (GtkCMCList *clist,
{
GtkAdjustment *old_adjustment;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (adjustment)
- g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
+ cm_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
if (clist->vadjustment == adjustment)
return;
@@ -1310,7 +1311,7 @@ gtk_cmclist_set_vadjustment (GtkCMCList *clist,
GtkAdjustment *
gtk_cmclist_get_vadjustment (GtkCMCList *clist)
{
- g_return_val_if_fail (GTK_IS_CMCLIST (clist), NULL);
+ cm_return_val_if_fail (GTK_IS_CMCLIST (clist), NULL);
return clist->vadjustment;
}
@@ -1330,7 +1331,7 @@ void
gtk_cmclist_set_shadow_type (GtkCMCList *clist,
GtkShadowType type)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
clist->shadow_type = type;
@@ -1342,8 +1343,8 @@ void
gtk_cmclist_set_selection_mode (GtkCMCList *clist,
GtkSelectionMode mode)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
- g_return_if_fail (mode != GTK_SELECTION_NONE);
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (mode != GTK_SELECTION_NONE);
if (mode == clist->selection_mode)
return;
@@ -1376,7 +1377,7 @@ gtk_cmclist_set_selection_mode (GtkCMCList *clist,
void
gtk_cmclist_freeze (GtkCMCList *clist)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
clist->freeze_count++;
}
@@ -1384,7 +1385,7 @@ gtk_cmclist_freeze (GtkCMCList *clist)
void
gtk_cmclist_thaw (GtkCMCList *clist)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (clist->freeze_count)
{
@@ -1415,7 +1416,7 @@ gtk_cmclist_thaw (GtkCMCList *clist)
void
gtk_cmclist_column_titles_show (GtkCMCList *clist)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (!GTK_CMCLIST_SHOW_TITLES(clist))
{
@@ -1429,7 +1430,7 @@ gtk_cmclist_column_titles_show (GtkCMCList *clist)
void
gtk_cmclist_column_titles_hide (GtkCMCList *clist)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (GTK_CMCLIST_SHOW_TITLES(clist))
{
@@ -1444,7 +1445,7 @@ void
gtk_cmclist_column_title_active (GtkCMCList *clist,
gint column)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (column < 0 || column >= clist->columns)
return;
@@ -1467,7 +1468,7 @@ gtk_cmclist_column_title_passive (GtkCMCList *clist,
{
GtkButton *button;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (column < 0 || column >= clist->columns)
return;
@@ -1496,7 +1497,7 @@ gtk_cmclist_column_titles_active (GtkCMCList *clist)
{
gint i;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
for (i = 0; i < clist->columns; i++)
gtk_cmclist_column_title_active (clist, i);
@@ -1507,7 +1508,7 @@ gtk_cmclist_column_titles_passive (GtkCMCList *clist)
{
gint i;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
for (i = 0; i < clist->columns; i++)
gtk_cmclist_column_title_passive (clist, i);
@@ -1523,7 +1524,7 @@ gtk_cmclist_set_column_title (GtkCMCList *clist,
GtkWidget *alignment = NULL;
GtkWidget *label;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (column < 0 || column >= clist->columns)
return;
@@ -1581,7 +1582,7 @@ gchar *
gtk_cmclist_get_column_title (GtkCMCList *clist,
gint column)
{
- g_return_val_if_fail (GTK_IS_CMCLIST (clist), NULL);
+ cm_return_val_if_fail (GTK_IS_CMCLIST (clist), NULL);
if (column < 0 || column >= clist->columns)
return NULL;
@@ -1597,7 +1598,7 @@ gtk_cmclist_set_column_widget (GtkCMCList *clist,
gint new_button = 0;
GtkWidget *old_widget;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (column < 0 || column >= clist->columns)
return;
@@ -1635,7 +1636,7 @@ GtkWidget *
gtk_cmclist_get_column_widget (GtkCMCList *clist,
gint column)
{
- g_return_val_if_fail (GTK_IS_CMCLIST (clist), NULL);
+ cm_return_val_if_fail (GTK_IS_CMCLIST (clist), NULL);
if (column < 0 || column >= clist->columns)
return NULL;
@@ -1653,7 +1654,7 @@ gtk_cmclist_set_column_justification (GtkCMCList *clist,
{
GtkWidget *alignment;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (column < 0 || column >= clist->columns)
return;
@@ -1698,7 +1699,7 @@ gtk_cmclist_set_column_visibility (GtkCMCList *clist,
gint column,
gboolean visible)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (column < 0 || column >= clist->columns)
return;
@@ -1737,7 +1738,7 @@ gtk_cmclist_set_column_resizeable (GtkCMCList *clist,
gint column,
gboolean resizeable)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (column < 0 || column >= clist->columns)
return;
@@ -1757,7 +1758,7 @@ gtk_cmclist_set_column_auto_resize (GtkCMCList *clist,
gint column,
gboolean auto_resize)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (column < 0 || column >= clist->columns)
return;
@@ -1787,7 +1788,7 @@ gtk_cmclist_columns_autosize (GtkCMCList *clist)
gint i;
gint width;
- g_return_val_if_fail (GTK_IS_CMCLIST (clist), 0);
+ cm_return_val_if_fail (GTK_IS_CMCLIST (clist), 0);
gtk_cmclist_freeze (clist);
width = 0;
@@ -1811,7 +1812,7 @@ gtk_cmclist_optimal_column_width (GtkCMCList *clist,
GList *list;
gint width;
- g_return_val_if_fail (GTK_CMCLIST (clist), 0);
+ cm_return_val_if_fail (GTK_CMCLIST (clist), 0);
if (column < 0 || column >= clist->columns)
return 0;
@@ -1840,7 +1841,7 @@ gtk_cmclist_set_column_width (GtkCMCList *clist,
gint column,
gint width)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (column < 0 || column >= clist->columns)
return;
@@ -1854,7 +1855,7 @@ gtk_cmclist_set_column_min_width (GtkCMCList *clist,
gint column,
gint min_width)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (column < 0 || column >= clist->columns)
return;
@@ -1876,7 +1877,7 @@ gtk_cmclist_set_column_max_width (GtkCMCList *clist,
gint column,
gint max_width)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (column < 0 || column >= clist->columns)
return;
@@ -1959,7 +1960,7 @@ real_resize_column (GtkCMCList *clist,
gint column,
gint width)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (column < 0 || column >= clist->columns)
return;
@@ -1986,7 +1987,7 @@ real_resize_column (GtkCMCList *clist,
static void
abort_column_resize (GtkCMCList *clist)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (!GTK_CMCLIST_IN_DRAG(clist))
return;
@@ -2233,8 +2234,8 @@ column_button_clicked (GtkWidget *widget,
gint i;
GtkCMCList *clist;
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_CMCLIST (data));
+ cm_return_if_fail (widget != NULL);
+ cm_return_if_fail (GTK_IS_CMCLIST (data));
clist = GTK_CMCLIST (data);
@@ -2251,7 +2252,7 @@ column_title_passive_func (GtkWidget *widget,
GdkEvent *event,
gpointer data)
{
- g_return_val_if_fail (event != NULL, FALSE);
+ cm_return_val_if_fail (event != NULL, FALSE);
switch (event->type)
{
@@ -2287,7 +2288,7 @@ gtk_cmclist_get_cell_type (GtkCMCList *clist,
{
GtkCMCListRow *clist_row;
- g_return_val_if_fail (GTK_IS_CMCLIST (clist), -1);
+ cm_return_val_if_fail (GTK_IS_CMCLIST (clist), -1);
if (row < 0 || row >= clist->rows)
return -1;
@@ -2307,7 +2308,7 @@ gtk_cmclist_set_text (GtkCMCList *clist,
{
GtkCMCListRow *clist_row;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (row < 0 || row >= clist->rows)
return;
@@ -2336,7 +2337,7 @@ gtk_cmclist_get_text (GtkCMCList *clist,
{
GtkCMCListRow *clist_row;
- g_return_val_if_fail (GTK_IS_CMCLIST (clist), 0);
+ cm_return_val_if_fail (GTK_IS_CMCLIST (clist), 0);
if (row < 0 || row >= clist->rows)
return 0;
@@ -2362,7 +2363,7 @@ gtk_cmclist_set_pixbuf (GtkCMCList *clist,
{
GtkCMCListRow *clist_row;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (row < 0 || row >= clist->rows)
return;
@@ -2392,7 +2393,7 @@ gtk_cmclist_get_pixbuf (GtkCMCList *clist,
{
GtkCMCListRow *clist_row;
- g_return_val_if_fail (GTK_IS_CMCLIST (clist), 0);
+ cm_return_val_if_fail (GTK_IS_CMCLIST (clist), 0);
if (row < 0 || row >= clist->rows)
return 0;
@@ -2422,7 +2423,7 @@ gtk_cmclist_set_pixtext (GtkCMCList *clist,
{
GtkCMCListRow *clist_row;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (row < 0 || row >= clist->rows)
return;
@@ -2453,7 +2454,7 @@ gtk_cmclist_get_pixtext (GtkCMCList *clist,
{
GtkCMCListRow *clist_row;
- g_return_val_if_fail (GTK_IS_CMCLIST (clist), 0);
+ cm_return_val_if_fail (GTK_IS_CMCLIST (clist), 0);
if (row < 0 || row >= clist->rows)
return 0;
@@ -2485,7 +2486,7 @@ gtk_cmclist_set_shift (GtkCMCList *clist,
GtkRequisition requisition = { 0 };
GtkCMCListRow *clist_row;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (row < 0 || row >= clist->rows)
return;
@@ -2525,8 +2526,8 @@ set_cell_contents (GtkCMCList *clist,
gchar *old_text = NULL;
GdkPixbuf *old_pixbuf = NULL;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
- g_return_if_fail (clist_row != NULL);
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (clist_row != NULL);
if (clist->column[column].auto_resize &&
!GTK_CMCLIST_AUTO_RESIZE_BLOCKED (clist))
@@ -2646,8 +2647,8 @@ cell_size_request (GtkCMCList *clist,
PangoLayout *layout;
PangoRectangle logical_rect;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
- g_return_if_fail (requisition != NULL);
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (requisition != NULL);
layout = _gtk_cmclist_create_cell_layout (clist, clist_row, column);
if (layout)
@@ -2702,8 +2703,8 @@ gint
gtk_cmclist_prepend (GtkCMCList *clist,
gchar *text[])
{
- g_return_val_if_fail (GTK_IS_CMCLIST (clist), -1);
- g_return_val_if_fail (text != NULL, -1);
+ cm_return_val_if_fail (GTK_IS_CMCLIST (clist), -1);
+ cm_return_val_if_fail (text != NULL, -1);
return GTK_CMCLIST_GET_CLASS (clist)->insert_row (clist, 0, text);
}
@@ -2712,8 +2713,8 @@ gint
gtk_cmclist_append (GtkCMCList *clist,
gchar *text[])
{
- g_return_val_if_fail (GTK_IS_CMCLIST (clist), -1);
- g_return_val_if_fail (text != NULL, -1);
+ cm_return_val_if_fail (GTK_IS_CMCLIST (clist), -1);
+ cm_return_val_if_fail (text != NULL, -1);
return GTK_CMCLIST_GET_CLASS (clist)->insert_row (clist, clist->rows, text);
}
@@ -2723,8 +2724,8 @@ gtk_cmclist_insert (GtkCMCList *clist,
gint row,
gchar *text[])
{
- g_return_val_if_fail (GTK_IS_CMCLIST (clist), -1);
- g_return_val_if_fail (text != NULL, -1);
+ cm_return_val_if_fail (GTK_IS_CMCLIST (clist), -1);
+ cm_return_val_if_fail (text != NULL, -1);
if (row < 0 || row > clist->rows)
row = clist->rows;
@@ -2742,7 +2743,7 @@ gtk_cmclist_remove (GtkCMCList *clist,
void
gtk_cmclist_clear (GtkCMCList *clist)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
GTK_CMCLIST_GET_CLASS (clist)->clear (clist);
}
@@ -2761,8 +2762,8 @@ real_insert_row (GtkCMCList *clist,
gint i;
GtkCMCListRow *clist_row;
- g_return_val_if_fail (GTK_IS_CMCLIST (clist), -1);
- g_return_val_if_fail (text != NULL, -1);
+ cm_return_val_if_fail (GTK_IS_CMCLIST (clist), -1);
+ cm_return_val_if_fail (text != NULL, -1);
/* return if out of bounds */
if (row < 0 || row > clist->rows)
@@ -2856,7 +2857,7 @@ real_remove_row (GtkCMCList *clist,
GList *list;
GtkCMCListRow *clist_row;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
/* return if out of bounds */
if (row < 0 || row > (clist->rows - 1))
@@ -2915,7 +2916,7 @@ real_clear (GtkCMCList *clist)
GList *free_list;
gint i;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
/* free up the selection list */
g_list_free (clist->selection);
@@ -2973,7 +2974,7 @@ real_row_move (GtkCMCList *clist,
gint first, last;
gint d;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (GTK_CMCLIST_AUTO_SORT(clist))
return;
@@ -3049,7 +3050,7 @@ gtk_cmclist_moveto (GtkCMCList *clist,
gfloat row_align,
gfloat col_align)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (row < -1 || row >= clist->rows)
return;
@@ -3087,7 +3088,7 @@ gtk_cmclist_set_row_height (GtkCMCList *clist,
{
GtkWidget *widget;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
widget = GTK_WIDGET (clist);
@@ -3140,7 +3141,7 @@ gtk_cmclist_set_row_data_full (GtkCMCList *clist,
{
GtkCMCListRow *clist_row;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (row < 0 || row > (clist->rows - 1))
return;
@@ -3160,7 +3161,7 @@ gtk_cmclist_get_row_data (GtkCMCList *clist,
{
GtkCMCListRow *clist_row;
- g_return_val_if_fail (GTK_IS_CMCLIST (clist), NULL);
+ cm_return_val_if_fail (GTK_IS_CMCLIST (clist), NULL);
if (row < 0 || row > (clist->rows - 1))
return NULL;
@@ -3176,7 +3177,7 @@ gtk_cmclist_find_row_from_data (GtkCMCList *clist,
GList *list;
gint n;
- g_return_val_if_fail (GTK_IS_CMCLIST (clist), -1);
+ cm_return_val_if_fail (GTK_IS_CMCLIST (clist), -1);
for (n = 0, list = clist->row_list; list; n++, list = list->next)
if (GTK_CMCLIST_ROW (list)->data == data)
@@ -3192,8 +3193,8 @@ gtk_cmclist_swap_rows (GtkCMCList *clist,
{
gint first, last;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
- g_return_if_fail (row1 != row2);
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (row1 != row2);
if (GTK_CMCLIST_AUTO_SORT(clist))
return;
@@ -3214,7 +3215,7 @@ gtk_cmclist_row_move (GtkCMCList *clist,
gint source_row,
gint dest_row)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (GTK_CMCLIST_AUTO_SORT(clist))
return;
@@ -3234,7 +3235,7 @@ gtk_cmclist_row_is_visible (GtkCMCList *clist,
{
gint top;
- g_return_val_if_fail (GTK_IS_CMCLIST (clist), 0);
+ cm_return_val_if_fail (GTK_IS_CMCLIST (clist), 0);
if (row < 0 || row >= clist->rows)
return GTK_VISIBILITY_NONE;
@@ -3264,7 +3265,7 @@ gtk_cmclist_set_foreground (GtkCMCList *clist,
{
GtkCMCListRow *clist_row;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (row < 0 || row >= clist->rows)
return;
@@ -3293,7 +3294,7 @@ gtk_cmclist_set_background (GtkCMCList *clist,
{
GtkCMCListRow *clist_row;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (row < 0 || row >= clist->rows)
return;
@@ -3331,7 +3332,7 @@ gtk_cmclist_set_cell_style (GtkCMCList *clist,
GtkRequisition requisition = { 0 };
GtkCMCListRow *clist_row;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (row < 0 || row >= clist->rows)
return;
@@ -3384,7 +3385,7 @@ gtk_cmclist_get_cell_style (GtkCMCList *clist,
{
GtkCMCListRow *clist_row;
- g_return_val_if_fail (GTK_IS_CMCLIST (clist), NULL);
+ cm_return_val_if_fail (GTK_IS_CMCLIST (clist), NULL);
if (row < 0 || row >= clist->rows || column < 0 || column >= clist->columns)
return NULL;
@@ -3404,7 +3405,7 @@ gtk_cmclist_set_row_style (GtkCMCList *clist,
gint *old_width;
gint i;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (row < 0 || row >= clist->rows)
return;
@@ -3465,7 +3466,7 @@ gtk_cmclist_get_row_style (GtkCMCList *clist,
{
GtkCMCListRow *clist_row;
- g_return_val_if_fail (GTK_IS_CMCLIST (clist), NULL);
+ cm_return_val_if_fail (GTK_IS_CMCLIST (clist), NULL);
if (row < 0 || row >= clist->rows)
return NULL;
@@ -3491,7 +3492,7 @@ gtk_cmclist_set_selectable (GtkCMCList *clist,
{
GtkCMCListRow *clist_row;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (row < 0 || row >= clist->rows)
return;
@@ -3521,7 +3522,7 @@ gboolean
gtk_cmclist_get_selectable (GtkCMCList *clist,
gint row)
{
- g_return_val_if_fail (GTK_IS_CMCLIST (clist), FALSE);
+ cm_return_val_if_fail (GTK_IS_CMCLIST (clist), FALSE);
if (row < 0 || row >= clist->rows)
return FALSE;
@@ -3534,7 +3535,7 @@ gtk_cmclist_select_row (GtkCMCList *clist,
gint row,
gint column)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (row < 0 || row >= clist->rows)
return;
@@ -3550,7 +3551,7 @@ gtk_cmclist_unselect_row (GtkCMCList *clist,
gint row,
gint column)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (row < 0 || row >= clist->rows)
return;
@@ -3564,7 +3565,7 @@ gtk_cmclist_unselect_row (GtkCMCList *clist,
void
gtk_cmclist_select_all (GtkCMCList *clist)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
GTK_CMCLIST_GET_CLASS (clist)->select_all (clist);
}
@@ -3572,7 +3573,7 @@ gtk_cmclist_select_all (GtkCMCList *clist)
void
gtk_cmclist_unselect_all (GtkCMCList *clist)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
GTK_CMCLIST_GET_CLASS (clist)->unselect_all (clist);
}
@@ -3580,7 +3581,7 @@ gtk_cmclist_unselect_all (GtkCMCList *clist)
void
gtk_cmclist_undo_selection (GtkCMCList *clist)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (clist->selection_mode == GTK_SELECTION_MULTIPLE &&
(clist->undo_selection || clist->undo_unselection))
@@ -3679,8 +3680,8 @@ clist_has_grab (GtkCMCList *clist)
static void
toggle_focus_row (GtkCMCList *clist)
{
- g_return_if_fail (clist != 0);
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (clist != 0);
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (clist_has_grab (clist) ||
clist->focus_row < 0 || clist->focus_row >= clist->rows)
@@ -3716,8 +3717,8 @@ toggle_focus_row (GtkCMCList *clist)
static void
toggle_add_mode (GtkCMCList *clist)
{
- g_return_if_fail (clist != 0);
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (clist != 0);
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (clist_has_grab (clist) ||
clist->selection_mode != GTK_SELECTION_MULTIPLE)
@@ -3751,7 +3752,7 @@ real_select_row (GtkCMCList *clist,
gint sel_row;
gboolean row_selected;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (row < 0 || row > (clist->rows - 1))
return;
@@ -3812,7 +3813,7 @@ real_unselect_row (GtkCMCList *clist,
{
GtkCMCListRow *clist_row;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (row < 0 || row > (clist->rows - 1))
return;
@@ -3839,7 +3840,7 @@ real_unselect_row (GtkCMCList *clist,
static void
real_select_all (GtkCMCList *clist)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (clist_has_grab (clist))
return;
@@ -3879,7 +3880,7 @@ real_unselect_all (GtkCMCList *clist)
GList *list;
gint i;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (clist_has_grab (clist))
return;
@@ -3964,7 +3965,7 @@ real_undo_selection (GtkCMCList *clist)
{
GList *work;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (clist_has_grab (clist) ||
clist->selection_mode != GTK_SELECTION_MULTIPLE)
@@ -4018,7 +4019,7 @@ set_anchor (GtkCMCList *clist,
gint anchor,
gint undo_anchor)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (clist->selection_mode != GTK_SELECTION_MULTIPLE || clist->anchor >= 0)
return;
@@ -4316,7 +4317,7 @@ update_extended_selection (GtkCMCList *clist,
static void
start_selection (GtkCMCList *clist)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (clist_has_grab (clist))
return;
@@ -4328,7 +4329,7 @@ start_selection (GtkCMCList *clist)
static void
end_selection (GtkCMCList *clist)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (GTK_WIDGET (clist))) &&
GTK_WIDGET_HAS_FOCUS (clist))
@@ -4343,7 +4344,7 @@ extend_selection (GtkCMCList *clist,
gfloat position,
gboolean auto_start_selection)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (clist_has_grab (clist) ||
clist->selection_mode != GTK_SELECTION_MULTIPLE)
@@ -4422,7 +4423,7 @@ gtk_cmclist_destroy (GtkObject *object)
gint i;
GtkCMCList *clist;
- g_return_if_fail (GTK_IS_CMCLIST (object));
+ cm_return_if_fail (GTK_IS_CMCLIST (object));
clist = GTK_CMCLIST (object);
@@ -4474,7 +4475,7 @@ gtk_cmclist_finalize (GObject *object)
{
GtkCMCList *clist;
- g_return_if_fail (GTK_IS_CMCLIST (object));
+ cm_return_if_fail (GTK_IS_CMCLIST (object));
clist = GTK_CMCLIST (object);
@@ -4513,7 +4514,7 @@ gtk_cmclist_realize (GtkWidget *widget)
gint i;
gint j;
- g_return_if_fail (GTK_IS_CMCLIST (widget));
+ cm_return_if_fail (GTK_IS_CMCLIST (widget));
clist = GTK_CMCLIST (widget);
@@ -4665,7 +4666,7 @@ gtk_cmclist_unrealize (GtkWidget *widget)
gint i;
GtkCMCList *clist;
- g_return_if_fail (GTK_IS_CMCLIST (widget));
+ cm_return_if_fail (GTK_IS_CMCLIST (widget));
clist = GTK_CMCLIST (widget);
@@ -4738,7 +4739,7 @@ gtk_cmclist_map (GtkWidget *widget)
gint i;
GtkCMCList *clist;
- g_return_if_fail (GTK_IS_CMCLIST (widget));
+ cm_return_if_fail (GTK_IS_CMCLIST (widget));
clist = GTK_CMCLIST (widget);
@@ -4777,7 +4778,7 @@ gtk_cmclist_unmap (GtkWidget *widget)
gint i;
GtkCMCList *clist;
- g_return_if_fail (GTK_IS_CMCLIST (widget));
+ cm_return_if_fail (GTK_IS_CMCLIST (widget));
clist = GTK_CMCLIST (widget);
@@ -4833,8 +4834,8 @@ gtk_cmclist_expose (GtkWidget *widget,
{
GtkCMCList *clist;
- g_return_val_if_fail (GTK_IS_CMCLIST (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_CMCLIST (widget), FALSE);
+ cm_return_val_if_fail (event != NULL, FALSE);
if (GTK_WIDGET_DRAWABLE (widget))
{
@@ -4887,7 +4888,7 @@ gtk_cmclist_style_set (GtkWidget *widget,
{
GtkCMCList *clist;
- g_return_if_fail (GTK_IS_CMCLIST (widget));
+ cm_return_if_fail (GTK_IS_CMCLIST (widget));
if (GTK_WIDGET_CLASS (parent_class)->style_set)
(*GTK_WIDGET_CLASS (parent_class)->style_set) (widget, previous_style);
@@ -4936,8 +4937,8 @@ gtk_cmclist_button_press (GtkWidget *widget,
gint column;
gint button_actions;
- g_return_val_if_fail (GTK_IS_CMCLIST (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_CMCLIST (widget), FALSE);
+ cm_return_val_if_fail (event != NULL, FALSE);
clist = GTK_CMCLIST (widget);
@@ -5148,8 +5149,8 @@ gtk_cmclist_button_release (GtkWidget *widget,
GtkCMCList *clist;
gint button_actions;
- g_return_val_if_fail (GTK_IS_CMCLIST (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_CMCLIST (widget), FALSE);
+ cm_return_val_if_fail (event != NULL, FALSE);
clist = GTK_CMCLIST (widget);
@@ -5249,7 +5250,7 @@ gtk_cmclist_motion (GtkWidget *widget,
gint new_width;
gint button_actions = 0;
- g_return_val_if_fail (GTK_IS_CMCLIST (widget), FALSE);
+ cm_return_val_if_fail (GTK_IS_CMCLIST (widget), FALSE);
clist = GTK_CMCLIST (widget);
if (!clist_has_grab (clist))
@@ -5428,8 +5429,8 @@ gtk_cmclist_size_request (GtkWidget *widget,
GtkCMCList *clist;
gint i;
gint font_height = 0;
- g_return_if_fail (GTK_IS_CMCLIST (widget));
- g_return_if_fail (requisition != NULL);
+ cm_return_if_fail (GTK_IS_CMCLIST (widget));
+ cm_return_if_fail (requisition != NULL);
clist = GTK_CMCLIST (widget);
@@ -5473,8 +5474,8 @@ gtk_cmclist_size_allocate (GtkWidget *widget,
GtkAllocation clist_allocation;
gint border_width;
- g_return_if_fail (GTK_IS_CMCLIST (widget));
- g_return_if_fail (allocation != NULL);
+ cm_return_if_fail (GTK_IS_CMCLIST (widget));
+ cm_return_if_fail (allocation != NULL);
clist = GTK_CMCLIST (widget);
widget->allocation = *allocation;
@@ -5556,8 +5557,8 @@ gtk_cmclist_forall (GtkContainer *container,
GtkCMCList *clist;
guint i;
- g_return_if_fail (GTK_IS_CMCLIST (container));
- g_return_if_fail (callback != NULL);
+ cm_return_if_fail (GTK_IS_CMCLIST (container));
+ cm_return_if_fail (callback != NULL);
if (!include_internals)
return;
@@ -5699,7 +5700,7 @@ draw_row (GtkCMCList *clist,
gint state;
gint i;
- g_return_if_fail (clist != NULL);
+ cm_return_if_fail (clist != NULL);
/* bail now if we arn't drawable yet */
if (!GTK_WIDGET_DRAWABLE (clist) || row < 0 || row >= clist->rows)
@@ -5962,7 +5963,7 @@ draw_rows (GtkCMCList *clist,
gint first_row;
gint last_row;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (clist->row_height == 0 ||
!GTK_WIDGET_DRAWABLE (clist))
@@ -6010,7 +6011,7 @@ draw_xor_line (GtkCMCList *clist)
{
GtkWidget *widget;
- g_return_if_fail (clist != NULL);
+ cm_return_if_fail (clist != NULL);
widget = GTK_WIDGET (clist);
@@ -6025,7 +6026,7 @@ draw_xor_line (GtkCMCList *clist)
static void
clist_refresh (GtkCMCList *clist)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (CLIST_UNFROZEN (clist))
{
@@ -6047,7 +6048,7 @@ get_selection_info (GtkCMCList *clist,
{
gint trow, tcol;
- g_return_val_if_fail (GTK_IS_CMCLIST (clist), 0);
+ cm_return_val_if_fail (GTK_IS_CMCLIST (clist), 0);
/* bounds checking, return false if the user clicked
* on a blank area */
@@ -6075,7 +6076,7 @@ gtk_cmclist_get_selection_info (GtkCMCList *clist,
gint *row,
gint *column)
{
- g_return_val_if_fail (GTK_IS_CMCLIST (clist), 0);
+ cm_return_val_if_fail (GTK_IS_CMCLIST (clist), 0);
return get_selection_info (clist, x, y, row, column);
}
@@ -6155,8 +6156,8 @@ vadjustment_changed (GtkAdjustment *adjustment,
{
GtkCMCList *clist;
- g_return_if_fail (adjustment != NULL);
- g_return_if_fail (data != NULL);
+ cm_return_if_fail (adjustment != NULL);
+ cm_return_if_fail (data != NULL);
clist = GTK_CMCLIST (data);
}
@@ -6167,8 +6168,8 @@ hadjustment_changed (GtkAdjustment *adjustment,
{
GtkCMCList *clist;
- g_return_if_fail (adjustment != NULL);
- g_return_if_fail (data != NULL);
+ cm_return_if_fail (adjustment != NULL);
+ cm_return_if_fail (data != NULL);
clist = GTK_CMCLIST (data);
}
@@ -6180,8 +6181,8 @@ vadjustment_value_changed (GtkAdjustment *adjustment,
GtkCMCList *clist;
gint dy, value;
- g_return_if_fail (adjustment != NULL);
- g_return_if_fail (GTK_IS_CMCLIST (data));
+ cm_return_if_fail (adjustment != NULL);
+ cm_return_if_fail (GTK_IS_CMCLIST (data));
clist = GTK_CMCLIST (data);
@@ -6271,8 +6272,8 @@ hadjustment_value_changed (GtkAdjustment *adjustment,
gint value;
gint dx;
- g_return_if_fail (adjustment != NULL);
- g_return_if_fail (GTK_IS_CMCLIST (data));
+ cm_return_if_fail (adjustment != NULL);
+ cm_return_if_fail (GTK_IS_CMCLIST (data));
clist = GTK_CMCLIST (data);
container = GTK_CONTAINER (data);
@@ -6597,7 +6598,7 @@ gtk_cmclist_draw_focus (GtkWidget *widget)
{
GtkCMCList *clist;
- g_return_if_fail (GTK_IS_CMCLIST (widget));
+ cm_return_if_fail (GTK_IS_CMCLIST (widget));
if (!GTK_WIDGET_DRAWABLE (widget) || !GTK_WIDGET_CAN_FOCUS (widget))
return;
@@ -6837,8 +6838,8 @@ move_focus_row (GtkCMCList *clist,
{
GtkWidget *widget;
- g_return_if_fail (clist != 0);
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (clist != 0);
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
widget = GTK_WIDGET (clist);
@@ -6904,8 +6905,8 @@ scroll_horizontal (GtkCMCList *clist,
gint column = 0;
gint last_column;
- g_return_if_fail (clist != 0);
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (clist != 0);
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (clist_has_grab (clist))
return;
@@ -6979,7 +6980,7 @@ scroll_vertical (GtkCMCList *clist,
{
gint old_focus_row;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (clist_has_grab (clist))
return;
@@ -7173,7 +7174,7 @@ remove_grab (GtkCMCList *clist)
void
gtk_cmclist_sort (GtkCMCList *clist)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
GTK_CMCLIST_GET_CLASS (clist)->sort_list (clist);
}
@@ -7182,7 +7183,7 @@ void
gtk_cmclist_set_compare_func (GtkCMCList *clist,
GtkCMCListCompareFunc cmp_func)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
clist->compare = (cmp_func) ? cmp_func : default_compare;
}
@@ -7191,7 +7192,7 @@ void
gtk_cmclist_set_auto_sort (GtkCMCList *clist,
gboolean auto_sort)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (GTK_CMCLIST_AUTO_SORT(clist) && !auto_sort)
GTK_CMCLIST_UNSET_FLAG (clist, CMCLIST_AUTO_SORT);
@@ -7206,7 +7207,7 @@ void
gtk_cmclist_set_sort_type (GtkCMCList *clist,
GtkSortType sort_type)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
clist->sort_type = sort_type;
}
@@ -7215,7 +7216,7 @@ void
gtk_cmclist_set_sort_column (GtkCMCList *clist,
gint column)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (column < 0 || column >= clist->columns)
return;
@@ -7280,7 +7281,7 @@ real_sort_list (GtkCMCList *clist)
GList *work;
gint i;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (clist->rows <= 1)
return;
@@ -7485,8 +7486,8 @@ gtk_cmclist_drag_begin (GtkWidget *widget,
GtkCMCList *clist;
GtkCMCListCellInfo *info;
- g_return_if_fail (GTK_IS_CMCLIST (widget));
- g_return_if_fail (context != NULL);
+ cm_return_if_fail (GTK_IS_CMCLIST (widget));
+ cm_return_if_fail (context != NULL);
clist = GTK_CMCLIST (widget);
@@ -7534,8 +7535,8 @@ gtk_cmclist_drag_end (GtkWidget *widget,
{
GtkCMCList *clist;
- g_return_if_fail (GTK_IS_CMCLIST (widget));
- g_return_if_fail (context != NULL);
+ cm_return_if_fail (GTK_IS_CMCLIST (widget));
+ cm_return_if_fail (context != NULL);
clist = GTK_CMCLIST (widget);
@@ -7551,8 +7552,8 @@ gtk_cmclist_drag_leave (GtkWidget *widget,
GtkCMCList *clist;
GtkCMCListDestInfo *dest_info;
- g_return_if_fail (GTK_IS_CMCLIST (widget));
- g_return_if_fail (context != NULL);
+ cm_return_if_fail (GTK_IS_CMCLIST (widget));
+ cm_return_if_fail (context != NULL);
clist = GTK_CMCLIST (widget);
@@ -7597,7 +7598,7 @@ gtk_cmclist_drag_motion (GtkWidget *widget,
GtkCMCListDestInfo new_info;
GtkCMCListDestInfo *dest_info;
- g_return_val_if_fail (GTK_IS_CMCLIST (widget), FALSE);
+ cm_return_val_if_fail (GTK_IS_CMCLIST (widget), FALSE);
clist = GTK_CMCLIST (widget);
@@ -7689,8 +7690,8 @@ gtk_cmclist_drag_drop (GtkWidget *widget,
gint y,
guint time)
{
- g_return_val_if_fail (GTK_IS_CMCLIST (widget), FALSE);
- g_return_val_if_fail (context != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_CMCLIST (widget), FALSE);
+ cm_return_val_if_fail (context != NULL, FALSE);
if (GTK_CMCLIST_REORDERABLE (widget) &&
gtk_drag_get_source_widget (context) == widget)
@@ -7720,9 +7721,9 @@ gtk_cmclist_drag_data_received (GtkWidget *widget,
{
GtkCMCList *clist;
- g_return_if_fail (GTK_IS_CMCLIST (widget));
- g_return_if_fail (context != NULL);
- g_return_if_fail (selection_data != NULL);
+ cm_return_if_fail (GTK_IS_CMCLIST (widget));
+ cm_return_if_fail (context != NULL);
+ cm_return_if_fail (selection_data != NULL);
clist = GTK_CMCLIST (widget);
@@ -7761,9 +7762,9 @@ gtk_cmclist_drag_data_get (GtkWidget *widget,
guint info,
guint time)
{
- g_return_if_fail (GTK_IS_CMCLIST (widget));
- g_return_if_fail (context != NULL);
- g_return_if_fail (selection_data != NULL);
+ cm_return_if_fail (GTK_IS_CMCLIST (widget));
+ cm_return_if_fail (context != NULL);
+ cm_return_if_fail (selection_data != NULL);
if (selection_data->target == gdk_atom_intern_static_string ("gtk-clist-drag-reorder"))
{
@@ -7818,7 +7819,7 @@ gtk_cmclist_set_reorderable (GtkCMCList *clist,
{
GtkWidget *widget;
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if ((GTK_CMCLIST_REORDERABLE(clist) != 0) == reorderable)
return;
@@ -7843,7 +7844,7 @@ void
gtk_cmclist_set_use_drag_icons (GtkCMCList *clist,
gboolean use_icons)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (use_icons != 0)
GTK_CMCLIST_SET_FLAG (clist, CMCLIST_USE_DRAG_ICONS);
@@ -7856,7 +7857,7 @@ gtk_cmclist_set_button_actions (GtkCMCList *clist,
guint button,
guint8 button_actions)
{
- g_return_if_fail (GTK_IS_CMCLIST (clist));
+ cm_return_if_fail (GTK_IS_CMCLIST (clist));
if (button < MAX_BUTTON)
{
diff --git a/src/gtk/gtkcmctree.c b/src/gtk/gtkcmctree.c
@@ -34,6 +34,7 @@
#include <gdk/gdkkeysyms.h>
#include "gtkcmctree.h"
#include "claws-marshal.h"
+#include "utils.h"
#if !GTK_CHECK_VERSION(2,10,0)
#define gdk_atom_intern_static_string(str) gdk_atom_intern(str, FALSE)
@@ -682,7 +683,7 @@ gtk_cmctree_set_arg (GObject *object,
{
case ARG_N_COLUMNS: /* construct-only arg, only set at construction time */
#if !GLIB_CHECK_VERSION(2,10,0)
- g_return_if_fail (clist->row_mem_chunk == NULL);
+ cm_return_if_fail (clist->row_mem_chunk == NULL);
#endif
clist->columns = MAX (1, g_value_get_uint (value));
#if !GLIB_CHECK_VERSION(2,10,0)
@@ -845,7 +846,7 @@ gtk_cmctree_realize (GtkWidget *widget)
GtkCMCTreeNode *child;
gint i;
- g_return_if_fail (GTK_IS_CMCTREE (widget));
+ cm_return_if_fail (GTK_IS_CMCTREE (widget));
GTK_WIDGET_CLASS (parent_class)->realize (widget);
@@ -887,7 +888,7 @@ gtk_cmctree_unrealize (GtkWidget *widget)
GtkCMCTree *ctree;
GtkCMCList *clist;
- g_return_if_fail (GTK_IS_CMCTREE (widget));
+ cm_return_if_fail (GTK_IS_CMCTREE (widget));
GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
@@ -923,8 +924,8 @@ gtk_cmctree_button_press (GtkWidget *widget,
GtkCMCList *clist;
gint button_actions;
- g_return_val_if_fail (GTK_IS_CMCTREE (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (widget), FALSE);
+ cm_return_val_if_fail (event != NULL, FALSE);
ctree = GTK_CMCTREE (widget);
clist = GTK_CMCLIST (widget);
@@ -979,7 +980,7 @@ draw_drag_highlight (GtkCMCList *clist,
gint i;
gint y = 0;
- g_return_if_fail (GTK_IS_CMCTREE (clist));
+ cm_return_if_fail (GTK_IS_CMCTREE (clist));
ctree = GTK_CMCTREE (clist);
@@ -1754,7 +1755,7 @@ draw_row (GtkCMCList *clist,
gint state;
gint i;
- g_return_if_fail (clist != NULL);
+ cm_return_if_fail (clist != NULL);
/* bail now if we arn't drawable yet */
if (!GTK_WIDGET_DRAWABLE (clist) || row < 0 || row >= clist->rows)
@@ -2193,10 +2194,10 @@ gtk_cmctree_link (GtkCMCTree *ctree,
gint rows = 0;
if (sibling)
- g_return_if_fail (GTK_CMCTREE_ROW (sibling)->parent == parent);
- g_return_if_fail (node != NULL);
- g_return_if_fail (node != sibling);
- g_return_if_fail (node != parent);
+ cm_return_if_fail (GTK_CMCTREE_ROW (sibling)->parent == parent);
+ cm_return_if_fail (node != NULL);
+ cm_return_if_fail (node != sibling);
+ cm_return_if_fail (node != parent);
clist = GTK_CMCLIST (ctree);
@@ -2339,8 +2340,8 @@ gtk_cmctree_unlink (GtkCMCTree *ctree,
GtkCMCTreeNode *parent;
GList *list;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
clist = GTK_CMCLIST (ctree);
@@ -2457,7 +2458,7 @@ real_row_move (GtkCMCList *clist,
GtkCMCTree *ctree;
GtkCMCTreeNode *node;
- g_return_if_fail (GTK_IS_CMCTREE (clist));
+ cm_return_if_fail (GTK_IS_CMCTREE (clist));
if (GTK_CMCLIST_AUTO_SORT (clist))
return;
@@ -2508,9 +2509,9 @@ real_tree_move (GtkCMCTree *ctree,
GtkCMCTreeNode *work;
gboolean visible = FALSE;
- g_return_if_fail (ctree != NULL);
- g_return_if_fail (node != NULL);
- g_return_if_fail (!new_sibling ||
+ cm_return_if_fail (ctree != NULL);
+ cm_return_if_fail (node != NULL);
+ cm_return_if_fail (!new_sibling ||
GTK_CMCTREE_ROW (new_sibling)->parent == new_parent);
if (new_parent && GTK_CMCTREE_ROW (new_parent)->is_leaf)
@@ -2588,7 +2589,7 @@ change_focus_row_expansion (GtkCMCTree *ctree,
GtkCMCList *clist;
GtkCMCTreeNode *node;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
clist = GTK_CMCLIST (ctree);
@@ -2633,7 +2634,7 @@ real_tree_expand (GtkCMCTree *ctree,
GtkRequisition requisition;
gboolean visible;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
if (!node || GTK_CMCTREE_ROW (node)->expanded || GTK_CMCTREE_ROW (node)->is_leaf)
return;
@@ -2760,7 +2761,7 @@ real_tree_collapse (GtkCMCTree *ctree,
gboolean visible;
gint level;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
if (!node || !GTK_CMCTREE_ROW (node)->expanded ||
GTK_CMCTREE_ROW (node)->is_leaf)
@@ -2921,8 +2922,8 @@ cell_size_request (GtkCMCList *clist,
PangoLayout *layout;
PangoRectangle logical_rect;
- g_return_if_fail (GTK_IS_CMCTREE (clist));
- g_return_if_fail (requisition != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (clist));
+ cm_return_if_fail (requisition != NULL);
ctree = GTK_CMCTREE (clist);
@@ -3006,8 +3007,8 @@ set_cell_contents (GtkCMCList *clist,
gchar *old_text = NULL;
GdkPixbuf *old_pixbuf = NULL;
- g_return_if_fail (GTK_IS_CMCTREE (clist));
- g_return_if_fail (clist_row != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (clist));
+ cm_return_if_fail (clist_row != NULL);
ctree = GTK_CMCTREE (clist);
@@ -3358,7 +3359,7 @@ real_select_row (GtkCMCList *clist,
{
GList *node;
- g_return_if_fail (GTK_IS_CMCTREE (clist));
+ cm_return_if_fail (GTK_IS_CMCTREE (clist));
if ((node = g_list_nth (clist->row_list, row)) &&
GTK_CMCTREE_ROW (node)->row.selectable)
@@ -3374,7 +3375,7 @@ real_unselect_row (GtkCMCList *clist,
{
GList *node;
- g_return_if_fail (GTK_IS_CMCTREE (clist));
+ cm_return_if_fail (GTK_IS_CMCTREE (clist));
if ((node = g_list_nth (clist->row_list, row)))
g_signal_emit (G_OBJECT (clist), ctree_signals[TREE_UNSELECT_ROW],0,
@@ -3391,7 +3392,7 @@ real_tree_select (GtkCMCTree *ctree,
GtkCMCTreeNode *sel_row;
gboolean node_selected;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
if (!node || GTK_CMCTREE_ROW (node)->row.state == GTK_STATE_SELECTED ||
!GTK_CMCTREE_ROW (node)->row.selectable)
@@ -3446,7 +3447,7 @@ real_tree_unselect (GtkCMCTree *ctree,
{
GtkCMCList *clist;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
if (!node || GTK_CMCTREE_ROW (node)->row.state != GTK_STATE_SELECTED)
return;
@@ -3483,7 +3484,7 @@ real_select_all (GtkCMCList *clist)
GtkCMCTree *ctree;
GtkCMCTreeNode *node;
- g_return_if_fail (GTK_IS_CMCTREE (clist));
+ cm_return_if_fail (GTK_IS_CMCTREE (clist));
ctree = GTK_CMCTREE (clist);
@@ -3527,7 +3528,7 @@ real_unselect_all (GtkCMCList *clist)
GtkCMCTreeNode *node;
GList *list;
- g_return_if_fail (GTK_IS_CMCTREE (clist));
+ cm_return_if_fail (GTK_IS_CMCTREE (clist));
ctree = GTK_CMCTREE (clist);
@@ -3580,8 +3581,8 @@ ctree_is_hot_spot (GtkCMCTree *ctree,
gint xl;
gint yu;
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
- g_return_val_if_fail (node != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
+ cm_return_val_if_fail (node != NULL, FALSE);
clist = GTK_CMCLIST (ctree);
@@ -3637,8 +3638,8 @@ gtk_cmctree_new_with_titles (gint columns,
{
GtkWidget *widget;
- g_return_val_if_fail (columns > 0, NULL);
- g_return_val_if_fail (tree_column >= 0 && tree_column < columns, NULL);
+ cm_return_val_if_fail (columns > 0, NULL);
+ cm_return_val_if_fail (tree_column >= 0 && tree_column < columns, NULL);
widget = gtk_widget_new (GTK_TYPE_CMCTREE,
"n_columns", columns,
@@ -3673,7 +3674,7 @@ real_insert_row (GtkCMCList *clist,
GtkCMCTreeNode *sibling;
GtkCMCTreeNode *node;
- g_return_val_if_fail (GTK_IS_CMCTREE (clist), -1);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (clist), -1);
sibling = GTK_CMCTREE_NODE (g_list_nth (clist->row_list, row));
if (sibling)
@@ -3705,9 +3706,9 @@ gtk_cmctree_insert_node (GtkCMCTree *ctree,
GList *list;
gint i;
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
if (sibling)
- g_return_val_if_fail (GTK_CMCTREE_ROW (sibling)->parent == parent, NULL);
+ cm_return_val_if_fail (GTK_CMCTREE_ROW (sibling)->parent == parent, NULL);
if (parent && GTK_CMCTREE_ROW (parent)->is_leaf)
return NULL;
@@ -3782,11 +3783,11 @@ gtk_cmctree_insert_gnode (GtkCMCTree *ctree,
GNode *work;
guint depth = 1;
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
- g_return_val_if_fail (gnode != NULL, NULL);
- g_return_val_if_fail (func != NULL, NULL);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
+ cm_return_val_if_fail (gnode != NULL, NULL);
+ cm_return_val_if_fail (func != NULL, NULL);
if (sibling)
- g_return_val_if_fail (GTK_CMCTREE_ROW (sibling)->parent == parent, NULL);
+ cm_return_val_if_fail (GTK_CMCTREE_ROW (sibling)->parent == parent, NULL);
clist = GTK_CMCLIST (ctree);
@@ -3847,13 +3848,13 @@ gtk_cmctree_export_to_gnode (GtkCMCTree *ctree,
GNode *gnode;
gint depth;
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
- g_return_val_if_fail (node != NULL, NULL);
- g_return_val_if_fail (func != NULL, NULL);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
+ cm_return_val_if_fail (node != NULL, NULL);
+ cm_return_val_if_fail (func != NULL, NULL);
if (sibling)
{
- g_return_val_if_fail (parent != NULL, NULL);
- g_return_val_if_fail (sibling->parent == parent, NULL);
+ cm_return_val_if_fail (parent != NULL, NULL);
+ cm_return_val_if_fail (sibling->parent == parent, NULL);
}
gnode = g_node_new (NULL);
@@ -3889,7 +3890,7 @@ real_remove_row (GtkCMCList *clist,
{
GtkCMCTreeNode *node;
- g_return_if_fail (GTK_IS_CMCTREE (clist));
+ cm_return_if_fail (GTK_IS_CMCTREE (clist));
node = GTK_CMCTREE_NODE (g_list_nth (clist->row_list, row));
@@ -3903,7 +3904,7 @@ gtk_cmctree_remove_node (GtkCMCTree *ctree,
{
GtkCMCList *clist;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
clist = GTK_CMCLIST (ctree);
@@ -3933,7 +3934,7 @@ real_clear (GtkCMCList *clist)
GtkCMCTreeNode *work;
GtkCMCTreeNode *ptr;
- g_return_if_fail (GTK_IS_CMCTREE (clist));
+ cm_return_if_fail (GTK_IS_CMCTREE (clist));
ctree = GTK_CMCTREE (clist);
@@ -3971,8 +3972,8 @@ gtk_cmctree_post_recursive (GtkCMCTree *ctree,
GtkCMCTreeNode *work;
GtkCMCTreeNode *tmp;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (func != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (func != NULL);
if (node)
work = GTK_CMCTREE_ROW (node)->children;
@@ -4000,8 +4001,8 @@ gtk_cmctree_post_recursive_to_depth (GtkCMCTree *ctree,
GtkCMCTreeNode *work;
GtkCMCTreeNode *tmp;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (func != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (func != NULL);
if (depth < 0)
{
@@ -4037,8 +4038,8 @@ gtk_cmctree_pre_recursive (GtkCMCTree *ctree,
GtkCMCTreeNode *work;
GtkCMCTreeNode *tmp;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (func != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (func != NULL);
if (node)
{
@@ -4066,8 +4067,8 @@ gtk_cmctree_pre_recursive_to_depth (GtkCMCTree *ctree,
GtkCMCTreeNode *work;
GtkCMCTreeNode *tmp;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (func != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (func != NULL);
if (depth < 0)
{
@@ -4101,8 +4102,8 @@ gtk_cmctree_is_viewable (GtkCMCTree *ctree,
{
GtkCMCTreeRow *work;
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
- g_return_val_if_fail (node != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
+ cm_return_val_if_fail (node != NULL, FALSE);
work = GTK_CMCTREE_ROW (node);
@@ -4119,7 +4120,7 @@ GtkCMCTreeNode *
gtk_cmctree_last (GtkCMCTree *ctree,
GtkCMCTreeNode *node)
{
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
if (!node)
return NULL;
@@ -4139,8 +4140,8 @@ gtk_cmctree_find_node_ptr (GtkCMCTree *ctree,
{
GtkCMCTreeNode *node;
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
- g_return_val_if_fail (ctree_row != NULL, NULL);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
+ cm_return_val_if_fail (ctree_row != NULL, NULL);
if (ctree_row->parent)
node = GTK_CMCTREE_ROW (ctree_row->parent)->children;
@@ -4157,7 +4158,7 @@ GtkCMCTreeNode *
gtk_cmctree_node_nth (GtkCMCTree *ctree,
guint row)
{
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
if ((row >= GTK_CMCLIST(ctree)->rows))
return NULL;
@@ -4195,8 +4196,8 @@ gtk_cmctree_is_ancestor (GtkCMCTree *ctree,
GtkCMCTreeNode *node,
GtkCMCTreeNode *child)
{
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
- g_return_val_if_fail (node != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
+ cm_return_val_if_fail (node != NULL, FALSE);
if (GTK_CMCTREE_ROW (node)->children)
return gtk_cmctree_find (ctree, GTK_CMCTREE_ROW (node)->children, child);
@@ -4234,7 +4235,7 @@ gtk_cmctree_find_all_by_row_data (GtkCMCTree *ctree,
{
GList *list = NULL;
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
/* if node == NULL then look in the whole tree */
if (!node)
@@ -4268,7 +4269,7 @@ gtk_cmctree_find_by_row_data_custom (GtkCMCTree *ctree,
{
GtkCMCTreeNode *work;
- g_return_val_if_fail (func != NULL, NULL);
+ cm_return_val_if_fail (func != NULL, NULL);
if (!node)
node = GTK_CMCTREE_NODE (GTK_CMCLIST (ctree)->row_list);
@@ -4294,8 +4295,8 @@ gtk_cmctree_find_all_by_row_data_custom (GtkCMCTree *ctree,
{
GList *list = NULL;
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
- g_return_val_if_fail (func != NULL, NULL);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
+ cm_return_val_if_fail (func != NULL, NULL);
/* if node == NULL then look in the whole tree */
if (!node)
@@ -4331,7 +4332,7 @@ gtk_cmctree_is_hot_spot (GtkCMCTree *ctree,
gint column;
gint row;
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
if (gtk_cmclist_get_selection_info (GTK_CMCLIST (ctree), x, y, &row, &column))
if ((node = GTK_CMCTREE_NODE(g_list_nth (GTK_CMCLIST (ctree)->row_list, row))))
@@ -4352,8 +4353,8 @@ gtk_cmctree_move (GtkCMCTree *ctree,
GtkCMCTreeNode *new_parent,
GtkCMCTreeNode *new_sibling)
{
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
g_signal_emit (G_OBJECT (ctree), ctree_signals[TREE_MOVE], 0, node,
new_parent, new_sibling);
@@ -4363,8 +4364,8 @@ void
gtk_cmctree_expand (GtkCMCTree *ctree,
GtkCMCTreeNode *node)
{
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
if (GTK_CMCTREE_ROW (node)->is_leaf)
return;
@@ -4379,7 +4380,7 @@ gtk_cmctree_expand_recursive (GtkCMCTree *ctree,
GtkCMCList *clist;
gboolean thaw = FALSE;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
clist = GTK_CMCLIST (ctree);
@@ -4406,7 +4407,7 @@ gtk_cmctree_expand_to_depth (GtkCMCTree *ctree,
GtkCMCList *clist;
gboolean thaw = FALSE;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
clist = GTK_CMCLIST (ctree);
@@ -4430,8 +4431,8 @@ void
gtk_cmctree_collapse (GtkCMCTree *ctree,
GtkCMCTreeNode *node)
{
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
if (GTK_CMCTREE_ROW (node)->is_leaf)
return;
@@ -4447,7 +4448,7 @@ gtk_cmctree_collapse_recursive (GtkCMCTree *ctree,
gboolean thaw = FALSE;
gint i;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
if (node && GTK_CMCTREE_ROW (node)->is_leaf)
return;
@@ -4481,7 +4482,7 @@ gtk_cmctree_collapse_to_depth (GtkCMCTree *ctree,
gboolean thaw = FALSE;
gint i;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
if (node && GTK_CMCTREE_ROW (node)->is_leaf)
return;
@@ -4512,8 +4513,8 @@ void
gtk_cmctree_toggle_expansion (GtkCMCTree *ctree,
GtkCMCTreeNode *node)
{
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
if (GTK_CMCTREE_ROW (node)->is_leaf)
return;
@@ -4528,7 +4529,7 @@ gtk_cmctree_toggle_expansion_recursive (GtkCMCTree *ctree,
GtkCMCList *clist;
gboolean thaw = FALSE;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
if (node && GTK_CMCTREE_ROW (node)->is_leaf)
return;
@@ -4552,8 +4553,8 @@ void
gtk_cmctree_select (GtkCMCTree *ctree,
GtkCMCTreeNode *node)
{
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
if (GTK_CMCTREE_ROW (node)->row.selectable)
g_signal_emit (G_OBJECT (ctree), ctree_signals[TREE_SELECT_ROW], 0,
@@ -4564,8 +4565,8 @@ void
gtk_cmctree_unselect (GtkCMCTree *ctree,
GtkCMCTreeNode *node)
{
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
g_signal_emit (G_OBJECT (ctree), ctree_signals[TREE_UNSELECT_ROW], 0,
node, -1);
@@ -4593,7 +4594,7 @@ gtk_cmctree_real_select_recursive (GtkCMCTree *ctree,
GtkCMCList *clist;
gboolean thaw = FALSE;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
clist = GTK_CMCLIST (ctree);
@@ -4644,8 +4645,8 @@ gtk_cmctree_node_set_text (GtkCMCTree *ctree,
{
GtkCMCList *clist;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
if (column < 0 || column >= GTK_CMCLIST (ctree)->columns)
return;
@@ -4667,9 +4668,9 @@ gtk_cmctree_node_set_pixbuf (GtkCMCTree *ctree,
{
GtkCMCList *clist;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
- g_return_if_fail (pixbuf != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
+ cm_return_if_fail (pixbuf != NULL);
if (column < 0 || column >= GTK_CMCLIST (ctree)->columns)
return;
@@ -4695,10 +4696,10 @@ gtk_cmctree_node_set_pixtext (GtkCMCTree *ctree,
{
GtkCMCList *clist;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
if (column != ctree->tree_column)
- g_return_if_fail (pixbuf != NULL);
+ cm_return_if_fail (pixbuf != NULL);
if (column < 0 || column >= GTK_CMCLIST (ctree)->columns)
return;
@@ -4729,8 +4730,8 @@ gtk_cmctree_set_node_info (GtkCMCTree *ctree,
gboolean old_leaf;
gboolean old_expanded;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
old_leaf = GTK_CMCTREE_ROW (node)->is_leaf;
old_expanded = GTK_CMCTREE_ROW (node)->expanded;
@@ -4777,8 +4778,8 @@ gtk_cmctree_node_set_shift (GtkCMCTree *ctree,
GtkRequisition requisition;
gboolean visible = FALSE;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
if (column < 0 || column >= GTK_CMCLIST (ctree)->columns)
return;
@@ -4833,8 +4834,8 @@ gtk_cmctree_node_set_selectable (GtkCMCTree *ctree,
GtkCMCTreeNode *node,
gboolean selectable)
{
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
if (selectable == GTK_CMCTREE_ROW (node)->row.selectable)
return;
@@ -4863,7 +4864,7 @@ gboolean
gtk_cmctree_node_get_selectable (GtkCMCTree *ctree,
GtkCMCTreeNode *node)
{
- g_return_val_if_fail (node != NULL, FALSE);
+ cm_return_val_if_fail (node != NULL, FALSE);
return GTK_CMCTREE_ROW (node)->row.selectable;
}
@@ -4873,8 +4874,8 @@ gtk_cmctree_node_get_cell_type (GtkCMCTree *ctree,
GtkCMCTreeNode *node,
gint column)
{
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), -1);
- g_return_val_if_fail (node != NULL, -1);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), -1);
+ cm_return_val_if_fail (node != NULL, -1);
if (column < 0 || column >= GTK_CMCLIST (ctree)->columns)
return -1;
@@ -4888,8 +4889,8 @@ gtk_cmctree_node_get_text (GtkCMCTree *ctree,
gint column,
gchar **text)
{
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
- g_return_val_if_fail (node != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
+ cm_return_val_if_fail (node != NULL, FALSE);
if (column < 0 || column >= GTK_CMCLIST (ctree)->columns)
return FALSE;
@@ -4909,8 +4910,8 @@ gtk_cmctree_node_get_pixbuf (GtkCMCTree *ctree,
gint column,
GdkPixbuf **pixbuf)
{
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
- g_return_val_if_fail (node != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
+ cm_return_val_if_fail (node != NULL, FALSE);
if (column < 0 || column >= GTK_CMCLIST (ctree)->columns)
return FALSE;
@@ -4932,8 +4933,8 @@ gtk_cmctree_node_get_pixtext (GtkCMCTree *ctree,
guint8 *spacing,
GdkPixbuf **pixbuf)
{
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
- g_return_val_if_fail (node != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
+ cm_return_val_if_fail (node != NULL, FALSE);
if (column < 0 || column >= GTK_CMCLIST (ctree)->columns)
return FALSE;
@@ -4963,8 +4964,8 @@ gtk_cmctree_get_node_info (GtkCMCTree *ctree,
gboolean *is_leaf,
gboolean *expanded)
{
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
- g_return_val_if_fail (node != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
+ cm_return_val_if_fail (node != NULL, FALSE);
if (text)
*text = GTK_CMCELL_PIXTEXT
@@ -4994,8 +4995,8 @@ gtk_cmctree_node_set_cell_style (GtkCMCTree *ctree,
GtkRequisition requisition;
gboolean visible = FALSE;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
clist = GTK_CMCLIST (ctree);
@@ -5045,8 +5046,8 @@ gtk_cmctree_node_get_cell_style (GtkCMCTree *ctree,
GtkCMCTreeNode *node,
gint column)
{
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
- g_return_val_if_fail (node != NULL, NULL);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
+ cm_return_val_if_fail (node != NULL, NULL);
if (column < 0 || column >= GTK_CMCLIST (ctree)->columns)
return NULL;
@@ -5065,8 +5066,8 @@ gtk_cmctree_node_set_row_style (GtkCMCTree *ctree,
gint *old_width = NULL;
gint i;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
clist = GTK_CMCLIST (ctree);
@@ -5120,8 +5121,8 @@ GtkStyle *
gtk_cmctree_node_get_row_style (GtkCMCTree *ctree,
GtkCMCTreeNode *node)
{
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
- g_return_val_if_fail (node != NULL, NULL);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
+ cm_return_val_if_fail (node != NULL, NULL);
return GTK_CMCTREE_ROW (node)->row.style;
}
@@ -5131,8 +5132,8 @@ gtk_cmctree_node_set_foreground (GtkCMCTree *ctree,
GtkCMCTreeNode *node,
const GdkColor *color)
{
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
if (color)
{
@@ -5153,8 +5154,8 @@ gtk_cmctree_node_set_background (GtkCMCTree *ctree,
GtkCMCTreeNode *node,
const GdkColor *color)
{
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
if (color)
{
@@ -5187,8 +5188,8 @@ gtk_cmctree_node_set_row_data_full (GtkCMCTree *ctree,
GDestroyNotify dnotify;
gpointer ddata;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
dnotify = GTK_CMCTREE_ROW (node)->row.destroy;
ddata = GTK_CMCTREE_ROW (node)->row.data;
@@ -5204,7 +5205,7 @@ gpointer
gtk_cmctree_node_get_row_data (GtkCMCTree *ctree,
GtkCMCTreeNode *node)
{
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
return node ? GTK_CMCTREE_ROW (node)->row.data : NULL;
}
@@ -5219,7 +5220,7 @@ gtk_cmctree_node_moveto (GtkCMCTree *ctree,
gint row = -1;
GtkCMCList *clist;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
clist = GTK_CMCLIST (ctree);
@@ -5238,8 +5239,8 @@ gtk_cmctree_node_is_visible (GtkCMCTree *ctree,
{
gint row;
- g_return_val_if_fail (ctree != NULL, 0);
- g_return_val_if_fail (node != NULL, 0);
+ cm_return_val_if_fail (ctree != NULL, 0);
+ cm_return_val_if_fail (node != NULL, 0);
row = g_list_position (GTK_CMCLIST (ctree)->row_list, (GList*) node);
return gtk_cmclist_row_is_visible (GTK_CMCLIST (ctree), row);
@@ -5256,8 +5257,8 @@ gtk_cmctree_set_indent (GtkCMCTree *ctree,
{
GtkCMCList *clist;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (indent >= 0);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (indent >= 0);
if (indent == ctree->tree_indent)
return;
@@ -5281,8 +5282,8 @@ gtk_cmctree_set_spacing (GtkCMCTree *ctree,
GtkCMCList *clist;
gint old_spacing;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (spacing >= 0);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (spacing >= 0);
if (spacing == ctree->tree_spacing)
return;
@@ -5305,7 +5306,7 @@ void
gtk_cmctree_set_show_stub (GtkCMCTree *ctree,
gboolean show_stub)
{
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
show_stub = show_stub != FALSE;
@@ -5330,7 +5331,7 @@ gtk_cmctree_set_line_style (GtkCMCTree *ctree,
GtkCMCList *clist;
GtkCMCTreeLineStyle old_style;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
if (line_style == ctree->line_style)
return;
@@ -5389,7 +5390,7 @@ gtk_cmctree_set_expander_style (GtkCMCTree *ctree,
GtkCMCList *clist;
GtkCMCTreeExpanderStyle old_style;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
if (expander_style == ctree->expander_style)
return;
@@ -5498,7 +5499,7 @@ gtk_cmctree_sort_recursive (GtkCMCTree *ctree,
GtkCMCList *clist;
GtkCMCTreeNode *focus_node = NULL;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
clist = GTK_CMCLIST (ctree);
@@ -5545,7 +5546,7 @@ gtk_cmctree_sort_node (GtkCMCTree *ctree,
GtkCMCList *clist;
GtkCMCTreeNode *focus_node = NULL;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
clist = GTK_CMCLIST (ctree);
@@ -5632,7 +5633,7 @@ resync_selection (GtkCMCList *clist, GdkEvent *event)
gint row;
gboolean unselect;
- g_return_if_fail (GTK_IS_CMCTREE (clist));
+ cm_return_if_fail (GTK_IS_CMCTREE (clist));
if (clist->selection_mode != GTK_SELECTION_MULTIPLE)
return;
@@ -5744,7 +5745,7 @@ real_undo_selection (GtkCMCList *clist)
GtkCMCTree *ctree;
GList *work;
- g_return_if_fail (GTK_IS_CMCTREE (clist));
+ cm_return_if_fail (GTK_IS_CMCTREE (clist));
if (clist->selection_mode != GTK_SELECTION_MULTIPLE)
return;
@@ -5792,7 +5793,7 @@ void
gtk_cmctree_set_drag_compare_func (GtkCMCTree *ctree,
GtkCMCTreeCompareDragFunc cmp_func)
{
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
ctree->drag_compare = cmp_func;
}
@@ -5803,7 +5804,7 @@ check_drag (GtkCMCTree *ctree,
GtkCMCTreeNode *drag_target,
GtkCMCListDragPos insert_pos)
{
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
if (drag_source && drag_source != drag_target &&
(!GTK_CMCTREE_ROW (drag_source)->children ||
@@ -5920,8 +5921,8 @@ gtk_cmctree_drag_begin (GtkWidget *widget,
GtkCMCTree *ctree;
gboolean use_icons;
- g_return_if_fail (GTK_IS_CMCTREE (widget));
- g_return_if_fail (context != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (widget));
+ cm_return_if_fail (context != NULL);
clist = GTK_CMCLIST (widget);
ctree = GTK_CMCTREE (widget);
@@ -5953,7 +5954,7 @@ gtk_cmctree_drag_motion (GtkWidget *widget,
GtkCMCListDestInfo new_info;
GtkCMCListDestInfo *dest_info;
- g_return_val_if_fail (GTK_IS_CMCTREE (widget), FALSE);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (widget), FALSE);
clist = GTK_CMCLIST (widget);
ctree = GTK_CMCTREE (widget);
@@ -6055,9 +6056,9 @@ gtk_cmctree_drag_data_received (GtkWidget *widget,
GtkCMCTree *ctree;
GtkCMCList *clist;
- g_return_if_fail (GTK_IS_CMCTREE (widget));
- g_return_if_fail (context != NULL);
- g_return_if_fail (selection_data != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (widget));
+ cm_return_if_fail (context != NULL);
+ cm_return_if_fail (selection_data != NULL);
ctree = GTK_CMCTREE (widget);
clist = GTK_CMCLIST (widget);
diff --git a/src/gtk/gtkcmoptionmenu.c b/src/gtk/gtkcmoptionmenu.c
@@ -31,6 +31,7 @@
#include "claws-marshal.h"
#include "gtkcmoptionmenu.h"
+#include "utils.h"
#define CHILD_LEFT_SPACING 4
#define CHILD_RIGHT_SPACING 1
@@ -199,7 +200,7 @@ gtk_cmoption_menu_new (void)
GtkWidget*
gtk_cmoption_menu_get_menu (GtkCMOptionMenu *option_menu)
{
- g_return_val_if_fail (GTK_IS_CMOPTION_MENU (option_menu), NULL);
+ cm_return_val_if_fail (GTK_IS_CMOPTION_MENU (option_menu), NULL);
return option_menu->menu;
}
@@ -210,10 +211,10 @@ gtk_cmoption_menu_detacher (GtkWidget *widget,
{
GtkCMOptionMenu *option_menu;
- g_return_if_fail (GTK_IS_CMOPTION_MENU (widget));
+ cm_return_if_fail (GTK_IS_CMOPTION_MENU (widget));
option_menu = GTK_CMOPTION_MENU (widget);
- g_return_if_fail (option_menu->menu == (GtkWidget*) menu);
+ cm_return_if_fail (option_menu->menu == (GtkWidget*) menu);
gtk_cmoption_menu_remove_contents (option_menu);
g_signal_handlers_disconnect_by_func (option_menu->menu,
@@ -231,8 +232,8 @@ void
gtk_cmoption_menu_set_menu (GtkCMOptionMenu *option_menu,
GtkWidget *menu)
{
- g_return_if_fail (GTK_IS_CMOPTION_MENU (option_menu));
- g_return_if_fail (GTK_IS_MENU (menu));
+ cm_return_if_fail (GTK_IS_CMOPTION_MENU (option_menu));
+ cm_return_if_fail (GTK_IS_MENU (menu));
if (option_menu->menu != menu)
{
@@ -264,7 +265,7 @@ gtk_cmoption_menu_set_menu (GtkCMOptionMenu *option_menu,
void
gtk_cmoption_menu_remove_menu (GtkCMOptionMenu *option_menu)
{
- g_return_if_fail (GTK_IS_CMOPTION_MENU (option_menu));
+ cm_return_if_fail (GTK_IS_CMOPTION_MENU (option_menu));
if (option_menu->menu)
{
@@ -281,7 +282,7 @@ gtk_cmoption_menu_set_history (GtkCMOptionMenu *option_menu,
{
GtkWidget *menu_item;
- g_return_if_fail (GTK_IS_CMOPTION_MENU (option_menu));
+ cm_return_if_fail (GTK_IS_CMOPTION_MENU (option_menu));
if (option_menu->menu)
{
@@ -308,7 +309,7 @@ gtk_cmoption_menu_get_history (GtkCMOptionMenu *option_menu)
{
GtkWidget *active_widget;
- g_return_val_if_fail (GTK_IS_CMOPTION_MENU (option_menu), -1);
+ cm_return_val_if_fail (GTK_IS_CMOPTION_MENU (option_menu), -1);
if (option_menu->menu)
{
@@ -369,7 +370,7 @@ gtk_cmoption_menu_destroy (GtkObject *object)
{
GtkCMOptionMenu *option_menu;
- g_return_if_fail (GTK_IS_CMOPTION_MENU (object));
+ cm_return_if_fail (GTK_IS_CMOPTION_MENU (object));
option_menu = GTK_CMOPTION_MENU (object);
@@ -493,8 +494,8 @@ gtk_cmoption_menu_paint (GtkWidget *widget,
gint border_width;
gint tab_x;
- g_return_if_fail (GTK_IS_CMOPTION_MENU (widget));
- g_return_if_fail (area != NULL);
+ cm_return_if_fail (GTK_IS_CMOPTION_MENU (widget));
+ cm_return_if_fail (area != NULL);
if (GTK_WIDGET_DRAWABLE (widget))
{
@@ -573,8 +574,8 @@ static gint
gtk_cmoption_menu_expose (GtkWidget *widget,
GdkEventExpose *event)
{
- g_return_val_if_fail (GTK_IS_CMOPTION_MENU (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_CMOPTION_MENU (widget), FALSE);
+ cm_return_val_if_fail (event != NULL, FALSE);
if (GTK_WIDGET_DRAWABLE (widget))
{
@@ -632,8 +633,8 @@ gtk_cmoption_menu_button_press (GtkWidget *widget,
GtkCMOptionMenu *option_menu;
GtkWidget *menu_item;
- g_return_val_if_fail (GTK_IS_CMOPTION_MENU (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_CMOPTION_MENU (widget), FALSE);
+ cm_return_val_if_fail (event != NULL, FALSE);
option_menu = GTK_CMOPTION_MENU (widget);
@@ -660,8 +661,8 @@ gtk_cmoption_menu_key_press (GtkWidget *widget,
GtkCMOptionMenu *option_menu;
GtkWidget *menu_item;
- g_return_val_if_fail (GTK_IS_CMOPTION_MENU (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_CMOPTION_MENU (widget), FALSE);
+ cm_return_val_if_fail (event != NULL, FALSE);
option_menu = GTK_CMOPTION_MENU (widget);
@@ -686,8 +687,8 @@ static void
gtk_cmoption_menu_selection_done (GtkMenuShell *menu_shell,
GtkCMOptionMenu *option_menu)
{
- g_return_if_fail (menu_shell != NULL);
- g_return_if_fail (GTK_IS_CMOPTION_MENU (option_menu));
+ cm_return_if_fail (menu_shell != NULL);
+ cm_return_if_fail (GTK_IS_CMOPTION_MENU (option_menu));
gtk_cmoption_menu_update_contents (option_menu);
}
@@ -695,7 +696,7 @@ gtk_cmoption_menu_selection_done (GtkMenuShell *menu_shell,
static void
gtk_cmoption_menu_changed (GtkCMOptionMenu *option_menu)
{
- g_return_if_fail (GTK_IS_CMOPTION_MENU (option_menu));
+ cm_return_if_fail (GTK_IS_CMOPTION_MENU (option_menu));
g_signal_emit (option_menu, signals[CHANGED], 0);
}
@@ -756,7 +757,7 @@ gtk_cmoption_menu_update_contents (GtkCMOptionMenu *option_menu)
GtkWidget *child;
GtkRequisition child_requisition;
- g_return_if_fail (GTK_IS_CMOPTION_MENU (option_menu));
+ cm_return_if_fail (GTK_IS_CMOPTION_MENU (option_menu));
if (option_menu->menu)
{
@@ -799,7 +800,7 @@ gtk_cmoption_menu_remove_contents (GtkCMOptionMenu *option_menu)
{
GtkWidget *child;
- g_return_if_fail (GTK_IS_CMOPTION_MENU (option_menu));
+ cm_return_if_fail (GTK_IS_CMOPTION_MENU (option_menu));
if (option_menu->menu_item)
{
@@ -833,7 +834,7 @@ gtk_cmoption_menu_calc_size (GtkCMOptionMenu *option_menu)
gint old_width = option_menu->width;
gint old_height = option_menu->height;
- g_return_if_fail (GTK_IS_CMOPTION_MENU (option_menu));
+ cm_return_if_fail (GTK_IS_CMOPTION_MENU (option_menu));
option_menu->width = 0;
option_menu->height = 0;
@@ -883,7 +884,7 @@ gtk_cmoption_menu_position (GtkMenu *menu,
gint menu_ypos;
gint menu_width;
- g_return_if_fail (GTK_IS_CMOPTION_MENU (user_data));
+ cm_return_if_fail (GTK_IS_CMOPTION_MENU (user_data));
option_menu = GTK_CMOPTION_MENU (user_data);
widget = GTK_WIDGET (option_menu);
@@ -943,7 +944,7 @@ gtk_cmoption_menu_show_all (GtkWidget *widget)
GtkContainer *container;
GtkCMOptionMenu *option_menu;
- g_return_if_fail (GTK_IS_CMOPTION_MENU (widget));
+ cm_return_if_fail (GTK_IS_CMOPTION_MENU (widget));
container = GTK_CONTAINER (widget);
option_menu = GTK_CMOPTION_MENU (widget);
@@ -961,7 +962,7 @@ gtk_cmoption_menu_hide_all (GtkWidget *widget)
{
GtkContainer *container;
- g_return_if_fail (GTK_IS_CMOPTION_MENU (widget));
+ cm_return_if_fail (GTK_IS_CMOPTION_MENU (widget));
container = GTK_CONTAINER (widget);
gtk_widget_hide (widget);
diff --git a/src/gtk/gtksctree.c b/src/gtk/gtksctree.c
@@ -878,7 +878,7 @@ gtk_sctree_draw_row (GtkCMCList *clist,
}
}
- g_return_if_fail (clist != NULL);
+ cm_return_if_fail (clist != NULL);
/* bail now if we arn't drawable yet */
if (!GTK_WIDGET_DRAWABLE (clist) || row < 0 || row >= clist->rows)
@@ -1277,7 +1277,7 @@ gtk_sctree_change_focus_row_expansion (GtkCMCTree *ctree,
GtkCMCList *clist;
GtkCMCTreeNode *node;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
clist = GTK_CMCLIST (ctree);
@@ -1485,8 +1485,8 @@ static void
select_row (GtkSCTree *sctree, gint row, gint col, guint state, GtkCMCTreeNode *_node)
{
gboolean range, additive;
- g_return_if_fail (sctree != NULL);
- g_return_if_fail (GTK_IS_SCTREE (sctree));
+ cm_return_if_fail (sctree != NULL);
+ cm_return_if_fail (GTK_IS_SCTREE (sctree));
range = ((state & GDK_SHIFT_MASK) != 0) &&
(GTK_CMCLIST(sctree)->selection_mode != GTK_SELECTION_SINGLE) &&
@@ -1541,8 +1541,8 @@ sctree_is_hot_spot (GtkSCTree *sctree,
gint xl, xmax;
gint yu;
- g_return_val_if_fail (GTK_IS_SCTREE (sctree), FALSE);
- g_return_val_if_fail (node != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_SCTREE (sctree), FALSE);
+ cm_return_val_if_fail (node != NULL, FALSE);
clist = GTK_CMCLIST (sctree);
ctree = GTK_CMCTREE (sctree);
@@ -1607,7 +1607,7 @@ gtk_sctree_is_hot_spot (GtkSCTree *ctree,
gint column;
gint row;
- g_return_val_if_fail (GTK_IS_SCTREE (ctree), FALSE);
+ cm_return_val_if_fail (GTK_IS_SCTREE (ctree), FALSE);
if (gtk_cmclist_get_selection_info (GTK_CMCLIST (ctree), x, y, &row, &column))
if ((node = GTK_CMCTREE_NODE(g_list_nth (GTK_CMCLIST (ctree)->row_list, row))))
@@ -1629,9 +1629,9 @@ gtk_sctree_button_press (GtkWidget *widget, GdkEventButton *event)
gint col;
gint retval;
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_SCTREE (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ cm_return_val_if_fail (widget != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_SCTREE (widget), FALSE);
+ cm_return_val_if_fail (event != NULL, FALSE);
sctree = GTK_SCTREE (widget);
clist = GTK_CMCLIST (widget);
@@ -1735,9 +1735,9 @@ gtk_sctree_button_release (GtkWidget *widget, GdkEventButton *event)
gint row, col;
gint retval;
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_SCTREE (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ cm_return_val_if_fail (widget != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_SCTREE (widget), FALSE);
+ cm_return_val_if_fail (event != NULL, FALSE);
sctree = GTK_SCTREE (widget);
clist = GTK_CMCLIST (widget);
@@ -1777,9 +1777,9 @@ gtk_sctree_motion (GtkWidget *widget, GdkEventMotion *event)
GtkSCTree *sctree;
GtkCMCList *clist;
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_SCTREE (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ cm_return_val_if_fail (widget != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_SCTREE (widget), FALSE);
+ cm_return_val_if_fail (event != NULL, FALSE);
sctree = GTK_SCTREE (widget);
clist = GTK_CMCLIST (widget);
@@ -1886,8 +1886,8 @@ gtk_sctree_clear (GtkCMCList *clist)
{
GtkSCTree *sctree;
- g_return_if_fail (clist != NULL);
- g_return_if_fail (GTK_IS_SCTREE (clist));
+ cm_return_if_fail (clist != NULL);
+ cm_return_if_fail (GTK_IS_SCTREE (clist));
sctree = GTK_SCTREE (clist);
sctree->anchor_row = NULL;
@@ -1902,8 +1902,8 @@ gtk_sctree_real_unselect_all (GtkCMCList *clist)
GtkSCTree *sctree;
gboolean should_freeze = FALSE;
- g_return_if_fail (clist != NULL);
- g_return_if_fail (GTK_IS_SCTREE (clist));
+ cm_return_if_fail (clist != NULL);
+ cm_return_if_fail (GTK_IS_SCTREE (clist));
sctree = GTK_SCTREE (clist);
@@ -1992,7 +1992,7 @@ gtk_sctree_real_tree_collapse (GtkCMCTree *ctree,
gboolean visible;
gint level;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
if (!node || !GTK_CMCTREE_ROW (node)->expanded ||
GTK_CMCTREE_ROW (node)->is_leaf)
@@ -2089,8 +2089,8 @@ GtkWidget *gtk_sctree_new_with_titles (gint columns, gint tree_column,
{
GtkWidget *widget;
- g_return_val_if_fail (columns > 0, NULL);
- g_return_val_if_fail (tree_column >= 0, NULL);
+ cm_return_val_if_fail (columns > 0, NULL);
+ cm_return_val_if_fail (tree_column >= 0, NULL);
widget = gtk_widget_new (TYPE_GTK_SCTREE,
"n_columns", columns,
@@ -2121,14 +2121,14 @@ void gtk_sctree_set_use_markup (GtkSCTree *sctree,
gint columns = 0;
GValue value = { 0 };
- g_return_if_fail(GTK_IS_SCTREE(sctree));
+ cm_return_if_fail(GTK_IS_SCTREE(sctree));
g_value_init (&value, G_TYPE_INT);
g_object_get_property (G_OBJECT (sctree), "n-columns", &value);
columns = g_value_get_int (&value);
g_value_unset (&value);
- g_return_if_fail(column < columns);
+ cm_return_if_fail(column < columns);
sctree->use_markup[column] = markup;
}
@@ -2296,8 +2296,8 @@ gtk_sctree_sort_recursive (GtkCMCTree *ctree,
GtkCMCList *clist;
GtkCMCTreeNode *focus_node = NULL;
- g_return_if_fail (ctree != NULL);
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (ctree != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
clist = GTK_CMCLIST (ctree);
@@ -2339,8 +2339,8 @@ gtk_sctree_sort_node (GtkCMCTree *ctree,
GtkCMCList *clist;
GtkCMCTreeNode *focus_node = NULL;
- g_return_if_fail (ctree != NULL);
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (ctree != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
clist = GTK_CMCLIST (ctree);
@@ -2387,9 +2387,9 @@ gtk_sctree_unlink (GtkCMCTree *ctree,
GtkCMCTreeNode *parent;
GList *list;
- g_return_if_fail (ctree != NULL);
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (ctree != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
clist = GTK_CMCLIST (ctree);
@@ -2496,10 +2496,10 @@ gtk_sctree_link (GtkCMCTree *ctree,
gint rows = 0;
if (sibling)
- g_return_if_fail (GTK_CMCTREE_ROW (sibling)->parent == parent);
- g_return_if_fail (node != NULL);
- g_return_if_fail (node != sibling);
- g_return_if_fail (node != parent);
+ cm_return_if_fail (GTK_CMCTREE_ROW (sibling)->parent == parent);
+ cm_return_if_fail (node != NULL);
+ cm_return_if_fail (node != sibling);
+ cm_return_if_fail (node != parent);
clist = GTK_CMCLIST (ctree);
@@ -2889,7 +2889,7 @@ gtk_sctree_real_tree_expand (GtkCMCTree *ctree,
gboolean visible;
gint level;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
if (!node || GTK_CMCTREE_ROW (node)->expanded || GTK_CMCTREE_ROW (node)->is_leaf)
return;
@@ -3029,9 +3029,9 @@ gtk_sctree_insert_node (GtkCMCTree *ctree,
GList *list;
gint i;
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
if (sibling)
- g_return_val_if_fail (GTK_CMCTREE_ROW (sibling)->parent == parent, NULL);
+ cm_return_val_if_fail (GTK_CMCTREE_ROW (sibling)->parent == parent, NULL);
if (parent && GTK_CMCTREE_ROW (parent)->is_leaf)
return NULL;
@@ -3106,11 +3106,11 @@ gtk_sctree_insert_gnode (GtkCMCTree *ctree,
GNode *work;
guint depth = 1;
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
- g_return_val_if_fail (gnode != NULL, NULL);
- g_return_val_if_fail (func != NULL, NULL);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
+ cm_return_val_if_fail (gnode != NULL, NULL);
+ cm_return_val_if_fail (func != NULL, NULL);
if (sibling)
- g_return_val_if_fail (GTK_CMCTREE_ROW (sibling)->parent == parent, NULL);
+ cm_return_val_if_fail (GTK_CMCTREE_ROW (sibling)->parent == parent, NULL);
clist = GTK_CMCLIST (ctree);
@@ -3169,9 +3169,9 @@ sreal_tree_move (GtkCMCTree *ctree,
GtkCMCTreeNode *work;
gboolean visible = FALSE;
- g_return_if_fail (ctree != NULL);
- g_return_if_fail (node != NULL);
- g_return_if_fail (!new_sibling ||
+ cm_return_if_fail (ctree != NULL);
+ cm_return_if_fail (node != NULL);
+ cm_return_if_fail (!new_sibling ||
GTK_CMCTREE_ROW (new_sibling)->parent == new_parent);
if (new_parent && GTK_CMCTREE_ROW (new_parent)->is_leaf)
diff --git a/src/gtk/gtkshruler.c b/src/gtk/gtkshruler.c
@@ -31,6 +31,7 @@
#include <string.h>
#include <gtk/gtk.h>
#include "gtkshruler.h"
+#include "utils.h"
#define RULER_HEIGHT 14
#define MINIMUM_INCR 5
@@ -120,8 +121,8 @@ gtk_shruler_draw_ticks(GtkRuler *ruler)
gint ythickness;
gint pos;
- g_return_if_fail (ruler != NULL);
- g_return_if_fail (GTK_IS_HRULER (ruler));
+ cm_return_if_fail (ruler != NULL);
+ cm_return_if_fail (GTK_IS_HRULER (ruler));
if (!GTK_WIDGET_DRAWABLE (ruler))
return;
diff --git a/src/gtk/gtksourceprintjob.c b/src/gtk/gtksourceprintjob.c
@@ -477,7 +477,7 @@ gtk_source_print_job_finalize (GObject *object)
GtkSourcePrintJob *job;
GtkSourcePrintJobPrivate *priv;
- g_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (object));
+ cm_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (object));
job = GTK_SOURCE_PRINT_JOB (object);
priv = job->priv;
@@ -673,7 +673,7 @@ gtk_source_print_job_set_property (GObject *object,
static void
gtk_source_print_job_begin_page (GtkSourcePrintJob *job)
{
- g_return_if_fail (job->priv->printing);
+ cm_return_if_fail (job->priv->printing);
if (job->priv->print_header && job->priv->header_height > 0)
{
@@ -836,8 +836,8 @@ update_page_size_and_margins (GtkSourcePrintJob *job)
job->priv->header_height - job->priv->footer_height);
/* FIXME: put some saner values than 5cm - Gustavo */
- g_return_val_if_fail (job->priv->text_width > CM(5.0), FALSE);
- g_return_val_if_fail (job->priv->text_height > CM(5.0), FALSE);
+ cm_return_val_if_fail (job->priv->text_width > CM(5.0), FALSE);
+ cm_return_val_if_fail (job->priv->text_height > CM(5.0), FALSE);
return TRUE;
}
@@ -982,7 +982,7 @@ text_style_new (GtkSourcePrintJob *job, GtkTextTag *tag)
TextStyle *style;
gboolean bg_set, fg_set;
- g_return_val_if_fail (tag != NULL && GTK_IS_TEXT_TAG (tag), NULL);
+ cm_return_val_if_fail (tag != NULL && GTK_IS_TEXT_TAG (tag), NULL);
style = g_new0 (TextStyle, 1);
@@ -1207,8 +1207,8 @@ get_text_to_print (GtkSourcePrintJob *job,
GtkTextIter _start, _end;
gboolean retval;
- g_return_val_if_fail (start != NULL && end != NULL, FALSE);
- g_return_val_if_fail (job->priv->buffer != NULL, FALSE);
+ cm_return_val_if_fail (start != NULL && end != NULL, FALSE);
+ cm_return_val_if_fail (job->priv->buffer != NULL, FALSE);
_start = *start;
_end = *end;
@@ -1800,7 +1800,7 @@ gtk_source_print_job_new (GnomePrintConfig *config)
{
GtkSourcePrintJob *job;
- g_return_val_if_fail (config == NULL || GNOME_IS_PRINT_CONFIG (config), NULL);
+ cm_return_val_if_fail (config == NULL || GNOME_IS_PRINT_CONFIG (config), NULL);
job = GTK_SOURCE_PRINT_JOB (g_object_new (GTK_TYPE_SOURCE_PRINT_JOB, NULL));
if (config != NULL)
@@ -1824,8 +1824,8 @@ gtk_source_print_job_new_with_buffer (GnomePrintConfig *config,
{
GtkSourcePrintJob *job;
- g_return_val_if_fail (config == NULL || GNOME_IS_PRINT_CONFIG (config), NULL);
- g_return_val_if_fail (buffer == NULL || GTK_IS_TEXT_BUFFER (buffer), NULL);
+ cm_return_val_if_fail (config == NULL || GNOME_IS_PRINT_CONFIG (config), NULL);
+ cm_return_val_if_fail (buffer == NULL || GTK_IS_TEXT_BUFFER (buffer), NULL);
job = gtk_source_print_job_new (config);
if (buffer != NULL)
@@ -1849,9 +1849,9 @@ void
gtk_source_print_job_set_config (GtkSourcePrintJob *job,
GnomePrintConfig *config)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
- g_return_if_fail (GNOME_IS_PRINT_CONFIG (config));
- g_return_if_fail (!job->priv->printing);
+ cm_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
+ cm_return_if_fail (GNOME_IS_PRINT_CONFIG (config));
+ cm_return_if_fail (!job->priv->printing);
if (config == job->priv->config)
return;
@@ -1878,7 +1878,7 @@ gtk_source_print_job_set_config (GtkSourcePrintJob *job,
GnomePrintConfig *
gtk_source_print_job_get_config (GtkSourcePrintJob *job)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), NULL);
+ cm_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), NULL);
ensure_print_config (job);
@@ -1898,9 +1898,9 @@ void
gtk_source_print_job_set_buffer (GtkSourcePrintJob *job,
GtkTextBuffer *buffer)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
- g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
- g_return_if_fail (!job->priv->printing);
+ cm_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
+ cm_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+ cm_return_if_fail (!job->priv->printing);
if (buffer == job->priv->buffer)
return;
@@ -1927,7 +1927,7 @@ gtk_source_print_job_set_buffer (GtkSourcePrintJob *job,
GtkTextBuffer *
gtk_source_print_job_get_buffer (GtkSourcePrintJob *job)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), NULL);
+ cm_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), NULL);
return job->priv->buffer;
}
@@ -1948,8 +1948,8 @@ void
gtk_source_print_job_set_tabs_width (GtkSourcePrintJob *job,
guint tabs_width)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
- g_return_if_fail (!job->priv->printing);
+ cm_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
+ cm_return_if_fail (!job->priv->printing);
if (tabs_width == job->priv->tabs_width)
return;
@@ -1971,7 +1971,7 @@ gtk_source_print_job_set_tabs_width (GtkSourcePrintJob *job,
guint
gtk_source_print_job_get_tabs_width (GtkSourcePrintJob *job)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), 0);
+ cm_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), 0);
return job->priv->tabs_width;
}
@@ -1988,8 +1988,8 @@ void
gtk_source_print_job_set_wrap_mode (GtkSourcePrintJob *job,
GtkWrapMode wrap)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
- g_return_if_fail (!job->priv->printing);
+ cm_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
+ cm_return_if_fail (!job->priv->printing);
if (wrap == job->priv->wrap_mode)
return;
@@ -2011,7 +2011,7 @@ gtk_source_print_job_set_wrap_mode (GtkSourcePrintJob *job,
GtkWrapMode
gtk_source_print_job_get_wrap_mode (GtkSourcePrintJob *job)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), GTK_WRAP_NONE);
+ cm_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), GTK_WRAP_NONE);
return job->priv->wrap_mode;
}
@@ -2028,8 +2028,8 @@ void
gtk_source_print_job_set_highlight (GtkSourcePrintJob *job,
gboolean highlight)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
- g_return_if_fail (!job->priv->printing);
+ cm_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
+ cm_return_if_fail (!job->priv->printing);
highlight = (highlight != FALSE);
@@ -2054,7 +2054,7 @@ gtk_source_print_job_set_highlight (GtkSourcePrintJob *job,
gboolean
gtk_source_print_job_get_highlight (GtkSourcePrintJob *job)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), FALSE);
+ cm_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), FALSE);
return job->priv->highlight;
}
@@ -2070,9 +2070,9 @@ void
gtk_source_print_job_set_font_desc (GtkSourcePrintJob *job,
PangoFontDescription *desc)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
- g_return_if_fail (desc != NULL);
- g_return_if_fail (!job->priv->printing);
+ cm_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
+ cm_return_if_fail (desc != NULL);
+ cm_return_if_fail (!job->priv->printing);
desc = pango_font_description_copy (desc);
if (job->priv->font != NULL)
@@ -2104,9 +2104,9 @@ gtk_source_print_job_set_font (GtkSourcePrintJob *job,
{
PangoFontDescription *desc;
- g_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
- g_return_if_fail (font_name != NULL);
- g_return_if_fail (!job->priv->printing);
+ cm_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
+ cm_return_if_fail (font_name != NULL);
+ cm_return_if_fail (!job->priv->printing);
desc = font_description_from_gnome_font_name (font_name);
if (desc)
@@ -2131,7 +2131,7 @@ gtk_source_print_job_set_font (GtkSourcePrintJob *job,
PangoFontDescription *
gtk_source_print_job_get_font_desc (GtkSourcePrintJob *job)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), NULL);
+ cm_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), NULL);
ensure_print_config (job);
@@ -2158,7 +2158,7 @@ gtk_source_print_job_get_font_desc (GtkSourcePrintJob *job)
gchar *
gtk_source_print_job_get_font (GtkSourcePrintJob *job)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), NULL);
+ cm_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), NULL);
ensure_print_config (job);
@@ -2182,8 +2182,8 @@ gtk_source_print_job_setup_from_view (GtkSourcePrintJob *job,
GtkTextBuffer *buffer = NULL;
PangoContext *pango_context;
- g_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
- g_return_if_fail (!job->priv->printing);
+ cm_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
+ cm_return_if_fail (!job->priv->printing);
buffer = gtk_text_view_get_buffer (view);
@@ -2212,8 +2212,8 @@ void
gtk_source_print_job_set_numbers_font_desc (GtkSourcePrintJob *job,
PangoFontDescription *desc)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
- g_return_if_fail (!job->priv->printing);
+ cm_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
+ cm_return_if_fail (!job->priv->printing);
if (desc)
desc = pango_font_description_copy (desc);
@@ -2246,8 +2246,8 @@ gtk_source_print_job_set_numbers_font (GtkSourcePrintJob *job,
{
PangoFontDescription *desc;
- g_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
- g_return_if_fail (!job->priv->printing);
+ cm_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
+ cm_return_if_fail (!job->priv->printing);
if (font_name != NULL)
{
@@ -2275,7 +2275,7 @@ gtk_source_print_job_set_numbers_font (GtkSourcePrintJob *job,
PangoFontDescription *
gtk_source_print_job_get_numbers_font_desc (GtkSourcePrintJob *job)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), NULL);
+ cm_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), NULL);
return job->priv->numbers_font;
}
@@ -2301,7 +2301,7 @@ gtk_source_print_job_get_numbers_font_desc (GtkSourcePrintJob *job)
gchar *
gtk_source_print_job_get_numbers_font (GtkSourcePrintJob *job)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), NULL);
+ cm_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), NULL);
if (job->priv->numbers_font != NULL)
return font_description_to_gnome_font_name (job->priv->numbers_font);
@@ -2322,8 +2322,8 @@ void
gtk_source_print_job_set_print_numbers (GtkSourcePrintJob *job,
guint interval)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
- g_return_if_fail (!job->priv->printing);
+ cm_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
+ cm_return_if_fail (!job->priv->printing);
if (interval == job->priv->print_numbers)
return;
@@ -2346,7 +2346,7 @@ gtk_source_print_job_set_print_numbers (GtkSourcePrintJob *job,
guint
gtk_source_print_job_get_print_numbers (GtkSourcePrintJob *job)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), 0);
+ cm_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), 0);
return job->priv->print_numbers;
}
@@ -2379,8 +2379,8 @@ gtk_source_print_job_set_text_margins (GtkSourcePrintJob *job,
gdouble left,
gdouble right)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
- g_return_if_fail (!job->priv->printing);
+ cm_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
+ cm_return_if_fail (!job->priv->printing);
if (top >= 0)
job->priv->margin_top = top;
@@ -2413,7 +2413,7 @@ gtk_source_print_job_get_text_margins (GtkSourcePrintJob *job,
gdouble *left,
gdouble *right)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
+ cm_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
if (top != NULL)
*top = job->priv->margin_top;
@@ -2434,10 +2434,10 @@ gtk_source_print_job_prepare (GtkSourcePrintJob *job,
{
PROFILE (GTimer *timer);
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), FALSE);
- g_return_val_if_fail (!job->priv->printing, FALSE);
- g_return_val_if_fail (job->priv->buffer != NULL, FALSE);
- g_return_val_if_fail (start != NULL && end != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), FALSE);
+ cm_return_val_if_fail (!job->priv->printing, FALSE);
+ cm_return_val_if_fail (job->priv->buffer != NULL, FALSE);
+ cm_return_val_if_fail (start != NULL && end != NULL, FALSE);
/* make sure we have a sane configuration to start printing */
ensure_print_config (job);
@@ -2489,9 +2489,9 @@ gtk_source_print_job_print (GtkSourcePrintJob *job)
{
GtkTextIter start, end;
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), NULL);
- g_return_val_if_fail (!job->priv->printing, NULL);
- g_return_val_if_fail (job->priv->buffer != NULL, NULL);
+ cm_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), NULL);
+ cm_return_val_if_fail (!job->priv->printing, NULL);
+ cm_return_val_if_fail (job->priv->buffer != NULL, NULL);
gtk_text_buffer_get_bounds (GTK_TEXT_BUFFER (job->priv->buffer), &start, &end);
@@ -2516,11 +2516,11 @@ gtk_source_print_job_print_range (GtkSourcePrintJob *job,
const GtkTextIter *start,
const GtkTextIter *end)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), NULL);
- g_return_val_if_fail (!job->priv->printing, NULL);
- g_return_val_if_fail (job->priv->buffer != NULL, NULL);
- g_return_val_if_fail (start != NULL && end != NULL, NULL);
- g_return_val_if_fail (gtk_text_iter_get_buffer (start) ==
+ cm_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), NULL);
+ cm_return_val_if_fail (!job->priv->printing, NULL);
+ cm_return_val_if_fail (job->priv->buffer != NULL, NULL);
+ cm_return_val_if_fail (start != NULL && end != NULL, NULL);
+ cm_return_val_if_fail (gtk_text_iter_get_buffer (start) ==
GTK_TEXT_BUFFER (job->priv->buffer) &&
gtk_text_iter_get_buffer (end) ==
GTK_TEXT_BUFFER (job->priv->buffer), NULL);
@@ -2572,11 +2572,11 @@ gtk_source_print_job_print_range_async (GtkSourcePrintJob *job,
{
GSource *idle_source;
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), FALSE);
- g_return_val_if_fail (!job->priv->printing, FALSE);
- g_return_val_if_fail (job->priv->buffer != NULL, FALSE);
- g_return_val_if_fail (start != NULL && end != NULL, FALSE);
- g_return_val_if_fail (gtk_text_iter_get_buffer (start) ==
+ cm_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), FALSE);
+ cm_return_val_if_fail (!job->priv->printing, FALSE);
+ cm_return_val_if_fail (job->priv->buffer != NULL, FALSE);
+ cm_return_val_if_fail (start != NULL && end != NULL, FALSE);
+ cm_return_val_if_fail (gtk_text_iter_get_buffer (start) ==
GTK_TEXT_BUFFER (job->priv->buffer) &&
gtk_text_iter_get_buffer (end) ==
GTK_TEXT_BUFFER (job->priv->buffer), FALSE);
@@ -2622,8 +2622,8 @@ gtk_source_print_job_print_range_async (GtkSourcePrintJob *job,
void
gtk_source_print_job_cancel (GtkSourcePrintJob *job)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
- g_return_if_fail (job->priv->printing);
+ cm_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
+ cm_return_if_fail (job->priv->printing);
if (job->priv->idle_printing_tag > 0)
{
@@ -2658,7 +2658,7 @@ gtk_source_print_job_cancel (GtkSourcePrintJob *job)
GnomePrintJob *
gtk_source_print_job_get_print_job (GtkSourcePrintJob *job)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), NULL);
+ cm_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), NULL);
if (job->priv->print_job)
g_object_ref (job->priv->print_job);
@@ -2680,8 +2680,8 @@ gtk_source_print_job_get_print_job (GtkSourcePrintJob *job)
guint
gtk_source_print_job_get_page (GtkSourcePrintJob *job)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), 0);
- g_return_val_if_fail (job->priv->printing, 0);
+ cm_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), 0);
+ cm_return_val_if_fail (job->priv->printing, 0);
return job->priv->page;
}
@@ -2702,7 +2702,7 @@ gtk_source_print_job_get_page (GtkSourcePrintJob *job)
guint
gtk_source_print_job_get_page_count (GtkSourcePrintJob *job)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), 0);
+ cm_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), 0);
return job->priv->page_count;
}
@@ -2724,8 +2724,8 @@ gtk_source_print_job_get_page_count (GtkSourcePrintJob *job)
GnomePrintContext *
gtk_source_print_job_get_print_context (GtkSourcePrintJob *job)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), NULL);
- g_return_val_if_fail (job->priv->printing, NULL);
+ cm_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), NULL);
+ cm_return_val_if_fail (job->priv->printing, NULL);
return job->priv->print_ctxt;
}
@@ -2748,8 +2748,8 @@ strdup_strftime (const gchar *format, const struct tm *tm)
gsize convlen = 0;
GError *error = NULL;
- g_return_val_if_fail (format != NULL, NULL);
- g_return_val_if_fail (tm != NULL, NULL);
+ cm_return_val_if_fail (format != NULL, NULL);
+ cm_return_val_if_fail (tm != NULL, NULL);
locale_format = g_locale_from_utf8 (format, -1, NULL, &locale_format_len, &error);
@@ -2977,8 +2977,8 @@ void
gtk_source_print_job_set_print_header (GtkSourcePrintJob *job,
gboolean setting)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
- g_return_if_fail (!job->priv->printing);
+ cm_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
+ cm_return_if_fail (!job->priv->printing);
setting = (setting != FALSE);
@@ -3004,7 +3004,7 @@ gtk_source_print_job_set_print_header (GtkSourcePrintJob *job,
gboolean
gtk_source_print_job_get_print_header (GtkSourcePrintJob *job)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), FALSE);
+ cm_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), FALSE);
return job->priv->print_header;
}
@@ -3026,8 +3026,8 @@ void
gtk_source_print_job_set_print_footer (GtkSourcePrintJob *job,
gboolean setting)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
- g_return_if_fail (!job->priv->printing);
+ cm_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
+ cm_return_if_fail (!job->priv->printing);
setting = (setting != FALSE);
@@ -3053,7 +3053,7 @@ gtk_source_print_job_set_print_footer (GtkSourcePrintJob *job,
gboolean
gtk_source_print_job_get_print_footer (GtkSourcePrintJob *job)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), FALSE);
+ cm_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), FALSE);
return job->priv->print_footer;
}
@@ -3071,8 +3071,8 @@ void
gtk_source_print_job_set_header_footer_font_desc (GtkSourcePrintJob *job,
PangoFontDescription *desc)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
- g_return_if_fail (!job->priv->printing);
+ cm_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
+ cm_return_if_fail (!job->priv->printing);
if (desc)
desc = pango_font_description_copy (desc);
@@ -3105,8 +3105,8 @@ gtk_source_print_job_set_header_footer_font (GtkSourcePrintJob *job,
{
PangoFontDescription *desc;
- g_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
- g_return_if_fail (!job->priv->printing);
+ cm_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
+ cm_return_if_fail (!job->priv->printing);
if (font_name != NULL)
{
@@ -3134,7 +3134,7 @@ gtk_source_print_job_set_header_footer_font (GtkSourcePrintJob *job,
PangoFontDescription *
gtk_source_print_job_get_header_footer_font_desc (GtkSourcePrintJob *job)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), NULL);
+ cm_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), NULL);
return job->priv->header_footer_font;
}
@@ -3160,7 +3160,7 @@ gtk_source_print_job_get_header_footer_font_desc (GtkSourcePrintJob *job)
gchar *
gtk_source_print_job_get_header_footer_font (GtkSourcePrintJob *job)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), NULL);
+ cm_return_val_if_fail (GTK_IS_SOURCE_PRINT_JOB (job), NULL);
if (job->priv->header_footer_font != NULL)
return font_description_to_gnome_font_name (job->priv->header_footer_font);
@@ -3197,8 +3197,8 @@ gtk_source_print_job_set_header_format (GtkSourcePrintJob *job,
const gchar *right,
gboolean separator)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
- g_return_if_fail (!job->priv->printing);
+ cm_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
+ cm_return_if_fail (!job->priv->printing);
/* FIXME: validate given strings? */
g_free (job->priv->header_format_left);
@@ -3227,8 +3227,8 @@ gtk_source_print_job_set_footer_format (GtkSourcePrintJob *job,
const gchar *right,
gboolean separator)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
- g_return_if_fail (!job->priv->printing);
+ cm_return_if_fail (GTK_IS_SOURCE_PRINT_JOB (job));
+ cm_return_if_fail (!job->priv->printing);
/* FIXME: validate given strings? */
g_free (job->priv->footer_format_left);
diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
@@ -66,10 +66,10 @@ gboolean gtkut_get_font_size(GtkWidget *widget,
PangoLayout *layout;
const gchar *str = "Abcdef";
- g_return_val_if_fail(GTK_IS_WIDGET(widget), FALSE);
+ cm_return_val_if_fail(GTK_IS_WIDGET(widget), FALSE);
layout = gtk_widget_create_pango_layout(widget, str);
- g_return_val_if_fail(layout, FALSE);
+ cm_return_val_if_fail(layout, FALSE);
pango_layout_get_pixel_size(layout, width, height);
if (width)
*width = *width / g_utf8_strlen(str, -1);
@@ -83,8 +83,8 @@ void gtkut_widget_set_small_font_size(GtkWidget *widget)
PangoFontDescription *font_desc;
gint size;
- g_return_if_fail(widget != NULL);
- g_return_if_fail(widget->style != NULL);
+ cm_return_if_fail(widget != NULL);
+ cm_return_if_fail(widget->style != NULL);
if (prefs_common.derive_from_normal_font || !SMALL_FONT) {
font_desc = pango_font_description_from_string(NORMAL_FONT);
@@ -101,7 +101,7 @@ void gtkut_widget_set_small_font_size(GtkWidget *widget)
void gtkut_convert_int_to_gdk_color(gint rgbvalue, GdkColor *color)
{
- g_return_if_fail(color != NULL);
+ cm_return_if_fail(color != NULL);
color->pixel = 0L;
color->red = (int) (((gdouble)((rgbvalue & 0xff0000) >> 16) / 255.0) * 65535.0);
@@ -122,7 +122,7 @@ gint gtkut_convert_gdk_color_to_int(GdkColor *color)
void gtkut_stock_button_add_help(GtkWidget *bbox, GtkWidget **help_btn)
{
- g_return_if_fail(bbox != NULL);
+ cm_return_if_fail(bbox != NULL);
*help_btn = gtk_button_new_from_stock(GTK_STOCK_HELP);
@@ -141,8 +141,8 @@ void gtkut_stock_button_set_create_with_help(GtkWidget **bbox,
GtkWidget **button2, const gchar *label2,
GtkWidget **button3, const gchar *label3)
{
- g_return_if_fail(bbox != NULL);
- g_return_if_fail(button1 != NULL);
+ cm_return_if_fail(bbox != NULL);
+ cm_return_if_fail(button1 != NULL);
gtkut_stock_button_set_create(bbox, button1, label1,
button2, label2, button3, label3);
@@ -155,8 +155,8 @@ void gtkut_stock_button_set_create(GtkWidget **bbox,
GtkWidget **button2, const gchar *label2,
GtkWidget **button3, const gchar *label3)
{
- g_return_if_fail(bbox != NULL);
- g_return_if_fail(button1 != NULL);
+ cm_return_if_fail(bbox != NULL);
+ cm_return_if_fail(button1 != NULL);
*bbox = gtk_hbutton_box_new();
gtk_button_box_set_layout(GTK_BUTTON_BOX(*bbox), GTK_BUTTONBOX_END);
@@ -187,8 +187,8 @@ void gtkut_stock_with_text_button_set_create(GtkWidget **bbox,
GtkWidget **button2, const gchar *label2, const gchar *text2,
GtkWidget **button3, const gchar *label3, const gchar *text3)
{
- g_return_if_fail(bbox != NULL);
- g_return_if_fail(button1 != NULL);
+ cm_return_if_fail(bbox != NULL);
+ cm_return_if_fail(button1 != NULL);
*bbox = gtk_hbutton_box_new();
gtk_button_box_set_layout(GTK_BUTTON_BOX(*bbox), GTK_BUTTONBOX_END);
@@ -233,8 +233,8 @@ void gtkut_ctree_node_move_if_on_the_edge(GtkCMCTree *ctree, GtkCMCTreeNode *nod
gint row;
GtkVisibility row_visibility, prev_row_visibility, next_row_visibility;
- g_return_if_fail(ctree != NULL);
- g_return_if_fail(node != NULL);
+ cm_return_if_fail(ctree != NULL);
+ cm_return_if_fail(node != NULL);
row = (_row != -1 ? _row : g_list_position(clist->row_list, (GList *)node));
@@ -271,8 +271,8 @@ void gtkut_ctree_node_move_if_on_the_edge(GtkCMCTree *ctree, GtkCMCTreeNode *nod
gint gtkut_ctree_get_nth_from_node(GtkCMCTree *ctree, GtkCMCTreeNode *node)
{
- g_return_val_if_fail(ctree != NULL, -1);
- g_return_val_if_fail(node != NULL, -1);
+ cm_return_val_if_fail(ctree != NULL, -1);
+ cm_return_val_if_fail(node != NULL, -1);
return g_list_position(GTK_CMCLIST(ctree)->row_list, (GList *)node);
}
@@ -356,8 +356,8 @@ void gtkut_ctree_expand_parent_all(GtkCMCTree *ctree, GtkCMCTreeNode *node)
gboolean gtkut_ctree_node_is_parent(GtkCMCTreeNode *parent, GtkCMCTreeNode *node)
{
GtkCMCTreeNode *tmp;
- g_return_val_if_fail(node != NULL, FALSE);
- g_return_val_if_fail(parent != NULL, FALSE);
+ cm_return_val_if_fail(node != NULL, FALSE);
+ cm_return_val_if_fail(parent != NULL, FALSE);
tmp = node;
while (tmp) {
@@ -510,7 +510,7 @@ gchar *gtkut_text_view_get_selection(GtkTextView *textview)
GtkTextIter start_iter, end_iter;
gboolean found;
- g_return_val_if_fail(GTK_IS_TEXT_VIEW(textview), NULL);
+ cm_return_val_if_fail(GTK_IS_TEXT_VIEW(textview), NULL);
buffer = gtk_text_view_get_buffer(textview);
found = gtk_text_buffer_get_selection_bounds(buffer,
@@ -529,7 +529,7 @@ void gtkut_text_view_set_position(GtkTextView *text, gint pos)
GtkTextBuffer *buffer;
GtkTextIter iter;
- g_return_if_fail(text != NULL);
+ cm_return_if_fail(text != NULL);
buffer = gtk_text_view_get_buffer(text);
@@ -546,13 +546,13 @@ gboolean gtkut_text_view_search_string(GtkTextView *text, const gchar *str,
GtkTextMark *mark;
gint len;
- g_return_val_if_fail(text != NULL, FALSE);
- g_return_val_if_fail(str != NULL, FALSE);
+ cm_return_val_if_fail(text != NULL, FALSE);
+ cm_return_val_if_fail(str != NULL, FALSE);
buffer = gtk_text_view_get_buffer(text);
len = g_utf8_strlen(str, -1);
- g_return_val_if_fail(len >= 0, FALSE);
+ cm_return_val_if_fail(len >= 0, FALSE);
mark = gtk_text_buffer_get_insert(buffer);
gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
@@ -579,13 +579,13 @@ gboolean gtkut_text_view_search_string_backward(GtkTextView *text, const gchar *
GtkTextMark *mark;
gint len;
- g_return_val_if_fail(text != NULL, FALSE);
- g_return_val_if_fail(str != NULL, FALSE);
+ cm_return_val_if_fail(text != NULL, FALSE);
+ cm_return_val_if_fail(str != NULL, FALSE);
buffer = gtk_text_view_get_buffer(text);
len = g_utf8_strlen(str, -1);
- g_return_val_if_fail(len >= 0, FALSE);
+ cm_return_val_if_fail(len >= 0, FALSE);
mark = gtk_text_buffer_get_insert(buffer);
gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
@@ -607,8 +607,8 @@ void gtkut_window_popup(GtkWidget *window)
{
gint x, y, sx, sy, new_x, new_y;
- g_return_if_fail(window != NULL);
- g_return_if_fail(window->window != NULL);
+ cm_return_if_fail(window != NULL);
+ cm_return_if_fail(window->window != NULL);
sx = gdk_screen_width();
sy = gdk_screen_height();
@@ -632,8 +632,8 @@ void gtkut_widget_get_uposition(GtkWidget *widget, gint *px, gint *py)
gint x, y;
gint sx, sy;
- g_return_if_fail(widget != NULL);
- g_return_if_fail(widget->window != NULL);
+ cm_return_if_fail(widget != NULL);
+ cm_return_if_fail(widget->window != NULL);
sx = gdk_screen_width();
sy = gdk_screen_height();
@@ -712,8 +712,8 @@ void gtkut_widget_set_app_icon(GtkWidget *widget)
{
static GdkPixbuf *icon = NULL;
- g_return_if_fail(widget != NULL);
- g_return_if_fail(widget->window != NULL);
+ cm_return_if_fail(widget != NULL);
+ cm_return_if_fail(widget->window != NULL);
if (!icon) {
stock_pixbuf_gdk(widget, STOCK_PIXMAP_CLAWS_MAIL_ICON, &icon);
}
@@ -725,8 +725,8 @@ void gtkut_widget_set_composer_icon(GtkWidget *widget)
{
static GdkPixbuf *icon = NULL;
- g_return_if_fail(widget != NULL);
- g_return_if_fail(widget->window != NULL);
+ cm_return_if_fail(widget != NULL);
+ cm_return_if_fail(widget->window != NULL);
if (!icon) {
stock_pixbuf_gdk(widget, STOCK_PIXMAP_MAIL_COMPOSE, &icon);
}
@@ -814,7 +814,7 @@ GtkWidget *gtkut_account_menu_new(GList *ac_list,
PrefsAccount *account;
gchar *name;
- g_return_val_if_fail(ac_list != NULL, NULL);
+ cm_return_val_if_fail(ac_list != NULL, NULL);
optmenu = gtkut_sc_combobox_create(NULL, FALSE);
menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu)));
@@ -863,7 +863,7 @@ GtkWidget *gtkut_get_focused_child(GtkContainer *parent)
GList *child_list = NULL;
GList *c;
- g_return_val_if_fail(parent, NULL);
+ cm_return_val_if_fail(parent, NULL);
/* Get children list and see which has the focus. */
child_list = gtk_container_get_children(parent);
@@ -1263,7 +1263,7 @@ static gboolean _combobox_separator_func(GtkTreeModel *model,
{
gchar *txt = NULL;
- g_return_val_if_fail(model != NULL, FALSE);
+ cm_return_val_if_fail(model != NULL, FALSE);
gtk_tree_model_get(model, iter, COMBOBOX_TEXT, &txt, -1);
@@ -1473,8 +1473,8 @@ gboolean gtkut_tree_model_text_iter_prev(GtkTreeModel *model,
gboolean valid;
gint count;
- g_return_val_if_fail(model != NULL, FALSE);
- g_return_val_if_fail(iter != NULL, FALSE);
+ cm_return_val_if_fail(model != NULL, FALSE);
+ cm_return_val_if_fail(iter != NULL, FALSE);
if (text == NULL || *text == '\0')
return FALSE;
@@ -1504,8 +1504,8 @@ gboolean gtkut_tree_model_get_iter_last(GtkTreeModel *model,
{
gint count;
- g_return_val_if_fail(model != NULL, FALSE);
- g_return_val_if_fail(iter != NULL, FALSE);
+ cm_return_val_if_fail(model != NULL, FALSE);
+ cm_return_val_if_fail(iter != NULL, FALSE);
count = gtk_tree_model_iter_n_children(model, NULL);
@@ -1602,7 +1602,7 @@ static GtkUIManager *gui_manager = NULL;
GtkUIManager *gtkut_create_ui_manager(void)
{
- g_return_val_if_fail(gui_manager == NULL, gui_manager);
+ cm_return_val_if_fail(gui_manager == NULL, gui_manager);
return (gui_manager = gtk_ui_manager_new());
}
diff --git a/src/gtk/gtkvscrollbutton.c b/src/gtk/gtkvscrollbutton.c
@@ -34,7 +34,7 @@
#include <glib.h>
#include <gtk/gtk.h>
-
+#include "utils.h"
#include "gtkvscrollbutton.h"
#define SCROLL_TIMER_LENGTH 20
@@ -223,14 +223,14 @@ GtkWidget *gtk_vscrollbutton_new(GtkAdjustment *adjustment)
void gtk_vscrollbutton_set_adjustment(GtkVScrollbutton *scrollbutton,
GtkAdjustment *adjustment)
{
- g_return_if_fail(scrollbutton != NULL);
- g_return_if_fail(GTK_IS_VSCROLLBUTTON(scrollbutton));
+ cm_return_if_fail(scrollbutton != NULL);
+ cm_return_if_fail(GTK_IS_VSCROLLBUTTON(scrollbutton));
if (!adjustment)
adjustment =
GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, 0.0, 0.0, 0.0, 0.0));
else
- g_return_if_fail(GTK_IS_ADJUSTMENT(adjustment));
+ cm_return_if_fail(GTK_IS_ADJUSTMENT(adjustment));
if (scrollbutton->adjustment != adjustment) {
if (scrollbutton->adjustment) {
@@ -296,8 +296,8 @@ gint gtk_vscrollbutton_scroll(GtkVScrollbutton *scrollbutton)
gfloat new_value;
gint return_val;
- g_return_val_if_fail(scrollbutton != NULL, FALSE);
- g_return_val_if_fail(GTK_IS_VSCROLLBUTTON(scrollbutton), FALSE);
+ cm_return_val_if_fail(scrollbutton != NULL, FALSE);
+ cm_return_val_if_fail(GTK_IS_VSCROLLBUTTON(scrollbutton), FALSE);
new_value = scrollbutton->adjustment->value;
return_val = TRUE;
@@ -368,8 +368,8 @@ gtk_vscrollbutton_timer_1st_time(GtkVScrollbutton *scrollbutton)
static void gtk_vscrollbutton_add_timer(GtkVScrollbutton *scrollbutton)
{
- g_return_if_fail(scrollbutton != NULL);
- g_return_if_fail(GTK_IS_VSCROLLBUTTON(scrollbutton));
+ cm_return_if_fail(scrollbutton != NULL);
+ cm_return_if_fail(GTK_IS_VSCROLLBUTTON(scrollbutton));
if (!scrollbutton->timer) {
scrollbutton->need_timer = TRUE;
@@ -382,8 +382,8 @@ static void gtk_vscrollbutton_add_timer(GtkVScrollbutton *scrollbutton)
static void gtk_vscrollbutton_remove_timer(GtkVScrollbutton *scrollbutton)
{
- g_return_if_fail(scrollbutton != NULL);
- g_return_if_fail(GTK_IS_VSCROLLBUTTON(scrollbutton));
+ cm_return_if_fail(scrollbutton != NULL);
+ cm_return_if_fail(GTK_IS_VSCROLLBUTTON(scrollbutton));
if (scrollbutton->timer) {
g_source_remove(scrollbutton->timer);
diff --git a/src/gtk/logwindow.c b/src/gtk/logwindow.c
@@ -62,11 +62,11 @@ static void size_allocate_cb(GtkWidget *widget,
gint *prefs_logwin_height = NULL;
LogInstance instance = GPOINTER_TO_INT(data);
- g_return_if_fail(allocation != NULL);
+ cm_return_if_fail(allocation != NULL);
get_log_prefs(instance, &prefs_logwin_width, &prefs_logwin_height);
- g_return_if_fail(prefs_logwin_width != NULL);
- g_return_if_fail(prefs_logwin_height != NULL);
+ cm_return_if_fail(prefs_logwin_width != NULL);
+ cm_return_if_fail(prefs_logwin_height != NULL);
*prefs_logwin_width = allocation->width;
*prefs_logwin_height = allocation->height;
@@ -87,8 +87,8 @@ LogWindow *log_window_create(LogInstance instance)
debug_print("Creating log window...\n");
get_log_prefs(instance, &prefs_logwin_width, &prefs_logwin_height);
- g_return_val_if_fail(prefs_logwin_width != NULL, NULL);
- g_return_val_if_fail(prefs_logwin_height != NULL, NULL);
+ cm_return_val_if_fail(prefs_logwin_width != NULL, NULL);
+ cm_return_val_if_fail(prefs_logwin_height != NULL, NULL);
logwin = g_new0(LogWindow, 1);
@@ -271,7 +271,7 @@ void log_window_show_error(LogWindow *logwin)
void log_window_set_clipping(LogWindow *logwin, gboolean clip, guint clip_length)
{
- g_return_if_fail(logwin != NULL);
+ cm_return_if_fail(logwin != NULL);
logwin->clip = clip;
logwin->clip_length = clip_length;
@@ -287,9 +287,9 @@ static gboolean log_window_append(gpointer source, gpointer data)
gchar *head = NULL;
const gchar *tag;
- g_return_val_if_fail(logtext != NULL, TRUE);
- g_return_val_if_fail(logtext->text != NULL, TRUE);
- g_return_val_if_fail(logwindow != NULL, FALSE);
+ cm_return_val_if_fail(logtext != NULL, TRUE);
+ cm_return_val_if_fail(logtext->text != NULL, TRUE);
+ cm_return_val_if_fail(logwindow != NULL, FALSE);
if (logwindow->clip && !logwindow->clip_length)
return FALSE;
@@ -436,8 +436,8 @@ static void log_window_popup_menu_extend(GtkTextView *textview,
{
GtkWidget *menuitem;
- g_return_if_fail(menu != NULL);
- g_return_if_fail(GTK_IS_MENU_SHELL(menu));
+ cm_return_if_fail(menu != NULL);
+ cm_return_if_fail(GTK_IS_MENU_SHELL(menu));
menuitem = gtk_separator_menu_item_new();
gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), menuitem);
diff --git a/src/gtk/menu.c b/src/gtk/menu.c
@@ -140,8 +140,8 @@ void menu_button_position(GtkMenu *menu, gint *x, gint *y, gboolean *push_in,
GdkRectangle monitor;
gint monitor_num;
- g_return_if_fail(x && y);
- g_return_if_fail(GTK_IS_BUTTON(user_data));
+ cm_return_if_fail(x && y);
+ cm_return_if_fail(GTK_IS_BUTTON(user_data));
widget = GTK_WIDGET(user_data);
diff --git a/src/gtk/pluginwindow.c b/src/gtk/pluginwindow.c
@@ -184,7 +184,7 @@ static void unload_cb(GtkButton *button, PluginWindow *pluginwindow)
{
Plugin *plugin = pluginwindow->selected_plugin;
- g_return_if_fail(plugin != NULL);
+ cm_return_if_fail(plugin != NULL);
pluginwindow->loading = TRUE;
plugin_unload(plugin);
pluginwindow->loading = FALSE;
@@ -262,7 +262,7 @@ static gboolean pluginwindow_key_pressed(GtkWidget *widget, GdkEventKey *event,
static void pluginwindow_size_allocate_cb(GtkWidget *widget,
GtkAllocation *allocation)
{
- g_return_if_fail(allocation != NULL);
+ cm_return_if_fail(allocation != NULL);
prefs_common.pluginswin_width = allocation->width;
prefs_common.pluginswin_height = allocation->height;
diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c
@@ -619,7 +619,7 @@ static void prefs_size_allocate_cb(GtkWidget *widget,
{
PrefsWindow *prefswindow = (PrefsWindow *) user_data;
- g_return_if_fail(allocation != NULL);
+ cm_return_if_fail(allocation != NULL);
/* don't try to save size to NULL pointers */
if (prefswindow && prefswindow->save_width && prefswindow->save_height) {
diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
@@ -164,8 +164,8 @@ static void update_extended_buttons (QuickSearch *quicksearch)
GtkWidget *expr_btn = quicksearch->search_condition_expression;
GtkWidget *ext_btn = quicksearch->search_description;
- g_return_if_fail(expr_btn != NULL);
- g_return_if_fail(ext_btn != NULL);
+ cm_return_if_fail(expr_btn != NULL);
+ cm_return_if_fail(ext_btn != NULL);
if (prefs_common.summary_quicksearch_type == QUICK_SEARCH_EXTENDED) {
gtk_widget_show(expr_btn);
@@ -267,7 +267,7 @@ static gboolean searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
quicksearch->in_typing = FALSE;
str = quicksearch_get_text(quicksearch);
- g_return_val_if_fail(str != NULL, TRUE);
+ cm_return_val_if_fail(str != NULL, TRUE);
/* If the string entry is empty -> hide quicksearch bar. If not -> empty it */
if (!*str) {
@@ -492,7 +492,7 @@ static void search_condition_expr_done(MatcherList * matchers)
{
gchar *str;
- g_return_if_fail(
+ cm_return_if_fail(
mainwindow_get_mainwindow()->summaryview->quicksearch != NULL);
if (matchers == NULL)
@@ -515,7 +515,7 @@ static gboolean search_condition_expr(GtkMenuItem *widget, gpointer data)
gchar * cond_str;
MatcherList * matchers = NULL;
- g_return_val_if_fail(
+ cm_return_val_if_fail(
mainwindow_get_mainwindow()->summaryview->quicksearch != NULL,
FALSE);
diff --git a/src/gtk/spell_entry.c b/src/gtk/spell_entry.c
@@ -140,8 +140,8 @@ GtkWidget *claws_spell_entry_new(void)
void claws_spell_entry_set_gtkaspell(ClawsSpellEntry *entry, GtkAspell *gtkaspell)
{
- g_return_if_fail(CLAWS_IS_SPELL_ENTRY(entry));
- g_return_if_fail(gtkaspell != NULL);
+ cm_return_if_fail(CLAWS_IS_SPELL_ENTRY(entry));
+ cm_return_if_fail(gtkaspell != NULL);
entry->gtkaspell = gtkaspell;
}
@@ -384,8 +384,8 @@ void claws_spell_entry_recheck_all(ClawsSpellEntry *entry)
PangoLayout *layout;
int length, i;
- g_return_if_fail(CLAWS_IS_SPELL_ENTRY(entry));
- g_return_if_fail(entry->gtkaspell != NULL);
+ cm_return_if_fail(CLAWS_IS_SPELL_ENTRY(entry));
+ cm_return_if_fail(entry->gtkaspell != NULL);
if (entry->priv->words == NULL)
return;
@@ -546,8 +546,8 @@ static void set_menu_pos(GtkMenu *menu, gint *x, gint *y,
void claws_spell_entry_context_set(ClawsSpellEntry *entry)
{
- g_return_if_fail(CLAWS_IS_SPELL_ENTRY(entry));
- g_return_if_fail(entry->gtkaspell != NULL);
+ cm_return_if_fail(CLAWS_IS_SPELL_ENTRY(entry));
+ cm_return_if_fail(entry->gtkaspell != NULL);
entry->gtkaspell->ctx.set_position = set_position;
entry->gtkaspell->ctx.set_menu_pos = set_menu_pos;
@@ -615,8 +615,8 @@ void claws_spell_entry_check_all(ClawsSpellEntry *entry)
gint start, end;
gchar *text;
- g_return_if_fail(CLAWS_IS_SPELL_ENTRY(entry));
- g_return_if_fail(entry->gtkaspell != NULL);
+ cm_return_if_fail(CLAWS_IS_SPELL_ENTRY(entry));
+ cm_return_if_fail(entry->gtkaspell != NULL);
if (!gtk_editable_get_selection_bounds(GTK_EDITABLE(entry), &start, &end)) {
text = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
@@ -638,8 +638,8 @@ void claws_spell_entry_check_all(ClawsSpellEntry *entry)
void claws_spell_entry_check_backwards(ClawsSpellEntry *entry)
{
- g_return_if_fail(CLAWS_IS_SPELL_ENTRY(entry));
- g_return_if_fail(entry->gtkaspell != NULL);
+ cm_return_if_fail(CLAWS_IS_SPELL_ENTRY(entry));
+ cm_return_if_fail(entry->gtkaspell != NULL);
entry->gtkaspell->continue_check = NULL;
claws_spell_entry_context_set(entry);
@@ -648,8 +648,8 @@ void claws_spell_entry_check_backwards(ClawsSpellEntry *entry)
void claws_spell_entry_check_forwards_go(ClawsSpellEntry *entry)
{
- g_return_if_fail(CLAWS_IS_SPELL_ENTRY(entry));
- g_return_if_fail(entry->gtkaspell != NULL);
+ cm_return_if_fail(CLAWS_IS_SPELL_ENTRY(entry));
+ cm_return_if_fail(entry->gtkaspell != NULL);
entry->gtkaspell->continue_check = NULL;
claws_spell_entry_context_set(entry);
diff --git a/src/html.c b/src/html.c
@@ -331,8 +331,8 @@ SC_HTMLParser *sc_html_parser_new(FILE *fp, CodeConverter *conv)
{
SC_HTMLParser *parser;
- g_return_val_if_fail(fp != NULL, NULL);
- g_return_val_if_fail(conv != NULL, NULL);
+ cm_return_val_if_fail(fp != NULL, NULL);
+ cm_return_val_if_fail(conv != NULL, NULL);
parser = g_new0(SC_HTMLParser, 1);
parser->fp = fp;
@@ -522,7 +522,7 @@ static SC_HTMLTag *sc_html_get_tag(const gchar *str)
gchar *tmp;
guchar *tmpp;
- g_return_val_if_fail(str != NULL, NULL);
+ cm_return_val_if_fail(str != NULL, NULL);
if (*str == '\0' || *str == '!') return NULL;
@@ -721,7 +721,7 @@ static void sc_html_parse_special(SC_HTMLParser *parser)
const gchar *val;
parser->state = SC_HTML_UNKNOWN;
- g_return_if_fail(*parser->bufp == '&');
+ cm_return_if_fail(*parser->bufp == '&');
/* &foo; */
for (n = 0; parser->bufp[n] != '\0' && parser->bufp[n] != ';'; n++)
@@ -750,7 +750,7 @@ static void sc_html_get_parenthesis(SC_HTMLParser *parser, gchar *buf, gint len)
gchar *p;
buf[0] = '\0';
- g_return_if_fail(*parser->bufp == '<');
+ cm_return_if_fail(*parser->bufp == '<');
/* ignore comment / CSS / script stuff */
if (!strncmp(parser->bufp, "<!--", 4)) {
diff --git a/src/imap.c b/src/imap.c
@@ -3794,7 +3794,7 @@ static gint imap_cmd_append(IMAPSession *session,
struct mailimap_flag_list * flag_list;
int r;
- g_return_val_if_fail(file != NULL, MAILIMAP_ERROR_BAD_STATE);
+ cm_return_val_if_fail(file != NULL, MAILIMAP_ERROR_BAD_STATE);
flag_list = imap_flag_to_lep(item, flags, NULL);
lock_session(session);
diff --git a/src/imap_gtk.c b/src/imap_gtk.c
@@ -184,9 +184,9 @@ static void new_folder_cb(GtkAction *action, gpointer data)
if (!folderview->selected) return;
item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
- g_return_if_fail(item != NULL);
- g_return_if_fail(item->folder != NULL);
- g_return_if_fail(item->folder->account != NULL);
+ cm_return_if_fail(item != NULL);
+ cm_return_if_fail(item->folder != NULL);
+ cm_return_if_fail(item->folder->account != NULL);
new_folder = input_dialog_with_checkbtn
(_("New folder"),
@@ -251,9 +251,9 @@ static void rename_folder_cb(GtkAction *action, gpointer data)
gchar separator = '/';
item = folderview_get_selected_item(folderview);
- g_return_if_fail(item != NULL);
- g_return_if_fail(item->path != NULL);
- g_return_if_fail(item->folder != NULL);
+ cm_return_if_fail(item != NULL);
+ cm_return_if_fail(item->path != NULL);
+ cm_return_if_fail(item->folder != NULL);
name = trim_string(item->name, 32);
message = g_strdup_printf(_("Input new name for '%s':"), name);
@@ -351,9 +351,9 @@ static void delete_folder_cb(GtkAction *action, gpointer data)
if (!folderview->selected) return;
item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
- g_return_if_fail(item != NULL);
- g_return_if_fail(item->path != NULL);
- g_return_if_fail(item->folder != NULL);
+ cm_return_if_fail(item != NULL);
+ cm_return_if_fail(item->path != NULL);
+ cm_return_if_fail(item->folder != NULL);
name = trim_string(item->name, 32);
AUTORELEASE_STR(name, {g_free(name); return;});
@@ -401,11 +401,11 @@ static void update_tree_cb(GtkAction *action, gpointer data)
const gchar *a_name = gtk_action_get_name(action);
item = folderview_get_selected_item(folderview);
- g_return_if_fail(item != NULL);
+ cm_return_if_fail(item != NULL);
summary_show(folderview->summaryview, NULL);
- g_return_if_fail(item->folder != NULL);
+ cm_return_if_fail(item->folder != NULL);
DO_ACTION("FolderViewPopup/CheckNewMessages", folderview_check_new(item->folder));
DO_ACTION("FolderViewPopup/CheckNewFolders", folderview_rescan_tree(item->folder, FALSE));
@@ -418,7 +418,7 @@ static void sync_cb(GtkAction *action, gpointer data)
FolderItem *item;
item = folderview_get_selected_item(folderview);
- g_return_if_fail(item != NULL);
+ cm_return_if_fail(item != NULL);
folder_synchronise(item->folder);
}
@@ -427,8 +427,8 @@ void imap_gtk_synchronise(FolderItem *item, gint days)
MainWindow *mainwin = mainwindow_get_mainwindow();
FolderView *folderview = mainwin->folderview;
- g_return_if_fail(item != NULL);
- g_return_if_fail(item->folder != NULL);
+ cm_return_if_fail(item != NULL);
+ cm_return_if_fail(item->folder != NULL);
main_window_cursor_wait(mainwin);
inc_lock();
@@ -495,8 +495,8 @@ static void subscribe_cb_full(FolderView *folderview, guint action)
if (!folderview->selected) return;
item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
- g_return_if_fail(item != NULL);
- g_return_if_fail(item->folder != NULL);
+ cm_return_if_fail(item != NULL);
+ cm_return_if_fail(item->folder != NULL);
name = trim_string(item->name, 32);
AUTORELEASE_STR(name, {g_free(name); return;});
diff --git a/src/inc.c b/src/inc.c
@@ -396,7 +396,7 @@ void inc_all_account_mail(MainWindow *mainwin, gboolean autocheck,
static void inc_progress_dialog_size_allocate_cb(GtkWidget *widget,
GtkAllocation *allocation)
{
- g_return_if_fail(allocation != NULL);
+ cm_return_if_fail(allocation != NULL);
prefs_common.receivewin_width = allocation->width;
prefs_common.receivewin_height = allocation->height;
@@ -485,7 +485,7 @@ static void inc_progress_dialog_clear(IncProgressDialog *inc_dialog)
static void inc_progress_dialog_destroy(IncProgressDialog *inc_dialog)
{
- g_return_if_fail(inc_dialog != NULL);
+ cm_return_if_fail(inc_dialog != NULL);
inc_dialog_list = g_list_remove(inc_dialog_list, inc_dialog);
@@ -500,7 +500,7 @@ static IncSession *inc_session_new(PrefsAccount *account)
{
IncSession *session;
- g_return_val_if_fail(account != NULL, NULL);
+ cm_return_val_if_fail(account != NULL, NULL);
if (account->protocol != A_POP3)
return NULL;
@@ -525,7 +525,7 @@ static IncSession *inc_session_new(PrefsAccount *account)
static void inc_session_destroy(IncSession *session)
{
- g_return_if_fail(session != NULL);
+ cm_return_if_fail(session != NULL);
session_destroy(session->session);
g_free(session);
@@ -899,7 +899,7 @@ static void inc_progress_dialog_set_label(IncProgressDialog *inc_dialog,
ProgressDialog *dialog = inc_dialog->dialog;
Pop3Session *session;
- g_return_if_fail(inc_session != NULL);
+ cm_return_if_fail(inc_session != NULL);
session = POP3_SESSION(inc_session->session);
@@ -1024,7 +1024,7 @@ static gint inc_recv_data_progressive(Session *session, guint cur_len,
IncProgressDialog *inc_dialog;
gint cur_total;
- g_return_val_if_fail(inc_session != NULL, -1);
+ cm_return_val_if_fail(inc_session != NULL, -1);
if (pop3_session->state != POP3_RETR &&
pop3_session->state != POP3_RETR_RECV &&
@@ -1049,7 +1049,7 @@ static gint inc_recv_data_finished(Session *session, guint len, gpointer data)
IncSession *inc_session = (IncSession *)data;
IncProgressDialog *inc_dialog;
- g_return_val_if_fail(inc_session != NULL, -1);
+ cm_return_val_if_fail(inc_session != NULL, -1);
inc_dialog = (IncProgressDialog *)inc_session->data;
@@ -1067,7 +1067,7 @@ static gint inc_recv_message(Session *session, const gchar *msg, gpointer data)
IncSession *inc_session = (IncSession *)data;
IncProgressDialog *inc_dialog;
- g_return_val_if_fail(inc_session != NULL, -1);
+ cm_return_val_if_fail(inc_session != NULL, -1);
inc_dialog = (IncProgressDialog *)inc_session->data;
@@ -1101,7 +1101,7 @@ static gint inc_drop_message(Pop3Session *session, const gchar *file)
IncSession *inc_session = (IncSession *)(SESSION(session)->data);
gint msgnum;
- g_return_val_if_fail(inc_session != NULL, -1);
+ cm_return_val_if_fail(inc_session != NULL, -1);
if (session->ac_prefs->inbox) {
inbox = folder_find_item_from_identifier
@@ -1236,7 +1236,7 @@ static void inc_cancel(IncProgressDialog *dialog)
{
IncSession *session;
- g_return_if_fail(dialog != NULL);
+ cm_return_if_fail(dialog != NULL);
if (dialog->queue_list == NULL) {
inc_progress_dialog_destroy(dialog);
@@ -1345,9 +1345,9 @@ static gint get_spool(FolderItem *dest, const gchar *mbox, PrefsAccount *account
gint lockfd;
gchar tmp_mbox[MAXPATHLEN + 1];
- g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(mbox != NULL, -1);
- g_return_val_if_fail(account != NULL, -1);
+ cm_return_val_if_fail(dest != NULL, -1);
+ cm_return_val_if_fail(mbox != NULL, -1);
+ cm_return_val_if_fail(account != NULL, -1);
if (!is_file_exist(mbox) || (size = get_file_size(mbox)) == 0) {
debug_print("%s: no messages in local mailbox.\n", mbox);
diff --git a/src/jpilot.c b/src/jpilot.c
@@ -208,30 +208,30 @@ JPilotFile *jpilot_create_path( const gchar *path ) {
* Properties...
*/
void jpilot_set_name( JPilotFile* pilotFile, const gchar *value ) {
- g_return_if_fail( pilotFile != NULL );
+ cm_return_if_fail( pilotFile != NULL );
addrcache_set_name( pilotFile->addressCache, value );
}
void jpilot_set_file( JPilotFile* pilotFile, const gchar *value ) {
- g_return_if_fail( pilotFile != NULL );
+ cm_return_if_fail( pilotFile != NULL );
addrcache_refresh( pilotFile->addressCache );
pilotFile->readMetadata = FALSE;
pilotFile->path = mgu_replace_string( pilotFile->path, value );
}
void jpilot_set_accessed( JPilotFile *pilotFile, const gboolean value ) {
- g_return_if_fail( pilotFile != NULL );
+ cm_return_if_fail( pilotFile != NULL );
pilotFile->addressCache->accessFlag = value;
}
gint jpilot_get_status( JPilotFile *pilotFile ) {
- g_return_val_if_fail( pilotFile != NULL, -1 );
+ cm_return_val_if_fail( pilotFile != NULL, -1 );
return pilotFile->retVal;
}
ItemFolder *jpilot_get_root_folder( JPilotFile *pilotFile ) {
- g_return_val_if_fail( pilotFile != NULL, NULL );
+ cm_return_val_if_fail( pilotFile != NULL, NULL );
return addrcache_get_root_folder( pilotFile->addressCache );
}
gchar *jpilot_get_name( JPilotFile *pilotFile ) {
- g_return_val_if_fail( pilotFile != NULL, NULL );
+ cm_return_val_if_fail( pilotFile != NULL, NULL );
return addrcache_get_name( pilotFile->addressCache );
}
@@ -241,7 +241,7 @@ gchar *jpilot_get_name( JPilotFile *pilotFile ) {
* \return <i>TRUE</i> if file was read.
*/
gboolean jpilot_get_read_flag( JPilotFile *pilotFile ) {
- g_return_val_if_fail( pilotFile != NULL, FALSE );
+ cm_return_val_if_fail( pilotFile != NULL, FALSE );
return pilotFile->addressCache->dataRead;
}
@@ -252,7 +252,7 @@ gboolean jpilot_get_read_flag( JPilotFile *pilotFile ) {
void jpilot_clear_custom_labels( JPilotFile *pilotFile ) {
GList *node;
- g_return_if_fail( pilotFile != NULL );
+ cm_return_if_fail( pilotFile != NULL );
/* Release custom labels */
mgu_free_dlist( pilotFile->customLabels );
@@ -277,7 +277,7 @@ void jpilot_clear_custom_labels( JPilotFile *pilotFile ) {
* \param pilotFile JPilot control data.
*/
void jpilot_add_custom_label( JPilotFile *pilotFile, const gchar *labelName ) {
- g_return_if_fail( pilotFile != NULL );
+ cm_return_if_fail( pilotFile != NULL );
if( labelName ) {
gchar *labelCopy = g_strdup( labelName );
@@ -302,7 +302,7 @@ GList *jpilot_get_custom_labels( JPilotFile *pilotFile ) {
GList *retVal = NULL;
GList *node;
- g_return_val_if_fail( pilotFile != NULL, NULL );
+ cm_return_val_if_fail( pilotFile != NULL, NULL );
node = pilotFile->customLabels;
while( node ) {
@@ -404,12 +404,12 @@ static gboolean jpilot_check_files( JPilotFile *pilotFile ) {
* Return: TRUE if file was modified.
*/
gboolean jpilot_get_modified( JPilotFile *pilotFile ) {
- g_return_val_if_fail( pilotFile != NULL, FALSE );
+ cm_return_val_if_fail( pilotFile != NULL, FALSE );
pilotFile->addressCache->modified = jpilot_check_files( pilotFile );
return pilotFile->addressCache->modified;
}
gboolean jpilot_get_accessed( JPilotFile *pilotFile ) {
- g_return_val_if_fail( pilotFile != NULL, FALSE );
+ cm_return_val_if_fail( pilotFile != NULL, FALSE );
return pilotFile->addressCache->accessFlag;
}
@@ -418,7 +418,7 @@ gboolean jpilot_get_accessed( JPilotFile *pilotFile ) {
* \param pilotFile JPilot control data.
*/
void jpilot_free( JPilotFile *pilotFile ) {
- g_return_if_fail( pilotFile != NULL );
+ cm_return_if_fail( pilotFile != NULL );
/* Release custom labels */
jpilot_clear_custom_labels( pilotFile );
@@ -1256,7 +1256,7 @@ static gint jpilot_read_metadata( JPilotFile *pilotFile ) {
unsigned char *buf;
int num;
- g_return_val_if_fail( pilotFile != NULL, -1 );
+ cm_return_val_if_fail( pilotFile != NULL, -1 );
pilotFile->readMetadata = FALSE;
addrcache_clear( pilotFile->addressCache );
@@ -1292,7 +1292,7 @@ static gboolean jpilot_setup_labels( JPilotFile *pilotFile ) {
struct AddressAppInfo *ai;
GList *node;
- g_return_val_if_fail( pilotFile != NULL, -1 );
+ cm_return_val_if_fail( pilotFile != NULL, -1 );
/* Release indexes */
node = pilotFile->labelInd;
@@ -1346,7 +1346,7 @@ static gboolean jpilot_setup_labels( JPilotFile *pilotFile ) {
GList *jpilot_load_custom_label( JPilotFile *pilotFile, GList *labelList ) {
gint i;
- g_return_val_if_fail( pilotFile != NULL, NULL );
+ cm_return_val_if_fail( pilotFile != NULL, NULL );
if( pilotFile->readMetadata ) {
struct AddressAppInfo *ai = & pilotFile->addrInfo;
@@ -1526,7 +1526,7 @@ gint jpilot_read_data( JPilotFile *pilotFile ) {
name_order = FAMILY_FIRST;
}
- g_return_val_if_fail( pilotFile != NULL, -1 );
+ cm_return_val_if_fail( pilotFile != NULL, -1 );
pilotFile->retVal = MGU_SUCCESS;
pilotFile->addressCache->accessFlag = FALSE;
@@ -1553,7 +1553,7 @@ gint jpilot_read_data( JPilotFile *pilotFile ) {
* \return List of persons.
*/
GList *jpilot_get_list_person( JPilotFile *pilotFile ) {
- g_return_val_if_fail( pilotFile != NULL, NULL );
+ cm_return_val_if_fail( pilotFile != NULL, NULL );
return addrcache_get_list_person( pilotFile->addressCache );
}
@@ -1567,7 +1567,7 @@ GList *jpilot_get_list_person( JPilotFile *pilotFile ) {
* \return List of ItemFolder objects. This should not be freed.
*/
GList *jpilot_get_list_folder( JPilotFile *pilotFile ) {
- g_return_val_if_fail( pilotFile != NULL, NULL );
+ cm_return_val_if_fail( pilotFile != NULL, NULL );
return addrcache_get_list_folder( pilotFile->addressCache );
}
@@ -1580,7 +1580,7 @@ GList *jpilot_get_list_folder( JPilotFile *pilotFile ) {
* \return List of items, or NULL if none.
*/
GList *jpilot_get_all_persons( JPilotFile *pilotFile ) {
- g_return_val_if_fail( pilotFile != NULL, NULL );
+ cm_return_val_if_fail( pilotFile != NULL, NULL );
return addrcache_get_all_persons( pilotFile->addressCache );
}
@@ -1634,7 +1634,7 @@ gboolean jpilot_test_custom_label( JPilotFile *pilotFile, const gchar *labelName
gboolean retVal;
GList *node;
- g_return_val_if_fail( pilotFile != NULL, FALSE );
+ cm_return_val_if_fail( pilotFile != NULL, FALSE );
retVal = FALSE;
if( labelName ) {
diff --git a/src/ldapctrl.c b/src/ldapctrl.c
@@ -240,7 +240,7 @@ void ldapctl_set_ssl( LdapControl* ctl, const gboolean value ) {
* <code>ldapctl_criteria_list_add()</code> functions for this purpose.
*/
GList *ldapctl_get_criteria_list( const LdapControl* ctl ) {
- g_return_val_if_fail( ctl != NULL, NULL );
+ cm_return_val_if_fail( ctl != NULL, NULL );
return ctl->listCriteria;
}
@@ -249,7 +249,7 @@ GList *ldapctl_get_criteria_list( const LdapControl* ctl ) {
* \param ctl Control data object.
*/
void ldapctl_criteria_list_clear( LdapControl *ctl ) {
- g_return_if_fail( ctl != NULL );
+ cm_return_if_fail( ctl != NULL );
mgu_free_dlist( ctl->listCriteria );
ctl->listCriteria = NULL;
}
@@ -261,7 +261,7 @@ void ldapctl_criteria_list_clear( LdapControl *ctl ) {
* be appended to the list.
*/
void ldapctl_criteria_list_add( LdapControl *ctl, gchar *attr ) {
- g_return_if_fail( ctl != NULL );
+ cm_return_if_fail( ctl != NULL );
if( attr != NULL ) {
if( mgu_list_test_unq_nc( ctl->listCriteria, attr ) ) {
debug_print("adding to criteria list: %s\n", attr);
@@ -276,7 +276,7 @@ void ldapctl_criteria_list_add( LdapControl *ctl, gchar *attr ) {
* \param ctl Control object to clear.
*/
static void ldapctl_clear( LdapControl *ctl ) {
- g_return_if_fail( ctl != NULL );
+ cm_return_if_fail( ctl != NULL );
debug_print("clearing ldap controller members\n");
/* Free internal stuff */
@@ -317,7 +317,7 @@ static void ldapctl_clear( LdapControl *ctl ) {
* \param ctl Control object to free.
*/
void ldapctl_free( LdapControl *ctl ) {
- g_return_if_fail( ctl != NULL );
+ cm_return_if_fail( ctl != NULL );
debug_print("releasing requested memory for ldap controller\n");
/* Free internal stuff */
@@ -338,7 +338,7 @@ void ldapctl_free( LdapControl *ctl ) {
* \param stream Output stream.
*/
void ldapctl_print( const LdapControl *ctl, FILE *stream ) {
- g_return_if_fail( ctl != NULL );
+ cm_return_if_fail( ctl != NULL );
pthread_mutex_lock( ctl->mutexCtl );
fprintf( stream, "LdapControl:\n" );
@@ -378,8 +378,8 @@ void ldapctl_print( const LdapControl *ctl, FILE *stream ) {
void ldapctl_copy( const LdapControl *ctlFrom, LdapControl *ctlTo ) {
GList *node;
- g_return_if_fail( ctlFrom != NULL );
- g_return_if_fail( ctlTo != NULL );
+ cm_return_if_fail( ctlFrom != NULL );
+ cm_return_if_fail( ctlTo != NULL );
debug_print("ldap controller copy\n");
/* Lock both objects */
@@ -521,8 +521,8 @@ gchar *ldapctl_format_criteria( LdapControl *ctl, const gchar *searchVal ) {
gchar *p1, *p2, *retVal;
gchar *criteriaFmt;
- g_return_val_if_fail( ctl != NULL, NULL );
- g_return_val_if_fail( searchVal != NULL, NULL );
+ cm_return_val_if_fail( ctl != NULL, NULL );
+ cm_return_val_if_fail( searchVal != NULL, NULL );
/* Test whether there are more that one search terms */
retVal = ldapctl_build_ldap_criteria( searchVal, ctl->matchingOption );
@@ -589,7 +589,7 @@ char **ldapctl_attribute_array( LdapControl *ctl ) {
char **ptrArray;
GList *node;
gint cnt, i;
- g_return_val_if_fail( ctl != NULL, NULL );
+ cm_return_val_if_fail( ctl != NULL, NULL );
node = ctl->listCriteria;
cnt = g_list_length( ctl->listCriteria );
@@ -614,7 +614,7 @@ char **ldapctl_full_attribute_array( LdapControl *ctl ) {
GList *node, *def;
GList *tmp = NULL;
gint cnt, i;
- g_return_val_if_fail( ctl != NULL, NULL );
+ cm_return_val_if_fail( ctl != NULL, NULL );
def = ctl->listCriteria;
while (def) {
@@ -678,7 +678,7 @@ void ldapctl_parse_ldap_search( LdapControl *ctl, gchar *criteria ) {
gchar *attrib;
gint iLen;
- g_return_if_fail( ctl != NULL );
+ cm_return_if_fail( ctl != NULL );
ldapctl_criteria_list_clear( ctl );
if( criteria == NULL ) return;
diff --git a/src/ldapquery.c b/src/ldapquery.c
@@ -105,7 +105,7 @@ LdapQuery *ldapqry_create( void ) {
* \param ctl Control object.
*/
void ldapqry_set_control( LdapQuery *qry, LdapControl *ctl ) {
- g_return_if_fail( qry != NULL );
+ cm_return_if_fail( qry != NULL );
qry->control = ctl;
}
@@ -115,7 +115,7 @@ void ldapqry_set_control( LdapQuery *qry, LdapControl *ctl ) {
* \param value Name.
*/
void ldapqry_set_name( LdapQuery* qry, const gchar *value ) {
- g_return_if_fail( qry != NULL );
+ cm_return_if_fail( qry != NULL );
ADDRQUERY_NAME(qry) = mgu_replace_string( ADDRQUERY_NAME(qry), value );
if (ADDRQUERY_NAME(qry) == NULL)
return;
@@ -129,7 +129,7 @@ void ldapqry_set_name( LdapQuery* qry, const gchar *value ) {
* \param value
*/
void ldapqry_set_search_value( LdapQuery *qry, const gchar *value ) {
- g_return_if_fail( qry != NULL );
+ cm_return_if_fail( qry != NULL );
ADDRQUERY_SEARCHVALUE(qry) = mgu_replace_string( ADDRQUERY_SEARCHVALUE(qry), value );
if (ADDRQUERY_SEARCHVALUE(qry) == NULL)
return;
@@ -159,7 +159,7 @@ void ldapqry_set_query_type( LdapQuery* qry, const gint value ) {
* \param value Type.
*/
void ldapqry_set_search_type( LdapQuery *qry, const AddrSearchType value ) {
- g_return_if_fail( qry != NULL );
+ cm_return_if_fail( qry != NULL );
ADDRQUERY_SEARCHTYPE(qry) = value;
}
@@ -169,7 +169,7 @@ void ldapqry_set_search_type( LdapQuery *qry, const AddrSearchType value ) {
* \param value ID for the query.
*/
void ldapqry_set_query_id( LdapQuery* qry, const gint value ) {
- g_return_if_fail( qry != NULL );
+ cm_return_if_fail( qry != NULL );
ADDRQUERY_ID(qry) = value;
}
@@ -226,7 +226,7 @@ void ldapqry_set_callback_end( LdapQuery *qry, void *func ) {
* \param value Value of stop flag.
*/
void ldapqry_set_stop_flag( LdapQuery *qry, const gboolean value ) {
- g_return_if_fail( qry != NULL );
+ cm_return_if_fail( qry != NULL );
pthread_mutex_lock( qry->mutexStop );
qry->stopFlag = value;
@@ -241,7 +241,7 @@ void ldapqry_set_stop_flag( LdapQuery *qry, const gboolean value ) {
*/
static gboolean ldapqry_get_stop_flag( LdapQuery *qry ) {
gboolean value;
- g_return_val_if_fail( qry != NULL, TRUE );
+ cm_return_val_if_fail( qry != NULL, TRUE );
pthread_mutex_lock( qry->mutexStop );
value = qry->stopFlag;
@@ -255,7 +255,7 @@ static gboolean ldapqry_get_stop_flag( LdapQuery *qry ) {
* \param value Value of busy flag.
*/
static void ldapqry_set_busy_flag( LdapQuery *qry, const gboolean value ) {
- g_return_if_fail( qry != NULL );
+ cm_return_if_fail( qry != NULL );
if (qry->mutexBusy == NULL)
return; /* exiting, mutex already freed */
@@ -272,7 +272,7 @@ static void ldapqry_set_busy_flag( LdapQuery *qry, const gboolean value ) {
*/
static gboolean ldapqry_get_busy_flag( LdapQuery *qry ) {
gboolean value;
- g_return_val_if_fail( qry != NULL, FALSE );
+ cm_return_val_if_fail( qry != NULL, FALSE );
pthread_mutex_lock( qry->mutexBusy );
value = qry->busyFlag;
@@ -286,7 +286,7 @@ static gboolean ldapqry_get_busy_flag( LdapQuery *qry ) {
* \param value Value of aged flag.
*/
static void ldapqry_set_aged_flag( LdapQuery *qry, const gboolean value ) {
- g_return_if_fail( qry != NULL );
+ cm_return_if_fail( qry != NULL );
qry->agedFlag = value;
}
@@ -295,7 +295,7 @@ static void ldapqry_set_aged_flag( LdapQuery *qry, const gboolean value ) {
* \param qry Query object.
*/
static void ldapqry_clear( LdapQuery *qry ) {
- g_return_if_fail( qry != NULL );
+ cm_return_if_fail( qry != NULL );
/* Free internal stuff */
g_free( ADDRQUERY_NAME(qry) );
@@ -325,7 +325,7 @@ static void ldapqry_clear( LdapQuery *qry ) {
* \param qry Query object to process.
*/
void ldapqry_free( LdapQuery *qry ) {
- g_return_if_fail( qry != NULL );
+ cm_return_if_fail( qry != NULL );
/* Clear out internal members */
ADDRQUERY_TYPE(qry) = ADDRQUERY_NONE;
@@ -963,8 +963,8 @@ static gint ldapqry_perform_locate( LdapQuery *qry );
static gint ldapqry_search( LdapQuery *qry ) {
gint retVal;
- g_return_val_if_fail( qry != NULL, -1 );
- g_return_val_if_fail( qry->control != NULL, -1 );
+ cm_return_val_if_fail( qry != NULL, -1 );
+ cm_return_val_if_fail( qry->control != NULL, -1 );
ldapqry_touch( qry );
qry->completed = FALSE;
@@ -1015,8 +1015,8 @@ static gint ldapqry_search( LdapQuery *qry ) {
* \return Error/status code.
*/
gint ldapqry_read_data_th( LdapQuery *qry ) {
- g_return_val_if_fail( qry != NULL, -1 );
- g_return_val_if_fail( qry->control != NULL, -1 );
+ cm_return_val_if_fail( qry != NULL, -1 );
+ cm_return_val_if_fail( qry->control != NULL, -1 );
ldapqry_set_stop_flag( qry, FALSE );
ldapqry_touch( qry );
@@ -1043,7 +1043,7 @@ static void ldapqry_destroyer( void * ptr ) {
LdapQuery *qry;
qry = ( LdapQuery * ) ptr;
- g_return_if_fail( qry != NULL );
+ cm_return_if_fail( qry != NULL );
debug_print("ldapqry_destroyer::%d::%s\n", (int) pthread_self(),
ADDRQUERY_NAME(qry)?ADDRQUERY_NAME(qry):"null");
@@ -1062,7 +1062,7 @@ static void ldapqry_destroyer( void * ptr ) {
* \param qry Query object to process.
*/
void ldapqry_cancel( LdapQuery *qry ) {
- g_return_if_fail( qry != NULL );
+ cm_return_if_fail( qry != NULL );
debug_print("cancelling::%d::%s\n", (int) pthread_self(),
ADDRQUERY_NAME(qry)?ADDRQUERY_NAME(qry):"null");
@@ -1096,7 +1096,7 @@ void ldapqry_initialize( void ) {
void ldapqry_age( LdapQuery *qry, gint maxAge ) {
gint age;
- g_return_if_fail( qry != NULL );
+ cm_return_if_fail( qry != NULL );
/* Limit the time that queries can hang around */
if( maxAge < 1 ) maxAge = LDAPCTL_MAX_QUERY_AGE;
@@ -1116,7 +1116,7 @@ void ldapqry_delete_folder( LdapQuery *qry ) {
AddressCache *cache;
ItemFolder *folder;
- g_return_if_fail( qry != NULL );
+ cm_return_if_fail( qry != NULL );
folder = ADDRQUERY_FOLDER(qry);
if( folder ) {
@@ -1377,7 +1377,7 @@ gboolean ldapquery_remove_results( LdapQuery *qry ) {
}
void ldapqry_print(LdapQuery *qry, FILE *stream) {
- g_return_if_fail( qry != NULL );
+ cm_return_if_fail( qry != NULL );
ldapsvr_print_data(qry->server, stream);
ldapctl_print(qry->control, stream);
diff --git a/src/ldapserver.c b/src/ldapserver.c
@@ -77,7 +77,7 @@ LdapServer *ldapsvr_create( void ) {
* \return Name for server.
*/
gchar *ldapsvr_get_name( LdapServer *server ) {
- g_return_val_if_fail( server != NULL, NULL );
+ cm_return_val_if_fail( server != NULL, NULL );
return addrcache_get_name( server->addressCache );
}
@@ -87,7 +87,7 @@ gchar *ldapsvr_get_name( LdapServer *server ) {
* \param value Name for server.
*/
void ldapsvr_set_name( LdapServer* server, const gchar *value ) {
- g_return_if_fail( server != NULL );
+ cm_return_if_fail( server != NULL );
addrcache_set_name( server->addressCache, value );
debug_print("setting name: %s\n", value?value:"null");
}
@@ -97,7 +97,7 @@ void ldapsvr_set_name( LdapServer* server, const gchar *value ) {
* \param server Server object.
*/
void ldapsvr_force_refresh( LdapServer *server ) {
- g_return_if_fail( server != NULL );
+ cm_return_if_fail( server != NULL );
addrcache_refresh( server->addressCache );
}
@@ -107,7 +107,7 @@ void ldapsvr_force_refresh( LdapServer *server ) {
* \return Status/error code.
*/
gint ldapsvr_get_status( LdapServer *server ) {
- g_return_val_if_fail( server != NULL, -1 );
+ cm_return_val_if_fail( server != NULL, -1 );
return server->retVal;
}
@@ -117,7 +117,7 @@ gint ldapsvr_get_status( LdapServer *server ) {
* \return Root level folder.
*/
ItemFolder *ldapsvr_get_root_folder( LdapServer *server ) {
- g_return_val_if_fail( server != NULL, NULL );
+ cm_return_val_if_fail( server != NULL, NULL );
/*
g_print( "ldapsvr_get_root_folder/start\n" );
ldapsvr_print_data( server, stdout );
@@ -132,7 +132,7 @@ ItemFolder *ldapsvr_get_root_folder( LdapServer *server ) {
* \return <i>TRUE</i> if data was accessed.
*/
gboolean ldapsvr_get_accessed( LdapServer *server ) {
- g_return_val_if_fail( server != NULL, FALSE );
+ cm_return_val_if_fail( server != NULL, FALSE );
return server->addressCache->accessFlag;
}
@@ -142,7 +142,7 @@ gboolean ldapsvr_get_accessed( LdapServer *server ) {
* \param value Value for flag.
*/
void ldapsvr_set_accessed( LdapServer *server, const gboolean value ) {
- g_return_if_fail( server != NULL );
+ cm_return_if_fail( server != NULL );
server->addressCache->accessFlag = value;
debug_print("setting accessFlag: %d\n", value);
}
@@ -153,7 +153,7 @@ void ldapsvr_set_accessed( LdapServer *server, const gboolean value ) {
* \return <i>TRUE</i> if data was modified.
*/
gboolean ldapsvr_get_modified( LdapServer *server ) {
- g_return_val_if_fail( server != NULL, FALSE );
+ cm_return_val_if_fail( server != NULL, FALSE );
return server->addressCache->modified;
}
@@ -163,7 +163,7 @@ gboolean ldapsvr_get_modified( LdapServer *server ) {
* \param value Value for flag.
*/
void ldapsvr_set_modified( LdapServer *server, const gboolean value ) {
- g_return_if_fail( server != NULL );
+ cm_return_if_fail( server != NULL );
server->addressCache->modified = value;
debug_print("setting modified: %d\n", value);
}
@@ -174,7 +174,7 @@ void ldapsvr_set_modified( LdapServer *server, const gboolean value ) {
* \return <i>TRUE</i> if data was read.
*/
gboolean ldapsvr_get_read_flag( LdapServer *server ) {
- g_return_val_if_fail( server != NULL, FALSE );
+ cm_return_val_if_fail( server != NULL, FALSE );
return server->addressCache->dataRead;
}
@@ -184,7 +184,7 @@ gboolean ldapsvr_get_read_flag( LdapServer *server ) {
* \return <i>TRUE</i> if server is used for dynamic searches.
*/
gboolean ldapsvr_get_search_flag( LdapServer *server ) {
- g_return_val_if_fail( server != NULL, FALSE );
+ cm_return_val_if_fail( server != NULL, FALSE );
return server->searchFlag;
}
@@ -194,7 +194,7 @@ gboolean ldapsvr_get_search_flag( LdapServer *server ) {
* \param value Name for server.
*/
void ldapsvr_set_search_flag( LdapServer *server, const gboolean value ) {
- g_return_if_fail( server != NULL );
+ cm_return_if_fail( server != NULL );
server->searchFlag = value;
debug_print("setting searchFlag: %d\n", value);
}
@@ -206,7 +206,7 @@ void ldapsvr_set_search_flag( LdapServer *server, const gboolean value ) {
* \param ctl Control data.
*/
void ldapsvr_set_control( LdapServer *server, LdapControl *ctl ) {
- g_return_if_fail( server != NULL );
+ cm_return_if_fail( server != NULL );
addrcache_refresh( server->addressCache );
server->control = ctl;
}
@@ -217,7 +217,7 @@ void ldapsvr_set_control( LdapServer *server, LdapControl *ctl ) {
*/
void ldapsvr_free_all_query( LdapServer *server ) {
GList *node;
- g_return_if_fail( server != NULL );
+ cm_return_if_fail( server != NULL );
node = server->listQuery;
while( node ) {
@@ -236,8 +236,8 @@ void ldapsvr_free_all_query( LdapServer *server ) {
* \param qry Query object.
*/
void ldapsvr_add_query( LdapServer *server, LdapQuery *qry ) {
- g_return_if_fail( server != NULL );
- g_return_if_fail( qry != NULL );
+ cm_return_if_fail( server != NULL );
+ cm_return_if_fail( qry != NULL );
server->listQuery = g_list_append( server->listQuery, qry );
qry->server = server;
@@ -248,7 +248,7 @@ void ldapsvr_add_query( LdapServer *server, LdapQuery *qry ) {
* \param server Server object.
*/
void ldapsvr_free( LdapServer *server ) {
- g_return_if_fail( server != NULL );
+ cm_return_if_fail( server != NULL );
/* Stop and cancel any queries that may be active */
ldapsvr_stop_all_query( server );
@@ -285,7 +285,7 @@ void ldapsvr_print_data( LdapServer *server, FILE *stream ) {
GList *node;
gint i;
- g_return_if_fail( server != NULL );
+ cm_return_if_fail( server != NULL );
fprintf( stream, "LdapServer:\n" );
fprintf( stream, " ret val: %d\n", server->retVal );
@@ -317,7 +317,7 @@ void ldapsvr_print_data( LdapServer *server, FILE *stream ) {
* \return List of persons.
*/
GList *ldapsvr_get_list_person( LdapServer *server ) {
- g_return_val_if_fail( server != NULL, NULL );
+ cm_return_val_if_fail( server != NULL, NULL );
return addrcache_get_list_person( server->addressCache );
}
@@ -328,7 +328,7 @@ GList *ldapsvr_get_list_person( LdapServer *server ) {
* \return List of folders.
*/
GList *ldapsvr_get_list_folder( LdapServer *server ) {
- g_return_val_if_fail( server != NULL, NULL );
+ cm_return_val_if_fail( server != NULL, NULL );
/* return addrcache_get_list_folder( server->addressCache ); */
return NULL;
}
@@ -341,8 +341,8 @@ GList *ldapsvr_get_list_folder( LdapServer *server ) {
void ldapsvr_execute_query( LdapServer *server, LdapQuery *qry ) {
LdapControl *ctlCopy;
- g_return_if_fail( server != NULL );
- g_return_if_fail( qry != NULL );
+ cm_return_if_fail( server != NULL );
+ cm_return_if_fail( qry != NULL );
/* Copy server's control data to the query */
ctlCopy = ldapctl_create();
@@ -369,7 +369,7 @@ void ldapsvr_execute_query( LdapServer *server, LdapQuery *qry ) {
*/
void ldapsvr_stop_query_id( LdapServer *server, const gint queryID ) {
GList *node;
- g_return_if_fail( server != NULL );
+ cm_return_if_fail( server != NULL );
node = server->listQuery;
while( node ) {
@@ -388,7 +388,7 @@ void ldapsvr_stop_query_id( LdapServer *server, const gint queryID ) {
*/
void ldapsvr_stop_all_query( LdapServer *server ) {
GList *node;
- g_return_if_fail( server != NULL );
+ cm_return_if_fail( server != NULL );
node = server->listQuery;
while( node ) {
@@ -404,7 +404,7 @@ void ldapsvr_stop_all_query( LdapServer *server ) {
*/
void ldapsvr_cancel_all_query( LdapServer *server ) {
GList *node;
- g_return_if_fail( server != NULL );
+ cm_return_if_fail( server != NULL );
node = server->listQuery;
while( node ) {
@@ -430,7 +430,7 @@ static LdapQuery *ldapsvr_locate_query(
{
LdapQuery *incomplete = NULL;
GList *node;
- g_return_val_if_fail( server != NULL, NULL );
+ cm_return_val_if_fail( server != NULL, NULL );
node = server->listQuery;
node = g_list_last( node );
@@ -470,7 +470,7 @@ void ldapsvr_retire_query( LdapServer *server ) {
ItemFolder *folder;
debug_print("ldapsvr_retire_query\n");
- g_return_if_fail( server != NULL );
+ cm_return_if_fail( server != NULL );
ctl = server->control;
maxAge = ctl->maxQueryAge;
@@ -569,8 +569,8 @@ gboolean ldapsvr_reuse_previous( const LdapServer *server, const QueryRequest *r
gchar *searchTerm;
ItemFolder *folder;
- g_return_val_if_fail( server != NULL, FALSE );
- g_return_val_if_fail( req != NULL, FALSE );
+ cm_return_val_if_fail( server != NULL, FALSE );
+ cm_return_val_if_fail( req != NULL, FALSE );
searchTerm = req->searchTerm;
@@ -603,8 +603,8 @@ LdapQuery *ldapsvr_new_dynamic_search( LdapServer *server, QueryRequest *req )
gchar *searchTerm;
ItemFolder *folder;
- g_return_val_if_fail( server != NULL, NULL );
- g_return_val_if_fail( req != NULL, NULL );
+ cm_return_val_if_fail( server != NULL, NULL );
+ cm_return_val_if_fail( req != NULL, NULL );
/* Retire any aged queries */
/* // ldapsvr_retire_query( server ); */
@@ -661,9 +661,9 @@ LdapQuery *ldapsvr_new_explicit_search(
gchar *searchTerm;
gchar *name;
- g_return_val_if_fail( server != NULL, NULL );
- g_return_val_if_fail( req != NULL, NULL );
- g_return_val_if_fail( folder != NULL, NULL );
+ cm_return_val_if_fail( server != NULL, NULL );
+ cm_return_val_if_fail( req != NULL, NULL );
+ cm_return_val_if_fail( folder != NULL, NULL );
/* Retire any aged queries */
/* // ldapsvr_retire_query( server ); */
@@ -701,7 +701,7 @@ gint ldapsvr_read_data( LdapServer *server )
{
gchar *name;
- g_return_val_if_fail( server != NULL, -1 );
+ cm_return_val_if_fail( server != NULL, -1 );
name = addrcache_get_name(server->addressCache);
debug_print("...addrbook_read_data :%s:\n", name?name:"null");
diff --git a/src/ldapupdate.c b/src/ldapupdate.c
@@ -96,7 +96,7 @@ struct _Rdn {
*/
void ldapsvr_retrieve_item_group(ItemGroup *group, GHashTable *array) {
/* Not implemented in this release */
- g_return_if_fail(group != NULL);
+ cm_return_if_fail(group != NULL);
}
/**
@@ -150,7 +150,7 @@ void attrkeyvalue_free(AttrKeyValue *akv) {
*/
EmailKeyValue *ldapsvr_retrieve_item_email(ItemEMail *item) {
EmailKeyValue *newItem;
- g_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
newItem = emailkeyvalue_create();
newItem->alias = g_strdup(ADDRITEM_NAME(item));
newItem->mail = g_strdup(item->address);
@@ -165,7 +165,7 @@ EmailKeyValue *ldapsvr_retrieve_item_email(ItemEMail *item) {
*/
AttrKeyValue *ldapsvr_retrieve_attribute(UserAttribute *item) {
AttrKeyValue *newItem;
- g_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
newItem = attrkeyvalue_create();
newItem->key = g_strdup(item->name);
newItem->value = g_strdup(item->value);
@@ -181,7 +181,7 @@ AttrKeyValue *ldapsvr_retrieve_attribute(UserAttribute *item) {
gboolean ldapsvr_retrieve_item_person(ItemPerson *person, GHashTable *array) {
GList *node, *attr;
- g_return_val_if_fail(person != NULL, FALSE);
+ cm_return_val_if_fail(person != NULL, FALSE);
switch (person->status) {
case NONE: return FALSE;
case ADD_ENTRY: g_hash_table_insert(array, "status", "new"); break;
@@ -297,7 +297,7 @@ void ldapsvr_free_hashtable(GList *list) {
*/
ItemPerson *ldapsvr_get_contact(LdapServer *server, gchar *uid) {
AddrItemObject *aio;
- g_return_val_if_fail(server != NULL || uid != NULL, NULL);
+ cm_return_val_if_fail(server != NULL || uid != NULL, NULL);
aio = addrcache_get_object(server->addressCache, uid);
if (aio) {
if(aio->type == ITEMTYPE_PERSON) {
@@ -318,7 +318,7 @@ LDAP *ldapsvr_connect(LdapControl *ctl) {
gint version;
gchar *uri = NULL;
- g_return_val_if_fail(ctl != NULL, NULL);
+ cm_return_val_if_fail(ctl != NULL, NULL);
ldapsrv_set_options (ctl->timeOut, NULL);
uri = g_strdup_printf("ldap%s://%s:%d",
@@ -375,7 +375,7 @@ LDAP *ldapsvr_connect(LdapControl *ctl) {
*/
void ldapsvr_disconnect(LDAP *ld) {
/* Disconnect */
- g_return_if_fail(ld != NULL);
+ cm_return_if_fail(ld != NULL);
ldap_unbind_ext(ld, NULL, NULL);
}
@@ -439,7 +439,7 @@ Rdn *ldapsvr_modify_dn(GHashTable *hash, gchar *dn) {
gchar *pos, *compare;
gchar *rest;
gchar *val;
- g_return_val_if_fail(hash != NULL || dn != NULL, NULL);
+ cm_return_val_if_fail(hash != NULL || dn != NULL, NULL);
pos = g_strstr_len(dn, strlen(dn), "=");
compare = g_strndup(dn, pos - dn);
@@ -575,7 +575,7 @@ AttrKeyValue *get_cn(gchar *dn) {
gchar *end;
gchar *item;
gchar **key_value;
- g_return_val_if_fail(dn != NULL, NULL);
+ cm_return_val_if_fail(dn != NULL, NULL);
cn = attrkeyvalue_create();
start = g_strstr_len(dn, strlen(dn), "cn");
@@ -609,7 +609,7 @@ AttrKeyValue *get_mail(gchar *dn) {
gchar *end;
gchar *item;
gchar **key_value;
- g_return_val_if_fail(dn != NULL, NULL);
+ cm_return_val_if_fail(dn != NULL, NULL);
mail = attrkeyvalue_create();
start = g_strstr_len(dn, strlen(dn), "mail");
@@ -644,7 +644,7 @@ AttrKeyValue *get_ou(gchar *dn) {
gchar *item;
gchar **key_value;
- g_return_val_if_fail(dn != NULL, NULL);
+ cm_return_val_if_fail(dn != NULL, NULL);
ou = attrkeyvalue_create();
start = g_strstr_len(dn, strlen(dn), ",o=");
if (start == NULL)
@@ -677,7 +677,7 @@ void ldapsvr_print_ldapmod(LDAPMod *mods[]) {
gchar *mod_op;
int i;
- g_return_if_fail(mods != NULL);
+ cm_return_if_fail(mods != NULL);
g_printerr( "Type\n");
for (i = 0; NULL != mods[i]; i++) {
LDAPMod *mod = (LDAPMod *) mods[i];
@@ -715,7 +715,7 @@ void ldapsvr_compare_attr(LDAP *ld, gchar *dn, gint cnt, LDAPMod *mods[]) {
#endif
- g_return_if_fail(ld != NULL || dn != NULL || cnt >= 0 || mods != NULL);
+ cm_return_if_fail(ld != NULL || dn != NULL || cnt >= 0 || mods != NULL);
for (i = 0; i < cnt; i++) {
gchar *value = g_strdup(mods[i]->mod_vals.modv_strvals[0]);
if (!value || strcmp(value, "") == 0)
@@ -762,7 +762,7 @@ int ldapsvr_compare_manual_attr(LDAP *ld, LdapServer *server, gchar *dn, char *a
int retVal = -2, i;
AttrKeyValue *mail;
- g_return_val_if_fail(ld != NULL || server != NULL || attr != NULL, -1);
+ cm_return_val_if_fail(ld != NULL || server != NULL || attr != NULL, -1);
ctl = server->control;
mail = get_mail(dn);
if (! mail)
@@ -852,7 +852,7 @@ int ldapsvr_deside_operation(LDAP *ld, LdapServer *server, char *dn, char *attr,
#endif
- g_return_val_if_fail(ld != NULL || server != NULL || dn != NULL || attr != NULL, -1);
+ cm_return_val_if_fail(ld != NULL || server != NULL || dn != NULL || attr != NULL, -1);
if (value == NULL)
return -1;
/* value containing empty string cause invalid syntax. A bug in
@@ -932,7 +932,7 @@ void ldapsvr_handle_other_attributes(LDAP *ld, LdapServer *server, char *dn, GHa
char *attr[ATTRIBUTE_SIZE + 1][2];
int mod_op, rc, i;
- g_return_if_fail(server != NULL || dn != NULL || contact != NULL);
+ cm_return_if_fail(server != NULL || dn != NULL || contact != NULL);
for (i = 0; i <= ATTRIBUTE_SIZE; i++) {
CHECKED_ATTRIBUTE[i] = FALSE;
attr[i][0] = attr[i][1] = NULL;
@@ -1072,7 +1072,7 @@ void ldapsvr_add_contact(LdapServer *server, GHashTable *contact) {
gchar *base_dn;
GList *mailList;
- g_return_if_fail(server != NULL || contact != NULL);
+ cm_return_if_fail(server != NULL || contact != NULL);
node = g_hash_table_lookup(contact , "mail");
if (node) {
EmailKeyValue *newEmail = node->data;
@@ -1195,7 +1195,7 @@ void ldapsvr_update_contact(LdapServer *server, GHashTable *contact) {
GList *mailList;
int mod_op;
- g_return_if_fail(server != NULL || contact != NULL);
+ cm_return_if_fail(server != NULL || contact != NULL);
ld = ldapsvr_connect(server->control);
if (ld == NULL) {
clean_up(ld, server, contact);
@@ -1418,7 +1418,7 @@ void ldapsvr_delete_contact(LdapServer *server, GHashTable *contact) {
gchar *dn;
int rc;
- g_return_if_fail(server != NULL || contact != NULL);
+ cm_return_if_fail(server != NULL || contact != NULL);
ld = ldapsvr_connect(server->control);
if (ld == NULL) {
clean_up(ld, server, contact);
@@ -1450,7 +1450,7 @@ void ldapsvr_update_book(LdapServer *server, ItemPerson *item) {
GHashTable *contact = NULL;
GList *contacts = NULL, *head = NULL;
- g_return_if_fail(server != NULL);
+ cm_return_if_fail(server != NULL);
debug_print("updating ldap addressbook\n");
contact = g_hash_table_new(g_str_hash, g_str_equal);
diff --git a/src/ldif.c b/src/ldif.c
@@ -63,7 +63,7 @@ LdifFile *ldif_create() {
* \param value Value of access flag.
*/
void ldif_set_file( LdifFile *ldifFile, const gchar *value ) {
- g_return_if_fail( ldifFile != NULL );
+ cm_return_if_fail( ldifFile != NULL );
if( ldifFile->path ) {
if( strcmp( ldifFile->path, value ) != 0 )
@@ -83,7 +83,7 @@ void ldif_set_file( LdifFile *ldifFile, const gchar *value ) {
* \param value File specification.
*/
void ldif_set_accessed( LdifFile *ldifFile, const gboolean value ) {
- g_return_if_fail( ldifFile != NULL );
+ cm_return_if_fail( ldifFile != NULL );
ldifFile->accessFlag = value;
}
@@ -123,7 +123,7 @@ static void ldif_free_fieldrec( Ldif_FieldRec *rec ) {
* named.
*/
void ldif_field_set_name( Ldif_FieldRec *rec, const gchar *value ) {
- g_return_if_fail( rec != NULL );
+ cm_return_if_fail( rec != NULL );
if( ! rec->reserved ) {
rec->userName = mgu_replace_string( rec->userName, value );
@@ -138,7 +138,7 @@ void ldif_field_set_name( Ldif_FieldRec *rec, const gchar *value ) {
* fields cannot be unselected.
*/
void ldif_field_set_selected( Ldif_FieldRec *rec, const gboolean value ) {
- g_return_if_fail( rec != NULL );
+ cm_return_if_fail( rec != NULL );
if( ! rec->reserved ) {
rec->selected = value;
@@ -151,7 +151,7 @@ void ldif_field_set_selected( Ldif_FieldRec *rec, const gboolean value ) {
* \param rec LDIF field object.
*/
void ldif_field_toggle( Ldif_FieldRec *rec ) {
- g_return_if_fail( rec != NULL );
+ cm_return_if_fail( rec != NULL );
if( ! rec->reserved ) {
rec->selected = !rec->selected;
@@ -177,7 +177,7 @@ static gint ldif_hash_free_vis( gpointer key, gpointer value, gpointer data ) {
* \param ldifFile LDIF import control object.
*/
void ldif_free( LdifFile *ldifFile ) {
- g_return_if_fail( ldifFile != NULL );
+ cm_return_if_fail( ldifFile != NULL );
/* Close file */
if( ldifFile->file ) fclose( ldifFile->file );
@@ -234,7 +234,7 @@ static gint ldif_open_file( LdifFile* ldifFile ) {
* \param ldifFile LDIF import control object.
*/
static void ldif_close_file( LdifFile *ldifFile ) {
- g_return_if_fail( ldifFile != NULL );
+ cm_return_if_fail( ldifFile != NULL );
if( ldifFile->file ) fclose( ldifFile->file );
ldifFile->file = NULL;
}
@@ -923,7 +923,7 @@ static void ldif_read_tag_list( LdifFile *ldifFile ) {
* \return Status code.
*/
gint ldif_import_data( LdifFile *ldifFile, AddressCache *cache ) {
- g_return_val_if_fail( ldifFile != NULL, MGU_BAD_ARGS );
+ cm_return_val_if_fail( ldifFile != NULL, MGU_BAD_ARGS );
ldifFile->retVal = MGU_SUCCESS;
addrcache_clear( cache );
cache->dataRead = FALSE;
@@ -947,7 +947,7 @@ gint ldif_import_data( LdifFile *ldifFile, AddressCache *cache ) {
* \return Status code.
*/
gint ldif_read_tags( LdifFile *ldifFile ) {
- g_return_val_if_fail( ldifFile != NULL, MGU_BAD_ARGS );
+ cm_return_val_if_fail( ldifFile != NULL, MGU_BAD_ARGS );
ldifFile->retVal = MGU_SUCCESS;
if( ldifFile->dirtyFlag ) {
ldif_open_file( ldifFile );
@@ -973,7 +973,7 @@ gint ldif_read_tags( LdifFile *ldifFile ) {
GList *ldif_get_fieldlist( LdifFile *ldifFile ) {
GList *list = NULL;
- g_return_val_if_fail( ldifFile != NULL, NULL );
+ cm_return_val_if_fail( ldifFile != NULL, NULL );
if( ldifFile->hashFields ) {
ldifFile->tempList = NULL;
g_hash_table_foreach( ldifFile->hashFields, ldif_hash2list_vis, ldifFile );
diff --git a/src/localfolder.c b/src/localfolder.c
@@ -32,7 +32,7 @@ void folder_local_folder_init(Folder *folder, const gchar *name,
void folder_local_folder_destroy(LocalFolder *lfolder)
{
- g_return_if_fail(lfolder != NULL);
+ cm_return_if_fail(lfolder != NULL);
g_free(lfolder->rootpath);
}
diff --git a/src/main.c b/src/main.c
@@ -1971,7 +1971,7 @@ static void initial_processing(FolderItem *item, gpointer data)
MainWindow *mainwin = (MainWindow *)data;
gchar *buf;
- g_return_if_fail(item);
+ cm_return_if_fail(item);
buf = g_strdup_printf(_("Processing (%s)..."),
item->path
? item->path
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -877,13 +877,13 @@ static void mainwindow_colorlabel_menu_item_activate_item_cb(GtkMenuItem *menu_i
GSList *sel;
mainwin = (MainWindow *)data;
- g_return_if_fail(mainwin != NULL);
+ cm_return_if_fail(mainwin != NULL);
sel = summary_get_selection(mainwin->summaryview);
if (!sel) return;
menu = GTK_MENU_SHELL(mainwin->colorlabel_menu);
- g_return_if_fail(menu != NULL);
+ cm_return_if_fail(menu != NULL);
Xalloca(items, (N_COLOR_LABELS + 1) * sizeof(GtkWidget *), return);
@@ -933,7 +933,7 @@ static void mainwindow_colorlabel_menu_item_activate_cb(GtkWidget *widget,
MainWindow *mainwin;
mainwin = g_object_get_data(G_OBJECT(widget), "mainwin");
- g_return_if_fail(mainwin != NULL);
+ cm_return_if_fail(mainwin != NULL);
/* "dont_toggle" state set? */
if (g_object_get_data(G_OBJECT(mainwin->colorlabel_menu),
@@ -960,13 +960,13 @@ static void mainwindow_tags_menu_item_activate_item_cb(GtkMenuItem *menu_item,
NULL, NULL);
gint sel_len;
mainwin = (MainWindow *)data;
- g_return_if_fail(mainwin != NULL);
+ cm_return_if_fail(mainwin != NULL);
sel = summary_get_selection(mainwin->summaryview);
if (!sel) return;
menu = GTK_MENU_SHELL(mainwin->tags_menu);
- g_return_if_fail(menu != NULL);
+ cm_return_if_fail(menu != NULL);
/* NOTE: don't return prematurely because we set the "dont_toggle"
* state for check menu items */
@@ -1042,7 +1042,7 @@ static void mainwindow_tags_menu_item_activate_cb(GtkWidget *widget,
MainWindow *mainwin;
mainwin = g_object_get_data(G_OBJECT(widget), "mainwin");
- g_return_if_fail(mainwin != NULL);
+ cm_return_if_fail(mainwin != NULL);
/* "dont_toggle" state set? */
if (g_object_get_data(G_OBJECT(mainwin->tags_menu),
@@ -1153,7 +1153,7 @@ static void mainwindow_tags_menu_item_apply_tags_activate_cb(GtkWidget *widget,
MainWindow *mainwin;
mainwin = g_object_get_data(G_OBJECT(widget), "mainwin");
- g_return_if_fail(mainwin != NULL);
+ cm_return_if_fail(mainwin != NULL);
/* "dont_toggle" state set? */
if (g_object_get_data(G_OBJECT(mainwin->tags_menu),
@@ -2449,7 +2449,7 @@ void main_window_reflect_prefs_custom_colors(MainWindow *mainwin)
/* re-create colorlabel submenu */
menu = GTK_MENU_SHELL(mainwin->colorlabel_menu);
- g_return_if_fail(menu != NULL);
+ cm_return_if_fail(menu != NULL);
/* clear items. get item pointers. */
for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
@@ -2477,7 +2477,7 @@ static gboolean main_window_reflect_tags_changes_real(gpointer data)
}
/* re-create tags submenu */
menu = GTK_MENU_SHELL(mainwin->tags_menu);
- g_return_val_if_fail(menu != NULL, FALSE);
+ cm_return_val_if_fail(menu != NULL, FALSE);
/* clear items. get item pointers. */
for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
@@ -4071,10 +4071,10 @@ static void main_window_reply_cb(GtkAction *gaction, gpointer data)
DO_ACTION("Message/Redirect", COMPOSE_REDIRECT);
DO_ACTION("Message/FollowupReply", COMPOSE_FOLLOWUP_AND_REPLY_TO);
- g_return_if_fail(msgview != NULL);
+ cm_return_if_fail(msgview != NULL);
msginfo_list = summary_get_selection(mainwin->summaryview);
- g_return_if_fail(msginfo_list != NULL);
+ cm_return_if_fail(msginfo_list != NULL);
compose_reply_from_messageview(msgview, msginfo_list, action);
g_slist_free(msginfo_list);
}
@@ -4205,7 +4205,7 @@ static void online_switch_clicked (GtkButton *btn, gpointer data)
mainwin = (MainWindow *) data;
- g_return_if_fail(mainwin != NULL);
+ cm_return_if_fail(mainwin != NULL);
if (btn == GTK_BUTTON(mainwin->online_switch)) {
#ifndef GENERIC_UMPC
@@ -4637,7 +4637,7 @@ static void process_cb(GtkAction *action, gpointer data)
{
MainWindow *mainwin = (MainWindow *)data;
FolderItem *item = mainwin->summaryview->folder_item;
- g_return_if_fail(item != NULL);
+ cm_return_if_fail(item != NULL);
item->processing_pending = TRUE;
folder_item_apply_processing(item);
@@ -5035,11 +5035,11 @@ static gboolean mainwindow_focus_in_event(GtkWidget *widget, GdkEventFocus *focu
{
SummaryView *summary;
- g_return_val_if_fail(data, FALSE);
+ cm_return_val_if_fail(data, FALSE);
if (!g_list_find(mainwin_list, data))
return TRUE;
summary = ((MainWindow *)data)->summaryview;
- g_return_val_if_fail(summary, FALSE);
+ cm_return_val_if_fail(summary, FALSE);
if (GTK_CMCLIST(summary->ctree)->selection &&
g_list_length(GTK_CMCLIST(summary->ctree)->selection) > 1)
diff --git a/src/matcher.c b/src/matcher.c
@@ -351,7 +351,7 @@ static gboolean match_with_addresses_in_addressbook
gboolean found = FALSE;
gchar *path = NULL;
- g_return_val_if_fail(address_list != NULL, FALSE);
+ cm_return_val_if_fail(address_list != NULL, FALSE);
debug_print("match_with_addresses_in_addressbook(%d, %s)\n",
g_slist_length(address_list), folderpath?folderpath:"(null)");
@@ -1206,7 +1206,7 @@ void matcherlist_free(MatcherList *cond)
{
GSList *l;
- g_return_if_fail(cond);
+ cm_return_if_fail(cond);
for (l = cond->matchers ; l != NULL ; l = g_slist_next(l)) {
matcherprop_free((MatcherProp *) l->data);
}
diff --git a/src/mbox.c b/src/mbox.c
@@ -92,8 +92,8 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, gboolean apply_filter,
gboolean printed = FALSE;
FolderItem *dropfolder;
- g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(mbox != NULL, -1);
+ cm_return_val_if_fail(dest != NULL, -1);
+ cm_return_val_if_fail(mbox != NULL, -1);
debug_print("Getting messages from %s into %s...\n", mbox, dest->path);
@@ -681,9 +681,9 @@ gint export_to_mbox(FolderItem *src, const gchar *mbox)
GSList *mlist;
gint ret;
- g_return_val_if_fail(src != NULL, -1);
- g_return_val_if_fail(src->folder != NULL, -1);
- g_return_val_if_fail(mbox != NULL, -1);
+ cm_return_val_if_fail(src != NULL, -1);
+ cm_return_val_if_fail(src->folder != NULL, -1);
+ cm_return_val_if_fail(mbox != NULL, -1);
debug_print("Exporting messages from %s into %s...\n",
src->path, mbox);
diff --git a/src/messageview.c b/src/messageview.c
@@ -730,8 +730,8 @@ static void notification_convert_header(gchar *dest, gint len,
{
char *src;
- g_return_if_fail(src_ != NULL);
- g_return_if_fail(dest != NULL);
+ cm_return_if_fail(src_ != NULL);
+ cm_return_if_fail(dest != NULL);
if (len < 1) return;
@@ -1114,7 +1114,7 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
gchar *file;
MimeInfo *mimeinfo, *encinfo;
gchar *subject = NULL;
- g_return_val_if_fail(msginfo != NULL, -1);
+ cm_return_val_if_fail(msginfo != NULL, -1);
if (msginfo != messageview->msginfo)
messageview->show_full_text = FALSE;
@@ -1461,7 +1461,7 @@ void messageview_delete(MessageView *msgview)
} else {
msginfo = msgview->msginfo;
- g_return_if_fail(msginfo != NULL);
+ cm_return_if_fail(msginfo != NULL);
/* to get the trash folder, we have to choose either
* the folder's or account's trash default - we prefer
@@ -1476,7 +1476,7 @@ void messageview_delete(MessageView *msgview)
trash = folder_get_default_trash();
}
- g_return_if_fail(trash != NULL);
+ cm_return_if_fail(trash != NULL);
if (prefs_common.immediate_exec)
/* TODO: Delete from trash */
@@ -1503,7 +1503,7 @@ static void messageview_update(MessageView *msgview, MsgInfo *old_msginfo)
{
SummaryView *summaryview = (SummaryView*)msgview->mainwin->summaryview;
- g_return_if_fail(summaryview != NULL);
+ cm_return_if_fail(summaryview != NULL);
if (summaryview->selected) {
MsgInfo *msginfo = summary_get_selected_msg(summaryview);
@@ -1666,7 +1666,7 @@ static gint messageview_delete_cb(GtkWidget *widget, GdkEventAny *event,
static void messageview_size_allocate_cb(GtkWidget *widget,
GtkAllocation *allocation)
{
- g_return_if_fail(allocation != NULL);
+ cm_return_if_fail(allocation != NULL);
prefs_common.msgwin_width = allocation->width;
prefs_common.msgwin_height = allocation->height;
@@ -1880,8 +1880,8 @@ static PrefsAccount *select_account_from_list(GList *ac_list)
GtkWidget *optmenu;
gint account_id;
- g_return_val_if_fail(ac_list != NULL, NULL);
- g_return_val_if_fail(ac_list->data != NULL, NULL);
+ cm_return_val_if_fail(ac_list != NULL, NULL);
+ cm_return_val_if_fail(ac_list->data != NULL, NULL);
optmenu = gtkut_account_menu_new(ac_list,
G_CALLBACK(select_account_cb),
@@ -1917,7 +1917,7 @@ gchar *messageview_get_selection(MessageView *msgview)
GtkTextBuffer *textbuf;
gint body_pos = 0;
- g_return_val_if_fail(msgview != NULL, NULL);
+ cm_return_val_if_fail(msgview != NULL, NULL);
if (msgview->mimeview->type == MIMEVIEW_VIEWER) {
MimeViewer *viewer = msgview->mimeview->mimeviewer;
@@ -1929,10 +1929,10 @@ gchar *messageview_get_selection(MessageView *msgview)
}
textview = messageview_get_current_textview(msgview);
- g_return_val_if_fail(textview != NULL, NULL);
+ cm_return_val_if_fail(textview != NULL, NULL);
edit = GTK_TEXT_VIEW(textview->text);
- g_return_val_if_fail(edit != NULL, NULL);
+ cm_return_val_if_fail(edit != NULL, NULL);
body_pos = textview->body_pos;
textbuf = gtk_text_view_get_buffer(edit);
@@ -2585,7 +2585,7 @@ static void reply_cb(GtkAction *gaction, gpointer data)
gint action = COMPOSE_REPLY;
const gchar *a_name = gtk_action_get_name(gaction);
- g_return_if_fail(messageview->msginfo);
+ cm_return_if_fail(messageview->msginfo);
DO_ACTION("Message/Reply", COMPOSE_REPLY);
DO_ACTION("Message/ReplyTo/All", COMPOSE_REPLY_TO_ALL);
diff --git a/src/mh.c b/src/mh.c
@@ -210,7 +210,7 @@ gboolean mh_scan_required(Folder *folder, FolderItem *item)
struct stat s;
path = folder_item_get_path(item);
- g_return_val_if_fail(path != NULL, FALSE);
+ cm_return_val_if_fail(path != NULL, FALSE);
if (g_stat(path, &s) < 0) {
FILE_OP_ERROR(path, "stat");
@@ -244,12 +244,12 @@ static void mh_get_last_num(Folder *folder, FolderItem *item)
gint max = 0;
gint num;
- g_return_if_fail(item != NULL);
+ cm_return_if_fail(item != NULL);
debug_print("mh_get_last_num(): Scanning %s ...\n", item->path?item->path:"(null)");
path = folder_item_get_path(item);
- g_return_if_fail(path != NULL);
+ cm_return_if_fail(path != NULL);
if (change_dir(path) < 0) {
g_free(path);
return;
@@ -284,14 +284,14 @@ gint mh_get_num_list(Folder *folder, FolderItem *item, GSList **list, gboolean *
struct dirent *d;
gint num, nummsgs = 0;
- g_return_val_if_fail(item != NULL, -1);
+ cm_return_val_if_fail(item != NULL, -1);
debug_print("mh_get_num_list(): Scanning %s ...\n", item->path?item->path:"(null)");
*old_uids_valid = TRUE;
path = folder_item_get_path(item);
- g_return_val_if_fail(path != NULL, -1);
+ cm_return_val_if_fail(path != NULL, -1);
if (change_dir(path) < 0) {
g_free(path);
return -1;
@@ -320,8 +320,8 @@ static gchar *mh_fetch_msg(Folder *folder, FolderItem *item, gint num)
gchar *path;
gchar *file;
- g_return_val_if_fail(item != NULL, NULL);
- g_return_val_if_fail(num > 0, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(num > 0, NULL);
path = folder_item_get_path(item);
file = g_strconcat(path, G_DIR_SEPARATOR_S, itos(num), NULL);
@@ -340,7 +340,7 @@ static MsgInfo *mh_get_msginfo(Folder *folder, FolderItem *item, gint num)
MsgInfo *msginfo;
gchar *file;
- g_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
if (num <= 0)
return NULL;
@@ -362,7 +362,7 @@ static gchar *mh_get_new_msg_filename(FolderItem *dest)
gchar *destpath;
destpath = folder_item_get_path(dest);
- g_return_val_if_fail(destpath != NULL, NULL);
+ cm_return_val_if_fail(destpath != NULL, NULL);
if (!is_dir_exist(destpath))
make_dir_hier(destpath);
@@ -388,7 +388,7 @@ static gint mh_add_msg(Folder *folder, FolderItem *dest, const gchar *file, MsgF
GSList file_list;
MsgFileInfo fileinfo;
- g_return_val_if_fail(file != NULL, -1);
+ cm_return_val_if_fail(file != NULL, -1);
fileinfo.msginfo = NULL;
fileinfo.file = (gchar *)file;
@@ -407,8 +407,8 @@ static gint mh_add_msgs(Folder *folder, FolderItem *dest, GSList *file_list,
GSList *cur;
MsgFileInfo *fileinfo;
- g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(file_list != NULL, -1);
+ cm_return_val_if_fail(dest != NULL, -1);
+ cm_return_val_if_fail(file_list != NULL, -1);
if (dest->last_num < 0) {
mh_get_last_num(folder, dest);
@@ -447,7 +447,7 @@ static gint mh_copy_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
{
GSList msglist;
- g_return_val_if_fail(msginfo != NULL, -1);
+ cm_return_val_if_fail(msginfo != NULL, -1);
msglist.data = msginfo;
msglist.next = NULL;
@@ -473,12 +473,12 @@ static gint mh_copy_msgs(Folder *folder, FolderItem *dest, MsgInfoList *msglist,
time_t last_dest_mtime = (time_t)0;
time_t last_src_mtime = (time_t)0;
- g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(msglist != NULL, -1);
+ cm_return_val_if_fail(dest != NULL, -1);
+ cm_return_val_if_fail(msglist != NULL, -1);
msginfo = (MsgInfo *)msglist->data;
- g_return_val_if_fail(msginfo != NULL, -1);
+ cm_return_val_if_fail(msginfo != NULL, -1);
if (msginfo->folder == dest) {
g_warning("the src folder is identical to the dest.\n");
@@ -618,10 +618,10 @@ static gint mh_remove_msg(Folder *folder, FolderItem *item, gint num)
time_t last_mtime = (time_t)0;
gchar *file;
- g_return_val_if_fail(item != NULL, -1);
+ cm_return_val_if_fail(item != NULL, -1);
file = mh_fetch_msg(folder, item, num);
- g_return_val_if_fail(file != NULL, -1);
+ cm_return_val_if_fail(file != NULL, -1);
need_scan = mh_scan_required(folder, item);
last_mtime = item->mtime;
@@ -648,7 +648,7 @@ static gint mh_remove_msgs(Folder *folder, FolderItem *item,
MsgInfoList *cur;
gint total = 0, curnum = 0;
- g_return_val_if_fail(item != NULL, -1);
+ cm_return_val_if_fail(item != NULL, -1);
path = folder_item_get_path(item);
@@ -704,10 +704,10 @@ static gint mh_remove_all_msg(Folder *folder, FolderItem *item)
gchar *path;
gint val;
- g_return_val_if_fail(item != NULL, -1);
+ cm_return_val_if_fail(item != NULL, -1);
path = folder_item_get_path(item);
- g_return_val_if_fail(path != NULL, -1);
+ cm_return_val_if_fail(path != NULL, -1);
val = remove_all_numbered_files(path);
g_free(path);
@@ -736,7 +736,7 @@ static gint mh_scan_tree(Folder *folder)
FolderItem *item;
gchar *rootpath;
- g_return_val_if_fail(folder != NULL, -1);
+ cm_return_val_if_fail(folder != NULL, -1);
if (!folder->node) {
item = folder_item_new(folder, folder->name, NULL);
@@ -776,7 +776,7 @@ static gint mh_create_tree(Folder *folder)
{
gchar *rootpath;
- g_return_val_if_fail(folder != NULL, -1);
+ cm_return_val_if_fail(folder != NULL, -1);
CHDIR_RETURN_VAL_IF_FAIL(get_mail_base_dir(), -1);
rootpath = LOCAL_FOLDER(folder)->rootpath;
@@ -797,11 +797,11 @@ static gchar *mh_item_get_path(Folder *folder, FolderItem *item)
{
gchar *folder_path, *path;
gchar *real_path;
- g_return_val_if_fail(folder != NULL, NULL);
- g_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(folder != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
folder_path = g_strdup(LOCAL_FOLDER(folder)->rootpath);
- g_return_val_if_fail(folder_path != NULL, NULL);
+ cm_return_val_if_fail(folder_path != NULL, NULL);
/* FIXME: [W32] The code below does not correctly merge
relative filenames; there should be a function to handle
@@ -843,9 +843,9 @@ static FolderItem *mh_create_folder(Folder *folder, FolderItem *parent,
gchar *mh_sequences_filename;
FILE *mh_sequences_file;
- g_return_val_if_fail(folder != NULL, NULL);
- g_return_val_if_fail(parent != NULL, NULL);
- g_return_val_if_fail(name != NULL, NULL);
+ cm_return_val_if_fail(folder != NULL, NULL);
+ cm_return_val_if_fail(parent != NULL, NULL);
+ cm_return_val_if_fail(name != NULL, NULL);
path = folder_item_get_path(parent);
if (!is_dir_exist(path))
@@ -895,10 +895,10 @@ static gint mh_rename_folder(Folder *folder, FolderItem *item,
gchar *newpath, *utf8newpath;
gchar *paths[2];
- g_return_val_if_fail(folder != NULL, -1);
- g_return_val_if_fail(item != NULL, -1);
- g_return_val_if_fail(item->path != NULL, -1);
- g_return_val_if_fail(name != NULL, -1);
+ cm_return_val_if_fail(folder != NULL, -1);
+ cm_return_val_if_fail(item != NULL, -1);
+ cm_return_val_if_fail(item->path != NULL, -1);
+ cm_return_val_if_fail(name != NULL, -1);
oldpath = folder_item_get_path(item);
if (!is_dir_exist(oldpath))
@@ -944,9 +944,9 @@ static gint mh_remove_folder(Folder *folder, FolderItem *item)
{
gchar *path;
- g_return_val_if_fail(folder != NULL, -1);
- g_return_val_if_fail(item != NULL, -1);
- g_return_val_if_fail(item->path != NULL, -1);
+ cm_return_val_if_fail(folder != NULL, -1);
+ cm_return_val_if_fail(item != NULL, -1);
+ cm_return_val_if_fail(item->path != NULL, -1);
path = folder_item_get_path(item);
if (remove_dir_recursive(path) < 0) {
@@ -965,8 +965,8 @@ static MsgInfo *mh_parse_msg(const gchar *file, FolderItem *item)
MsgInfo *msginfo;
MsgFlags flags;
- g_return_val_if_fail(item != NULL, NULL);
- g_return_val_if_fail(file != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(file != NULL, NULL);
flags.perm_flags = MSG_NEW|MSG_UNREAD;
flags.tmp_flags = 0;
@@ -991,7 +991,7 @@ static gboolean mh_remove_missing_folder_items_func(GNode *node, gpointer data)
FolderItem *item;
gchar *path;
- g_return_val_if_fail(node->data != NULL, FALSE);
+ cm_return_val_if_fail(node->data != NULL, FALSE);
if (G_NODE_IS_ROOT(node))
return FALSE;
@@ -1010,7 +1010,7 @@ static gboolean mh_remove_missing_folder_items_func(GNode *node, gpointer data)
static void mh_remove_missing_folder_items(Folder *folder)
{
- g_return_if_fail(folder != NULL);
+ cm_return_if_fail(folder != NULL);
debug_print("searching missing folders...\n");
@@ -1032,8 +1032,8 @@ static void mh_scan_tree_recursive(FolderItem *item)
gchar *real_path, *entry, *utf8entry, *utf8name;
gint n_msg = 0;
- g_return_if_fail(item != NULL);
- g_return_if_fail(item->folder != NULL);
+ cm_return_if_fail(item != NULL);
+ cm_return_if_fail(item->folder != NULL);
folder = item->folder;
@@ -1451,7 +1451,7 @@ static void mh_set_mtime(Folder *folder, FolderItem *item)
struct stat s;
gchar *path = folder_item_get_path(item);
- g_return_if_fail(path != NULL);
+ cm_return_if_fail(path != NULL);
if (g_stat(path, &s) < 0) {
FILE_OP_ERROR(path, "stat");
diff --git a/src/mh_gtk.c b/src/mh_gtk.c
@@ -136,8 +136,8 @@ static void new_folder_cb(GtkAction *action, gpointer data)
if (!folderview->selected) return;
item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
- g_return_if_fail(item != NULL);
- g_return_if_fail(item->folder != NULL);
+ cm_return_if_fail(item != NULL);
+ cm_return_if_fail(item->folder != NULL);
new_folder = input_dialog_with_checkbtn(_("New folder"),
_("Input the name of new folder:"),
@@ -187,9 +187,9 @@ static void delete_folder_cb(GtkAction *action, gpointer data)
gchar *old_id;
item = folderview_get_selected_item(folderview);
- g_return_if_fail(item != NULL);
- g_return_if_fail(item->path != NULL);
- g_return_if_fail(item->folder != NULL);
+ cm_return_if_fail(item != NULL);
+ cm_return_if_fail(item->path != NULL);
+ cm_return_if_fail(item->folder != NULL);
name = trim_string(item->name, 32);
AUTORELEASE_STR(name, {g_free(name); return;});
@@ -241,9 +241,9 @@ static void rename_folder_cb(GtkAction *action, gpointer data)
gchar *base;
item = folderview_get_selected_item(folderview);
- g_return_if_fail(item != NULL);
- g_return_if_fail(item->path != NULL);
- g_return_if_fail(item->folder != NULL);
+ cm_return_if_fail(item != NULL);
+ cm_return_if_fail(item->path != NULL);
+ cm_return_if_fail(item->folder != NULL);
name = trim_string(item->name, 32);
message = g_strdup_printf(_("Input new name for '%s':"), name);
@@ -330,11 +330,11 @@ static void update_tree_cb(GtkAction *action, gpointer data)
const gchar *a_name = gtk_action_get_name(action);
item = folderview_get_selected_item(folderview);
- g_return_if_fail(item != NULL);
+ cm_return_if_fail(item != NULL);
summary_show(folderview->summaryview, NULL);
- g_return_if_fail(item->folder != NULL);
+ cm_return_if_fail(item->folder != NULL);
DO_ACTION("FolderViewPopup/CheckNewMessages", folderview_check_new(item->folder));
DO_ACTION("FolderViewPopup/CheckNewFolders", folderview_rescan_tree(item->folder, FALSE));
@@ -350,8 +350,8 @@ static void remove_mailbox_cb(GtkAction *action, gpointer data)
AlertValue avalue;
item = folderview_get_selected_item(folderview);
- g_return_if_fail(item != NULL);
- g_return_if_fail(item->folder != NULL);
+ cm_return_if_fail(item != NULL);
+ cm_return_if_fail(item->folder != NULL);
if (folder_item_parent(item)) return;
name = trim_string(item->folder->name, 32);
diff --git a/src/mimeview.c b/src/mimeview.c
@@ -461,8 +461,8 @@ void mimeview_show_message(MimeView *mimeview, MimeInfo *mimeinfo,
mimeview_clear(mimeview);
- g_return_if_fail(file != NULL);
- g_return_if_fail(mimeinfo != NULL);
+ cm_return_if_fail(file != NULL);
+ cm_return_if_fail(mimeinfo != NULL);
mimeview->mimeinfo = mimeinfo;
@@ -575,7 +575,7 @@ static void mimeview_set_multipart_tree(MimeView *mimeview,
{
GtkCMCTreeNode *node;
- g_return_if_fail(mimeinfo != NULL);
+ cm_return_if_fail(mimeinfo != NULL);
while (mimeinfo != NULL) {
node = mimeview_append_part(mimeview, mimeinfo, parent);
@@ -860,8 +860,8 @@ static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo,
StockPixmap icon = STOCK_PIXMAP_PRIVACY_SIGNED;
SignatureStatus mycode = SIGNATURE_UNCHECKED;
- g_return_if_fail(mimeview != NULL);
- g_return_if_fail(mimeinfo != NULL);
+ cm_return_if_fail(mimeview != NULL);
+ cm_return_if_fail(mimeinfo != NULL);
if (special)
mycode = code;
@@ -1171,8 +1171,8 @@ static void update_signature_info(MimeView *mimeview, MimeInfo *selected)
MimeInfo *siginfo;
MimeInfo *first_text;
- g_return_if_fail(mimeview != NULL);
- g_return_if_fail(selected != NULL);
+ cm_return_if_fail(mimeview != NULL);
+ cm_return_if_fail(selected != NULL);
if (selected->type == MIMETYPE_MESSAGE
&& !g_ascii_strcasecmp(selected->subtype, "rfc822")) {
@@ -1251,7 +1251,7 @@ static void mimeview_start_drag(GtkWidget *widget, gint button,
GdkDragContext *context;
MimeInfo *partinfo;
- g_return_if_fail(mimeview != NULL);
+ cm_return_if_fail(mimeview != NULL);
partinfo = mimeview_get_selected_part(mimeview);
if (partinfo->disposition == DISPOSITIONTYPE_INLINE) return;
@@ -1769,7 +1769,7 @@ static void mimeview_save_as(MimeView *mimeview)
partinfo = mimeview_get_part_to_use(mimeview);
- g_return_if_fail(partinfo != NULL);
+ cm_return_if_fail(partinfo != NULL);
if (get_part_name(partinfo) == NULL) {
return;
@@ -1825,7 +1825,7 @@ static void mimeview_display_as_text(MimeView *mimeview)
partinfo = mimeview_get_part_to_use(mimeview);
mimeview_select_mimepart_icon(mimeview, partinfo);
- g_return_if_fail(partinfo != NULL);
+ cm_return_if_fail(partinfo != NULL);
mimeview_show_message_part(mimeview, partinfo);
}
@@ -1840,7 +1840,7 @@ static void mimeview_launch(MimeView *mimeview, MimeInfo *partinfo)
if (!partinfo)
partinfo = mimeview_get_part_to_use(mimeview);
- g_return_if_fail(partinfo != NULL);
+ cm_return_if_fail(partinfo != NULL);
filename = procmime_get_tmp_file_name(partinfo);
@@ -1883,7 +1883,7 @@ static void mimeview_open_part_with(MimeView *mimeview, MimeInfo *partinfo, gboo
gchar *uri;
int r = 0;
#endif
- g_return_if_fail(partinfo != NULL);
+ cm_return_if_fail(partinfo != NULL);
filename = procmime_get_tmp_file_name(partinfo);
@@ -2421,7 +2421,7 @@ static void icon_list_create(MimeView *mimeview, MimeInfo *mimeinfo)
{
GtkRequisition size;
- g_return_if_fail(mimeinfo != NULL);
+ cm_return_if_fail(mimeinfo != NULL);
while (mimeinfo != NULL) {
if (mimeinfo->type != MIMETYPE_MULTIPART)
diff --git a/src/msgcache.c b/src/msgcache.c
@@ -146,7 +146,7 @@ static gboolean msgcache_msginfo_free_func(gpointer num, gpointer msginfo, gpoin
void msgcache_destroy(MsgCache *cache)
{
- g_return_if_fail(cache != NULL);
+ cm_return_if_fail(cache != NULL);
g_hash_table_foreach_remove(cache->msgnum_table, msgcache_msginfo_free_func, NULL);
g_hash_table_destroy(cache->msgid_table);
@@ -158,8 +158,8 @@ void msgcache_add_msg(MsgCache *cache, MsgInfo *msginfo)
{
MsgInfo *newmsginfo;
- g_return_if_fail(cache != NULL);
- g_return_if_fail(msginfo != NULL);
+ cm_return_if_fail(cache != NULL);
+ cm_return_if_fail(msginfo != NULL);
newmsginfo = procmsg_msginfo_new_ref(msginfo);
g_hash_table_insert(cache->msgnum_table, &newmsginfo->msgnum, newmsginfo);
@@ -175,8 +175,8 @@ void msgcache_remove_msg(MsgCache *cache, guint msgnum)
{
MsgInfo *msginfo;
- g_return_if_fail(cache != NULL);
- g_return_if_fail(msgnum > 0);
+ cm_return_if_fail(cache != NULL);
+ cm_return_if_fail(msgnum > 0);
msginfo = (MsgInfo *) g_hash_table_lookup(cache->msgnum_table, &msgnum);
if(!msginfo)
@@ -196,8 +196,8 @@ void msgcache_update_msg(MsgCache *cache, MsgInfo *msginfo)
{
MsgInfo *oldmsginfo, *newmsginfo;
- g_return_if_fail(cache != NULL);
- g_return_if_fail(msginfo != NULL);
+ cm_return_if_fail(cache != NULL);
+ cm_return_if_fail(msginfo != NULL);
oldmsginfo = g_hash_table_lookup(cache->msgnum_table, &msginfo->msgnum);
if(oldmsginfo && oldmsginfo->msgid)
@@ -224,7 +224,7 @@ MsgInfo *msgcache_get_msg(MsgCache *cache, guint num)
{
MsgInfo *msginfo;
- g_return_val_if_fail(cache != NULL, NULL);
+ cm_return_val_if_fail(cache != NULL, NULL);
msginfo = g_hash_table_lookup(cache->msgnum_table, &num);
if(!msginfo)
@@ -238,8 +238,8 @@ MsgInfo *msgcache_get_msg_by_id(MsgCache *cache, const gchar *msgid)
{
MsgInfo *msginfo;
- g_return_val_if_fail(cache != NULL, NULL);
- g_return_val_if_fail(msgid != NULL, NULL);
+ cm_return_val_if_fail(cache != NULL, NULL);
+ cm_return_val_if_fail(msgid != NULL, NULL);
msginfo = g_hash_table_lookup(cache->msgid_table, msgid);
if(!msginfo)
@@ -261,7 +261,7 @@ MsgInfoList *msgcache_get_msg_list(MsgCache *cache)
{
MsgInfoList *msg_list = NULL;
START_TIMING("");
- g_return_val_if_fail(cache != NULL, NULL);
+ cm_return_val_if_fail(cache != NULL, NULL);
g_hash_table_foreach((GHashTable *)cache->msgnum_table, msgcache_get_msg_list_func, (gpointer)&msg_list);
cache->last_access = time(NULL);
@@ -273,14 +273,14 @@ MsgInfoList *msgcache_get_msg_list(MsgCache *cache)
time_t msgcache_get_last_access_time(MsgCache *cache)
{
- g_return_val_if_fail(cache != NULL, 0);
+ cm_return_val_if_fail(cache != NULL, 0);
return cache->last_access;
}
gint msgcache_get_memory_usage(MsgCache *cache)
{
- g_return_val_if_fail(cache != NULL, 0);
+ cm_return_val_if_fail(cache != NULL, 0);
return cache->memusage;
}
@@ -391,7 +391,7 @@ static FILE *msgcache_open_data_file(const gchar *file, guint version,
FILE *fp;
gint32 data_ver;
- g_return_val_if_fail(file != NULL, NULL);
+ cm_return_val_if_fail(file != NULL, NULL);
if (mode == DATA_WRITE) {
int w_err = 0, wrote = 0;
@@ -566,8 +566,8 @@ MsgCache *msgcache_read_cache(FolderItem *item, const gchar *cache_file)
char *cache_data = NULL;
struct stat st;
- g_return_val_if_fail(cache_file != NULL, NULL);
- g_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(cache_file != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
swapping = TRUE;
@@ -1158,10 +1158,10 @@ gint msgcache_write(const gchar *cache_file, const gchar *mark_file, const gchar
char *tags_data = NULL;
START_TIMING("");
- g_return_val_if_fail(cache_file != NULL, -1);
- g_return_val_if_fail(mark_file != NULL, -1);
- g_return_val_if_fail(tags_file != NULL, -1);
- g_return_val_if_fail(cache != NULL, -1);
+ cm_return_val_if_fail(cache_file != NULL, -1);
+ cm_return_val_if_fail(mark_file != NULL, -1);
+ cm_return_val_if_fail(tags_file != NULL, -1);
+ cm_return_val_if_fail(cache != NULL, -1);
new_cache = g_strconcat(cache_file, ".new", NULL);
new_mark = g_strconcat(mark_file, ".new", NULL);
diff --git a/src/mutt.c b/src/mutt.c
@@ -54,7 +54,7 @@ MuttFile *mutt_create() {
* Properties...
*/
void mutt_set_file( MuttFile* muttFile, const gchar *value ) {
- g_return_if_fail( muttFile != NULL );
+ cm_return_if_fail( muttFile != NULL );
muttFile->path = mgu_replace_string( muttFile->path, value );
g_strstrip( muttFile->path );
}
@@ -73,7 +73,7 @@ static gint mutt_free_table_vis( gpointer key, gpointer value, gpointer data ) {
* Free up object by releasing internal memory.
*/
void mutt_free( MuttFile *muttFile ) {
- g_return_if_fail( muttFile != NULL );
+ cm_return_if_fail( muttFile != NULL );
/* Close file */
if( muttFile->file ) fclose( muttFile->file );
@@ -123,7 +123,7 @@ static gint mutt_open_file( MuttFile* muttFile ) {
* Close file.
*/
static void mutt_close_file( MuttFile *muttFile ) {
- g_return_if_fail( muttFile != NULL );
+ cm_return_if_fail( muttFile != NULL );
if( muttFile->file ) fclose( muttFile->file );
muttFile->file = NULL;
}
@@ -506,8 +506,8 @@ static void mutt_read_file( MuttFile *muttFile, AddressCache *cache ) {
* ============================================================================================
*/
gint mutt_import_data( MuttFile *muttFile, AddressCache *cache ) {
- g_return_val_if_fail( muttFile != NULL, MGU_BAD_ARGS );
- g_return_val_if_fail( cache != NULL, MGU_BAD_ARGS );
+ cm_return_val_if_fail( muttFile != NULL, MGU_BAD_ARGS );
+ cm_return_val_if_fail( cache != NULL, MGU_BAD_ARGS );
muttFile->retVal = MGU_SUCCESS;
addrcache_clear( cache );
cache->dataRead = FALSE;
diff --git a/src/news.c b/src/news.c
@@ -205,8 +205,8 @@ static int news_remove_msg (Folder *folder,
{
gchar *path, *filename;
- g_return_val_if_fail(folder != NULL, -1);
- g_return_val_if_fail(item != NULL, -1);
+ cm_return_val_if_fail(folder != NULL, -1);
+ cm_return_val_if_fail(item != NULL, -1);
path = folder_item_get_path(item);
if (!is_dir_exist(path))
@@ -275,7 +275,7 @@ static void news_session_destroy(Session *session)
{
NewsSession *news_session = NEWS_SESSION(session);
- g_return_if_fail(session != NULL);
+ cm_return_if_fail(session != NULL);
if (news_session->group)
g_free(news_session->group);
@@ -292,7 +292,7 @@ static Session *news_session_new(Folder *folder, const gchar *server, gushort po
{
NewsSession *session;
int r = 0;
- g_return_val_if_fail(server != NULL, NULL);
+ cm_return_val_if_fail(server != NULL, NULL);
log_message(LOG_PROTOCOL, _("creating NNTP connection to %s:%d ...\n"), server, port);
@@ -329,8 +329,8 @@ static Session *news_session_new_for_folder(Folder *folder)
gchar *passwd = NULL;
gushort port;
- g_return_val_if_fail(folder != NULL, NULL);
- g_return_val_if_fail(folder->account != NULL, NULL);
+ cm_return_val_if_fail(folder != NULL, NULL);
+ cm_return_val_if_fail(folder->account != NULL, NULL);
ac = folder->account;
if (ac->use_nntp_auth && ac->userid && ac->userid[0]) {
@@ -390,9 +390,9 @@ static NewsSession *news_session_get(Folder *folder)
struct tm lt;
int r;
- g_return_val_if_fail(folder != NULL, NULL);
- g_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, NULL);
- g_return_val_if_fail(folder->account != NULL, NULL);
+ cm_return_val_if_fail(folder != NULL, NULL);
+ cm_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, NULL);
+ cm_return_val_if_fail(folder->account != NULL, NULL);
if (prefs_common.work_offline &&
!inc_offline_should_override(FALSE,
@@ -456,8 +456,8 @@ static gchar *news_fetch_msg(Folder *folder, FolderItem *item, gint num)
NewsSession *session;
gint ok;
- g_return_val_if_fail(folder != NULL, NULL);
- g_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(folder != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
path = folder_item_get_path(item);
if (!is_dir_exist(path))
@@ -536,8 +536,8 @@ GSList *news_get_group_list(Folder *folder)
GSList *last = NULL;
gchar buf[BUFFSIZE];
- g_return_val_if_fail(folder != NULL, NULL);
- g_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, NULL);
+ cm_return_val_if_fail(folder != NULL, NULL);
+ cm_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, NULL);
path = folder_item_get_path(FOLDER_ITEM(folder->node->data));
if (!is_dir_exist(path))
@@ -660,8 +660,8 @@ void news_remove_group_list_cache(Folder *folder)
{
gchar *path, *filename;
- g_return_if_fail(folder != NULL);
- g_return_if_fail(FOLDER_CLASS(folder) == &news_class);
+ cm_return_if_fail(folder != NULL);
+ cm_return_if_fail(FOLDER_CLASS(folder) == &news_class);
path = folder_item_get_path(FOLDER_ITEM(folder->node->data));
filename = g_strconcat(path, G_DIR_SEPARATOR_S, NEWSGROUP_LIST, NULL);
@@ -680,9 +680,9 @@ gint news_post(Folder *folder, const gchar *file)
char *contents = file_read_to_str_no_recode(file);
NewsSession *session;
- g_return_val_if_fail(folder != NULL, -1);
- g_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, -1);
- g_return_val_if_fail(contents != NULL, -1);
+ cm_return_val_if_fail(folder != NULL, -1);
+ cm_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, -1);
+ cm_return_val_if_fail(contents != NULL, -1);
session = news_session_get(folder);
if (!session) {
@@ -745,7 +745,7 @@ static gint news_select_group(Folder *folder, const gchar *group,
struct newsnntp_group_info *info = NULL;
NewsSession *session = NEWS_SESSION(news_session_get(folder));
- g_return_val_if_fail(session != NULL, -1);
+ cm_return_val_if_fail(session != NULL, -1);
if (!num || !first || !last) {
if (session->group && g_ascii_strcasecmp(session->group, group) == 0)
@@ -917,7 +917,7 @@ static gchar *news_folder_get_path(Folder *folder)
{
gchar *folder_path;
- g_return_val_if_fail(folder->account != NULL, NULL);
+ cm_return_val_if_fail(folder->account != NULL, NULL);
folder_path = g_strconcat(get_news_cache_dir(),
G_DIR_SEPARATOR_S,
@@ -930,11 +930,11 @@ static gchar *news_item_get_path(Folder *folder, FolderItem *item)
{
gchar *folder_path, *path;
- g_return_val_if_fail(folder != NULL, NULL);
- g_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(folder != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
folder_path = news_folder_get_path(folder);
- g_return_val_if_fail(folder_path != NULL, NULL);
+ cm_return_val_if_fail(folder_path != NULL, NULL);
if (g_path_is_absolute(folder_path)) {
if (item->path)
path = g_strconcat(folder_path, G_DIR_SEPARATOR_S,
@@ -964,12 +964,12 @@ static gint news_get_num_list(Folder *folder, FolderItem *item, GSList **msgnum_
gint i, ok, num, first, last, nummsgs = 0;
gchar *dir;
- g_return_val_if_fail(item != NULL, -1);
- g_return_val_if_fail(item->folder != NULL, -1);
- g_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, -1);
+ cm_return_val_if_fail(item != NULL, -1);
+ cm_return_val_if_fail(item->folder != NULL, -1);
+ cm_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, -1);
session = news_session_get(folder);
- g_return_val_if_fail(session != NULL, -1);
+ cm_return_val_if_fail(session != NULL, -1);
*old_uids_valid = TRUE;
@@ -1032,10 +1032,10 @@ static MsgInfo *news_get_msginfo(Folder *folder, FolderItem *item, gint num)
clist *hdrlist = NULL;
session = news_session_get(folder);
- g_return_val_if_fail(session != NULL, NULL);
- g_return_val_if_fail(item != NULL, NULL);
- g_return_val_if_fail(item->folder != NULL, NULL);
- g_return_val_if_fail(FOLDER_CLASS(item->folder) == &news_class, NULL);
+ cm_return_val_if_fail(session != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(item->folder != NULL, NULL);
+ cm_return_val_if_fail(FOLDER_CLASS(item->folder) == &news_class, NULL);
log_message(LOG_PROTOCOL, _("getting xover %d in %s...\n"),
num, item->path);
@@ -1111,8 +1111,8 @@ static GSList *news_get_msginfos_for_range(NewsSession *session, FolderItem *ite
gint ok;
clist *msglist = NULL;
clistiter *cur;
- g_return_val_if_fail(session != NULL, NULL);
- g_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(session != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
log_message(LOG_PROTOCOL, _("getting xover %d - %d in %s...\n"),
begin, end, item->path);
@@ -1170,13 +1170,13 @@ static GSList *news_get_msginfos(Folder *folder, FolderItem *item, GSList *msgnu
guint first, last, next;
guint tofetch, fetched;
- g_return_val_if_fail(folder != NULL, NULL);
- g_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, NULL);
- g_return_val_if_fail(msgnum_list != NULL, NULL);
- g_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(folder != NULL, NULL);
+ cm_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, NULL);
+ cm_return_val_if_fail(msgnum_list != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
session = news_session_get(folder);
- g_return_val_if_fail(session != NULL, NULL);
+ cm_return_val_if_fail(session != NULL, NULL);
tmp_msgnum_list = g_slist_copy(msgnum_list);
tmp_msgnum_list = g_slist_sort(tmp_msgnum_list, g_int_compare);
@@ -1234,10 +1234,10 @@ static gint news_rename_folder(Folder *folder, FolderItem *item,
{
gchar *path;
- g_return_val_if_fail(folder != NULL, -1);
- g_return_val_if_fail(item != NULL, -1);
- g_return_val_if_fail(item->path != NULL, -1);
- g_return_val_if_fail(name != NULL, -1);
+ cm_return_val_if_fail(folder != NULL, -1);
+ cm_return_val_if_fail(item != NULL, -1);
+ cm_return_val_if_fail(item->path != NULL, -1);
+ cm_return_val_if_fail(name != NULL, -1);
path = folder_item_get_path(item);
if (!is_dir_exist(path))
@@ -1253,9 +1253,9 @@ static gint news_remove_folder(Folder *folder, FolderItem *item)
{
gchar *path;
- g_return_val_if_fail(folder != NULL, -1);
- g_return_val_if_fail(item != NULL, -1);
- g_return_val_if_fail(item->path != NULL, -1);
+ cm_return_val_if_fail(folder != NULL, -1);
+ cm_return_val_if_fail(item != NULL, -1);
+ cm_return_val_if_fail(item->path != NULL, -1);
path = folder_item_get_path(item);
if (remove_dir_recursive(path) < 0) {
diff --git a/src/news_gtk.c b/src/news_gtk.c
@@ -147,15 +147,15 @@ static void subscribe_newsgroup_cb(GtkAction *action, gpointer data)
if (!folderview->selected) return;
item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
- g_return_if_fail(item != NULL);
+ cm_return_if_fail(item != NULL);
if (mainwin->lock_count || news_folder_locked(item->folder))
return;
folder = item->folder;
- g_return_if_fail(folder != NULL);
- g_return_if_fail(FOLDER_TYPE(folder) == F_NEWS);
- g_return_if_fail(folder->account != NULL);
+ cm_return_if_fail(folder != NULL);
+ cm_return_if_fail(FOLDER_TYPE(folder) == F_NEWS);
+ cm_return_if_fail(folder->account != NULL);
if (GTK_CMCTREE_ROW(folderview->selected)->parent != NULL)
servernode = GTK_CMCTREE_ROW(folderview->selected)->parent;
@@ -235,14 +235,14 @@ static void unsubscribe_newsgroup_cb(GtkAction *action, gpointer data)
if (!folderview->selected) return;
item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
- g_return_if_fail(item != NULL);
+ cm_return_if_fail(item != NULL);
if (mainwin->lock_count || news_folder_locked(item->folder))
return;
- g_return_if_fail(item->folder != NULL);
- g_return_if_fail(FOLDER_TYPE(item->folder) == F_NEWS);
- g_return_if_fail(item->folder->account != NULL);
+ cm_return_if_fail(item->folder != NULL);
+ cm_return_if_fail(FOLDER_TYPE(item->folder) == F_NEWS);
+ cm_return_if_fail(item->folder->account != NULL);
old_id = folder_item_get_identifier(item);
@@ -297,9 +297,9 @@ static void rename_newsgroup_cb(GtkAction *action, gpointer data)
gchar *message;
item = folderview_get_selected_item(folderview);
- g_return_if_fail(item != NULL);
- g_return_if_fail(item->path != NULL);
- g_return_if_fail(item->folder != NULL);
+ cm_return_if_fail(item != NULL);
+ cm_return_if_fail(item->path != NULL);
+ cm_return_if_fail(item->folder != NULL);
name = trim_string(item->name, 32);
message = g_strdup_printf(_("Input new name for '%s':"), name);
@@ -339,14 +339,14 @@ static void update_tree_cb(GtkAction *action, gpointer data)
MainWindow *mainwin = mainwindow_get_mainwindow();
item = folderview_get_selected_item(folderview);
- g_return_if_fail(item != NULL);
+ cm_return_if_fail(item != NULL);
if (mainwin->lock_count || news_folder_locked(item->folder))
return;
summary_show(folderview->summaryview, NULL);
- g_return_if_fail(item->folder != NULL);
+ cm_return_if_fail(item->folder != NULL);
folderview_check_new(item->folder);
}
@@ -357,7 +357,7 @@ static void sync_cb(GtkAction *action, gpointer data)
FolderItem *item;
item = folderview_get_selected_item(folderview);
- g_return_if_fail(item != NULL);
+ cm_return_if_fail(item != NULL);
folder_synchronise(item->folder);
}
@@ -371,8 +371,8 @@ void news_gtk_synchronise(FolderItem *item, gint days)
gint total = 0;
time_t t = time(NULL);
- g_return_if_fail(item != NULL);
- g_return_if_fail(item->folder != NULL);
+ cm_return_if_fail(item != NULL);
+ cm_return_if_fail(item->folder != NULL);
if (mainwin->lock_count || news_folder_locked(item->folder))
return;
diff --git a/src/noticeview.c b/src/noticeview.c
@@ -168,13 +168,13 @@ void noticeview_hide(NoticeView *noticeview)
void noticeview_set_text(NoticeView *noticeview, const char *text)
{
- g_return_if_fail(noticeview);
+ cm_return_if_fail(noticeview);
gtk_label_set_text(GTK_LABEL(noticeview->text), text);
}
void noticeview_set_button_text(NoticeView *noticeview, const char *text)
{
- g_return_if_fail(noticeview);
+ cm_return_if_fail(noticeview);
if (text != NULL) {
gtk_label_set_text
@@ -242,7 +242,7 @@ static gboolean noticeview_enter_notify(GtkWidget *widget,
void noticeview_set_2ndbutton_text(NoticeView *noticeview, const char *text)
{
- g_return_if_fail(noticeview);
+ cm_return_if_fail(noticeview);
if (text != NULL) {
gtk_label_set_text
diff --git a/src/pine.c b/src/pine.c
@@ -56,7 +56,7 @@ PineFile *pine_create() {
* Properties...
*/
void pine_set_file( PineFile* pineFile, const gchar *value ) {
- g_return_if_fail( pineFile != NULL );
+ cm_return_if_fail( pineFile != NULL );
pineFile->path = mgu_replace_string( pineFile->path, value );
g_strstrip( pineFile->path );
}
@@ -75,7 +75,7 @@ static gint pine_free_table_vis( gpointer key, gpointer value, gpointer data ) {
* Free up object by releasing internal memory.
*/
void pine_free( PineFile *pineFile ) {
- g_return_if_fail( pineFile != NULL );
+ cm_return_if_fail( pineFile != NULL );
/* Close file */
if( pineFile->file ) fclose( pineFile->file );
@@ -127,7 +127,7 @@ static gint pine_open_file( PineFile* pineFile ) {
* Enter: pineFile File object.
*/
static void pine_close_file( PineFile *pineFile ) {
- g_return_if_fail( pineFile != NULL );
+ cm_return_if_fail( pineFile != NULL );
if( pineFile->file ) fclose( pineFile->file );
pineFile->file = NULL;
}
@@ -389,7 +389,7 @@ static void pine_parse_address( PineFile *pineFile, AddressCache *cache, Pine_Pa
gchar *name;
gint len;
- g_return_if_fail( rec->address != NULL );
+ cm_return_if_fail( rec->address != NULL );
buf = rec->address;
while((atCh = strchr( buf, CHAR_AT )) != NULL) {
@@ -427,7 +427,7 @@ static ItemEMail *pine_insert_table(
ItemEMail *email;
gchar *key;
- g_return_val_if_fail( address != NULL, NULL );
+ cm_return_val_if_fail( address != NULL, NULL );
/* create an entry with empty name if needed */
if ( name == NULL )
@@ -607,8 +607,8 @@ static void pine_read_file( PineFile *pineFile, AddressCache *cache ) {
* ============================================================================================
*/
gint pine_import_data( PineFile *pineFile, AddressCache *cache ) {
- g_return_val_if_fail( pineFile != NULL, MGU_BAD_ARGS );
- g_return_val_if_fail( cache != NULL, MGU_BAD_ARGS );
+ cm_return_val_if_fail( pineFile != NULL, MGU_BAD_ARGS );
+ cm_return_val_if_fail( cache != NULL, MGU_BAD_ARGS );
pineFile->retVal = MGU_SUCCESS;
addrcache_clear( cache );
diff --git a/src/plugins/pgpcore/select-keys.c b/src/plugins/pgpcore/select-keys.c
@@ -274,9 +274,9 @@ fill_clist (struct select_keys_s *sk, const char *pattern, gpgme_protocol_t prot
int num_results = 0;
gboolean exact_match = FALSE;
gpgme_key_t last_key = NULL;
- g_return_val_if_fail (sk, NULL);
+ cm_return_val_if_fail (sk, NULL);
clist = sk->clist;
- g_return_val_if_fail (clist, NULL);
+ cm_return_val_if_fail (clist, NULL);
debug_print ("select_keys:fill_clist: pattern '%s' proto %d\n", pattern, proto);
@@ -463,7 +463,7 @@ open_dialog (struct select_keys_s *sk)
static void
close_dialog (struct select_keys_s *sk)
{
- g_return_if_fail (sk);
+ cm_return_if_fail (sk);
gtk_widget_destroy (sk->window);
sk->window = NULL;
}
@@ -486,7 +486,7 @@ key_pressed_cb (GtkWidget *widget, GdkEventKey *event, gpointer data)
{
struct select_keys_s *sk = data;
- g_return_val_if_fail (sk, FALSE);
+ cm_return_val_if_fail (sk, FALSE);
if (event && event->keyval == GDK_Escape) {
sk->okay = 0;
gtk_main_quit ();
@@ -503,7 +503,7 @@ select_btn_cb (GtkWidget *widget, gpointer data)
gboolean use_key;
gpgme_key_t key;
- g_return_if_fail (sk);
+ cm_return_if_fail (sk);
if (!sk->clist->selection) {
debug_print ("** nothing selected");
return;
@@ -535,7 +535,7 @@ cancel_btn_cb (GtkWidget *widget, gpointer data)
{
struct select_keys_s *sk = data;
- g_return_if_fail (sk);
+ cm_return_if_fail (sk);
sk->okay = 0;
sk->result = KEY_SELECTION_CANCEL;
if (sk->select_ctx)
@@ -548,7 +548,7 @@ dont_encrypt_btn_cb (GtkWidget *widget, gpointer data)
{
struct select_keys_s *sk = data;
- g_return_if_fail (sk);
+ cm_return_if_fail (sk);
sk->okay = 0;
sk->result = KEY_SELECTION_DONT;
if (sk->select_ctx)
@@ -562,7 +562,7 @@ other_btn_cb (GtkWidget *widget, gpointer data)
struct select_keys_s *sk = data;
char *uid;
- g_return_if_fail (sk);
+ cm_return_if_fail (sk);
uid = input_dialog ( _("Add key"),
_("Enter another user or key ID:"),
NULL );
diff --git a/src/plugins/pgpinline/pgpinline.c b/src/plugins/pgpinline/pgpinline.c
@@ -122,7 +122,7 @@ static gchar *get_part_as_string(MimeInfo *mimeinfo)
gchar *filename = NULL;
FILE *fp;
- g_return_val_if_fail(mimeinfo != NULL, 0);
+ cm_return_val_if_fail(mimeinfo != NULL, 0);
procmime_decode_content(mimeinfo);
if (mimeinfo->content == MIMECONTENT_MEM)
@@ -178,7 +178,7 @@ static gboolean pgpinline_is_signed(MimeInfo *mimeinfo)
const gchar *sig_indicator = "-----BEGIN PGP SIGNED MESSAGE-----";
gchar *textdata, *sigpos;
- g_return_val_if_fail(mimeinfo != NULL, FALSE);
+ cm_return_val_if_fail(mimeinfo != NULL, FALSE);
if (procmime_mimeinfo_parent(mimeinfo) == NULL)
return FALSE; /* not parent */
@@ -235,7 +235,7 @@ static gint pgpinline_check_signature(MimeInfo *mimeinfo)
gpgme_data_t plain = NULL, cipher = NULL;
gpgme_error_t err;
- g_return_val_if_fail(mimeinfo != NULL, 0);
+ cm_return_val_if_fail(mimeinfo != NULL, 0);
if (procmime_mimeinfo_parent(mimeinfo) == NULL) {
privacy_set_error(_("Incorrect part"));
@@ -246,7 +246,7 @@ static gint pgpinline_check_signature(MimeInfo *mimeinfo)
debug_print("type %d\n", mimeinfo->type);
return 0;
}
- g_return_val_if_fail(mimeinfo->privacy != NULL, 0);
+ cm_return_val_if_fail(mimeinfo->privacy != NULL, 0);
data = (PrivacyDataPGP *) mimeinfo->privacy;
textdata = get_part_as_string(mimeinfo);
@@ -302,7 +302,7 @@ static SignatureStatus pgpinline_get_sig_status(MimeInfo *mimeinfo)
{
PrivacyDataPGP *data = (PrivacyDataPGP *) mimeinfo->privacy;
- g_return_val_if_fail(data != NULL, SIGNATURE_INVALID);
+ cm_return_val_if_fail(data != NULL, SIGNATURE_INVALID);
if (data->sigstatus == NULL &&
prefs_gpg_get_config()->auto_check_signatures)
@@ -315,7 +315,7 @@ static gchar *pgpinline_get_sig_info_short(MimeInfo *mimeinfo)
{
PrivacyDataPGP *data = (PrivacyDataPGP *) mimeinfo->privacy;
- g_return_val_if_fail(data != NULL, g_strdup("Error"));
+ cm_return_val_if_fail(data != NULL, g_strdup("Error"));
if (data->sigstatus == NULL &&
prefs_gpg_get_config()->auto_check_signatures)
@@ -328,7 +328,7 @@ static gchar *pgpinline_get_sig_info_full(MimeInfo *mimeinfo)
{
PrivacyDataPGP *data = (PrivacyDataPGP *) mimeinfo->privacy;
- g_return_val_if_fail(data != NULL, g_strdup("Error"));
+ cm_return_val_if_fail(data != NULL, g_strdup("Error"));
return sgpgme_sigstat_info_full(data->ctx, data->sigstatus);
}
@@ -340,7 +340,7 @@ static gboolean pgpinline_is_encrypted(MimeInfo *mimeinfo)
const gchar *enc_indicator = "-----BEGIN PGP MESSAGE-----";
gchar *textdata;
- g_return_val_if_fail(mimeinfo != NULL, FALSE);
+ cm_return_val_if_fail(mimeinfo != NULL, FALSE);
if (procmime_mimeinfo_parent(mimeinfo) == NULL)
return FALSE; /* not parent */
@@ -396,8 +396,8 @@ static MimeInfo *pgpinline_decrypt(MimeInfo *mimeinfo)
gpgme_set_textmode(ctx, 1);
gpgme_set_armor(ctx, 1);
- g_return_val_if_fail(mimeinfo != NULL, NULL);
- g_return_val_if_fail(pgpinline_is_encrypted(mimeinfo), NULL);
+ cm_return_val_if_fail(mimeinfo != NULL, NULL);
+ cm_return_val_if_fail(pgpinline_is_encrypted(mimeinfo), NULL);
if (procmime_mimeinfo_parent(mimeinfo) == NULL ||
mimeinfo->type != MIMETYPE_TEXT) {
diff --git a/src/plugins/pgpmime/pgpmime.c b/src/plugins/pgpmime/pgpmime.c
@@ -90,7 +90,7 @@ static gboolean pgpmime_is_signed(MimeInfo *mimeinfo)
const gchar *protocol;
PrivacyDataPGP *data = NULL;
- g_return_val_if_fail(mimeinfo != NULL, FALSE);
+ cm_return_val_if_fail(mimeinfo != NULL, FALSE);
if (mimeinfo->privacy != NULL) {
data = (PrivacyDataPGP *) mimeinfo->privacy;
if (data->done_sigtest)
@@ -173,8 +173,8 @@ static gint pgpmime_check_signature(MimeInfo *mimeinfo)
gchar *textstr;
gpgme_data_t sigdata = NULL, textdata = NULL;
gpgme_error_t err;
- g_return_val_if_fail(mimeinfo != NULL, -1);
- g_return_val_if_fail(mimeinfo->privacy != NULL, -1);
+ cm_return_val_if_fail(mimeinfo != NULL, -1);
+ cm_return_val_if_fail(mimeinfo->privacy != NULL, -1);
data = (PrivacyDataPGP *) mimeinfo->privacy;
if ((err = gpgme_new(&data->ctx)) != GPG_ERR_NO_ERROR) {
debug_print(("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
@@ -194,7 +194,7 @@ static gint pgpmime_check_signature(MimeInfo *mimeinfo)
parent = procmime_mimeinfo_parent(mimeinfo);
fp = g_fopen(parent->data.filename, "rb");
- g_return_val_if_fail(fp != NULL, SIGNATURE_INVALID);
+ cm_return_val_if_fail(fp != NULL, SIGNATURE_INVALID);
boundary = g_hash_table_lookup(parent->typeparameters, "boundary");
if (!boundary) {
@@ -237,7 +237,7 @@ static SignatureStatus pgpmime_get_sig_status(MimeInfo *mimeinfo)
{
PrivacyDataPGP *data = (PrivacyDataPGP *) mimeinfo->privacy;
- g_return_val_if_fail(data != NULL, SIGNATURE_INVALID);
+ cm_return_val_if_fail(data != NULL, SIGNATURE_INVALID);
if (data->sigstatus == NULL &&
prefs_gpg_get_config()->auto_check_signatures)
@@ -250,7 +250,7 @@ static gchar *pgpmime_get_sig_info_short(MimeInfo *mimeinfo)
{
PrivacyDataPGP *data = (PrivacyDataPGP *) mimeinfo->privacy;
- g_return_val_if_fail(data != NULL, g_strdup("Error"));
+ cm_return_val_if_fail(data != NULL, g_strdup("Error"));
if (data->sigstatus == NULL &&
prefs_gpg_get_config()->auto_check_signatures)
@@ -263,7 +263,7 @@ static gchar *pgpmime_get_sig_info_full(MimeInfo *mimeinfo)
{
PrivacyDataPGP *data = (PrivacyDataPGP *) mimeinfo->privacy;
- g_return_val_if_fail(data != NULL, g_strdup("Error"));
+ cm_return_val_if_fail(data != NULL, g_strdup("Error"));
if (data->sigstatus == NULL &&
prefs_gpg_get_config()->auto_check_signatures)
@@ -322,7 +322,7 @@ static MimeInfo *pgpmime_decrypt(MimeInfo *mimeinfo)
return NULL;
}
- g_return_val_if_fail(pgpmime_is_encrypted(mimeinfo), NULL);
+ cm_return_val_if_fail(pgpmime_is_encrypted(mimeinfo), NULL);
encinfo = (MimeInfo *) g_node_nth_child(mimeinfo->node, 1)->data;
diff --git a/src/plugins/smime/smime.c b/src/plugins/smime/smime.c
@@ -88,7 +88,7 @@ static gboolean smime_is_signed(MimeInfo *mimeinfo)
const gchar *protocol, *tmpstr;
PrivacyDataPGP *data = NULL;
- g_return_val_if_fail(mimeinfo != NULL, FALSE);
+ cm_return_val_if_fail(mimeinfo != NULL, FALSE);
if (mimeinfo->privacy != NULL) {
data = (PrivacyDataPGP *) mimeinfo->privacy;
if (data->done_sigtest)
@@ -194,8 +194,8 @@ static gint smime_check_signature(MimeInfo *mimeinfo)
const gchar *tmpstr;
gpgme_data_t sigdata = NULL, textdata = NULL;
gpgme_error_t err;
- g_return_val_if_fail(mimeinfo != NULL, -1);
- g_return_val_if_fail(mimeinfo->privacy != NULL, -1);
+ cm_return_val_if_fail(mimeinfo != NULL, -1);
+ cm_return_val_if_fail(mimeinfo->privacy != NULL, -1);
data = (PrivacyDataPGP *) mimeinfo->privacy;
gpgme_new(&data->ctx);
EncodingType oldenc = ENC_BINARY;
@@ -211,7 +211,7 @@ static gint smime_check_signature(MimeInfo *mimeinfo)
parent = procmime_mimeinfo_parent(mimeinfo);
fp = g_fopen(parent->data.filename, "rb");
- g_return_val_if_fail(fp != NULL, SIGNATURE_INVALID);
+ cm_return_val_if_fail(fp != NULL, SIGNATURE_INVALID);
boundary = g_hash_table_lookup(parent->typeparameters, "boundary");
if (!boundary) {
@@ -328,7 +328,7 @@ static SignatureStatus smime_get_sig_status(MimeInfo *mimeinfo)
{
PrivacyDataPGP *data = (PrivacyDataPGP *) mimeinfo->privacy;
- g_return_val_if_fail(data != NULL, SIGNATURE_INVALID);
+ cm_return_val_if_fail(data != NULL, SIGNATURE_INVALID);
if (data->sigstatus == NULL &&
prefs_gpg_get_config()->auto_check_signatures)
@@ -341,7 +341,7 @@ static gchar *smime_get_sig_info_short(MimeInfo *mimeinfo)
{
PrivacyDataPGP *data = (PrivacyDataPGP *) mimeinfo->privacy;
- g_return_val_if_fail(data != NULL, g_strdup("Error"));
+ cm_return_val_if_fail(data != NULL, g_strdup("Error"));
if (data->sigstatus == NULL &&
prefs_gpg_get_config()->auto_check_signatures)
@@ -354,7 +354,7 @@ static gchar *smime_get_sig_info_full(MimeInfo *mimeinfo)
{
PrivacyDataPGP *data = (PrivacyDataPGP *) mimeinfo->privacy;
- g_return_val_if_fail(data != NULL, g_strdup("Error"));
+ cm_return_val_if_fail(data != NULL, g_strdup("Error"));
if (data->sigstatus == NULL &&
prefs_gpg_get_config()->auto_check_signatures)
@@ -400,7 +400,7 @@ static MimeInfo *smime_decrypt(MimeInfo *mimeinfo)
gchar *chars;
size_t len;
- g_return_val_if_fail(smime_is_encrypted(mimeinfo), NULL);
+ cm_return_val_if_fail(smime_is_encrypted(mimeinfo), NULL);
if ((err = gpgme_new(&ctx)) != GPG_ERR_NO_ERROR) {
privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c
@@ -192,7 +192,7 @@ static void transport_sel_cb(GtkMenuItem *menuitem, gpointer data)
GtkTreeModel *model;
GtkTreeIter iter;
- g_return_if_fail(gtk_combo_box_get_active_iter(
+ cm_return_if_fail(gtk_combo_box_get_active_iter(
GTK_COMBO_BOX(page->transport_optmenu), &iter));
model = gtk_combo_box_get_model(GTK_COMBO_BOX(page->transport_optmenu));
diff --git a/src/pop.c b/src/pop.c
@@ -120,7 +120,7 @@ static gint pop3_stls_recv(Pop3Session *session)
static gint pop3_getauth_user_send(Pop3Session *session)
{
- g_return_val_if_fail(session->user != NULL, -1);
+ cm_return_val_if_fail(session->user != NULL, -1);
session->state = POP3_GETAUTH_USER;
pop3_gen_send(session, "USER %s", session->user);
@@ -129,7 +129,7 @@ static gint pop3_getauth_user_send(Pop3Session *session)
static gint pop3_getauth_pass_send(Pop3Session *session)
{
- g_return_val_if_fail(session->pass != NULL, -1);
+ cm_return_val_if_fail(session->pass != NULL, -1);
session->state = POP3_GETAUTH_PASS;
pop3_gen_send(session, "PASS %s", session->pass);
@@ -142,8 +142,8 @@ static gint pop3_getauth_apop_send(Pop3Session *session)
gchar *apop_str;
gchar md5sum[33];
- g_return_val_if_fail(session->user != NULL, -1);
- g_return_val_if_fail(session->pass != NULL, -1);
+ cm_return_val_if_fail(session->user != NULL, -1);
+ cm_return_val_if_fail(session->pass != NULL, -1);
session->state = POP3_GETAUTH_APOP;
@@ -516,7 +516,7 @@ Session *pop3_session_new(PrefsAccount *account)
{
Pop3Session *session;
- g_return_val_if_fail(account != NULL, NULL);
+ cm_return_val_if_fail(account != NULL, NULL);
session = g_new0(Pop3Session, 1);
@@ -546,7 +546,7 @@ static void pop3_session_destroy(Session *session)
Pop3Session *pop3_session = POP3_SESSION(session);
gint n;
- g_return_if_fail(session != NULL);
+ cm_return_if_fail(session != NULL);
for (n = 1; n <= pop3_session->count; n++)
g_free(pop3_session->msg[n].uidl);
@@ -724,7 +724,7 @@ static gint pop3_write_msg_to_file(const gchar *file, const gchar *data,
FILE *fp;
const gchar *prev, *cur;
- g_return_val_if_fail(file != NULL, -1);
+ cm_return_val_if_fail(file != NULL, -1);
if ((fp = g_fopen(file, "wb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
diff --git a/src/prefs_account.c b/src/prefs_account.c
@@ -3350,8 +3350,8 @@ void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label)
gint id;
gchar **strv, **cur;
- g_return_if_fail(ac_prefs != NULL);
- g_return_if_fail(label != NULL);
+ cm_return_if_fail(ac_prefs != NULL);
+ cm_return_if_fail(label != NULL);
memset(&tmp_ac_prefs, 0, sizeof(PrefsAccount));
tmp_ac_prefs.privacy_prefs = ac_prefs->privacy_prefs;
@@ -3870,10 +3870,10 @@ static void prefs_account_set_string_from_combobox(PrefParam *pparam)
GtkTreeIter iter;
gchar **str;
- g_return_if_fail(*pparam->widget != NULL);
+ cm_return_if_fail(*pparam->widget != NULL);
combobox = *pparam->widget;
- g_return_if_fail(gtk_combo_box_get_active_iter(
+ cm_return_if_fail(gtk_combo_box_get_active_iter(
GTK_COMBO_BOX(combobox), &iter));
str = (gchar **)pparam->data;
@@ -3923,7 +3923,7 @@ static void prefs_account_set_privacy_combobox_from_string(PrefParam *pparam)
gchar *prefsid;
PrivacySystemSetCtx *ctx = NULL;
- g_return_if_fail(*pparam->widget != NULL);
+ cm_return_if_fail(*pparam->widget != NULL);
prefsid = *((gchar **) pparam->data);
if (prefsid == NULL)
@@ -4512,7 +4512,7 @@ static void prefs_account_compose_default_dictionary_set_string_from_optmenu
GtkWidget *combo;
gchar **str;
- g_return_if_fail(*pparam->widget != NULL);
+ cm_return_if_fail(*pparam->widget != NULL);
combo = *pparam->widget;
str = (gchar **) pparam->data;
@@ -4527,23 +4527,31 @@ static void prefs_account_compose_default_dictionary_set_optmenu_from_string
GtkWidget *combo;
gchar *dictionary;
- g_return_if_fail(*pparam->widget != NULL);
+ cm_return_if_fail(*pparam->widget != NULL);
dictionary = *((gchar **) pparam->data);
- if (dictionary == NULL)
- return;
-
- if (strrchr(dictionary, '/')) {
- dictionary = g_strdup(strrchr(dictionary, '/')+1);
- }
+ if (dictionary != NULL) {
+ if (strrchr(dictionary, '/')) {
+ dictionary = g_strdup(strrchr(dictionary, '/')+1);
+ }
- if (strchr(dictionary, '-')) {
- *(strchr(dictionary, '-')) = '\0';
+ if (strchr(dictionary, '-')) {
+ *(strchr(dictionary, '-')) = '\0';
+ }
}
combo = *pparam->widget;
- if (dictionary)
+ if (dictionary && *dictionary)
gtkaspell_set_dictionary_menu_active_item(GTK_COMBO_BOX(combo),
dictionary);
+ else {
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ if((model = gtk_combo_box_get_model(GTK_COMBO_BOX(combo))) == NULL)
+ return;
+ if((gtk_tree_model_get_iter_first(model, &iter)) == FALSE)
+ return;
+ gtk_combo_box_set_active_iter(GTK_COMBO_BOX(combo), &iter);
+ }
}
#endif
diff --git a/src/prefs_actions.c b/src/prefs_actions.c
@@ -150,7 +150,7 @@ void prefs_actions_open(MainWindow *mainwin)
static void prefs_actions_size_allocate_cb(GtkWidget *widget,
GtkAllocation *allocation)
{
- g_return_if_fail(allocation != NULL);
+ cm_return_if_fail(allocation != NULL);
prefs_common.actionswin_width = allocation->width;
prefs_common.actionswin_height = allocation->height;
diff --git a/src/prefs_common.c b/src/prefs_common.c
@@ -1338,8 +1338,8 @@ void pref_get_unescaped_pref(gchar *out, const gchar *in)
*out = '\0';
- g_return_if_fail( in != NULL );
- g_return_if_fail( out != NULL );
+ cm_return_if_fail( in != NULL );
+ cm_return_if_fail( out != NULL );
i = in;
o = out;
@@ -1374,8 +1374,8 @@ void pref_get_escaped_pref(gchar *out, const gchar *in)
*out = '\0';
- g_return_if_fail( in != NULL );
- g_return_if_fail( out != NULL );
+ cm_return_if_fail( in != NULL );
+ cm_return_if_fail( out != NULL );
i = in;
o = out;
@@ -1404,7 +1404,7 @@ void pref_set_textview_from_pref(GtkTextView *textview, const gchar *txt)
GtkTextBuffer *buffer;
gchar *out = NULL;
- g_return_if_fail( textview != NULL );
+ cm_return_if_fail( textview != NULL );
buffer = gtk_text_view_get_buffer(textview);
@@ -1426,7 +1426,7 @@ void pref_set_entry_from_pref(GtkEntry *entry, const gchar *txt)
{
gchar *out = NULL;
- g_return_if_fail( entry != NULL );
+ cm_return_if_fail( entry != NULL );
if (!txt) {
gtk_entry_set_text(entry, "");
} else {
@@ -1447,7 +1447,7 @@ gchar *pref_get_pref_from_textview(GtkTextView *textview)
GtkTextIter start, end;
gchar *out, *tmp;
- g_return_val_if_fail( textview != NULL, "" );
+ cm_return_val_if_fail( textview != NULL, "" );
buffer = gtk_text_view_get_buffer(textview);
gtk_text_buffer_get_start_iter(buffer, &start);
@@ -1467,7 +1467,7 @@ gchar *pref_get_pref_from_entry(GtkEntry *entry)
{
gchar *out, *tmp;
- g_return_val_if_fail( entry != NULL, "" );
+ cm_return_val_if_fail( entry != NULL, "" );
tmp = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
out = malloc(2*strlen(tmp)+1);
diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
@@ -227,7 +227,7 @@ void prefs_filtering_open(GSList ** p_processing,
static void prefs_filtering_size_allocate_cb(GtkWidget *widget,
GtkAllocation *allocation)
{
- g_return_if_fail(allocation != NULL);
+ cm_return_if_fail(allocation != NULL);
prefs_common.filteringwin_width = allocation->width;
prefs_common.filteringwin_height = allocation->height;
@@ -254,7 +254,7 @@ static void prefs_filtering_account_option_menu_populate(void)
accounts = account_get_list();
- g_return_if_fail(accounts != NULL);
+ cm_return_if_fail(accounts != NULL);
COMBOBOX_ADD(filtering.account_combobox_list, Q_("Filtering Account Menu|All"), 0);
for (; accounts != NULL; accounts = accounts->next) {
@@ -733,9 +733,9 @@ static gboolean prefs_filtering_rename_path_func(GNode *node, gpointer data)
old_path = paths[0];
new_path = paths[1];
- g_return_val_if_fail(old_path != NULL, FALSE);
- g_return_val_if_fail(new_path != NULL, FALSE);
- g_return_val_if_fail(node != NULL, FALSE);
+ cm_return_val_if_fail(old_path != NULL, FALSE);
+ cm_return_val_if_fail(new_path != NULL, FALSE);
+ cm_return_val_if_fail(node != NULL, FALSE);
item = node->data;
if (!item || !item->prefs)
@@ -786,9 +786,9 @@ static gboolean prefs_filtering_rename_tag_func(GNode *node, gpointer data)
old_tag = tags[0];
new_tag = tags[1];
- g_return_val_if_fail(old_tag != NULL, FALSE);
- g_return_val_if_fail(new_tag != NULL, FALSE);
- g_return_val_if_fail(node != NULL, FALSE);
+ cm_return_val_if_fail(old_tag != NULL, FALSE);
+ cm_return_val_if_fail(new_tag != NULL, FALSE);
+ cm_return_val_if_fail(node != NULL, FALSE);
item = node->data;
if (!item || !item->prefs)
@@ -873,8 +873,8 @@ static gboolean prefs_filtering_delete_path_func(GNode *node, gpointer data)
FolderItem *item;
GSList ** p_filters;
- g_return_val_if_fail(path != NULL, FALSE);
- g_return_val_if_fail(node != NULL, FALSE);
+ cm_return_val_if_fail(path != NULL, FALSE);
+ cm_return_val_if_fail(node != NULL, FALSE);
item = node->data;
if (!item || !item->prefs)
diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c
@@ -291,7 +291,7 @@ void prefs_filtering_action_open(GSList *action_list,
static void prefs_filtering_action_size_allocate_cb(GtkWidget *widget,
GtkAllocation *allocation)
{
- g_return_if_fail(allocation != NULL);
+ cm_return_if_fail(allocation != NULL);
prefs_common.filteringactionwin_width = allocation->width;
prefs_common.filteringactionwin_height = allocation->height;
@@ -1263,7 +1263,7 @@ static void prefs_filtering_action_select_addressbook(void)
static void prefs_filtering_action_enable_widget(GtkWidget* widget, const gboolean enable)
{
- g_return_if_fail(widget != NULL);
+ cm_return_if_fail(widget != NULL);
if(enable == TRUE)
{
diff --git a/src/prefs_folder_column.c b/src/prefs_folder_column.c
@@ -442,7 +442,7 @@ static void prefs_folder_column_set_view(void)
(gtk_tree_view_get_model(GTK_TREE_VIEW
(folder_col.shown_list_view)), NULL);
- g_return_if_fail
+ cm_return_if_fail
(stock_n_rows + shown_n_rows == N_FOLDER_COLS);
for (row = 0; row < stock_n_rows; row++) {
diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
@@ -627,7 +627,7 @@ static void general_save_folder_prefs(FolderItem *folder, FolderItemGeneralPage
if (folder->path == NULL)
return;
- g_return_if_fail(prefs != NULL);
+ cm_return_if_fail(prefs != NULL);
if (page->item == folder)
all = TRUE;
@@ -694,8 +694,8 @@ static gboolean general_save_recurse_func(GNode *node, gpointer data)
FolderItem *item = (FolderItem *) node->data;
FolderItemGeneralPage *page = (FolderItemGeneralPage *) data;
- g_return_val_if_fail(item != NULL, TRUE);
- g_return_val_if_fail(page != NULL, TRUE);
+ cm_return_val_if_fail(item != NULL, TRUE);
+ cm_return_val_if_fail(page != NULL, TRUE);
general_save_folder_prefs(item, page);
@@ -1068,7 +1068,7 @@ static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage
if (page->item == folder)
all = TRUE;
- g_return_if_fail(prefs != NULL);
+ cm_return_if_fail(prefs != NULL);
if (item_protocol(folder) != A_NNTP) {
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->request_return_receipt_rec_checkbtn))) {
@@ -1138,8 +1138,8 @@ static gboolean compose_save_recurse_func(GNode *node, gpointer data)
FolderItem *item = (FolderItem *) node->data;
FolderItemComposePage *page = (FolderItemComposePage *) data;
- g_return_val_if_fail(item != NULL, TRUE);
- g_return_val_if_fail(page != NULL, TRUE);
+ cm_return_val_if_fail(item != NULL, TRUE);
+ cm_return_val_if_fail(page != NULL, TRUE);
compose_save_folder_prefs(item, page);
@@ -1346,7 +1346,7 @@ static void templates_save_folder_prefs(FolderItem *folder, FolderItemTemplatesP
if (page->item == folder)
all = TRUE;
- g_return_if_fail(prefs != NULL);
+ cm_return_if_fail(prefs != NULL);
/* save and check formats */
@@ -1404,8 +1404,8 @@ static gboolean templates_save_recurse_func(GNode *node, gpointer data)
FolderItem *item = (FolderItem *) node->data;
FolderItemTemplatesPage *page = (FolderItemTemplatesPage *) data;
- g_return_val_if_fail(item != NULL, TRUE);
- g_return_val_if_fail(page != NULL, TRUE);
+ cm_return_val_if_fail(item != NULL, TRUE);
+ cm_return_val_if_fail(page != NULL, TRUE);
templates_save_folder_prefs(item, page);
diff --git a/src/prefs_gtk.c b/src/prefs_gtk.c
@@ -75,9 +75,9 @@ void prefs_read_config(PrefParam *param, const gchar *label,
gchar buf[PREFSBUFSIZE];
gchar *block_label;
- g_return_if_fail(param != NULL);
- g_return_if_fail(label != NULL);
- g_return_if_fail(rcfile != NULL);
+ cm_return_if_fail(param != NULL);
+ cm_return_if_fail(label != NULL);
+ cm_return_if_fail(rcfile != NULL);
if (encoding != NULL)
g_warning("Encoding is ignored\n");
@@ -259,9 +259,9 @@ void prefs_write_config(PrefParam *param, const gchar *label,
gchar *block_label = NULL;
gboolean block_matched = FALSE;
- g_return_if_fail(param != NULL);
- g_return_if_fail(label != NULL);
- g_return_if_fail(rcfile != NULL);
+ cm_return_if_fail(param != NULL);
+ cm_return_if_fail(label != NULL);
+ cm_return_if_fail(rcfile != NULL);
rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, rcfile, NULL);
if ((orig_fp = g_fopen(rcpath, "rb")) == NULL) {
@@ -422,7 +422,7 @@ void prefs_set_default(PrefParam *param)
gint i;
GdkColor color;
- g_return_if_fail(param != NULL);
+ cm_return_if_fail(param != NULL);
for (i = 0; param[i].name != NULL; i++) {
if (!param[i].data) continue;
@@ -521,7 +521,7 @@ void prefs_free(PrefParam *param)
{
gint i;
- g_return_if_fail(param != NULL);
+ cm_return_if_fail(param != NULL);
for (i = 0; param[i].name != NULL; i++) {
if (!param[i].data) continue;
@@ -656,7 +656,7 @@ void prefs_set_data_from_entry(PrefParam *pparam)
gchar **str;
const gchar *entry_str;
- g_return_if_fail(*pparam->widget != NULL);
+ cm_return_if_fail(*pparam->widget != NULL);
entry_str = gtk_entry_get_text(GTK_ENTRY(*pparam->widget));
@@ -683,7 +683,7 @@ void prefs_set_escaped_data_from_entry(PrefParam *pparam)
{
gchar **str;
- g_return_if_fail(*pparam->widget != NULL);
+ cm_return_if_fail(*pparam->widget != NULL);
switch (pparam->type) {
case P_STRING:
@@ -701,7 +701,7 @@ void prefs_set_entry(PrefParam *pparam)
{
gchar **str;
- g_return_if_fail(*pparam->widget != NULL);
+ cm_return_if_fail(*pparam->widget != NULL);
switch (pparam->type) {
case P_STRING:
@@ -728,7 +728,7 @@ void prefs_set_entry_from_escaped(PrefParam *pparam)
{
gchar **str;
- g_return_if_fail(*pparam->widget != NULL);
+ cm_return_if_fail(*pparam->widget != NULL);
switch (pparam->type) {
case P_STRING:
@@ -748,7 +748,7 @@ void prefs_set_data_from_text(PrefParam *pparam)
gchar *text = NULL, *tp = NULL;
gchar *tmp, *tmpp;
- g_return_if_fail(*pparam->widget != NULL);
+ cm_return_if_fail(*pparam->widget != NULL);
switch (pparam->type) {
case P_STRING:
@@ -767,7 +767,7 @@ void prefs_set_data_from_text(PrefParam *pparam)
tp = text = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
}
- g_return_if_fail (tp && text);
+ cm_return_if_fail (tp && text);
if (text[0] == '\0') {
*str = NULL;
@@ -799,7 +799,7 @@ void prefs_set_escaped_data_from_text(PrefParam *pparam)
{
gchar **str;
- g_return_if_fail(*pparam->widget != NULL);
+ cm_return_if_fail(*pparam->widget != NULL);
switch (pparam->type) {
case P_STRING:
@@ -821,7 +821,7 @@ void prefs_set_text(PrefParam *pparam)
GtkTextBuffer *buffer;
GtkTextIter iter;
- g_return_if_fail(*pparam->widget != NULL);
+ cm_return_if_fail(*pparam->widget != NULL);
switch (pparam->type) {
case P_STRING:
@@ -860,7 +860,7 @@ void prefs_set_text_from_escaped(PrefParam *pparam)
{
gchar **str;
- g_return_if_fail(*pparam->widget != NULL);
+ cm_return_if_fail(*pparam->widget != NULL);
switch (pparam->type) {
case P_STRING:
@@ -876,8 +876,8 @@ void prefs_set_text_from_escaped(PrefParam *pparam)
void prefs_set_data_from_toggle(PrefParam *pparam)
{
- g_return_if_fail(pparam->type == P_BOOL);
- g_return_if_fail(*pparam->widget != NULL);
+ cm_return_if_fail(pparam->type == P_BOOL);
+ cm_return_if_fail(*pparam->widget != NULL);
*((gboolean *)pparam->data) =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(*pparam->widget));
@@ -885,8 +885,8 @@ void prefs_set_data_from_toggle(PrefParam *pparam)
void prefs_set_toggle(PrefParam *pparam)
{
- g_return_if_fail(pparam->type == P_BOOL);
- g_return_if_fail(*pparam->widget != NULL);
+ cm_return_if_fail(pparam->type == P_BOOL);
+ cm_return_if_fail(*pparam->widget != NULL);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(*pparam->widget),
*((gboolean *)pparam->data));
@@ -894,7 +894,7 @@ void prefs_set_toggle(PrefParam *pparam)
void prefs_set_data_from_spinbtn(PrefParam *pparam)
{
- g_return_if_fail(*pparam->widget != NULL);
+ cm_return_if_fail(*pparam->widget != NULL);
switch (pparam->type) {
case P_INT:
@@ -915,7 +915,7 @@ void prefs_set_data_from_spinbtn(PrefParam *pparam)
void prefs_set_spinbtn(PrefParam *pparam)
{
- g_return_if_fail(*pparam->widget != NULL);
+ cm_return_if_fail(*pparam->widget != NULL);
switch (pparam->type) {
case P_INT:
diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
@@ -444,7 +444,7 @@ void prefs_matcher_open(MatcherList *matchers, PrefsMatcherSignal *cb)
static void prefs_matcher_size_allocate_cb(GtkWidget *widget,
GtkAllocation *allocation)
{
- g_return_if_fail(allocation != NULL);
+ cm_return_if_fail(allocation != NULL);
prefs_common.matcherwin_width = allocation->width;
prefs_common.matcherwin_height = allocation->height;
@@ -1670,7 +1670,7 @@ static void prefs_matcher_down(void)
static void prefs_matcher_enable_widget(GtkWidget* widget, const gboolean enable)
{
- g_return_if_fail(widget != NULL);
+ cm_return_if_fail(widget != NULL);
if(enable == TRUE) {
gtk_widget_set_sensitive(widget, TRUE);
@@ -1683,8 +1683,8 @@ static void prefs_matcher_enable_widget(GtkWidget* widget, const gboolean enable
static void prefs_matcher_set_model(GtkWidget *widget, GtkTreeModel *model)
{
- g_return_if_fail(widget != NULL);
- g_return_if_fail(model != NULL);
+ cm_return_if_fail(widget != NULL);
+ cm_return_if_fail(model != NULL);
gtk_combo_box_set_model(GTK_COMBO_BOX(widget), model);
gtk_combo_box_set_active(GTK_COMBO_BOX(widget), 0);
diff --git a/src/prefs_quote.c b/src/prefs_quote.c
@@ -62,7 +62,7 @@ QuotePage *prefs_quote;
static void prefs_quote_set_default_new_msg_fmt(void)
{
- g_return_if_fail(prefs_quote->text_format != NULL);
+ cm_return_if_fail(prefs_quote->text_format != NULL);
pref_set_textview_from_pref(GTK_TEXT_VIEW(prefs_quote->text_format),
_("Hello,\\n"));
@@ -70,7 +70,7 @@ static void prefs_quote_set_default_new_msg_fmt(void)
static void prefs_quote_set_default_reply_fmt(void)
{
- g_return_if_fail(prefs_quote->text_quotefmt != NULL);
+ cm_return_if_fail(prefs_quote->text_quotefmt != NULL);
pref_set_textview_from_pref(GTK_TEXT_VIEW(prefs_quote->text_quotefmt),
_("On %d\\n%f wrote:\\n\\n%q"));
@@ -78,7 +78,7 @@ static void prefs_quote_set_default_reply_fmt(void)
static void prefs_quote_set_default_forward_fmt(void)
{
- g_return_if_fail(prefs_quote->text_fw_quotefmt != NULL);
+ cm_return_if_fail(prefs_quote->text_fw_quotefmt != NULL);
pref_set_textview_from_pref(GTK_TEXT_VIEW(prefs_quote->text_fw_quotefmt),
_("\\n\\nBegin forwarded message:\\n\\n"
diff --git a/src/prefs_send.c b/src/prefs_send.c
@@ -61,9 +61,9 @@ static gchar * prefs_common_charset_set_data_from_optmenu(GtkWidget *widget)
GtkTreeIter iter;
gchar *data = NULL;
- g_return_val_if_fail(widget != NULL, NULL);
+ cm_return_val_if_fail(widget != NULL, NULL);
- g_return_val_if_fail(gtk_combo_box_get_active_iter(
+ cm_return_val_if_fail(gtk_combo_box_get_active_iter(
GTK_COMBO_BOX(widget), &iter), NULL);
model = gtk_combo_box_get_model(GTK_COMBO_BOX(widget));
@@ -99,7 +99,7 @@ static void prefs_common_charset_set_optmenu(GtkWidget *widget, gchar *data)
GtkComboBox *combobox = GTK_COMBO_BOX(widget);
GtkTreeModel *model;
ComboboxSelCtx *ctx = NULL;
- g_return_if_fail(combobox != NULL);
+ cm_return_if_fail(combobox != NULL);
model = gtk_combo_box_get_model(combobox);
@@ -117,7 +117,7 @@ static gboolean _combobox_separator_func(GtkTreeModel *model,
{
gchar *txt = NULL;
- g_return_val_if_fail(model != NULL, FALSE);
+ cm_return_val_if_fail(model != NULL, FALSE);
gtk_tree_model_get(model, iter, COMBOBOX_TEXT, &txt, -1);
diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c
@@ -707,13 +707,13 @@ static void date_format_ok_btn_clicked(GtkButton *button, GtkWidget **widget)
GtkWidget *datefmt_sample = NULL;
gchar *text;
- g_return_if_fail(widget != NULL);
- g_return_if_fail(*widget != NULL);
- g_return_if_fail(prefs_summaries->entry_datefmt != NULL);
+ cm_return_if_fail(widget != NULL);
+ cm_return_if_fail(*widget != NULL);
+ cm_return_if_fail(prefs_summaries->entry_datefmt != NULL);
datefmt_sample = GTK_WIDGET(g_object_get_data
(G_OBJECT(*widget), "datefmt_sample"));
- g_return_if_fail(datefmt_sample != NULL);
+ cm_return_if_fail(datefmt_sample != NULL);
text = gtk_editable_get_chars(GTK_EDITABLE(datefmt_sample), 0, -1);
g_free(prefs_common.date_format);
@@ -727,8 +727,8 @@ static void date_format_ok_btn_clicked(GtkButton *button, GtkWidget **widget)
static void date_format_cancel_btn_clicked(GtkButton *button,
GtkWidget **widget)
{
- g_return_if_fail(widget != NULL);
- g_return_if_fail(*widget != NULL);
+ cm_return_if_fail(widget != NULL);
+ cm_return_if_fail(*widget != NULL);
gtk_widget_destroy(*widget);
*widget = NULL;
@@ -745,8 +745,8 @@ static gboolean date_format_key_pressed(GtkWidget *keywidget, GdkEventKey *event
static gboolean date_format_on_delete(GtkWidget *dialogwidget,
GdkEventAny *event, GtkWidget **widget)
{
- g_return_val_if_fail(widget != NULL, FALSE);
- g_return_val_if_fail(*widget != NULL, FALSE);
+ cm_return_val_if_fail(widget != NULL, FALSE);
+ cm_return_val_if_fail(*widget != NULL, FALSE);
*widget = NULL;
return FALSE;
@@ -793,13 +793,13 @@ static void date_format_select_row(GtkTreeView *list_view,
GtkTreeIter iter;
GtkTreeModel *model;
- g_return_if_fail(date_format != NULL);
+ cm_return_if_fail(date_format != NULL);
/* only on double click */
datefmt_sample = GTK_WIDGET(g_object_get_data(G_OBJECT(date_format),
"datefmt_sample"));
- g_return_if_fail(datefmt_sample != NULL);
+ cm_return_if_fail(datefmt_sample != NULL);
model = gtk_tree_view_get_model(list_view);
diff --git a/src/prefs_summary_column.c b/src/prefs_summary_column.c
@@ -458,7 +458,7 @@ static void prefs_summary_column_set_view(void)
(gtk_tree_view_get_model(GTK_TREE_VIEW
(summary_col.shown_list_view)), NULL);
- g_return_if_fail
+ cm_return_if_fail
(stock_n_rows + shown_n_rows == N_SUMMARY_COLS);
for (row = 0; row < stock_n_rows; row++) {
diff --git a/src/prefs_template.c b/src/prefs_template.c
@@ -143,7 +143,7 @@ void prefs_template_open(void)
static void prefs_template_size_allocate_cb(GtkWidget *widget,
GtkAllocation *allocation)
{
- g_return_if_fail(allocation != NULL);
+ cm_return_if_fail(allocation != NULL);
prefs_common.templateswin_width = allocation->width;
prefs_common.templateswin_height = allocation->height;
diff --git a/src/prefs_themes.c b/src/prefs_themes.c
@@ -228,8 +228,8 @@ static void prefs_themes_foreach_file(const gchar *dirname, const FileFunc func,
struct dirent *d;
DIR *dp;
- g_return_if_fail(dirname != NULL);
- g_return_if_fail(func != NULL);
+ cm_return_if_fail(dirname != NULL);
+ cm_return_if_fail(func != NULL);
if ((dp = opendir(dirname)) == NULL) {
debug_print("directory %s not found\n", dirname);
@@ -256,7 +256,7 @@ static gboolean prefs_themes_is_system_theme(const gchar *dirname)
gchar *system_theme_dir;
gboolean is_sys = FALSE;
- g_return_val_if_fail(dirname != NULL, FALSE);
+ cm_return_val_if_fail(dirname != NULL, FALSE);
system_theme_dir = stock_pixmap_get_system_theme_dir_for_theme(NULL);
len = strlen(system_theme_dir);
@@ -276,7 +276,7 @@ static void prefs_themes_set_themes_menu(GtkComboBox *combo, const ThemesData *t
gint i = 0, active = 0;
GList *sorted_list = NULL;
- g_return_if_fail(combo != NULL);
+ cm_return_if_fail(combo != NULL);
/* sort theme data list by data name */
while (themes != NULL) {
@@ -329,7 +329,7 @@ static void prefs_themes_get_themes_and_names(ThemesData *tdata)
{
GList *tpaths;
- g_return_if_fail(tdata != NULL);
+ cm_return_if_fail(tdata != NULL);
if (tdata->themes != NULL)
stock_pixmap_themes_list_free(tdata->themes);
@@ -602,7 +602,7 @@ static void prefs_themes_menu_item_activated_cb(GtkWidget *widget, gpointer data
GtkTreeModel *model;
GtkTreeIter iter;
- g_return_if_fail(gtk_combo_box_get_active_iter(GTK_COMBO_BOX(widget), &iter));
+ cm_return_if_fail(gtk_combo_box_get_active_iter(GTK_COMBO_BOX(widget), &iter));
model = gtk_combo_box_get_model(GTK_COMBO_BOX(widget));
gtk_tree_model_get(model, &iter, 1, &path, -1);
@@ -716,9 +716,9 @@ static void prefs_themes_get_theme_info(ThemesData *tdata)
ThemeInfo *info;
ThemesPage *theme = tdata->page;
- g_return_if_fail(theme != NULL);
+ cm_return_if_fail(theme != NULL);
path = tdata->displayed;
- g_return_if_fail(path != NULL);
+ cm_return_if_fail(path != NULL);
debug_print("Getting theme info for %s\n", path);
diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
@@ -378,7 +378,7 @@ static gboolean is_duplicate(ToolbarPage *prefs_toolbar, gchar *chosen_action)
GtkTreeIter iter;
gboolean result;
- g_return_val_if_fail(chosen_action != NULL, TRUE);
+ cm_return_val_if_fail(chosen_action != NULL, TRUE);
if (!gtk_tree_model_iter_n_children(model_set, NULL))
return FALSE;
@@ -1262,7 +1262,7 @@ static void icon_chooser_ok_clicked(GtkButton *button,
GdkPixbuf *pix;
gchar *icon_file;
- g_return_if_fail(prefs_toolbar != NULL);
+ cm_return_if_fail(prefs_toolbar != NULL);
model = gtk_icon_view_get_model(GTK_ICON_VIEW(prefs_toolbar->icon_chooser_view));
list = gtk_icon_view_get_selected_items(GTK_ICON_VIEW(prefs_toolbar->icon_chooser_view));
@@ -1296,7 +1296,7 @@ static void icon_chooser_ok_clicked(GtkButton *button,
static void icon_chooser_cancel_clicked(GtkButton *button,
ToolbarPage *prefs_toolbar)
{
- g_return_if_fail(prefs_toolbar != NULL);
+ cm_return_if_fail(prefs_toolbar != NULL);
gtk_widget_destroy(prefs_toolbar->icon_chooser_win);
prefs_toolbar->icon_chooser_win = NULL;
diff --git a/src/printing.c b/src/printing.c
@@ -557,7 +557,7 @@ static gboolean cb_preview_close(GtkWidget *widget, GdkEventAny *event,
static void cb_preview_size_allocate(GtkWidget *widget,
GtkAllocation *allocation)
{
- g_return_if_fail(allocation != NULL);
+ cm_return_if_fail(allocation != NULL);
prefs_common.print_previewwin_width = allocation->width;
prefs_common.print_previewwin_height = allocation->height;
diff --git a/src/privacy.c b/src/privacy.c
@@ -100,7 +100,7 @@ void privacy_free_privacydata(PrivacyData *privacydata)
{
PrivacySystem *system = NULL;
- g_return_if_fail(privacydata != NULL);
+ cm_return_if_fail(privacydata != NULL);
system = privacy_data_get_system(privacydata);
if (!system)
@@ -120,7 +120,7 @@ void privacy_free_privacydata(PrivacyData *privacydata)
gboolean privacy_mimeinfo_is_signed(MimeInfo *mimeinfo)
{
GSList *cur;
- g_return_val_if_fail(mimeinfo != NULL, FALSE);
+ cm_return_val_if_fail(mimeinfo != NULL, FALSE);
if (mimeinfo->privacy != NULL) {
PrivacySystem *system =
@@ -196,7 +196,7 @@ gint privacy_mimeinfo_check_signature(MimeInfo *mimeinfo)
{
PrivacySystem *system;
- g_return_val_if_fail(mimeinfo != NULL, -1);
+ cm_return_val_if_fail(mimeinfo != NULL, -1);
if (mimeinfo->privacy == NULL)
privacy_mimeinfo_is_signed(mimeinfo);
@@ -218,7 +218,7 @@ SignatureStatus privacy_mimeinfo_get_sig_status(MimeInfo *mimeinfo)
{
PrivacySystem *system;
- g_return_val_if_fail(mimeinfo != NULL, -1);
+ cm_return_val_if_fail(mimeinfo != NULL, -1);
if (mimeinfo->privacy == NULL)
privacy_mimeinfo_is_signed(mimeinfo);
@@ -239,7 +239,7 @@ gchar *privacy_mimeinfo_sig_info_short(MimeInfo *mimeinfo)
{
PrivacySystem *system;
- g_return_val_if_fail(mimeinfo != NULL, NULL);
+ cm_return_val_if_fail(mimeinfo != NULL, NULL);
if (mimeinfo->privacy == NULL)
privacy_mimeinfo_is_signed(mimeinfo);
@@ -260,7 +260,7 @@ gchar *privacy_mimeinfo_sig_info_full(MimeInfo *mimeinfo)
{
PrivacySystem *system;
- g_return_val_if_fail(mimeinfo != NULL, NULL);
+ cm_return_val_if_fail(mimeinfo != NULL, NULL);
if (mimeinfo->privacy == NULL)
privacy_mimeinfo_is_signed(mimeinfo);
@@ -280,7 +280,7 @@ gchar *privacy_mimeinfo_sig_info_full(MimeInfo *mimeinfo)
gboolean privacy_mimeinfo_is_encrypted(MimeInfo *mimeinfo)
{
GSList *cur;
- g_return_val_if_fail(mimeinfo != NULL, FALSE);
+ cm_return_val_if_fail(mimeinfo != NULL, FALSE);
for(cur = systems; cur != NULL; cur = g_slist_next(cur)) {
PrivacySystem *system = (PrivacySystem *) cur->data;
@@ -297,7 +297,7 @@ static gint decrypt(MimeInfo *mimeinfo, PrivacySystem *system)
MimeInfo *decryptedinfo, *parentinfo;
gint childnumber;
- g_return_val_if_fail(system->decrypt != NULL, -1);
+ cm_return_val_if_fail(system->decrypt != NULL, -1);
decryptedinfo = system->decrypt(mimeinfo);
if (decryptedinfo == NULL)
@@ -316,7 +316,7 @@ static gint decrypt(MimeInfo *mimeinfo, PrivacySystem *system)
gint privacy_mimeinfo_decrypt(MimeInfo *mimeinfo)
{
GSList *cur;
- g_return_val_if_fail(mimeinfo != NULL, FALSE);
+ cm_return_val_if_fail(mimeinfo != NULL, FALSE);
for(cur = systems; cur != NULL; cur = g_slist_next(cur)) {
PrivacySystem *system = (PrivacySystem *) cur->data;
@@ -346,7 +346,7 @@ static PrivacySystem *privacy_get_system(const gchar *id)
{
GSList *cur;
- g_return_val_if_fail(id != NULL, NULL);
+ cm_return_val_if_fail(id != NULL, NULL);
for(cur = systems; cur != NULL; cur = g_slist_next(cur)) {
PrivacySystem *system = (PrivacySystem *) cur->data;
@@ -362,7 +362,7 @@ const gchar *privacy_system_get_name(const gchar *id)
{
PrivacySystem *system;
- g_return_val_if_fail(id != NULL, NULL);
+ cm_return_val_if_fail(id != NULL, NULL);
system = privacy_get_system(id);
if (system == NULL)
@@ -375,7 +375,7 @@ gboolean privacy_system_can_sign(const gchar *id)
{
PrivacySystem *system;
- g_return_val_if_fail(id != NULL, FALSE);
+ cm_return_val_if_fail(id != NULL, FALSE);
system = privacy_get_system(id);
if (system == NULL)
@@ -388,7 +388,7 @@ gboolean privacy_system_can_encrypt(const gchar *id)
{
PrivacySystem *system;
- g_return_val_if_fail(id != NULL, FALSE);
+ cm_return_val_if_fail(id != NULL, FALSE);
system = privacy_get_system(id);
if (system == NULL)
@@ -401,8 +401,8 @@ gboolean privacy_sign(const gchar *id, MimeInfo *target, PrefsAccount *account,
{
PrivacySystem *system;
- g_return_val_if_fail(id != NULL, FALSE);
- g_return_val_if_fail(target != NULL, FALSE);
+ cm_return_val_if_fail(id != NULL, FALSE);
+ cm_return_val_if_fail(target != NULL, FALSE);
system = privacy_get_system(id);
if (system == NULL)
@@ -421,8 +421,8 @@ gchar *privacy_get_encrypt_data(const gchar *id, GSList *recp_names)
gchar *ret = NULL;
GSList *uniq_names = NULL, *cur;
- g_return_val_if_fail(id != NULL, NULL);
- g_return_val_if_fail(recp_names != NULL, NULL);
+ cm_return_val_if_fail(id != NULL, NULL);
+ cm_return_val_if_fail(recp_names != NULL, NULL);
system = privacy_get_system(id);
if (system == NULL)
@@ -447,7 +447,7 @@ const gchar *privacy_get_encrypt_warning(const gchar *id)
{
PrivacySystem *system;
- g_return_val_if_fail(id != NULL, NULL);
+ cm_return_val_if_fail(id != NULL, NULL);
system = privacy_get_system(id);
if (system == NULL)
@@ -464,7 +464,7 @@ void privacy_inhibit_encrypt_warning(const gchar *id, gboolean inhibit)
{
PrivacySystem *system;
- g_return_if_fail(id != NULL);
+ cm_return_if_fail(id != NULL);
system = privacy_get_system(id);
if (system == NULL)
@@ -481,8 +481,8 @@ gboolean privacy_encrypt(const gchar *id, MimeInfo *mimeinfo, const gchar *encda
{
PrivacySystem *system;
- g_return_val_if_fail(id != NULL, FALSE);
- g_return_val_if_fail(mimeinfo != NULL, FALSE);
+ cm_return_val_if_fail(id != NULL, FALSE);
+ cm_return_val_if_fail(mimeinfo != NULL, FALSE);
if (encdata == NULL) {
privacy_set_error(_("No recipient keys defined."));
return FALSE;
diff --git a/src/procheader.c b/src/procheader.c
@@ -194,7 +194,7 @@ GPtrArray *procheader_get_header_array_asis(FILE *fp)
GPtrArray *headers;
Header *header;
- g_return_val_if_fail(fp != NULL, NULL);
+ cm_return_val_if_fail(fp != NULL, NULL);
headers = g_ptr_array_new();
@@ -1001,7 +1001,7 @@ gint procheader_get_header_from_msginfo(MsgInfo *msginfo, gchar *buf, gint len,
hentry[0].name = header;
- g_return_val_if_fail(msginfo != NULL, -1);
+ cm_return_val_if_fail(msginfo != NULL, -1);
file = procmsg_get_message_file_path(msginfo);
if ((fp = g_fopen(file, "rb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
diff --git a/src/procmime.c b/src/procmime.c
@@ -156,8 +156,8 @@ void procmime_mimeinfo_free_all(MimeInfo *mimeinfo)
MimeInfo *procmime_mimeinfo_parent(MimeInfo *mimeinfo)
{
- g_return_val_if_fail(mimeinfo != NULL, NULL);
- g_return_val_if_fail(mimeinfo->node != NULL, NULL);
+ cm_return_val_if_fail(mimeinfo != NULL, NULL);
+ cm_return_val_if_fail(mimeinfo->node != NULL, NULL);
if (mimeinfo->node->parent == NULL)
return NULL;
@@ -166,8 +166,8 @@ MimeInfo *procmime_mimeinfo_parent(MimeInfo *mimeinfo)
MimeInfo *procmime_mimeinfo_next(MimeInfo *mimeinfo)
{
- g_return_val_if_fail(mimeinfo != NULL, NULL);
- g_return_val_if_fail(mimeinfo->node != NULL, NULL);
+ cm_return_val_if_fail(mimeinfo != NULL, NULL);
+ cm_return_val_if_fail(mimeinfo->node != NULL, NULL);
if (mimeinfo->node->children)
return (MimeInfo *) mimeinfo->node->children->data;
@@ -242,8 +242,8 @@ const gchar *procmime_mimeinfo_get_parameter(MimeInfo *mimeinfo, const gchar *na
{
const gchar *value;
- g_return_val_if_fail(mimeinfo != NULL, NULL);
- g_return_val_if_fail(name != NULL, NULL);
+ cm_return_val_if_fail(mimeinfo != NULL, NULL);
+ cm_return_val_if_fail(name != NULL, NULL);
value = g_hash_table_lookup(mimeinfo->dispositionparameters, name);
if (value == NULL)
@@ -291,7 +291,7 @@ gboolean procmime_decode_content(MimeInfo *mimeinfo)
gchar lastline[BUFFSIZE];
memset(lastline, 0, BUFFSIZE);
- g_return_val_if_fail(mimeinfo != NULL, FALSE);
+ cm_return_val_if_fail(mimeinfo != NULL, FALSE);
if (prefs_common.respect_flowed_format &&
mimeinfo->type == MIMETYPE_TEXT &&
@@ -611,8 +611,8 @@ gint procmime_get_part(const gchar *outfile, MimeInfo *mimeinfo)
gint restlength, readlength;
gint saved_errno = 0;
- g_return_val_if_fail(outfile != NULL, -1);
- g_return_val_if_fail(mimeinfo != NULL, -1);
+ cm_return_val_if_fail(outfile != NULL, -1);
+ cm_return_val_if_fail(mimeinfo != NULL, -1);
if (mimeinfo->encoding_type != ENC_BINARY && !procmime_decode_content(mimeinfo))
return -EINVAL;
@@ -667,7 +667,7 @@ static FILE *procmime_get_text_content(MimeInfo *mimeinfo)
gchar *tmpfile;
gboolean err = FALSE;
- g_return_val_if_fail(mimeinfo != NULL, NULL);
+ cm_return_val_if_fail(mimeinfo != NULL, NULL);
if (!procmime_decode_content(mimeinfo))
return NULL;
@@ -764,7 +764,7 @@ FILE *procmime_get_first_text_content(MsgInfo *msginfo)
MimeInfo *mimeinfo, *partinfo;
gboolean empty_ok = FALSE, short_scan = TRUE;
START_TIMING("");
- g_return_val_if_fail(msginfo != NULL, NULL);
+ cm_return_val_if_fail(msginfo != NULL, NULL);
/* first we try to short-scan (for speed), refusing empty parts */
scan_again:
@@ -832,7 +832,7 @@ FILE *procmime_get_first_encrypted_text_content(MsgInfo *msginfo)
FILE *outfp = NULL;
MimeInfo *mimeinfo, *partinfo, *encinfo;
- g_return_val_if_fail(msginfo != NULL, NULL);
+ cm_return_val_if_fail(msginfo != NULL, NULL);
mimeinfo = procmime_scan_message(msginfo);
if (!mimeinfo) {
@@ -868,7 +868,7 @@ gboolean procmime_msginfo_is_encrypted(MsgInfo *msginfo)
MimeInfo *mimeinfo, *partinfo;
gboolean result = FALSE;
- g_return_val_if_fail(msginfo != NULL, FALSE);
+ cm_return_val_if_fail(msginfo != NULL, FALSE);
mimeinfo = procmime_scan_message(msginfo);
if (!mimeinfo) {
@@ -888,10 +888,10 @@ static gboolean procmime_find_string_part(MimeInfo *mimeinfo, const gchar *filen
FILE *outfp;
gchar buf[BUFFSIZE];
- g_return_val_if_fail(mimeinfo != NULL, FALSE);
- g_return_val_if_fail(mimeinfo->type == MIMETYPE_TEXT, FALSE);
- g_return_val_if_fail(str != NULL, FALSE);
- g_return_val_if_fail(find_func != NULL, FALSE);
+ cm_return_val_if_fail(mimeinfo != NULL, FALSE);
+ cm_return_val_if_fail(mimeinfo->type == MIMETYPE_TEXT, FALSE);
+ cm_return_val_if_fail(str != NULL, FALSE);
+ cm_return_val_if_fail(find_func != NULL, FALSE);
outfp = procmime_get_text_content(mimeinfo);
@@ -919,9 +919,9 @@ gboolean procmime_find_string(MsgInfo *msginfo, const gchar *str,
gchar *filename;
gboolean found = FALSE;
- g_return_val_if_fail(msginfo != NULL, FALSE);
- g_return_val_if_fail(str != NULL, FALSE);
- g_return_val_if_fail(find_func != NULL, FALSE);
+ cm_return_val_if_fail(msginfo != NULL, FALSE);
+ cm_return_val_if_fail(str != NULL, FALSE);
+ cm_return_val_if_fail(find_func != NULL, FALSE);
filename = procmsg_get_message_file(msginfo);
if (!filename) return FALSE;
@@ -951,7 +951,7 @@ gchar *procmime_get_tmp_file_name(MimeInfo *mimeinfo)
gchar *filename;
gchar f_prefix[10];
- g_return_val_if_fail(mimeinfo != NULL, NULL);
+ cm_return_val_if_fail(mimeinfo != NULL, NULL);
g_snprintf(f_prefix, sizeof(f_prefix), "%08x.", id++);
@@ -1764,8 +1764,8 @@ static void parse_parameters(const gchar *parameters, GHashTable *table)
static void procmime_parse_content_type(const gchar *content_type, MimeInfo *mimeinfo)
{
- g_return_if_fail(content_type != NULL);
- g_return_if_fail(mimeinfo != NULL);
+ cm_return_if_fail(content_type != NULL);
+ cm_return_if_fail(mimeinfo != NULL);
/* RFC 2045, page 13 says that the mime subtype is MANDATORY;
* if it's not available we use the default Content-Type */
@@ -1805,8 +1805,8 @@ static void procmime_parse_content_disposition(const gchar *content_disposition,
{
gchar *tmp, *params;
- g_return_if_fail(content_disposition != NULL);
- g_return_if_fail(mimeinfo != NULL);
+ cm_return_if_fail(content_disposition != NULL);
+ cm_return_if_fail(mimeinfo != NULL);
tmp = g_strdup(content_disposition);
if ((params = strchr(tmp, ';')) != NULL) {
@@ -1870,7 +1870,7 @@ void procmime_mimeparser_unregister(MimeParser *parser)
static gboolean procmime_mimeparser_parse(MimeParser *parser, MimeInfo *mimeinfo)
{
- g_return_val_if_fail(parser->parse != NULL, FALSE);
+ cm_return_val_if_fail(parser->parse != NULL, FALSE);
return parser->parse(parser, mimeinfo);
}
@@ -2049,7 +2049,7 @@ static MimeInfo *procmime_scan_file_full(const gchar *filename, gboolean short_s
{
MimeInfo *mimeinfo;
- g_return_val_if_fail(filename != NULL, NULL);
+ cm_return_val_if_fail(filename != NULL, NULL);
mimeinfo = procmime_scan_file_with_offset(filename, 0, short_scan);
@@ -2073,7 +2073,7 @@ static MimeInfo *procmime_scan_queue_file_full(const gchar *filename, gboolean s
gchar buf[BUFFSIZE];
gint offset = 0;
- g_return_val_if_fail(filename != NULL, NULL);
+ cm_return_val_if_fail(filename != NULL, NULL);
/* Open file */
if ((fp = g_fopen(filename, "rb")) == NULL)
diff --git a/src/procmsg.c b/src/procmsg.c
@@ -112,10 +112,10 @@ static void subject_relation_insert(GRelation *relation, GNode *node)
gchar *subject;
MsgInfo *msginfo;
- g_return_if_fail(relation != NULL);
- g_return_if_fail(node != NULL);
+ cm_return_if_fail(relation != NULL);
+ cm_return_if_fail(node != NULL);
msginfo = (MsgInfo *) node->data;
- g_return_if_fail(msginfo != NULL);
+ cm_return_if_fail(msginfo != NULL);
subject = msginfo->subject;
if (subject == NULL)
@@ -132,7 +132,7 @@ static GNode *subject_relation_lookup(GRelation *relation, MsgInfo *msginfo)
GNode *node = NULL;
gint prefix_length;
- g_return_val_if_fail(relation != NULL, NULL);
+ cm_return_val_if_fail(relation != NULL, NULL);
subject = msginfo->subject;
if (subject == NULL)
@@ -383,7 +383,7 @@ gchar *procmsg_get_message_file_path(MsgInfo *msginfo)
{
gchar *file;
- g_return_val_if_fail(msginfo != NULL, NULL);
+ cm_return_val_if_fail(msginfo != NULL, NULL);
if (msginfo->plaintext_file)
file = g_strdup(msginfo->plaintext_file);
@@ -398,7 +398,7 @@ gchar *procmsg_get_message_file(MsgInfo *msginfo)
{
gchar *filename = NULL;
- g_return_val_if_fail(msginfo != NULL, NULL);
+ cm_return_val_if_fail(msginfo != NULL, NULL);
filename = folder_item_fetch_msg(msginfo->folder, msginfo->msgnum);
if (!filename)
@@ -411,7 +411,7 @@ gchar *procmsg_get_message_file_full(MsgInfo *msginfo, gboolean headers, gboolea
{
gchar *filename = NULL;
- g_return_val_if_fail(msginfo != NULL, NULL);
+ cm_return_val_if_fail(msginfo != NULL, NULL);
filename = folder_item_fetch_msg_full(msginfo->folder, msginfo->msgnum,
headers, body);
@@ -470,10 +470,10 @@ FILE *procmsg_open_message(MsgInfo *msginfo)
FILE *fp;
gchar *file;
- g_return_val_if_fail(msginfo != NULL, NULL);
-
+ cm_return_val_if_fail(msginfo != NULL, NULL);
+
file = procmsg_get_message_file_path(msginfo);
- g_return_val_if_fail(file != NULL, NULL);
+ cm_return_val_if_fail(file != NULL, NULL);
if (!is_file_exist(file)) {
g_free(file);
@@ -557,9 +557,9 @@ void procmsg_get_filter_keyword(MsgInfo *msginfo, gchar **header, gchar **key,
FILE *fp;
- g_return_if_fail(msginfo != NULL);
- g_return_if_fail(header != NULL);
- g_return_if_fail(key != NULL);
+ cm_return_if_fail(msginfo != NULL);
+ cm_return_if_fail(header != NULL);
+ cm_return_if_fail(key != NULL);
*header = NULL;
*key = NULL;
@@ -731,7 +731,7 @@ static PrefsAccount *procmsg_get_account_from_file(const gchar *file)
{"X-Sylpheed-Encrypt-Data:", NULL, FALSE},
{NULL, NULL, FALSE}};
- g_return_val_if_fail(file != NULL, NULL);
+ cm_return_val_if_fail(file != NULL, NULL);
if ((fp = g_fopen(file, "rb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
@@ -957,7 +957,7 @@ gboolean procmsg_queue_is_empty(FolderItem *queue)
gboolean res = FALSE;
if (!queue)
queue = folder_get_default_queue();
- g_return_val_if_fail(queue != NULL, TRUE);
+ cm_return_val_if_fail(queue != NULL, TRUE);
folder_item_scan(queue);
list = folder_item_get_msg_list(queue);
@@ -1029,7 +1029,7 @@ static gint procmsg_save_to_outbox(FolderItem *outbox, const gchar *file,
if (!outbox)
outbox = folder_get_default_outbox();
- g_return_val_if_fail(outbox != NULL, -1);
+ cm_return_val_if_fail(outbox != NULL, -1);
/* remove queueing headers */
if (is_queued) {
@@ -1081,7 +1081,7 @@ void procmsg_print_message(MsgInfo *msginfo, const gchar *cmdline)
gchar buf[1024];
gchar *p;
int r;
- g_return_if_fail(msginfo);
+ cm_return_if_fail(msginfo);
if (procmime_msginfo_is_encrypted(msginfo))
tmpfp = procmime_get_first_encrypted_text_content(msginfo);
@@ -1460,7 +1460,7 @@ static gint procmsg_send_message_queue_full(const gchar *file, gboolean keep_ses
int local = 0;
- g_return_val_if_fail(file != NULL, -1);
+ cm_return_val_if_fail(file != NULL, -1);
if ((fp = g_fopen(file, "rb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
@@ -1891,9 +1891,9 @@ void procmsg_msginfo_set_flags(MsgInfo *msginfo, MsgPermFlags perm_flags, MsgTmp
MsgPermFlags perm_flags_new, perm_flags_old;
MsgTmpFlags tmp_flags_old;
- g_return_if_fail(msginfo != NULL);
+ cm_return_if_fail(msginfo != NULL);
item = msginfo->folder;
- g_return_if_fail(item != NULL);
+ cm_return_if_fail(item != NULL);
debug_print("Setting flags for message %d in folder %s\n", msginfo->msgnum, item->path);
@@ -1934,9 +1934,9 @@ void procmsg_msginfo_unset_flags(MsgInfo *msginfo, MsgPermFlags perm_flags, MsgT
MsgPermFlags perm_flags_new, perm_flags_old;
MsgTmpFlags tmp_flags_old;
- g_return_if_fail(msginfo != NULL);
+ cm_return_if_fail(msginfo != NULL);
item = msginfo->folder;
- g_return_if_fail(item != NULL);
+ cm_return_if_fail(item != NULL);
debug_print("Unsetting flags for message %d in folder %s\n", msginfo->msgnum, item->path);
@@ -1972,9 +1972,9 @@ void procmsg_msginfo_change_flags(MsgInfo *msginfo,
MsgPermFlags perm_flags_new, perm_flags_old;
MsgTmpFlags tmp_flags_old;
- g_return_if_fail(msginfo != NULL);
+ cm_return_if_fail(msginfo != NULL);
item = msginfo->folder;
- g_return_if_fail(item != NULL);
+ cm_return_if_fail(item != NULL);
debug_print("Changing flags for message %d in folder %s\n", msginfo->msgnum, item->path);
@@ -2023,7 +2023,7 @@ static gboolean procmsg_msg_has_flagged_parent_real(MsgInfo *info,
{
MsgInfo *tmp;
- g_return_val_if_fail(info != NULL, FALSE);
+ cm_return_val_if_fail(info != NULL, FALSE);
if (info != NULL && info->folder != NULL && info->inreplyto != NULL) {
tmp = folder_item_get_msginfo_by_msgid(info->folder,
@@ -2095,7 +2095,7 @@ static GSList *procmsg_find_children_func(MsgInfo *info,
{
GSList *cur;
- g_return_val_if_fail(info!=NULL, children);
+ cm_return_val_if_fail(info!=NULL, children);
if (info->msgid == NULL)
return children;
@@ -2121,7 +2121,7 @@ static GSList *procmsg_find_children (MsgInfo *info)
GSList *children;
GSList *all, *cur;
- g_return_val_if_fail(info!=NULL, NULL);
+ cm_return_val_if_fail(info!=NULL, NULL);
all = folder_item_get_msg_list(info->folder);
children = procmsg_find_children_func(info, NULL, all);
if (children != NULL) {
@@ -2212,8 +2212,8 @@ void procmsg_msglist_filter(GSList *list, PrefsAccount *ac,
gint total = 0, curnum = 0;
MailFilteringData mail_filtering_data;
- g_return_if_fail(filtered != NULL);
- g_return_if_fail(unfiltered != NULL);
+ cm_return_if_fail(filtered != NULL);
+ cm_return_if_fail(unfiltered != NULL);
*filtered = NULL;
*unfiltered = NULL;
diff --git a/src/quote_fmt.c b/src/quote_fmt.c
@@ -138,13 +138,13 @@ void quotefmt_create_new_msg_fmt_widgets(GtkWindow *parent_window,
GtkSizeGroup *size_group;
if (add_info_button)
- g_return_if_fail(parent_window != NULL);
- g_return_if_fail(parent_box != NULL);
+ cm_return_if_fail(parent_window != NULL);
+ cm_return_if_fail(parent_box != NULL);
if (checkbtn_compose_with_format)
- g_return_if_fail(checkbtn_compose_with_format != NULL);
+ cm_return_if_fail(checkbtn_compose_with_format != NULL);
- g_return_if_fail(edit_subject_format != NULL);
- g_return_if_fail(edit_body_format != NULL);
+ cm_return_if_fail(edit_subject_format != NULL);
+ cm_return_if_fail(edit_body_format != NULL);
size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
@@ -266,13 +266,13 @@ void quotefmt_create_reply_fmt_widgets(GtkWindow *parent_window,
GtkSizeGroup *size_group;
if (add_info_button)
- g_return_if_fail(parent_window != NULL);
- g_return_if_fail(parent_box != NULL);
+ cm_return_if_fail(parent_window != NULL);
+ cm_return_if_fail(parent_box != NULL);
if (checkbtn_reply_with_format)
- g_return_if_fail(checkbtn_reply_with_format != NULL);
+ cm_return_if_fail(checkbtn_reply_with_format != NULL);
- g_return_if_fail(edit_reply_quotemark != NULL);
- g_return_if_fail(edit_reply_format != NULL);
+ cm_return_if_fail(edit_reply_quotemark != NULL);
+ cm_return_if_fail(edit_reply_format != NULL);
size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
@@ -398,13 +398,13 @@ void quotefmt_create_forward_fmt_widgets(GtkWindow *parent_window,
GtkSizeGroup *size_group;
if (add_info_button)
- g_return_if_fail(parent_window != NULL);
- g_return_if_fail(parent_box != NULL);
+ cm_return_if_fail(parent_window != NULL);
+ cm_return_if_fail(parent_box != NULL);
if (checkbtn_forward_with_format) {
- g_return_if_fail(checkbtn_forward_with_format != NULL);
+ cm_return_if_fail(checkbtn_forward_with_format != NULL);
}
- g_return_if_fail(edit_fw_quotemark != NULL);
- g_return_if_fail(edit_fw_format != NULL);
+ cm_return_if_fail(edit_fw_quotemark != NULL);
+ cm_return_if_fail(edit_fw_format != NULL);
size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
@@ -538,7 +538,7 @@ void quotefmt_add_defaults_button(GtkWindow *parent_window,
GtkWidget *hbox_formatdesc;
GtkWidget *btn_formatdesc;
- g_return_if_fail(set_defaults_func != NULL);
+ cm_return_if_fail(set_defaults_func != NULL);
hbox_formatdesc = gtk_hbox_new (FALSE, 32);
gtk_widget_show (hbox_formatdesc);
diff --git a/src/remotefolder.c b/src/remotefolder.c
@@ -30,7 +30,7 @@ void folder_remote_folder_init(Folder *folder, const gchar *name,
void folder_remote_folder_destroy(RemoteFolder *rfolder)
{
- g_return_if_fail(rfolder != NULL);
+ cm_return_if_fail(rfolder != NULL);
if (rfolder->session)
session_destroy(rfolder->session);
diff --git a/src/send_message.c b/src/send_message.c
@@ -87,9 +87,9 @@ gint send_message(const gchar *file, PrefsAccount *ac_prefs, GSList *to_list)
FILE *fp;
gint val;
- g_return_val_if_fail(file != NULL, -1);
- g_return_val_if_fail(ac_prefs != NULL, -1);
- g_return_val_if_fail(to_list != NULL, -1);
+ cm_return_val_if_fail(file != NULL, -1);
+ cm_return_val_if_fail(ac_prefs != NULL, -1);
+ cm_return_val_if_fail(to_list != NULL, -1);
if ((fp = g_fopen(file, "rb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
@@ -129,8 +129,8 @@ gint send_message_local(const gchar *command, FILE *fp)
gboolean err = FALSE;
gint status;
- g_return_val_if_fail(command != NULL, -1);
- g_return_val_if_fail(fp != NULL, -1);
+ cm_return_val_if_fail(command != NULL, -1);
+ cm_return_val_if_fail(fp != NULL, -1);
log_message(LOG_PROTOCOL, _("Sending message using command: %s\n"), command);
@@ -205,11 +205,11 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
long fp_pos = 0;
gchar spec_from[BUFFSIZE];
- g_return_val_if_fail(ac_prefs != NULL, -1);
- g_return_val_if_fail(ac_prefs->address != NULL, -1);
- g_return_val_if_fail(ac_prefs->smtp_server != NULL, -1);
- g_return_val_if_fail(to_list != NULL, -1);
- g_return_val_if_fail(fp != NULL, -1);
+ cm_return_val_if_fail(ac_prefs != NULL, -1);
+ cm_return_val_if_fail(ac_prefs->address != NULL, -1);
+ cm_return_val_if_fail(ac_prefs->smtp_server != NULL, -1);
+ cm_return_val_if_fail(to_list != NULL, -1);
+ cm_return_val_if_fail(fp != NULL, -1);
/* get the From address used, not necessarily the ac_prefs',
* because it's editable. */
@@ -439,7 +439,7 @@ static gint send_recv_message(Session *session, const gchar *msg, gpointer data)
SendProgressDialog *dialog = (SendProgressDialog *)data;
gchar *state_str = NULL;
- g_return_val_if_fail(dialog != NULL, -1);
+ cm_return_val_if_fail(dialog != NULL, -1);
switch (smtp_session->state) {
case SMTP_READY:
@@ -496,7 +496,7 @@ static gint send_send_data_progressive(Session *session, guint cur_len,
SendProgressDialog *dialog = (SendProgressDialog *)data;
MainWindow *mainwin = mainwindow_get_mainwindow();
- g_return_val_if_fail(dialog != NULL, -1);
+ cm_return_val_if_fail(dialog != NULL, -1);
if (SMTP_SESSION(session)->state != SMTP_SEND_DATA &&
SMTP_SESSION(session)->state != SMTP_EOM)
@@ -521,7 +521,7 @@ static gint send_send_data_finished(Session *session, guint len, gpointer data)
SendProgressDialog *dialog = (SendProgressDialog *)data;
MainWindow *mainwin = mainwindow_get_mainwindow();
- g_return_val_if_fail(dialog != NULL, -1);
+ cm_return_val_if_fail(dialog != NULL, -1);
send_send_data_progressive(session, len, len, dialog);
if (mainwin)
@@ -534,7 +534,7 @@ static gint send_send_data_finished(Session *session, guint len, gpointer data)
static void send_progress_dialog_size_allocate_cb(GtkWidget *widget,
GtkAllocation *allocation)
{
- g_return_if_fail(allocation != NULL);
+ cm_return_if_fail(allocation != NULL);
prefs_common.sendwin_width = allocation->width;
prefs_common.sendwin_height = allocation->height;
@@ -583,7 +583,7 @@ static SendProgressDialog *send_progress_dialog_create(void)
static void send_progress_dialog_destroy(SendProgressDialog *dialog)
{
- g_return_if_fail(dialog != NULL);
+ cm_return_if_fail(dialog != NULL);
if (!prefs_common.send_dialog_invisible) {
progress_dialog_destroy(dialog->dialog);
}
diff --git a/src/sourcewindow.c b/src/sourcewindow.c
@@ -134,7 +134,7 @@ void source_window_show_msg(SourceWindow *sourcewin, MsgInfo *msginfo)
FILE *fp;
gchar buf[BUFFSIZE];
- g_return_if_fail(msginfo != NULL);
+ cm_return_if_fail(msginfo != NULL);
sourcewin->updating = TRUE;
file = procmsg_get_message_file(msginfo);
@@ -146,7 +146,7 @@ void source_window_show_msg(SourceWindow *sourcewin, MsgInfo *msginfo)
return;
}
- g_return_if_fail(file != NULL);
+ cm_return_if_fail(file != NULL);
if ((fp = g_fopen(file, "rb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
@@ -186,7 +186,7 @@ static void source_window_append(SourceWindow *sourcewin, const gchar *str)
static void source_window_size_alloc_cb(GtkWidget *widget,
GtkAllocation *allocation)
{
- g_return_if_fail(allocation != NULL);
+ cm_return_if_fail(allocation != NULL);
prefs_common.sourcewin_width = allocation->width;
prefs_common.sourcewin_height = allocation->height;
diff --git a/src/statusbar.c b/src/statusbar.c
@@ -204,8 +204,8 @@ static gboolean statusbar_puts_all_hook (gpointer source, gpointer data)
{
LogText *logtext = (LogText *) source;
- g_return_val_if_fail(logtext != NULL, TRUE);
- g_return_val_if_fail(logtext->text != NULL, TRUE);
+ cm_return_val_if_fail(logtext != NULL, TRUE);
+ cm_return_val_if_fail(logtext->text != NULL, TRUE);
statusbar_pop_all();
if (logtext->type == LOG_NORMAL) {
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
@@ -400,8 +400,8 @@ GtkWidget *stock_pixmap_widget(GtkWidget *window, StockPixmap icon)
{
GdkPixbuf *pixbuf;
- g_return_val_if_fail(window != NULL, NULL);
- g_return_val_if_fail(icon >= 0 && icon < N_STOCK_PIXMAPS, NULL);
+ cm_return_val_if_fail(window != NULL, NULL);
+ cm_return_val_if_fail(icon >= 0 && icon < N_STOCK_PIXMAPS, NULL);
if (stock_pixbuf_gdk(window, icon, &pixbuf) != -1)
return gtk_image_new_from_pixbuf(pixbuf);
@@ -422,7 +422,7 @@ gint stock_pixbuf_gdk(GtkWidget *window, StockPixmap icon, GdkPixbuf **pixbuf)
if (pixbuf)
*pixbuf = NULL;
- g_return_val_if_fail(icon >= 0 && icon < N_STOCK_PIXMAPS, -1);
+ cm_return_val_if_fail(icon >= 0 && icon < N_STOCK_PIXMAPS, -1);
pix_d = &pixmaps[icon];
@@ -476,7 +476,7 @@ try_next_extension:
}
}
- g_return_val_if_fail(pix_d->pixbuf != NULL, -1);
+ cm_return_val_if_fail(pix_d->pixbuf != NULL, -1);
if (pixbuf)
*pixbuf = pix_d->pixbuf;
@@ -599,10 +599,10 @@ static gboolean pixmap_with_overlay_expose_event_cb(GtkWidget *widget, GdkEventE
gint top = 0;
if (data->is_pixmap) {
- g_return_val_if_fail(data->base_pixmap != NULL, FALSE);
- g_return_val_if_fail(data->base_mask != NULL, FALSE);
+ cm_return_val_if_fail(data->base_pixmap != NULL, FALSE);
+ cm_return_val_if_fail(data->base_mask != NULL, FALSE);
} else {
- g_return_val_if_fail(data->base_pixbuf != NULL, FALSE);
+ cm_return_val_if_fail(data->base_pixbuf != NULL, FALSE);
}
gc_pix = gdk_gc_new((GdkWindow *)drawable);
@@ -690,8 +690,8 @@ static gboolean pixmap_with_overlay_expose_event_cb(GtkWidget *widget, GdkEventE
}
if (data->position != OVERLAY_NONE) {
if (data->is_pixmap) {
- g_return_val_if_fail(data->overlay_pixmap != NULL, FALSE);
- g_return_val_if_fail(data->overlay_mask != NULL, FALSE);
+ cm_return_val_if_fail(data->overlay_pixmap != NULL, FALSE);
+ cm_return_val_if_fail(data->overlay_mask != NULL, FALSE);
gdk_gc_set_tile(gc_pix, data->overlay_pixmap);
gdk_gc_set_clip_mask(gc_pix, data->overlay_mask);
@@ -701,7 +701,7 @@ static gboolean pixmap_with_overlay_expose_event_cb(GtkWidget *widget, GdkEventE
gdk_draw_rectangle(drawable, gc_pix, TRUE, left, top,
data->overlay_width, data->overlay_height);
} else {
- g_return_val_if_fail(data->overlay_pixbuf != NULL, FALSE);
+ cm_return_val_if_fail(data->overlay_pixbuf != NULL, FALSE);
gdk_draw_pixbuf(drawable, gc_pix, data->overlay_pixbuf,
0, 0, left, top,
-1, -1, GDK_RGB_DITHER_NONE, 0, 0);
diff --git a/src/summary_search.c b/src/summary_search.c
@@ -835,7 +835,7 @@ static void adv_condition_btn_done(MatcherList * matchers)
{
gchar *str;
- g_return_if_fail(
+ cm_return_if_fail(
mainwindow_get_mainwindow()->summaryview->quicksearch != NULL);
if (matchers == NULL) {
@@ -860,7 +860,7 @@ static void adv_condition_btn_clicked(GtkButton *button, gpointer data)
const gchar * cond_str;
MatcherList * matchers = NULL;
- g_return_if_fail( search_window.window != NULL );
+ cm_return_if_fail( search_window.window != NULL );
/* re-use the current search value if it's a condition expression,
otherwise ignore it silently */
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -2695,7 +2695,7 @@ void summary_reflect_tags_changes(SummaryView *summaryview)
/* re-create colorlabel submenu */
menu = GTK_MENU_SHELL(summaryview->tags_menu);
- g_return_if_fail(menu != NULL);
+ cm_return_if_fail(menu != NULL);
/* clear items. get item pointers. */
for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
@@ -3337,9 +3337,9 @@ gboolean defer_change(gpointer data)
static void msginfo_mark_as_read (SummaryView *summaryview, MsgInfo *msginfo,
GtkCMCTreeNode *row)
{
- g_return_if_fail(summaryview != NULL);
- g_return_if_fail(msginfo != NULL);
- g_return_if_fail(row != NULL);
+ cm_return_if_fail(summaryview != NULL);
+ cm_return_if_fail(msginfo != NULL);
+ cm_return_if_fail(row != NULL);
if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
summary_msginfo_unset_flags
@@ -3383,7 +3383,7 @@ static void summary_display_msg_full(SummaryView *summaryview,
else if (summaryview->messageview)
summaryview->messageview->filtered = FALSE;
}
- g_return_if_fail(row != NULL);
+ cm_return_if_fail(row != NULL);
if (summary_is_locked(summaryview)) return;
summary_lock(summaryview);
@@ -3393,7 +3393,7 @@ static void summary_display_msg_full(SummaryView *summaryview,
msginfo = gtk_cmctree_node_get_row_data(ctree, row);
- g_return_if_fail(msginfo);
+ cm_return_if_fail(msginfo);
if (new_window && prefs_common.layout_mode != SMALL_LAYOUT) {
MessageView *msgview;
@@ -3762,7 +3762,7 @@ static void summary_mark_row(SummaryView *summaryview, GtkCMCTreeNode *row)
MsgInfo *msginfo;
msginfo = gtk_cmctree_node_get_row_data(ctree, row);
- g_return_if_fail(msginfo);
+ cm_return_if_fail(msginfo);
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted--;
if (MSG_IS_MOVE(msginfo->flags))
@@ -3784,7 +3784,7 @@ static void summary_lock_row(SummaryView *summaryview, GtkCMCTreeNode *row)
MsgInfo *msginfo;
msginfo = gtk_cmctree_node_get_row_data(ctree, row);
- g_return_if_fail(msginfo);
+ cm_return_if_fail(msginfo);
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted--;
if (MSG_IS_MOVE(msginfo->flags)) {
@@ -3809,7 +3809,7 @@ static void summary_unlock_row(SummaryView *summaryview, GtkCMCTreeNode *row)
MsgInfo *msginfo;
msginfo = gtk_cmctree_node_get_row_data(ctree, row);
- g_return_if_fail(msginfo);
+ cm_return_if_fail(msginfo);
if (!MSG_IS_LOCKED(msginfo->flags))
return;
procmsg_msginfo_set_to_folder(msginfo, NULL);
@@ -3843,7 +3843,7 @@ static void summary_mark_row_as_read(SummaryView *summaryview,
MsgInfo *msginfo;
msginfo = gtk_cmctree_node_get_row_data(ctree, row);
- g_return_if_fail(msginfo);
+ cm_return_if_fail(msginfo);
if(!(MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)))
return;
@@ -4019,7 +4019,7 @@ static void summary_mark_row_as_unread(SummaryView *summaryview,
MsgInfo *msginfo;
msginfo = gtk_cmctree_node_get_row_data(ctree, row);
- g_return_if_fail(msginfo);
+ cm_return_if_fail(msginfo);
if (MSG_IS_DELETED(msginfo->flags)) {
procmsg_msginfo_set_to_folder(msginfo, NULL);
summary_msginfo_unset_flags(msginfo, MSG_DELETED, 0);
@@ -4108,7 +4108,7 @@ static void summary_delete_row(SummaryView *summaryview, GtkCMCTreeNode *row)
MsgInfo *msginfo;
msginfo = gtk_cmctree_node_get_row_data(ctree, row);
- g_return_if_fail(msginfo);
+ cm_return_if_fail(msginfo);
if (MSG_IS_LOCKED(msginfo->flags)) return;
@@ -4257,7 +4257,7 @@ static void summary_unmark_row(SummaryView *summaryview, GtkCMCTreeNode *row)
MsgInfo *msginfo;
msginfo = gtk_cmctree_node_get_row_data(ctree, row);
- g_return_if_fail(msginfo);
+ cm_return_if_fail(msginfo);
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted--;
if (MSG_IS_MOVE(msginfo->flags))
@@ -4298,10 +4298,10 @@ static void summary_move_row_to(SummaryView *summaryview, GtkCMCTreeNode *row,
GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
MsgInfo *msginfo;
- g_return_if_fail(to_folder != NULL);
+ cm_return_if_fail(to_folder != NULL);
msginfo = gtk_cmctree_node_get_row_data(ctree, row);
- g_return_if_fail(msginfo);
+ cm_return_if_fail(msginfo);
if (MSG_IS_LOCKED(msginfo->flags))
return;
@@ -4401,10 +4401,10 @@ static void summary_copy_row_to(SummaryView *summaryview, GtkCMCTreeNode *row,
GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
MsgInfo *msginfo;
- g_return_if_fail(to_folder != NULL);
+ cm_return_if_fail(to_folder != NULL);
msginfo = gtk_cmctree_node_get_row_data(ctree, row);
- g_return_if_fail(msginfo);
+ cm_return_if_fail(msginfo);
procmsg_msginfo_set_to_folder(msginfo, to_folder);
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted--;
@@ -5401,7 +5401,7 @@ static void summary_colorlabel_menu_item_activate_cb(GtkWidget *widget,
SummaryView *summaryview;
summaryview = g_object_get_data(G_OBJECT(widget), "summaryview");
- g_return_if_fail(summaryview != NULL);
+ cm_return_if_fail(summaryview != NULL);
/* "dont_toggle" state set? */
if (g_object_get_data(G_OBJECT(summaryview->colorlabel_menu),
@@ -5422,7 +5422,7 @@ void summary_set_colorlabel_color(GtkCMCTree *ctree, GtkCMCTreeNode *node,
gint color_index;
msginfo = gtk_cmctree_node_get_row_data(ctree, node);
- g_return_if_fail(msginfo);
+ cm_return_if_fail(msginfo);
color_index = labelcolor == 0 ? -1 : (gint)labelcolor - 1;
ctree_style = gtk_widget_get_style(GTK_WIDGET(ctree));
@@ -5459,7 +5459,7 @@ static void summary_set_row_colorlabel(SummaryView *summaryview, GtkCMCTreeNode
MsgInfo *msginfo;
msginfo = gtk_cmctree_node_get_row_data(ctree, row);
- g_return_if_fail(msginfo);
+ cm_return_if_fail(msginfo);
summary_msginfo_change_flags(msginfo, MSG_COLORLABEL_TO_FLAGS(labelcolor), 0,
MSG_CLABEL_FLAG_MASK, 0);
@@ -5486,7 +5486,7 @@ static gboolean summary_set_row_tag(SummaryView *summaryview, GtkCMCTreeNode *ro
MsgInfo *msginfo;
gchar *tags_str = NULL;
msginfo = gtk_cmctree_node_get_row_data(ctree, row);
- g_return_val_if_fail(msginfo, FALSE);
+ cm_return_val_if_fail(msginfo, FALSE);
procmsg_msginfo_update_tags(msginfo, set, id);
@@ -5537,7 +5537,7 @@ static void summary_tags_menu_item_activate_cb(GtkWidget *widget,
SummaryView *summaryview;
summaryview = g_object_get_data(G_OBJECT(widget), "summaryview");
- g_return_if_fail(summaryview != NULL);
+ cm_return_if_fail(summaryview != NULL);
/* "dont_toggle" state set? */
if (g_object_get_data(G_OBJECT(summaryview->tags_menu),
@@ -5559,14 +5559,14 @@ static void summary_colorlabel_menu_item_activate_item_cb(GtkMenuItem *menu_item
GList *cur, *sel;
summaryview = (SummaryView *)data;
- g_return_if_fail(summaryview != NULL);
+ cm_return_if_fail(summaryview != NULL);
sel = GTK_CMCLIST(summaryview->ctree)->selection;
if (!sel) return;
menu = GTK_MENU_SHELL(summaryview->colorlabel_menu);
- g_return_if_fail(menu != NULL);
+ cm_return_if_fail(menu != NULL);
Xalloca(items, (N_COLOR_LABELS + 1) * sizeof(GtkWidget *), return);
@@ -5692,13 +5692,13 @@ static void summary_tags_menu_item_activate_item_cb(GtkMenuItem *menu_item,
NULL, NULL);
gint sel_len;
SummaryView *summaryview = (SummaryView *)data;
- g_return_if_fail(summaryview != NULL);
+ cm_return_if_fail(summaryview != NULL);
sel = GTK_CMCLIST(summaryview->ctree)->selection;
if (!sel) return;
menu = GTK_MENU_SHELL(summaryview->tags_menu);
- g_return_if_fail(menu != NULL);
+ cm_return_if_fail(menu != NULL);
/* NOTE: don't return prematurely because we set the "dont_toggle"
* state for check menu items */
@@ -5783,7 +5783,7 @@ static void summary_tags_menu_item_apply_tags_activate_cb(GtkWidget *widget,
SummaryView *summaryview;
summaryview = g_object_get_data(G_OBJECT(widget), "summaryview");
- g_return_if_fail(summaryview != NULL);
+ cm_return_if_fail(summaryview != NULL);
/* "dont_toggle" state set? */
if (g_object_get_data(G_OBJECT(summaryview->tags_menu),
@@ -6584,7 +6584,7 @@ static void summary_selected(GtkCMCTree *ctree, GtkCMCTreeNode *row,
summaryview->selected = row;
msginfo = gtk_cmctree_node_get_row_data(ctree, row);
- g_return_if_fail(msginfo != NULL);
+ cm_return_if_fail(msginfo != NULL);
main_create_mailing_list_menu (summaryview->mainwin, msginfo);
toolbar_set_learn_button
@@ -6680,11 +6680,11 @@ GSList *summary_get_selection(SummaryView *summaryview)
GList *sel = NULL;
GSList *msginfo_list = NULL;
- g_return_val_if_fail(summaryview != NULL, NULL);
+ cm_return_val_if_fail(summaryview != NULL, NULL);
sel = GTK_CMCLIST(summaryview->ctree)->selection;
- g_return_val_if_fail(sel != NULL, NULL);
+ cm_return_val_if_fail(sel != NULL, NULL);
for ( ; sel != NULL; sel = sel->next)
msginfo_list =
@@ -6796,9 +6796,9 @@ static void summary_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
{
GdkDragContext *context;
- g_return_if_fail(summaryview != NULL);
- g_return_if_fail(summaryview->folder_item != NULL);
- g_return_if_fail(summaryview->folder_item->folder != NULL);
+ cm_return_if_fail(summaryview != NULL);
+ cm_return_if_fail(summaryview->folder_item != NULL);
+ cm_return_if_fail(summaryview->folder_item->folder != NULL);
if (summaryview->selected == NULL) return;
@@ -7035,7 +7035,7 @@ static gint summary_cmp_by_from(GtkCMCList *clist, gconstpointer ptr1,
const SummaryView *sv = g_object_get_data(G_OBJECT(clist), "summaryview");
gint res;
- g_return_val_if_fail(sv, -1);
+ cm_return_val_if_fail(sv, -1);
if (sv->col_state[sv->col_pos[S_COL_FROM]].visible) {
str1 = GTK_CMCELL_TEXT(r1->cell[sv->col_pos[S_COL_FROM]])->text;
str2 = GTK_CMCELL_TEXT(r2->cell[sv->col_pos[S_COL_FROM]])->text;
@@ -7064,7 +7064,7 @@ static gint summary_cmp_by_to(GtkCMCList *clist, gconstpointer ptr1,
MsgInfo *msginfo2 = ((GtkCMCListRow *)ptr2)->data;
const SummaryView *sv = g_object_get_data(G_OBJECT(clist), "summaryview");
gint res;
- g_return_val_if_fail(sv, -1);
+ cm_return_val_if_fail(sv, -1);
if (sv->col_state[sv->col_pos[S_COL_TO]].visible) {
str1 = GTK_CMCELL_TEXT(r1->cell[sv->col_pos[S_COL_TO]])->text;
@@ -7094,7 +7094,7 @@ static gint summary_cmp_by_tags(GtkCMCList *clist, gconstpointer ptr1,
MsgInfo *msginfo1 = ((GtkCMCListRow *)ptr1)->data;
MsgInfo *msginfo2 = ((GtkCMCListRow *)ptr2)->data;
gint res;
- g_return_val_if_fail(sv, -1);
+ cm_return_val_if_fail(sv, -1);
if (sv->col_state[sv->col_pos[S_COL_TAGS]].visible) {
str1 = g_strdup(GTK_CMCELL_TEXT(r1->cell[sv->col_pos[S_COL_TAGS]])->text);
@@ -7132,8 +7132,8 @@ static gint summary_cmp_by_simplified_subject
const SummaryView *sv = g_object_get_data(G_OBJECT(clist), "summaryview");
gint res;
- g_return_val_if_fail(sv, -1);
- g_return_val_if_fail(msginfo1 != NULL && msginfo2 != NULL, -1);
+ cm_return_val_if_fail(sv, -1);
+ cm_return_val_if_fail(msginfo1 != NULL && msginfo2 != NULL, -1);
if (sv->col_state[sv->col_pos[S_COL_SUBJECT]].visible) {
str1 = GTK_CMCELL_TEXT(r1->cell[sv->col_pos[S_COL_SUBJECT]])->text;
@@ -7181,7 +7181,7 @@ static void summary_ignore_thread_func(GtkCMCTree *ctree, GtkCMCTreeNode *row, g
MsgInfo *msginfo;
msginfo = gtk_cmctree_node_get_row_data(ctree, row);
- g_return_if_fail(msginfo);
+ cm_return_if_fail(msginfo);
summary_msginfo_unset_flags(msginfo, MSG_WATCH_THREAD, 0);
summary_msginfo_change_flags(msginfo, MSG_IGNORE_THREAD, 0, MSG_NEW | MSG_UNREAD, 0);
@@ -7214,7 +7214,7 @@ static void summary_unignore_thread_func(GtkCMCTree *ctree, GtkCMCTreeNode *row,
MsgInfo *msginfo;
msginfo = gtk_cmctree_node_get_row_data(ctree, row);
- g_return_if_fail(msginfo);
+ cm_return_if_fail(msginfo);
summary_msginfo_unset_flags(msginfo, MSG_IGNORE_THREAD, 0);
@@ -7276,7 +7276,7 @@ static void summary_watch_thread_func(GtkCMCTree *ctree, GtkCMCTreeNode *row, gp
MsgInfo *msginfo;
msginfo = gtk_cmctree_node_get_row_data(ctree, row);
- g_return_if_fail(msginfo);
+ cm_return_if_fail(msginfo);
summary_msginfo_change_flags(msginfo, MSG_WATCH_THREAD, 0, MSG_IGNORE_THREAD, 0);
@@ -7308,7 +7308,7 @@ static void summary_unwatch_thread_func(GtkCMCTree *ctree, GtkCMCTreeNode *row,
MsgInfo *msginfo;
msginfo = gtk_cmctree_node_get_row_data(ctree, row);
- g_return_if_fail(msginfo);
+ cm_return_if_fail(msginfo);
summary_msginfo_unset_flags(msginfo, MSG_WATCH_THREAD, 0);
@@ -7446,7 +7446,7 @@ void summary_reflect_prefs_custom_colors(SummaryView *summaryview)
/* re-create colorlabel submenu */
menu = GTK_MENU_SHELL(summaryview->colorlabel_menu);
- g_return_if_fail(menu != NULL);
+ cm_return_if_fail(menu != NULL);
/* clear items. get item pointers. */
for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
@@ -7505,8 +7505,8 @@ void summary_set_prefs_from_folderitem(SummaryView *summaryview, FolderItem *ite
{
FolderSortKey sort_key;
FolderSortType sort_type;
- g_return_if_fail(summaryview != NULL);
- g_return_if_fail(item != NULL);
+ cm_return_if_fail(summaryview != NULL);
+ cm_return_if_fail(item != NULL);
/* Subject simplification */
#ifndef G_OS_WIN32
@@ -7552,8 +7552,8 @@ static gboolean summary_update_msg(gpointer source, gpointer data)
SummaryView *summaryview = (SummaryView *)data;
GtkCMCTreeNode *node;
- g_return_val_if_fail(msginfo_update != NULL, TRUE);
- g_return_val_if_fail(summaryview != NULL, FALSE);
+ cm_return_val_if_fail(msginfo_update != NULL, TRUE);
+ cm_return_val_if_fail(summaryview != NULL, FALSE);
if (msginfo_update->msginfo->folder != summaryview->folder_item)
return FALSE;
@@ -7615,9 +7615,9 @@ static gboolean summary_update_folder_item_hook(gpointer source, gpointer data)
FolderItemUpdateData *hookdata = (FolderItemUpdateData *)source;
SummaryView *summaryview = (SummaryView *)data;
- g_return_val_if_fail(hookdata != NULL, FALSE);
- g_return_val_if_fail(hookdata->item != NULL, FALSE);
- g_return_val_if_fail(summaryview != NULL, FALSE);
+ cm_return_val_if_fail(hookdata != NULL, FALSE);
+ cm_return_val_if_fail(hookdata->item != NULL, FALSE);
+ cm_return_val_if_fail(summaryview != NULL, FALSE);
if (hookdata->update_flags & F_ITEM_UPDATE_NAME) {
gchar *name = folder_item_get_name(hookdata->item);
diff --git a/src/textview.c b/src/textview.c
@@ -576,8 +576,8 @@ void textview_reflect_prefs(TextView *textview)
void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
{
START_TIMING("");
- g_return_if_fail(mimeinfo != NULL);
- g_return_if_fail(fp != NULL);
+ cm_return_if_fail(mimeinfo != NULL);
+ cm_return_if_fail(fp != NULL);
if ((mimeinfo->type == MIMETYPE_MULTIPART) ||
((mimeinfo->type == MIMETYPE_MESSAGE) && !g_ascii_strcasecmp(mimeinfo->subtype, "rfc822"))) {
@@ -622,7 +622,7 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
gint charcount;
START_TIMING("");
- g_return_if_fail(mimeinfo != NULL);
+ cm_return_if_fail(mimeinfo != NULL);
text = GTK_TEXT_VIEW(textview->text);
buffer = gtk_text_view_get_buffer(text);
charcount = gtk_text_buffer_get_char_count(buffer);
@@ -832,7 +832,7 @@ static void recursive_add_parts(TextView *textview, GNode *node)
static void textview_add_parts(TextView *textview, MimeInfo *mimeinfo)
{
- g_return_if_fail(mimeinfo != NULL);
+ cm_return_if_fail(mimeinfo != NULL);
recursive_add_parts(textview, mimeinfo->node);
}
@@ -1111,7 +1111,7 @@ static void textview_show_html(TextView *textview, FILE *fp,
gint lines = 0;
parser = sc_html_parser_new(fp, conv);
- g_return_if_fail(parser != NULL);
+ cm_return_if_fail(parser != NULL);
while ((str = sc_html_parse(parser)) != NULL) {
if (parser->state == SC_HTML_HREF) {
@@ -1152,7 +1152,7 @@ static void textview_show_ertf(TextView *textview, FILE *fp,
gint lines = 0;
parser = ertf_parser_new(fp, conv);
- g_return_if_fail(parser != NULL);
+ cm_return_if_fail(parser != NULL);
while ((str = ertf_parse(parser)) != NULL) {
textview_write_line(textview, str, NULL, FALSE);
@@ -1722,8 +1722,8 @@ void textview_set_text(TextView *textview, const gchar *text)
GtkTextView *view;
GtkTextBuffer *buffer;
- g_return_if_fail(textview != NULL);
- g_return_if_fail(text != NULL);
+ cm_return_if_fail(textview != NULL);
+ cm_return_if_fail(text != NULL);
textview_clear(textview);
@@ -1783,7 +1783,7 @@ static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
Header *header;
gint i;
- g_return_val_if_fail(fp != NULL, NULL);
+ cm_return_val_if_fail(fp != NULL, NULL);
if (textview->show_all_headers) {
headers = procheader_get_header_array_asis(fp);
@@ -1865,7 +1865,7 @@ static void textview_show_face(TextView *textview)
gtk_widget_destroy(textview->image);
textview->image = face_get_from_header(msginfo->extradata->face);
- g_return_if_fail(textview->image != NULL);
+ cm_return_if_fail(textview->image != NULL);
gtk_widget_show(textview->image);
@@ -1893,7 +1893,7 @@ void textview_show_icon(TextView *textview, const gchar *stock_id)
gtk_widget_destroy(textview->image);
textview->image = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_DIALOG);
- g_return_if_fail(textview->image != NULL);
+ cm_return_if_fail(textview->image != NULL);
gtk_widget_show(textview->image);
@@ -1939,7 +1939,7 @@ static void textview_show_xface(TextView *textview)
textview->image = xface_get_from_header(msginfo->extradata->xface,
&textview->text->style->white,
window);
- g_return_if_fail(textview->image != NULL);
+ cm_return_if_fail(textview->image != NULL);
gtk_widget_show(textview->image);
@@ -2035,7 +2035,7 @@ static void textview_show_contact_pic(TextView *textview)
textview->image = gtk_image_new_from_pixbuf(picture);
g_object_unref(picture);
}
- g_return_if_fail(textview->image != NULL);
+ cm_return_if_fail(textview->image != NULL);
gtk_widget_show(textview->image);
@@ -2138,11 +2138,11 @@ static void textview_show_header(TextView *textview, GPtrArray *headers)
Header *header;
gint i;
- g_return_if_fail(headers != NULL);
+ cm_return_if_fail(headers != NULL);
for (i = 0; i < headers->len; i++) {
header = g_ptr_array_index(headers, i);
- g_return_if_fail(header->name != NULL);
+ cm_return_if_fail(header->name != NULL);
gtk_text_buffer_get_end_iter (buffer, &iter);
if(prefs_common.trans_hdr == TRUE) {
diff --git a/src/toolbar.c b/src/toolbar.c
@@ -245,7 +245,7 @@ gint toolbar_ret_val_from_descr(const gchar *descr)
gchar *toolbar_ret_descr_from_val(gint val)
{
- g_return_val_if_fail(val >=0 && val < N_ACTION_VAL, NULL);
+ cm_return_val_if_fail(val >=0 && val < N_ACTION_VAL, NULL);
return gettext(toolbar_text[val].descr);
}
@@ -264,7 +264,7 @@ static gint toolbar_ret_val_from_text(const gchar *text)
static gchar *toolbar_ret_text_from_val(gint val)
{
- g_return_val_if_fail(val >=0 && val < N_ACTION_VAL, NULL);
+ cm_return_val_if_fail(val >=0 && val < N_ACTION_VAL, NULL);
return toolbar_text[val].index_str;
}
@@ -505,7 +505,10 @@ static void toolbar_set_default_main(void)
if (default_toolbar[i].action != A_SEPARATOR) {
- gchar *file = stock_pixmap_get_name((StockPixmap)toolbar_get_icon(default_toolbar[i].action));
+ gchar *file = NULL;
+ if (toolbar_get_icon(default_toolbar[i].action) > -1) {
+ file = stock_pixmap_get_name((StockPixmap)toolbar_get_icon(default_toolbar[i].action));
+ }
toolbar_item->file = g_strdup(file);
toolbar_item->index = default_toolbar[i].action;
@@ -553,8 +556,10 @@ static void toolbar_set_default_compose(void)
if (default_toolbar[i].action != A_SEPARATOR) {
- gchar *file = stock_pixmap_get_name((StockPixmap)toolbar_get_icon(default_toolbar[i].action));
-
+ gchar *file = NULL;
+ if (toolbar_get_icon(default_toolbar[i].action) > -1) {
+ file = stock_pixmap_get_name((StockPixmap)toolbar_get_icon(default_toolbar[i].action));
+ }
toolbar_item->file = g_strdup(file);
toolbar_item->index = default_toolbar[i].action;
toolbar_item->text = g_strdup(toolbar_get_short_text(default_toolbar[i].action));
@@ -602,8 +607,10 @@ static void toolbar_set_default_msgview(void)
ToolbarItem *toolbar_item = g_new0(ToolbarItem, 1);
if (default_toolbar[i].action != A_SEPARATOR) {
-
- gchar *file = stock_pixmap_get_name((StockPixmap)toolbar_get_icon(default_toolbar[i].action));
+ gchar *file = NULL;
+ if (toolbar_get_icon(default_toolbar[i].action) > -1) {
+ file = stock_pixmap_get_name((StockPixmap)toolbar_get_icon(default_toolbar[i].action));
+ }
toolbar_item->file = g_strdup(file);
toolbar_item->index = default_toolbar[i].action;
@@ -952,7 +959,7 @@ void toolbar_toggle(guint action, gpointer data)
GList *list;
GList *cur;
- g_return_if_fail(mainwin != NULL);
+ cm_return_if_fail(mainwin != NULL);
toolbar_style(TOOLBAR_MAIN, action, mainwin);
@@ -1012,7 +1019,7 @@ static void toolbar_style(ToolbarType type, guint action, gpointer data)
Compose *compose = (Compose*)data;
MessageView *msgview = (MessageView*)data;
- g_return_if_fail(data != NULL);
+ cm_return_if_fail(data != NULL);
switch (type) {
case TOOLBAR_MAIN:
@@ -1041,7 +1048,7 @@ static void toolbar_inc_cb(GtkWidget *widget,
ToolbarItem *toolbar_item = (ToolbarItem*)data;
MainWindow *mainwin;
- g_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item != NULL);
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
@@ -1059,7 +1066,7 @@ static void toolbar_inc_all_cb(GtkWidget *widget,
ToolbarItem *toolbar_item = (ToolbarItem*)data;
MainWindow *mainwin;
- g_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item != NULL);
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
@@ -1076,7 +1083,7 @@ static void toolbar_send_queued_cb(GtkWidget *widget,gpointer data)
ToolbarItem *toolbar_item = (ToolbarItem*)data;
MainWindow *mainwin;
- g_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item != NULL);
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
@@ -1093,7 +1100,7 @@ static void toolbar_exec_cb(GtkWidget *widget,
{
MainWindow *mainwin = get_mainwin(data);
- g_return_if_fail(mainwin != NULL);
+ cm_return_if_fail(mainwin != NULL);
summary_execute(mainwin->summaryview);
}
@@ -1105,8 +1112,8 @@ static void toolbar_trash_cb(GtkWidget *widget, gpointer data)
ToolbarItem *toolbar_item = (ToolbarItem*)data;
MainWindow *mainwin;
- g_return_if_fail(toolbar_item != NULL);
- g_return_if_fail(toolbar_item->parent);
+ cm_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item->parent);
switch (toolbar_item->type) {
case TOOLBAR_MSGVIEW:
@@ -1130,8 +1137,8 @@ static void toolbar_delete_cb(GtkWidget *widget, gpointer data)
ToolbarItem *toolbar_item = (ToolbarItem*)data;
MainWindow *mainwin;
- g_return_if_fail(toolbar_item != NULL);
- g_return_if_fail(toolbar_item->parent);
+ cm_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item->parent);
switch (toolbar_item->type) {
case TOOLBAR_MSGVIEW:
@@ -1157,7 +1164,7 @@ static void toolbar_compose_cb(GtkWidget *widget, gpointer data)
MainWindow *mainwin;
MessageView *msgview;
- g_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item != NULL);
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
@@ -1183,7 +1190,7 @@ static void toolbar_learn(gpointer data, guint as_spam)
MainWindow *mainwin;
MessageView *msgview;
- g_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item != NULL);
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
@@ -1211,7 +1218,7 @@ static void toolbar_learn_cb(GtkWidget *widget, gpointer data)
MainWindow *mainwin;
MessageView *msgview;
- g_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item != NULL);
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
@@ -1284,7 +1291,7 @@ static void toolbar_addrbook_cb(GtkWidget *widget, gpointer data)
ToolbarItem *toolbar_item = (ToolbarItem*)data;
Compose *compose;
- g_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item != NULL);
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
@@ -1318,7 +1325,7 @@ static void toolbar_prev_unread_cb(GtkWidget *widget, gpointer data)
MainWindow *mainwin;
MessageView *msgview;
- g_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item != NULL);
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
@@ -1365,7 +1372,7 @@ static void toolbar_next_unread_cb(GtkWidget *widget, gpointer data)
MainWindow *mainwin;
MessageView *msgview;
- g_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item != NULL);
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
@@ -1408,7 +1415,7 @@ static void toolbar_ignore_thread_cb(GtkWidget *widget, gpointer data)
ToolbarItem *toolbar_item = (ToolbarItem*)data;
MainWindow *mainwin;
- g_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item != NULL);
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
@@ -1430,7 +1437,7 @@ static void toolbar_watch_thread_cb(GtkWidget *widget, gpointer data)
ToolbarItem *toolbar_item = (ToolbarItem*)data;
MainWindow *mainwin;
- g_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item != NULL);
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
@@ -1451,7 +1458,7 @@ static void toolbar_cancel_inc_cb(GtkWidget *widget, gpointer data)
{
ToolbarItem *toolbar_item = (ToolbarItem*)data;
- g_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item != NULL);
inc_cancel_all();
imap_cancel_all();
}
@@ -1462,7 +1469,7 @@ static void toolbar_print_cb(GtkWidget *widget, gpointer data)
ToolbarItem *toolbar_item = (ToolbarItem*)data;
MainWindow *mainwin;
- g_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item != NULL);
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
@@ -1501,7 +1508,7 @@ static void toolbar_close_cb(GtkWidget *widget, gpointer data)
MessageView *messageview;
Compose *compose;
- g_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item != NULL);
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
@@ -1529,7 +1536,7 @@ static void toolbar_open_mail_cb(GtkWidget *widget, gpointer data)
ToolbarItem *toolbar_item = (ToolbarItem*)data;
MainWindow *mainwin;
- g_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item != NULL);
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
@@ -1593,7 +1600,7 @@ static void toolbar_actions_execute_cb(GtkWidget *widget, gpointer data)
MessageView *msgview;
gpointer parent = toolbar_item->parent;
- g_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item != NULL);
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
@@ -1621,7 +1628,7 @@ static MainWindow *get_mainwin(gpointer data)
MainWindow *mainwin = NULL;
MessageView *msgview;
- g_return_val_if_fail(toolbar_item != NULL, NULL);
+ cm_return_val_if_fail(toolbar_item != NULL, NULL);
switch(toolbar_item->type) {
case TOOLBAR_MAIN:
@@ -2513,7 +2520,7 @@ static void toolbar_reply(gpointer data, guint action)
MessageView *msgview;
GSList *msginfo_list = NULL;
- g_return_if_fail(toolbar_item != NULL);
+ cm_return_if_fail(toolbar_item != NULL);
switch (toolbar_item->type) {
case TOOLBAR_MAIN:
@@ -2523,15 +2530,15 @@ static void toolbar_reply(gpointer data, guint action)
break;
case TOOLBAR_MSGVIEW:
msgview = (MessageView*)toolbar_item->parent;
- g_return_if_fail(msgview != NULL);
+ cm_return_if_fail(msgview != NULL);
msginfo_list = g_slist_append(msginfo_list, msgview->msginfo);
break;
default:
return;
}
- g_return_if_fail(msgview != NULL);
- g_return_if_fail(msginfo_list != NULL);
+ cm_return_if_fail(msgview != NULL);
+ cm_return_if_fail(msginfo_list != NULL);
compose_reply_from_messageview(msgview, msginfo_list, action);
g_slist_free(msginfo_list);
diff --git a/src/undo.c b/src/undo.c
@@ -83,7 +83,7 @@ UndoMain *undo_init(GtkWidget *text)
GtkTextView *textview = GTK_TEXT_VIEW(text);
GtkTextBuffer *textbuf = gtk_text_view_get_buffer(textview);
- g_return_val_if_fail(text != NULL, NULL);
+ cm_return_val_if_fail(text != NULL, NULL);
undostruct = g_new0(UndoMain, 1);
undostruct->textview = textview;
@@ -154,7 +154,7 @@ static void undo_free_list(GList **list_pointer)
void undo_set_change_state_func(UndoMain *undostruct, UndoChangeStateFunc func,
gpointer data)
{
- g_return_if_fail(undostruct != NULL);
+ cm_return_if_fail(undostruct != NULL);
undostruct->change_state_func = func;
undostruct->change_state_data = data;
@@ -286,8 +286,8 @@ static void undo_add(const gchar *text,
UndoInfo *undoinfo;
GtkAdjustment *vadj;
- g_return_if_fail(text != NULL);
- g_return_if_fail(end_pos >= start_pos);
+ cm_return_if_fail(text != NULL);
+ cm_return_if_fail(end_pos >= start_pos);
undo_free_list(&undostruct->redo);
@@ -342,14 +342,14 @@ void undo_undo(UndoMain *undostruct)
GtkTextIter iter, start_iter, end_iter;
GtkTextMark *mark;
- g_return_if_fail(undostruct != NULL);
+ cm_return_if_fail(undostruct != NULL);
if (undostruct->undo == NULL) return;
/* The undo data we need is always at the top op the
stack. So, therefore, the first one */
undoinfo = (UndoInfo *)undostruct->undo->data;
- g_return_if_fail(undoinfo != NULL);
+ cm_return_if_fail(undoinfo != NULL);
undoinfo->mergeable = FALSE;
undostruct->redo = g_list_prepend(undostruct->redo, undoinfo);
undostruct->undo = g_list_remove(undostruct->undo, undoinfo);
@@ -388,8 +388,8 @@ void undo_undo(UndoMain *undostruct)
undoinfo = (UndoInfo *)undostruct->undo->data;
undostruct->redo = g_list_prepend(undostruct->redo, undoinfo);
undostruct->undo = g_list_remove(undostruct->undo, undoinfo);
- g_return_if_fail(undoinfo != NULL);
- g_return_if_fail(undoinfo->action == UNDO_ACTION_REPLACE_DELETE);
+ cm_return_if_fail(undoinfo != NULL);
+ cm_return_if_fail(undoinfo->action == UNDO_ACTION_REPLACE_DELETE);
gtk_text_buffer_insert(buffer, &start_iter, undoinfo->text, -1);
}
break;
@@ -429,12 +429,12 @@ void undo_redo(UndoMain *undostruct)
GtkTextIter iter, start_iter, end_iter;
GtkTextMark *mark;
- g_return_if_fail(undostruct != NULL);
+ cm_return_if_fail(undostruct != NULL);
if (undostruct->redo == NULL) return;
redoinfo = (UndoInfo *)undostruct->redo->data;
- g_return_if_fail (redoinfo != NULL);
+ cm_return_if_fail (redoinfo != NULL);
undostruct->undo = g_list_prepend(undostruct->undo, redoinfo);
undostruct->redo = g_list_remove(undostruct->redo, redoinfo);
@@ -469,10 +469,10 @@ void undo_redo(UndoMain *undostruct)
debug_print("UNDO_ACTION_REPLACE %s\n", redoinfo->text);
/* "pull" another data structure from the list */
redoinfo = (UndoInfo *)undostruct->redo->data;
- g_return_if_fail(redoinfo != NULL);
+ cm_return_if_fail(redoinfo != NULL);
undostruct->undo = g_list_prepend(undostruct->undo, redoinfo);
undostruct->redo = g_list_remove(undostruct->redo, redoinfo);
- g_return_if_fail(redoinfo->action == UNDO_ACTION_REPLACE_INSERT);
+ cm_return_if_fail(redoinfo->action == UNDO_ACTION_REPLACE_INSERT);
gtk_text_buffer_insert(buffer, &start_iter, redoinfo->text, -1);
break;
case UNDO_ACTION_REPLACE_INSERT:
@@ -502,7 +502,7 @@ void undo_block(UndoMain *undostruct)
{
GtkTextBuffer *buffer;
- g_return_if_fail(GTK_IS_TEXT_VIEW(undostruct->textview));
+ cm_return_if_fail(GTK_IS_TEXT_VIEW(undostruct->textview));
buffer = gtk_text_view_get_buffer(undostruct->textview);
g_signal_handlers_block_by_func(buffer, undo_insert_text_cb, undostruct);
@@ -515,7 +515,7 @@ void undo_unblock(UndoMain *undostruct)
{
GtkTextBuffer *buffer;
- g_return_if_fail(GTK_IS_TEXT_VIEW(undostruct->textview));
+ cm_return_if_fail(GTK_IS_TEXT_VIEW(undostruct->textview));
buffer = gtk_text_view_get_buffer(undostruct->textview);
g_signal_handlers_unblock_by_func(buffer, undo_insert_text_cb, undostruct);
diff --git a/src/uri_opener.c b/src/uri_opener.c
@@ -73,10 +73,10 @@ void uri_opener_open(MessageView *msgview, GSList *uris)
{
GtkAdjustment *hadj, *vadj;
- g_return_if_fail(msgview);
- g_return_if_fail(msgview->mimeview);
- g_return_if_fail(msgview->mimeview->textview);
- g_return_if_fail(msgview);
+ cm_return_if_fail(msgview);
+ cm_return_if_fail(msgview->mimeview);
+ cm_return_if_fail(msgview->mimeview->textview);
+ cm_return_if_fail(msgview);
if (!opener.window)
uri_opener_create();
diff --git a/src/vcard.c b/src/vcard.c
@@ -63,17 +63,17 @@ VCardFile *vcard_create() {
* Properties...
*/
void vcard_set_name( VCardFile* cardFile, const gchar *value ) {
- g_return_if_fail( cardFile != NULL );
+ cm_return_if_fail( cardFile != NULL );
addrcache_set_name( cardFile->addressCache, value );
}
void vcard_set_file( VCardFile* cardFile, const gchar *value ) {
- g_return_if_fail( cardFile != NULL );
+ cm_return_if_fail( cardFile != NULL );
addrcache_refresh( cardFile->addressCache );
cardFile->path = mgu_replace_string( cardFile->path, value );
g_strstrip( cardFile->path );
}
void vcard_set_accessed( VCardFile *cardFile, const gboolean value ) {
- g_return_if_fail( cardFile != NULL );
+ cm_return_if_fail( cardFile != NULL );
cardFile->addressCache->accessFlag = value;
}
@@ -82,13 +82,13 @@ void vcard_set_accessed( VCardFile *cardFile, const gboolean value ) {
* Return: TRUE if file was modified.
*/
gboolean vcard_get_modified( VCardFile *cardFile ) {
- g_return_val_if_fail( cardFile != NULL, FALSE );
+ cm_return_val_if_fail( cardFile != NULL, FALSE );
cardFile->addressCache->modified =
addrcache_check_file( cardFile->addressCache, cardFile->path );
return cardFile->addressCache->modified;
}
gboolean vcard_get_accessed( VCardFile *cardFile ) {
- g_return_val_if_fail( cardFile != NULL, FALSE );
+ cm_return_val_if_fail( cardFile != NULL, FALSE );
return cardFile->addressCache->accessFlag;
}
@@ -97,7 +97,7 @@ gboolean vcard_get_accessed( VCardFile *cardFile ) {
* Return: TRUE if file was read.
*/
gboolean vcard_get_read_flag( VCardFile *cardFile ) {
- g_return_val_if_fail( cardFile != NULL, FALSE );
+ cm_return_val_if_fail( cardFile != NULL, FALSE );
return cardFile->addressCache->dataRead;
}
@@ -106,16 +106,16 @@ gboolean vcard_get_read_flag( VCardFile *cardFile ) {
* Return: Status code.
*/
gint vcard_get_status( VCardFile *cardFile ) {
- g_return_val_if_fail( cardFile != NULL, -1 );
+ cm_return_val_if_fail( cardFile != NULL, -1 );
return cardFile->retVal;
}
ItemFolder *vcard_get_root_folder( VCardFile *cardFile ) {
- g_return_val_if_fail( cardFile != NULL, NULL );
+ cm_return_val_if_fail( cardFile != NULL, NULL );
return addrcache_get_root_folder( cardFile->addressCache );
}
gchar *vcard_get_name( VCardFile *cardFile ) {
- g_return_val_if_fail( cardFile != NULL, NULL );
+ cm_return_val_if_fail( cardFile != NULL, NULL );
return addrcache_get_name( cardFile->addressCache );
}
@@ -133,7 +133,7 @@ static VCardFile *vcard_create_path( const gchar *path ) {
* Free up cardfile object by releasing internal memory.
*/
void vcard_free( VCardFile *cardFile ) {
- g_return_if_fail( cardFile != NULL );
+ cm_return_if_fail( cardFile != NULL );
/* Close file */
if( cardFile->file ) fclose( cardFile->file );
@@ -163,7 +163,7 @@ void vcard_free( VCardFile *cardFile ) {
* return: TRUE if file opened successfully.
*/
static gint vcard_open_file( VCardFile* cardFile ) {
- g_return_val_if_fail( cardFile != NULL, -1 );
+ cm_return_val_if_fail( cardFile != NULL, -1 );
/* g_print( "Opening file\n" ); */
cardFile->addressCache->dataRead = FALSE;
@@ -192,7 +192,7 @@ static gint vcard_open_file( VCardFile* cardFile ) {
* Close file.
*/
static void vcard_close_file( VCardFile *cardFile ) {
- g_return_if_fail( cardFile != NULL );
+ cm_return_if_fail( cardFile != NULL );
if( cardFile->file ) fclose( cardFile->file );
cardFile->file = NULL;
}
@@ -501,7 +501,7 @@ static void vcard_read_file( VCardFile *cardFile ) {
*/
/* ============================================================================================ */
gint vcard_read_data( VCardFile *cardFile ) {
- g_return_val_if_fail( cardFile != NULL, -1 );
+ cm_return_val_if_fail( cardFile != NULL, -1 );
cardFile->retVal = MGU_SUCCESS;
cardFile->addressCache->accessFlag = FALSE;
@@ -526,7 +526,7 @@ gint vcard_read_data( VCardFile *cardFile ) {
* Return link list of persons.
*/
GList *vcard_get_list_person( VCardFile *cardFile ) {
- g_return_val_if_fail( cardFile != NULL, NULL );
+ cm_return_val_if_fail( cardFile != NULL, NULL );
return addrcache_get_list_person( cardFile->addressCache );
}
@@ -536,7 +536,7 @@ GList *vcard_get_list_person( VCardFile *cardFile ) {
* Return: NULL.
*/
GList *vcard_get_list_folder( VCardFile *cardFile ) {
- g_return_val_if_fail( cardFile != NULL, NULL );
+ cm_return_val_if_fail( cardFile != NULL, NULL );
return NULL;
}
@@ -547,7 +547,7 @@ GList *vcard_get_list_folder( VCardFile *cardFile ) {
* Return: List of items, or NULL if none.
*/
GList *vcard_get_all_persons( VCardFile *cardFile ) {
- g_return_val_if_fail( cardFile != NULL, NULL );
+ cm_return_val_if_fail( cardFile != NULL, NULL );
return addrcache_get_all_persons( cardFile->addressCache );
}
