/*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail Team
- * Copyright (C) 2009-2010 Ricardo Mones
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2009-2015 Ricardo Mones and the Claws Mail Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifdef HAVE_CONFIG_H
#include "prefs_common.h"
/** Identifier for the hook. */
-static guint hook_id;
+static gulong hook_id = HOOK_NONE;
/**
* Extracts name from an address.
*
* @return TRUE if given address matches any of the patterns, FALSE otherwise.
*/
-gboolean matches_blocked_address(const gchar *addr, MatcherList *blocked)
+gboolean matches_blocked_address(gchar *addr, MatcherList *blocked)
{
if (blocked != NULL) {
MsgInfo info;
a_name = get_name_from_addr(addr);
a_comment = get_comment_from_addr(addr);
if (!addrbook_add_contact(abf, folder, a_name, clean_addr, a_comment)) {
- g_warning("contact could not be added\n");
+ g_warning("contact could not be added");
} else {
addressbook_refresh();
}
}
if (!addressbook_peek_folder_exists(keepto, &book, &folder)) {
- g_warning("addressbook folder not found '%s'\n", keepto);
+ g_warning("addressbook folder not found '%s'", keepto);
return FALSE;
}
if (!book) {
- g_warning("addressbook_peek_folder_exists: NULL book\n");
+ g_warning("addressbook_peek_folder_exists: NULL book");
return FALSE;
}
abf = book->rawDataSource;
if (addkeeperprefs.block_matching_addrs != NULL
&& addkeeperprefs.block_matching_addrs[0] != '\0') {
- blocked = matcherlist_new_from_lines(addkeeperprefs.block_matching_addrs, FALSE, TRUE);
+ blocked = matcherlist_new_from_lines(addkeeperprefs.block_matching_addrs, FALSE, FALSE);
if (blocked == NULL)
g_warning("couldn't allocate matcher");
}
hook_id = hooks_register_hook(COMPOSE_CHECK_BEFORE_SEND_HOOKLIST,
addrk_before_send_hook, NULL);
- if (hook_id == -1) {
+ if (hook_id == HOOK_NONE) {
*error = g_strdup(_("Failed to register check before send hook"));
return -1;
}
/**
* Get the kind of plugin.
*
- * @return The "GTK2" constant.
+ * @return The "GTK3" constant.
*/
const gchar *plugin_type(void)
{
- return "GTK2";
+ return "GTK3";
}
/**