aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSankarasivasubramanian Pasupathilingam <psankar@src.gnome.org>2007-05-11 18:22:26 +0800
committerSankarasivasubramanian Pasupathilingam <psankar@src.gnome.org>2007-05-11 18:22:26 +0800
commit730fa4cf41b25ad1c5e9a57ec97fd823ea6ff144 (patch)
treef419fdd0d3721e2182bdbb194193669ac382fcbc
parent347bdcf94d622efbdeaa687a617efa8d1480bb74 (diff)
downloadgsoc2013-evolution-730fa4cf41b25ad1c5e9a57ec97fd823ea6ff144.tar
gsoc2013-evolution-730fa4cf41b25ad1c5e9a57ec97fd823ea6ff144.tar.gz
gsoc2013-evolution-730fa4cf41b25ad1c5e9a57ec97fd823ea6ff144.tar.bz2
gsoc2013-evolution-730fa4cf41b25ad1c5e9a57ec97fd823ea6ff144.tar.lz
gsoc2013-evolution-730fa4cf41b25ad1c5e9a57ec97fd823ea6ff144.tar.xz
gsoc2013-evolution-730fa4cf41b25ad1c5e9a57ec97fd823ea6ff144.tar.zst
gsoc2013-evolution-730fa4cf41b25ad1c5e9a57ec97fd823ea6ff144.zip
Bug 437584 – Compilation warning in evolution's plugins folder
svn path=/trunk/; revision=33507
-rw-r--r--plugins/bbdb/ChangeLog7
-rw-r--r--plugins/bbdb/gaimbuddies.c22
-rw-r--r--plugins/bogo-junk-plugin/ChangeLog5
-rw-r--r--plugins/bogo-junk-plugin/bf-junk-filter.c10
-rw-r--r--plugins/calendar-weather/ChangeLog8
-rw-r--r--plugins/calendar-weather/calendar-weather.c24
-rw-r--r--plugins/exchange-operations/ChangeLog5
-rw-r--r--plugins/exchange-operations/exchange-folder.c10
-rw-r--r--plugins/groupwise-features/ChangeLog5
-rw-r--r--plugins/groupwise-features/mail-send-options.c6
-rw-r--r--plugins/itip-formatter/ChangeLog5
-rw-r--r--plugins/itip-formatter/itip-view.c4
-rw-r--r--plugins/print-message/ChangeLog5
-rw-r--r--plugins/print-message/print-message.c2
-rw-r--r--plugins/publish-calendar/ChangeLog5
-rw-r--r--plugins/publish-calendar/url-editor-dialog.c10
-rw-r--r--plugins/sa-junk-plugin/ChangeLog6
-rw-r--r--plugins/sa-junk-plugin/em-junk-filter.c13
18 files changed, 111 insertions, 41 deletions
diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog
index 88f214ffd3..f6ec39ec0e 100644
--- a/plugins/bbdb/ChangeLog
+++ b/plugins/bbdb/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-11 Gilles Dartiguelongue <dartigug@esiee.fr>
+
+ * gaimbuddies.c: (bbdb_sync_buddy_list_check),
+ (bbdb_get_gaim_buddy_list), (get_node_text), (parse_contact),
+ (parse_buddy_group): add casts to clear compilation warnings,
+ Fixes part of bug #437584
+
2007-04-02 Sankar P <psankar@novell.com>
* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c
index 2b6d6ca2f5..b00ebc5952 100644
--- a/plugins/bbdb/gaimbuddies.c
+++ b/plugins/bbdb/gaimbuddies.c
@@ -101,7 +101,7 @@ bbdb_sync_buddy_list_check (void)
/* Reprocess the buddy list if it's been updated. */
last_sync_str = gconf_client_get_string (gconf, GCONF_KEY_GAIM_LAST_SYNC, NULL);
- if (last_sync_str == NULL || ! strcmp (last_sync_str, ""))
+ if (last_sync_str == NULL || ! strcmp ((const char *)last_sync_str, ""))
last_sync = (time_t) 0;
else
last_sync = (time_t) g_ascii_strtoull (last_sync_str, NULL, 10);
@@ -314,7 +314,7 @@ bbdb_get_gaim_buddy_list (void)
}
root = xmlDocGetRootElement (buddy_xml);
- if (strcmp (root->name, "gaim")) {
+ if (strcmp ((const char *)root->name, "gaim")) {
fprintf (stderr, "bbdb: Could not parse Gaim buddy list.\n");
xmlFreeDoc (buddy_xml);
return NULL;
@@ -322,7 +322,7 @@ bbdb_get_gaim_buddy_list (void)
blist = NULL;
for (child = root->children; child != NULL; child = child->next) {
- if (! strcmp (child->name, "blist")) {
+ if (! strcmp ((const char *)child->name, "blist")) {
blist = child;
break;
}
@@ -334,7 +334,7 @@ bbdb_get_gaim_buddy_list (void)
}
for (child = blist->children; child != NULL; child = child->next) {
- if (! strcmp (child->name, "group"))
+ if (! strcmp ((const char *)child->name, "group"))
parse_buddy_group (child, &buddies);
}
@@ -365,7 +365,7 @@ static char *
get_node_text (xmlNodePtr node)
{
if (node->children == NULL || node->children->content == NULL ||
- strcmp (node->children->name, "text"))
+ strcmp ((const char *)node->children->name, "text"))
return NULL;
return g_strdup (node->children->content);
@@ -397,7 +397,7 @@ parse_contact (xmlNodePtr contact, GList **buddies)
GaimBuddy *gb;
for (child = contact->children; child != NULL; child = child->next) {
- if (! strcmp (child->name, "buddy")) {
+ if (! strcmp ((const char *)child->name, "buddy")) {
buddy = child;
break;
}
@@ -413,17 +413,17 @@ parse_contact (xmlNodePtr contact, GList **buddies)
gb->proto = e_xml_get_string_prop_by_name (buddy, "proto");
for (child = buddy->children; child != NULL; child = child->next) {
- if (! strcmp (child->name, "setting")) {
+ if (! strcmp ((const char *)child->name, "setting")) {
char *setting_type;
setting_type = e_xml_get_string_prop_by_name (child, "name");
- if (! strcmp (setting_type, "buddy_icon"))
+ if (! strcmp ((const char *)setting_type, "buddy_icon"))
gb->icon = get_buddy_icon_from_setting (child);
g_free (setting_type);
- } else if (! strcmp (child->name, "name"))
+ } else if (! strcmp ((const char *)child->name, "name"))
gb->account_name = get_node_text (child);
- else if (! strcmp (child->name, "alias"))
+ else if (! strcmp ((const char *)child->name, "alias"))
gb->alias = get_node_text (child);
}
@@ -437,7 +437,7 @@ parse_buddy_group (xmlNodePtr group, GList **buddies)
xmlNodePtr child;
for (child = group->children; child != NULL; child = child->next) {
- if (strcmp (child->name, "contact"))
+ if (strcmp ((const char *)child->name, "contact"))
continue;
parse_contact (child, buddies);
diff --git a/plugins/bogo-junk-plugin/ChangeLog b/plugins/bogo-junk-plugin/ChangeLog
index c41e9d396f..7ff27f19e0 100644
--- a/plugins/bogo-junk-plugin/ChangeLog
+++ b/plugins/bogo-junk-plugin/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-11 Gilles Dartiguelongue <dartigug@esiee.fr>
+
+ * bf-junk-filter.c: add prototypes to clean compilation warnings
+ Fixes part of bug #437584
+
2007-04-23 Matthew Barnes <mbarnes@redhat.com>
* Makefile.am: Distribute bogo-junk-plugin.schemas.in.in. (#432616)
diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c
index 0369ec5500..f1ef6a53c5 100644
--- a/plugins/bogo-junk-plugin/bf-junk-filter.c
+++ b/plugins/bogo-junk-plugin/bf-junk-filter.c
@@ -57,6 +57,16 @@ static gchar em_junk_bf_binary[] = BOGOFILTER_BINARY;
static const gchar em_junk_bf_gconf_dir[] = EM_JUNK_BF_GCONF_DIR;
GtkWidget * org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data);
+/* plugin fonction prototypes */
+gboolean em_junk_bf_check_junk (EPlugin *ep, EMJunkHookTarget *target);
+gboolean em_junk_bf_validate_binary (EPlugin *ep, EMJunkHookTarget *target);
+void em_junk_bf_report_junk (EPlugin *ep, EMJunkHookTarget *target);
+void em_junk_bf_report_non_junk (EPlugin *ep, EMJunkHookTarget *target);
+void em_junk_bf_commit_reports (EPlugin *ep, EMJunkHookTarget *target);
+
+/* eplugin stuff */
+int e_plugin_lib_enable (EPluginLib *ep, int enable);
+
#define EM_JUNK_BF_GCONF_DIR_LENGTH (G_N_ELEMENTS (em_junk_bf_gconf_dir) - 1)
diff --git a/plugins/calendar-weather/ChangeLog b/plugins/calendar-weather/ChangeLog
index 8f8bf6f8bd..03882cca19 100644
--- a/plugins/calendar-weather/ChangeLog
+++ b/plugins/calendar-weather/ChangeLog
@@ -1,3 +1,11 @@
+2007-05-11 Gilles Dartiguelongue <dartigug@esiee.fr>
+
+ * calendar-weather.c: (e_plugin_lib_enable), (parse_subtree),
+ (location_clicked), (e_calendar_weather_location),
+ (e_calendar_weather_refresh), (set_units),
+ (e_calendar_weather_units): fix casts in strcmp,
+ fixes part of bug #437584.
+
2007-03-20 Matthew Barnes <mbarnes@redhat.com>
** Fixes part of bug #419524
diff --git a/plugins/calendar-weather/calendar-weather.c b/plugins/calendar-weather/calendar-weather.c
index 4f5f4a1040..0eb04c41c6 100644
--- a/plugins/calendar-weather/calendar-weather.c
+++ b/plugins/calendar-weather/calendar-weather.c
@@ -51,7 +51,7 @@ e_plugin_lib_enable (EPluginLib *epl, int enable)
/* Add the categories icons if we don't have them. */
for (l = e_categories_get_list (); l; l = g_list_next (l)) {
- if (!strcmp (l->data, _("Weather: Cloudy"))) {
+ if (!strcmp ((const char *)l->data, _("Weather: Cloudy"))) {
found = TRUE;
break;
}
@@ -117,7 +117,7 @@ parse_subtree (GtkTreeIter *parent, xmlNode *node)
if (node->type == XML_ELEMENT_NODE) {
gtk_tree_store_append (store, &iter, parent);
- if (strcmp (node->name, "location") == 0) {
+ if (strcmp ((const char *)node->name, "location") == 0) {
xmlAttr *attr;
child = node->children;
@@ -125,11 +125,11 @@ parse_subtree (GtkTreeIter *parent, xmlNode *node)
gtk_tree_store_set (store, &iter, 0, child->content, -1);
for (attr = node->properties; attr; attr = attr->next) {
- if (strcmp (attr->name, "code") == 0)
+ if (strcmp ((const char *)attr->name, "code") == 0)
gtk_tree_store_set (store, &iter, 1, attr->children->content, -1);
- else if (strcmp (attr->name, "url") == 0)
+ else if (strcmp ((const char *)attr->name, "url") == 0)
gtk_tree_store_set (store, &iter, 2, attr->children->content, -1);
- else if (strcmp (attr->name, "type") == 0)
+ else if (strcmp ((const char *)attr->name, "type") == 0)
gtk_tree_store_set (store, &iter, 3, attr->children->content, -1);
}
} else {
@@ -139,7 +139,7 @@ parse_subtree (GtkTreeIter *parent, xmlNode *node)
parse_subtree (&iter, child);
for (attr = node->properties; attr; attr = attr->next)
- if (strcmp (attr->name, "name") == 0)
+ if (strcmp ((const char *)attr->name, "name") == 0)
gtk_tree_store_set (store, &iter, 0, attr->children->content, -1);
}
}
@@ -367,7 +367,7 @@ location_clicked (GtkButton *button, ESource *source)
label = GTK_WIDGET (gtk_bin_get_child (GTK_BIN (button)));
text = gtk_label_get_text (GTK_LABEL (label));
- if (strcmp (text, _("None")) == 0)
+ if (strcmp ((const char *)text, _("None")) == 0)
e_source_set_relative_uri (source, "");
}
@@ -397,7 +397,7 @@ e_calendar_weather_location (EPlugin *epl, EConfigHookItemFactoryData *data)
uri_text = e_source_get_uri (t->source);
uri = e_uri_new (uri_text);
- if (strcmp (uri->protocol, "weather")) {
+ if (strcmp ((const char *)uri->protocol, "weather")) {
e_uri_free (uri);
return hidden;
}
@@ -535,7 +535,7 @@ e_calendar_weather_refresh (EPlugin *epl, EConfigHookItemFactoryData *data)
uri_text = e_source_get_uri (t->source);
uri = e_uri_new (uri_text);
g_free (uri_text);
- if (strcmp (uri->protocol, "weather")) {
+ if (strcmp ((const char *)uri->protocol, "weather")) {
e_uri_free (uri);
return hidden;
}
@@ -593,7 +593,7 @@ set_units (ESource *source, GtkWidget *option)
if (format == NULL) {
e_source_set_property (source, "units", "metric");
gtk_option_menu_set_history (GTK_OPTION_MENU (option), 0);
- } else if (strcmp (format, "fahrenheit") == 0) {
+ } else if (strcmp ((const char *)format, "fahrenheit") == 0) {
/* old format, convert */
e_source_set_property (source, "units", "imperial");
gtk_option_menu_set_history (GTK_OPTION_MENU (option), 1);
@@ -602,7 +602,7 @@ set_units (ESource *source, GtkWidget *option)
gtk_option_menu_set_history (GTK_OPTION_MENU (option), 0);
}
} else {
- if (strcmp (format, "metric") == 0)
+ if (strcmp ((const char *)format, "metric") == 0)
gtk_option_menu_set_history (GTK_OPTION_MENU (option), 0);
else
gtk_option_menu_set_history (GTK_OPTION_MENU (option), 1);
@@ -641,7 +641,7 @@ e_calendar_weather_units (EPlugin *epl, EConfigHookItemFactoryData *data)
uri_text = e_source_get_uri (t->source);
uri = e_uri_new (uri_text);
g_free (uri_text);
- if (strcmp (uri->protocol, "weather")) {
+ if (strcmp ((const char *)uri->protocol, "weather")) {
e_uri_free (uri);
return hidden;
}
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index 9b66b769fb..259dd47f88 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-11 Gilles Dartiguelongue <dartigug@esiee.fr>
+
+ * exchange-folder.c: (org_gnome_exchange_folder_inbox_unsubscribe):
+ Fixes unhandled cases in switch, fixes part of bug #437584.
+
2007-05-25 Veerapuram Varadhan <vvaradhan@novell.com>
* Makefile.am: Distcheck fixes.
diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c
index ccdbec2841..ee48dd88aa 100644
--- a/plugins/exchange-operations/exchange-folder.c
+++ b/plugins/exchange-operations/exchange-folder.c
@@ -123,9 +123,15 @@ org_gnome_exchange_folder_inbox_unsubscribe (EPopup *ep, EPopupItem *p, void *da
case EXCHANGE_ACCOUNT_FOLDER_UNSUPPORTED_OPERATION:
e_error_run (NULL, ERROR_DOMAIN ":folder-unsupported-error", NULL);
return;
- case EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR:
+ case EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR:
e_error_run (NULL, ERROR_DOMAIN ":folder-generic-error", NULL);
- return;
+ return;
+ case EXCHANGE_ACCOUNT_FOLDER_GC_NOTREACHABLE:
+ e_error_run (NULL, ERROR_DOMAIN ":folder-no-gc-error", NULL);
+ return;
+ case EXCHANGE_ACCOUNT_FOLDER_NO_SUCH_USER:
+ e_error_run (NULL, ERROR_DOMAIN ":no-user-error", NULL);
+ return;
}
/* We need to get the physical uri for the Inbox */
diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index 603fb87899..8f9224f8d0 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-11 Gilles Dartiguelongue <dartigug@esiee.fr>
+
+ * mail-send-options.c: (org_gnome_composer_send_options):
+ Fixes typo and casts, fixes part of bug #437584
+
2007-04-19 Matthew Barnes <mbarnes@redhat.com>
** Fixes part of bug #429422
diff --git a/plugins/groupwise-features/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c
index 64992e5c8d..de4bb8a86d 100644
--- a/plugins/groupwise-features/mail-send-options.c
+++ b/plugins/groupwise-features/mail-send-options.c
@@ -42,7 +42,7 @@
static ESendOptionsDialog * dialog = NULL ;
-void org_gnome_compose_send_options (EPlugin *ep, EMEventTargetComposer *t);
+void org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t);
static time_t
add_day_to_time (time_t time, int days)
@@ -151,12 +151,12 @@ org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t)
return;
}
e_msg_composer_set_send_options (comp, TRUE);
- /*disply the send options dialog*/
+ /* display the send options dialog */
if (!dialog) {
g_print ("New dialog\n\n") ;
dialog = e_sendoptions_dialog_new () ;
}
- e_sendoptions_dialog_run (dialog, comp, E_ITEM_MAIL) ;
+ e_sendoptions_dialog_run (dialog, GTK_WIDGET (comp), E_ITEM_MAIL) ;
g_signal_connect (dialog, "sod_response",
G_CALLBACK (feed_input_data), comp);
diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
index c91e6b9927..d1777aee67 100644
--- a/plugins/itip-formatter/ChangeLog
+++ b/plugins/itip-formatter/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-11 Gilles Dartiguelongue <dartigug@esiee.fr>
+
+ * itip-view.c: (set_one_button): Fixes casts,
+ fixes part of bug #437584.
+
2007-04-19 Matthew Barnes <mbarnes@redhat.com>
** Fixes part of bug #429422
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index 63fa11211e..3abd8f9822 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -735,10 +735,10 @@ set_one_button (ItipView *view, char *label, char *stock_id, ItipViewResponse re
button = gtk_button_new_with_mnemonic (label);
image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON);
- gtk_button_set_image (button, image);
+ gtk_button_set_image (GTK_BUTTON (button), image);
data = GINT_TO_POINTER (response);
- g_object_set_data (button, DATA_RESPONSE_KEY, data);
+ g_object_set_data (G_OBJECT (button), DATA_RESPONSE_KEY, data);
gtk_widget_show (button);
gtk_container_add (GTK_CONTAINER (priv->button_box), button);
diff --git a/plugins/print-message/ChangeLog b/plugins/print-message/ChangeLog
index 506cffce8b..62ddd88b88 100644
--- a/plugins/print-message/ChangeLog
+++ b/plugins/print-message/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-11 Gilles Dartiguelongue <dartigug@esiee.fr>
+
+ * print-message.c: fix prototypes,
+ fixes part of bug #437584.
+
2007-04-20 Matthew Barnes <mbarnes@redhat.com>
* print-message.c:
diff --git a/plugins/print-message/print-message.c b/plugins/print-message/print-message.c
index 14b5e4655f..5e5ec389fd 100644
--- a/plugins/print-message/print-message.c
+++ b/plugins/print-message/print-message.c
@@ -37,6 +37,8 @@
#include "composer/e-msg-composer.h"
void org_gnome_compose_print_message (EPlugin *ep, EMMenuTargetWidget *t);
+void org_gnome_print_message (EPlugin *ep, EMMenuTargetWidget *t);
+void org_gnome_print_preview (EPlugin *ep, EMMenuTargetWidget *t);
void
org_gnome_print_message (EPlugin *ep, EMMenuTargetWidget *t)
diff --git a/plugins/publish-calendar/ChangeLog b/plugins/publish-calendar/ChangeLog
index b2e5b7be55..f72b9da841 100644
--- a/plugins/publish-calendar/ChangeLog
+++ b/plugins/publish-calendar/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-11 Gilles Dartiguelongue <dartigug@esiee.fr>
+
+ * url-editor-dialog.c: (set_from_uri): fixes casts in strcmp,
+ fixes par of bug #437584
+
2007-03-20 Matthew Barnes <mbarnes@redhat.com>
** Fixes part of bug #419524
diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c
index 352d6eff1e..c426c9cb20 100644
--- a/plugins/publish-calendar/url-editor-dialog.c
+++ b/plugins/publish-calendar/url-editor-dialog.c
@@ -261,17 +261,17 @@ set_from_uri (UrlEditorDialog *dialog)
euri = e_uri_new (uri->location);
/* determine our method */
method = euri->protocol;
- if (strcmp (method, "smb") == 0)
+ if (strcmp ((const char *)method, "smb") == 0)
uri->service_type = TYPE_SMB;
- else if (strcmp (method, "sftp") == 0)
+ else if (strcmp ((const char *)method, "sftp") == 0)
uri->service_type = TYPE_SSH;
- else if (strcmp (method, "ftp") == 0)
+ else if (strcmp ((const char *)method, "ftp") == 0)
/* we set TYPE_FTP here for now. if we don't find a
* username later, we'll change it to TYPE_ANON_FTP */
uri->service_type = TYPE_FTP;
- else if (strcmp (method, "dav") == 0)
+ else if (strcmp ((const char *)method, "dav") == 0)
uri->service_type = TYPE_DAV;
- else if (strcmp (method, "davs") == 0)
+ else if (strcmp ((const char *)method, "davs") == 0)
uri->service_type = TYPE_DAVS;
else
uri->service_type = TYPE_URI;
diff --git a/plugins/sa-junk-plugin/ChangeLog b/plugins/sa-junk-plugin/ChangeLog
index e55b01c320..9adab6f392 100644
--- a/plugins/sa-junk-plugin/ChangeLog
+++ b/plugins/sa-junk-plugin/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-11 Gilles Dartiguelongue <dartigug@esiee.fr>
+
+ * em-junk-filter.c: (pipe_to_sa_full), (em_junk_sa_check_junk),
+ (org_gnome_sa_use_remote_tests): Fix casts and prototypes,
+ fixes part of bug #437584.
+
2007-04-03 Srinivasa Ragavan <sragavan@novell.com>
Added few more plugin callbacks and moved the UI options from core
diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c
index ad5cd3c334..e60a505bd5 100644
--- a/plugins/sa-junk-plugin/em-junk-filter.c
+++ b/plugins/sa-junk-plugin/em-junk-filter.c
@@ -60,12 +60,13 @@ static pthread_mutex_t em_junk_sa_preferred_socket_path_lock = PTHREAD_MUTEX_INI
static pthread_mutex_t em_junk_sa_spamd_restart_lock = PTHREAD_MUTEX_INITIALIZER;
int e_plugin_lib_enable (EPluginLib *ep, int enable);
-static const char *em_junk_sa_get_name (void);
+//static const char *em_junk_sa_get_name (void);
gboolean em_junk_sa_check_junk (EPlugin *ep, EMJunkHookTarget *target);
void em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target);
void em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target);
void em_junk_sa_commit_reports (EPlugin *ep, EMJunkHookTarget *target);
gboolean em_junk_sa_validate_binary (EPlugin *ep, EMJunkHookTarget *target);
+GtkWidget *org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data);
static void em_junk_sa_init (void);
static void em_junk_sa_finalize (void);
@@ -206,7 +207,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err,
camel_stream_write_to_stream (stream, (CamelStream *) memstream);
camel_object_unref (stream);
- g_byte_array_append (output_buffer, "", 1);
+ g_byte_array_append (output_buffer, (unsigned char *)"", 1);
d(printf ("child process output: %s len: %d\n", output_buffer->data, output_buffer->len));
}
@@ -570,7 +571,7 @@ em_junk_sa_check_junk(EPlugin *ep, EMJunkHookTarget *target)
rv = pipe_to_sa_full (msg, NULL, argv, 0, 1, out) != 0;
- if (!rv && out && !strcmp (out->data, "0/0\n")) {
+ if (!rv && out && !strcmp ((const char *)out->data, "0/0\n")) {
/* an error occurred */
if (em_junk_sa_respawn_spamd ()) {
g_byte_array_set_size (out, 0);
@@ -846,11 +847,11 @@ org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFact
check = gtk_check_button_new_with_mnemonic (_("I_nclude remote tests"));
label = gtk_label_new (NULL);
- gtk_label_set_markup (label, text);
+ gtk_label_set_markup (GTK_LABEL (label), text);
g_free (text);
vbox = gtk_vbox_new (FALSE, 2);
- gtk_box_pack_start (vbox, check, FALSE, FALSE, 0);
- gtk_box_pack_start (vbox, label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (check), FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (label), FALSE, FALSE, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), em_junk_sa_local_only);
g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (use_remote_tests_cb), "/apps/evolution/mail/junk/sa/local_only");