Save us 35 warnings about hooks_register_hook() return checks.

diff --git a/src/avatars.c b/src/avatars.c
index ce03cdcf3d08da611f73db795014ea6de5b3c9fd..e73119487a76217a6f439f9fabbe26a4b4e681f4 100644 (file)
--- a/src/avatars.c
+++ b/src/avatars.c
@@ -93,19 +93,19 @@ gboolean avatars_internal_rendering_hook(gpointer source, gpointer data)
 
 void avatars_init(void)
 {
-       if (avatar_render_hook_id != -1) {
+       if (avatar_render_hook_id != (guint) -1) {
                g_warning("Internal avatars rendering already initialized");
                return;
        }
        avatar_render_hook_id = hooks_register_hook(AVATAR_IMAGE_RENDER_HOOKLIST, avatars_internal_rendering_hook, NULL);
-       if (avatar_render_hook_id == -1) {
+       if (avatar_render_hook_id == (guint) -1) {
                g_warning("Failed to register avatars internal rendering hook");
        }
 }
 
 void avatars_done(void)
 {
-       if (avatar_render_hook_id != -1) {
+       if (avatar_render_hook_id != (guint) -1) {
                hooks_unregister_hook(AVATAR_IMAGE_RENDER_HOOKLIST, avatar_render_hook_id);
                avatar_render_hook_id = -1;
        }

diff --git a/src/main.c b/src/main.c
index c404a3deaa30ef0ae1cc2e544eeba63c290632be..cb86e59ba56c902a20aec4ef7df02079c5573110 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -872,9 +872,9 @@ static void uninstall_dbus_status_handler(void)
        if(awn_proxy)
                g_object_unref(awn_proxy);
        awn_proxy = NULL;
-       if (dbus_item_hook_id != -1)
+       if (dbus_item_hook_id != (guint) -1)
                hooks_unregister_hook(FOLDER_ITEM_UPDATE_HOOKLIST, dbus_item_hook_id);
-       if (dbus_folder_hook_id != -1)
+       if (dbus_folder_hook_id != (guint) -1)
                hooks_unregister_hook(FOLDER_UPDATE_HOOKLIST, dbus_folder_hook_id);
 }
 
@@ -948,14 +948,14 @@ static void install_dbus_status_handler(void)
                        "/com/google/code/Awn",
                        "com.google.code.Awn");
        dbus_item_hook_id = hooks_register_hook (FOLDER_ITEM_UPDATE_HOOKLIST, dbus_status_update_item_hook, NULL);
-       if (dbus_item_hook_id == -1) {
+       if (dbus_item_hook_id == (guint) -1) {
                g_warning("Failed to register folder item update hook");
                uninstall_dbus_status_handler();
                return;
        }
 
        dbus_folder_hook_id = hooks_register_hook (FOLDER_UPDATE_HOOKLIST, dbus_status_update_folder_hook, NULL);
-       if (dbus_folder_hook_id == -1) {
+       if (dbus_folder_hook_id == (guint) -1) {
                g_warning("Failed to register folder update hook");
                uninstall_dbus_status_handler();
                return;

diff --git a/src/plugins/address_keeper/address_keeper.c b/src/plugins/address_keeper/address_keeper.c
index d85d949cc4cb28387e79b4a30817b5d31f91958c..c85b6fb923eef2a5f138b6abbe61d2a0bda4273d 100644 (file)
--- a/src/plugins/address_keeper/address_keeper.c
+++ b/src/plugins/address_keeper/address_keeper.c
@@ -248,7 +248,7 @@ gint plugin_init(gchar **error)
        hook_id = hooks_register_hook(COMPOSE_CHECK_BEFORE_SEND_HOOKLIST, 
                                      addrk_before_send_hook, NULL);
        
-       if (hook_id == -1) {
+       if (hook_id == (guint) -1) {
                *error = g_strdup(_("Failed to register check before send hook"));
                return -1;
        }

diff --git a/src/plugins/attachwarner/attachwarner.c b/src/plugins/attachwarner/attachwarner.c
index 7ada74b13a3ed92fcbf572cd892e2e2b27a2617c..3f782f5be469ba1fa0c497d4758f9b1ea12e9470 100644 (file)
--- a/src/plugins/attachwarner/attachwarner.c
+++ b/src/plugins/attachwarner/attachwarner.c
@@ -248,7 +248,7 @@ gint plugin_init(gchar **error)
        hook_id = hooks_register_hook(COMPOSE_CHECK_BEFORE_SEND_HOOKLIST, 
                                      attwarn_before_send_hook, NULL);
        
-       if (hook_id == -1) {
+       if (hook_id == (guint) -1) {
                *error = g_strdup(_("Failed to register check before send hook"));
                return -1;
        }

diff --git a/src/plugins/bogofilter/bogofilter.c b/src/plugins/bogofilter/bogofilter.c
index 07a764b370d4b58670b9fc04416ca40e5b850b29..85c5ddb194feb7f783645f07c3535010b6678753 100644 (file)
--- a/src/plugins/bogofilter/bogofilter.c
+++ b/src/plugins/bogofilter/bogofilter.c
@@ -959,7 +959,7 @@ FolderItem *bogofilter_get_spam_folder(MsgInfo *msginfo)
 
 gboolean plugin_done(void)
 {
-       if (hook_id != -1) {
+       if (hook_id != (guint) -1) {
                bogofilter_unregister_hook();
        }
 #ifdef USE_PTHREAD
@@ -1021,9 +1021,9 @@ struct PluginFeature *plugin_provides(void)
 
 void bogofilter_register_hook(void)
 {
-       if (hook_id == -1)
+       if (hook_id == (guint) -1)
                hook_id = hooks_register_hook(MAIL_LISTFILTERING_HOOKLIST, mail_filtering_hook, NULL);
-       if (hook_id == -1) {
+       if (hook_id == (guint) -1) {
                g_warning("Failed to register mail filtering hook");
                config.process_emails = FALSE;
        }
@@ -1031,7 +1031,7 @@ void bogofilter_register_hook(void)
 
 void bogofilter_unregister_hook(void)
 {
-       if (hook_id != -1) {
+       if (hook_id != (guint) -1) {
                hooks_unregister_hook(MAIL_LISTFILTERING_HOOKLIST, hook_id);
        }
        hook_id = -1;

diff --git a/src/plugins/bsfilter/bsfilter.c b/src/plugins/bsfilter/bsfilter.c
index 127e677cc79bc78f3a195122826a48128fd37b1c..9390983f50a45b22735aa80fc63f1c391aa1d200 100644 (file)
--- a/src/plugins/bsfilter/bsfilter.c
+++ b/src/plugins/bsfilter/bsfilter.c
@@ -592,7 +592,7 @@ FolderItem *bsfilter_get_spam_folder(MsgInfo *msginfo)
 
 gboolean plugin_done(void)
 {
-       if (hook_id != -1) {
+       if (hook_id != (guint) -1) {
                bsfilter_unregister_hook();
        }
 #ifdef USE_PTHREAD
@@ -654,9 +654,9 @@ struct PluginFeature *plugin_provides(void)
 
 void bsfilter_register_hook(void)
 {
-       if (hook_id == -1)
+       if (hook_id == (guint) -1)
                hook_id = hooks_register_hook(MAIL_FILTERING_HOOKLIST, mail_filtering_hook, NULL);
-       if (hook_id == -1) {
+       if (hook_id == (guint) -1) {
                g_warning("Failed to register mail filtering hook");
                config.process_emails = FALSE;
        }
@@ -664,7 +664,7 @@ void bsfilter_register_hook(void)
 
 void bsfilter_unregister_hook(void)
 {
-       if (hook_id != -1) {
+       if (hook_id != (guint) -1) {
                hooks_unregister_hook(MAIL_FILTERING_HOOKLIST, hook_id);
        }
        hook_id = -1;

diff --git a/src/plugins/clamd/clamav_plugin.c b/src/plugins/clamd/clamav_plugin.c
index 7653d470efbc8c4d2df98e0077e39323b7d95ab1..8a2736cdacf5d3812de2f9fabfb00012bfcc0130 100644 (file)
--- a/src/plugins/clamd/clamav_plugin.c
+++ b/src/plugins/clamd/clamav_plugin.c
@@ -276,7 +276,7 @@ gint plugin_init(gchar **error)
                return -1;
 
        hook_id = hooks_register_hook(MAIL_FILTERING_HOOKLIST, mail_filtering_hook, NULL);
-       if (hook_id == -1) {
+       if (hook_id == (guint) -1) {
                *error = g_strdup(_("Failed to register mail filtering hook"));
                return -1;
        }

diff --git a/src/plugins/demo/demo.c b/src/plugins/demo/demo.c
index 751c33f1e36d1c7615eb864fda3e43f54c8984b5..d5f484c591978fef24763f2f8b480d34025cffb2 100644 (file)
--- a/src/plugins/demo/demo.c
+++ b/src/plugins/demo/demo.c
@@ -48,7 +48,7 @@ gint plugin_init(gchar **error)
                return -1;
 
        hook_id = hooks_register_hook(LOG_APPEND_TEXT_HOOKLIST, my_log_hook, NULL);
-       if (hook_id == -1) {
+       if (hook_id == (guint) -1) {
                *error = g_strdup(_("Failed to register log text hook"));
                return -1;
        }

diff --git a/src/plugins/fetchinfo/fetchinfo_plugin.c b/src/plugins/fetchinfo/fetchinfo_plugin.c
index 04faeadc678de2b9dbb8e11ebb988b6c2a5ddd2f..bf350dd5a5db3eaa4785b8269bf401fa9766daac 100644 (file)
--- a/src/plugins/fetchinfo/fetchinfo_plugin.c
+++ b/src/plugins/fetchinfo/fetchinfo_plugin.c
@@ -162,7 +162,7 @@ gint plugin_init(gchar **error)
                return -1;
 
        mail_receive_hook_id = hooks_register_hook(MAIL_RECEIVE_HOOKLIST, mail_receive_hook, NULL);
-       if (mail_receive_hook_id == (guint)-1) {
+       if (mail_receive_hook_id == (guint) -1) {
                /* i18n: Possible error message during plugin load */
                *error = g_strdup(_("Failed to register mail receive hook"));
                return -1;

diff --git a/src/plugins/libravatar/libravatar.c b/src/plugins/libravatar/libravatar.c
index 7ce4341e397613b823a95bfcb3367fb757de4fa6..b8da96cded40ea0d19161224c9170222b78f9e8d 100644 (file)
--- a/src/plugins/libravatar/libravatar.c
+++ b/src/plugins/libravatar/libravatar.c
@@ -313,12 +313,12 @@ static void missing_cache_done()
 
 static void unregister_hooks()
 {
-       if (render_hook_id != -1) {
+       if (render_hook_id != (guint) -1) {
                hooks_unregister_hook(AVATAR_IMAGE_RENDER_HOOKLIST,
                                      render_hook_id);
                render_hook_id = -1;
        }
-       if (update_hook_id != -1) {
+       if (update_hook_id != (guint) -1) {
                hooks_unregister_hook(AVATAR_HEADER_UPDATE_HOOKLIST,
                                      update_hook_id);
                update_hook_id = -1;
@@ -341,7 +341,7 @@ gint plugin_init(gchar **error)
        update_hook_id = hooks_register_hook(AVATAR_HEADER_UPDATE_HOOKLIST,
                                             libravatar_header_update_hook,
                                             NULL);
-       if (update_hook_id == -1) {
+       if (update_hook_id == (guint) -1) {
                *error = g_strdup(_("Failed to register avatar header update hook"));
                return -1;
        }
@@ -349,7 +349,7 @@ gint plugin_init(gchar **error)
        render_hook_id = hooks_register_hook(AVATAR_IMAGE_RENDER_HOOKLIST,
                                             libravatar_image_render_hook,
                                             NULL);
-       if (render_hook_id == -1) {
+       if (render_hook_id == (guint) -1) {
                unregister_hooks();
                *error = g_strdup(_("Failed to register avatar image render hook"));
                return -1;

diff --git a/src/plugins/newmail/newmail.c b/src/plugins/newmail/newmail.c
index 588874870a6831a5edbf968b765aaff84b2052ae..1d77954c9db9f793f81bce57ba6f07d7c343ec72 100644 (file)
--- a/src/plugins/newmail/newmail.c
+++ b/src/plugins/newmail/newmail.c
@@ -107,7 +107,7 @@ gint plugin_init (gchar **error)
                return -1;
 
        hook_id = hooks_register_hook (MAIL_POSTFILTERING_HOOKLIST, newmail_hook, NULL);
-       if (hook_id == -1) {
+       if (hook_id == (guint) -1) {
                *error = g_strdup (_("Failed to register newmail hook"));
                return (-1);
        }

diff --git a/src/plugins/notification/notification_plugin.c b/src/plugins/notification/notification_plugin.c
index 0da3c1f824a0432a0f30df99fe7b95b00f162d31..1cc8c9f7942393ae5eb87b82c36d20043b89bff1 100644 (file)
--- a/src/plugins/notification/notification_plugin.c
+++ b/src/plugins/notification/notification_plugin.c
@@ -302,7 +302,7 @@ gint plugin_init(gchar **error)
   }
 
   hook_theme_changed = hooks_register_hook(THEME_CHANGED_HOOKLIST, my_update_theme_hook, NULL);
-  if(hook_theme_changed == (guint)-1) {
+  if(hook_theme_changed == (guint) -1) {
     *error = g_strdup(_("Failed to register theme change hook in the "
       "Notification plugin"));
     hooks_unregister_hook(FOLDER_ITEM_UPDATE_HOOKLIST, hook_f_item);

diff --git a/src/plugins/python/python_plugin.c b/src/plugins/python/python_plugin.c
index 0b0d81399b277f5cfc5dfd2dcbd13cf137763c31..1634a761efa09993542e8081d2d260dac672a0e2 100644 (file)
--- a/src/plugins/python/python_plugin.c
+++ b/src/plugins/python/python_plugin.c
@@ -653,7 +653,7 @@ gint plugin_init(gchar **error)
 
   /* load hooks */
   hook_compose_create = hooks_register_hook(COMPOSE_CREATED_HOOKLIST, my_compose_create_hook, NULL);
-  if(hook_compose_create == (guint)-1) {
+  if(hook_compose_create == (guint) -1) {
     *error = g_strdup(_("Failed to register \"compose create hook\" in the Python plugin"));
     return -1;
   }

diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c
index 59fd92a67cfcaa07fbdcd5f99256aa5e5f390690..84aa9a6dd847efa555b52d4834753c6daa3da74c 100644 (file)
--- a/src/plugins/spamassassin/spamassassin.c
+++ b/src/plugins/spamassassin/spamassassin.c
@@ -513,7 +513,7 @@ gboolean spamassassin_check_username(void)
        if (config.username == NULL || config.username[0] == '\0') {
                config.username = (gchar*)g_get_user_name();
                if (config.username == NULL) {
-                       if (hook_id != -1) {
+                       if (hook_id != (guint) -1) {
                                spamassassin_unregister_hook();
                        }
                        procmsg_unregister_spam_learner(spamassassin_learn);
@@ -571,7 +571,7 @@ gint plugin_init(gchar **error)
 
 gboolean plugin_done(void)
 {
-       if (hook_id != -1) {
+       if (hook_id != (guint) -1) {
                spamassassin_unregister_hook();
        }
        g_free(config.hostname);
@@ -629,9 +629,9 @@ struct PluginFeature *plugin_provides(void)
 
 void spamassassin_register_hook(void)
 {
-       if (hook_id == -1)
+       if (hook_id == (guint) -1)
                hook_id = hooks_register_hook(MAIL_FILTERING_HOOKLIST, mail_filtering_hook, NULL);
-       if (hook_id == -1) {
+       if (hook_id == (guint) -1) {
                g_warning("Failed to register mail filtering hook");
                config.process_emails = FALSE;
        }
@@ -639,7 +639,7 @@ void spamassassin_register_hook(void)
 
 void spamassassin_unregister_hook(void)
 {
-       if (hook_id != -1) {
+       if (hook_id != (guint) -1) {
                hooks_unregister_hook(MAIL_FILTERING_HOOKLIST, hook_id);
        }
        hook_id = -1;

diff --git a/src/statusbar.c b/src/statusbar.c
index 13d6bb6331247dd394f6bb37c5495f6de485d0c3..12fdb1d362e614b0b19b56fefc3c4883eef154fa 100644 (file)
--- a/src/statusbar.c
+++ b/src/statusbar.c
@@ -37,7 +37,7 @@
 #define BUFFSIZE 1024
 
 static GList *statusbar_list = NULL;
-gint statusbar_puts_all_hook_id = -1;
+guint statusbar_puts_all_hook_id = -1;
 
 GtkWidget *statusbar_create(void)
 {
@@ -149,10 +149,10 @@ static gboolean statusbar_puts_all_hook (gpointer source, gpointer data)
 
 void statusbar_verbosity_set(gboolean verbose)
 {
-       if (verbose && (statusbar_puts_all_hook_id == -1)) {
+       if (verbose && (statusbar_puts_all_hook_id == (guint) -1)) {
                statusbar_puts_all_hook_id =
                        hooks_register_hook(LOG_APPEND_TEXT_HOOKLIST, statusbar_puts_all_hook, NULL);
-       } else if (!verbose && (statusbar_puts_all_hook_id != -1)) {
+       } else if (!verbose && (statusbar_puts_all_hook_id != (guint) -1)) {
                hooks_unregister_hook(LOG_APPEND_TEXT_HOOKLIST, statusbar_puts_all_hook_id);
                statusbar_puts_all_hook_id = -1;
                statusbar_pop_all();