From 8da802661961ff0356088abfcb9217cef8ef2446 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 28 Apr 2009 17:02:53 +0200 Subject: Store username in a source URL in CalDAV ** Fix for bug #578335 * caldav-source.c: (user_changed), (location_changed): Revert part of bug #562990, as EPassword requires username as part of an URL to store passwords properly to a keyring. --- plugins/caldav/ChangeLog | 8 ++++++++ plugins/caldav/caldav-source.c | 14 +++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/caldav/ChangeLog b/plugins/caldav/ChangeLog index 5f28deb6b3..9a9bae7398 100644 --- a/plugins/caldav/ChangeLog +++ b/plugins/caldav/ChangeLog @@ -1,3 +1,11 @@ +2009-04-28 Milan Crha + + ** Fix for bug #578335 + + * caldav-source.c: (user_changed), (location_changed): + Revert part of bug #562990, as EPassword requires username + as part of an URL to store passwords properly to a keyring. + 2009-04-24 Milan Crha ** Part of fix for bug #569652 diff --git a/plugins/caldav/caldav-source.c b/plugins/caldav/caldav-source.c index 46e510367f..5df807a691 100644 --- a/plugins/caldav/caldav-source.c +++ b/plugins/caldav/caldav-source.c @@ -124,11 +124,22 @@ location_changed (GtkEntry *editable, ESource *source) { EUri *euri; char *ruri; - const char *uri; + const char *uri, *username; uri = gtk_entry_get_text (GTK_ENTRY (editable)); euri = e_uri_new (uri); + g_return_if_fail (euri != NULL); + + username = e_source_get_property (source, "username"); + if (username && !*username) + username = NULL; + + if ((!euri->user && username) || (euri->user && username && !g_str_equal (euri->user, username))) { + g_free (euri->user); + euri->user = g_strdup (username); + } + ruri = print_uri_noproto (euri); e_source_set_relative_uri (source, ruri); g_free (ruri); @@ -163,6 +174,7 @@ user_changed (GtkEntry *editable, ESource *source) euri->user = NULL; if (user != NULL && *user) { + euri->user = g_strdup (user); e_source_set_property (source, "auth", "1"); } else { e_source_set_property (source, "auth", NULL); -- cgit v1.2.3 From 156dfd09d8467bcc727e69f27795360866650eec Mon Sep 17 00:00:00 2001 From: Holger Macht Date: Tue, 28 Apr 2009 20:40:26 +0530 Subject: External Editor rewrite by Holger Macht. Fixes #567145 --- plugins/external-editor/ChangeLog | 13 + plugins/external-editor/Makefile.am | 4 +- .../apps-evolution-external-editor.schemas.in | 10 + plugins/external-editor/external-editor.c | 391 +++++++++++++-------- .../org-gnome-external-editor.eplug.xml | 40 +-- .../org-gnome-external-editor.error.xml | 7 +- 6 files changed, 300 insertions(+), 165 deletions(-) (limited to 'plugins') diff --git a/plugins/external-editor/ChangeLog b/plugins/external-editor/ChangeLog index dae79fc9a7..55ead0195b 100644 --- a/plugins/external-editor/ChangeLog +++ b/plugins/external-editor/ChangeLog @@ -1,3 +1,16 @@ +2009-04-28 Holger Macht + + ** Fix for bug #567145 + + External Editor rewrite. + * composer/evolution-composer.ui: + * plugins/external-editor/Makefile.am: + * plugins/external-editor/apps-evolution-external-editor.schemas.in + : + * plugins/external-editor/external-editor.c: + * plugins/external-editor/org-gnome-external-editor.eplug.xml: + * plugins/external-editor/org-gnome-external-editor.error.xml: + 2009-04-27 Milan Crha ** Fix for bug #561188 diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am index ff64941a28..36cba20344 100644 --- a/plugins/external-editor/Makefile.am +++ b/plugins/external-editor/Makefile.am @@ -25,8 +25,7 @@ error_DATA = org-gnome-external-editor.error errordir = $(privdatadir)/errors plugin_DATA = \ - org-gnome-external-editor.eplug \ - org-gnome-external-editor.xml + org-gnome-external-editor.eplug plugin_LTLIBRARIES = liborg-gnome-external-editor.la @@ -54,7 +53,6 @@ install-data-local: EXTRA_DIST = \ org-gnome-external-editor.eplug.xml \ org-gnome-external-editor.error.xml \ - org-gnome-external-editor.xml \ $(schema_in_files) BUILT_SOURCES = org-gnome-external-editor.eplug \ diff --git a/plugins/external-editor/apps-evolution-external-editor.schemas.in b/plugins/external-editor/apps-evolution-external-editor.schemas.in index 0f6d264b90..38becebdb7 100644 --- a/plugins/external-editor/apps-evolution-external-editor.schemas.in +++ b/plugins/external-editor/apps-evolution-external-editor.schemas.in @@ -10,6 +10,16 @@ Default External Editor The default command that must be used as the editor. + + /schemas/apps/evolution/eplugin/external-editor/launch-on-key-press + /apps/evolution/eplugin/external-editor/launch-on-key-press + evolution-mail + bool + false + + Automatically launch when a new mail is edited + Automatically launch editor when key is pressed in the mail composer + diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c index c541124e53..a07bb6e80e 100644 --- a/plugins/external-editor/external-editor.c +++ b/plugins/external-editor/external-editor.c @@ -11,11 +11,12 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: - * Sankar P + * Holger Macht + * based on work by Sankar P * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * @@ -31,11 +32,13 @@ #include #include #include +#include #include #include #include #include +#include #include #ifdef HAVE_SYS_WAIT_H @@ -47,56 +50,48 @@ #include -#define d(x) +#define d(x) -#define EDITOR_GCONF_KEY "/apps/evolution/eplugin/external-editor/editor-command" +#define EDITOR_GCONF_KEY_COMMAND "/apps/evolution/eplugin/external-editor/editor-command" +#define EDITOR_GCONF_KEY_IMMEDIATE "/apps/evolution/eplugin/external-editor/launch-on-key-press" -void org_gnome_external_editor (EPlugin *ep, EMMenuTargetSelect *select); -void ee_editor_command_changed (GtkWidget *textbox); +gboolean e_plugin_ui_init (GtkUIManager *manager, EMsgComposer *composer); GtkWidget * e_plugin_lib_get_configure_widget (EPlugin *epl); +static void ee_editor_command_changed (GtkWidget *textbox); +static void ee_editor_immediate_launch_changed (GtkWidget *checkbox); +static void async_external_editor (EMsgComposer *composer); +static gboolean editor_running (void); +static gboolean key_press_cb(GtkWidget * widget, GdkEventKey * event, EMsgComposer *composer); -/* Utility function to convert an email address to CamelInternetAddress. -May be this should belong to CamelInternetAddress.h file itself. */ -static CamelInternetAddress * convert_to_camel_internet_address (char * emails) -{ - CamelInternetAddress *cia = camel_internet_address_new(); - gchar **address_tokens = NULL; - int i; - - d(printf ("\n\aconvert called with : [%s] \n\a", emails)); - - emails = g_strstrip (emails); - - if (emails && strlen (emails) > 1) { - address_tokens = g_strsplit (emails, ",", 0); - - if (address_tokens) { - for (i = 0; address_tokens[i]; ++i) { - camel_internet_address_add (cia, " ", address_tokens [i]); - d(printf ("\nAdding camel_internet_address[%s] \n", address_tokens [i])); - } - g_strfreev (address_tokens); - - g_free (emails); - return cia; - } - } - camel_object_unref (cia); - g_free (emails); - return NULL; -} +/* used to track when the external editor is active */ +static GThread *editor_thread; -void ee_editor_command_changed (GtkWidget *textbox) +void +ee_editor_command_changed (GtkWidget *textbox) { const char *editor; GConfClient *gconf; editor = gtk_entry_get_text (GTK_ENTRY(textbox)); d(printf ("\n\aeditor is : [%s] \n\a", editor)); - + /* gconf access for every key-press. Sucky ? */ gconf = gconf_client_get_default (); - gconf_client_set_string (gconf, EDITOR_GCONF_KEY, editor, NULL); + gconf_client_set_string (gconf, EDITOR_GCONF_KEY_COMMAND, editor, NULL); + g_object_unref (gconf); +} + +void +ee_editor_immediate_launch_changed (GtkWidget *checkbox) +{ + gboolean immediately; + GConfClient *gconf; + + immediately = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox)); + d(printf ("\n\aimmediate launch is : [%d] \n\a", immediately)); + + gconf = gconf_client_get_default (); + gconf_client_set_bool (gconf, EDITOR_GCONF_KEY_IMMEDIATE, immediately, NULL); g_object_unref (gconf); } @@ -104,181 +99,297 @@ GtkWidget * e_plugin_lib_get_configure_widget (EPlugin *epl) { GtkWidget *vbox, *textbox, *label, *help; + GtkWidget *checkbox; GConfClient *gconf; char *editor; + gboolean checked; vbox = gtk_vbox_new (FALSE, 10); textbox = gtk_entry_new (); label = gtk_label_new (_("Command to be executed to launch the editor: ")); - help = gtk_label_new (_("For Emacs use \"xemacs\"\nFor VI use \"gvim\"")); + help = gtk_label_new (_("For Emacs use \"xemacs\"\nFor VI use \"gvim -f\"")); gconf = gconf_client_get_default (); - editor = gconf_client_get_string (gconf, EDITOR_GCONF_KEY, NULL); + editor = gconf_client_get_string (gconf, EDITOR_GCONF_KEY_COMMAND, NULL); if (editor) { gtk_entry_set_text (GTK_ENTRY(textbox), editor); g_free (editor); } + + checkbox = gtk_check_button_new_with_label ( + _("Automatically launch when a new mail is edited")); + checked = gconf_client_get_bool (gconf, EDITOR_GCONF_KEY_IMMEDIATE, NULL); + if (checked) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox), TRUE); g_object_unref (gconf); gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), textbox, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), help, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), checkbox, FALSE, FALSE, 0); g_signal_connect (textbox, "changed", G_CALLBACK(ee_editor_command_changed), textbox); - + + g_signal_connect (checkbox, "toggled", + G_CALLBACK(ee_editor_immediate_launch_changed), checkbox); + gtk_widget_show_all (vbox); return vbox; } -static gboolean -show_error (const char *id) -{ - if (id) - e_error_run (NULL, id, NULL); - return FALSE; -} - -static gboolean -read_file (char *filename) +static void +enable_disable_composer (EMsgComposer *composer, gboolean enable) { - gchar *buf; - CamelMimeMessage *message; - EMsgComposer *composer; - - message = camel_mime_message_new (); + GtkhtmlEditor *editor; + GtkAction *action; + GtkActionGroup *action_group; - if (filename && g_file_get_contents (filename, &buf, NULL, NULL)) { - gchar **tokens; - int i, j; + g_return_if_fail (E_IS_MSG_COMPOSER (composer)); - tokens = g_strsplit (buf, "###|||", 6); + editor = GTKHTML_EDITOR (composer); - for (i = 1; tokens[i]; ++i) { + if (enable) + gtkhtml_editor_run_command (editor, "editable-on"); + else + gtkhtml_editor_run_command (editor, "editable-off"); - for (j = 0; tokens[i][j] && tokens[i][j] != '\n'; ++j) { - tokens [i][j] = ' '; - } + action = GTKHTML_EDITOR_ACTION_EDIT_MENU (composer); + gtk_action_set_sensitive (action, enable); - if (tokens[i][j] == '\n') - tokens[i][j] = ' '; + action = GTKHTML_EDITOR_ACTION_FORMAT_MENU (composer); + gtk_action_set_sensitive (action, enable); - d(printf ("\nstripped off token[%d] is : %s \n", i, tokens[i])); - } + action = GTKHTML_EDITOR_ACTION_INSERT_MENU (composer); + gtk_action_set_sensitive (action, enable); - camel_mime_message_set_recipients (message, "To", convert_to_camel_internet_address(g_strchug(g_strdup(tokens[1])))); - camel_mime_message_set_recipients (message, "Cc", convert_to_camel_internet_address(g_strchug(g_strdup(tokens[2])))); - camel_mime_message_set_recipients (message, "Bcc", convert_to_camel_internet_address(g_strchug(g_strdup(tokens[3])))); - camel_mime_message_set_subject (message, tokens[4]); - camel_mime_part_set_content ((CamelMimePart *)message, tokens [5], strlen (tokens [5]), "text/plain"); + action_group = gtkhtml_editor_get_action_group (editor, "composer"); + gtk_action_group_set_sensitive (action_group, enable); +} - /* FIXME: We need to make mail-remote working properly. - So that we neednot invoke composer widget at all. +static void +enable_composer (EMsgComposer *composer) +{ + enable_disable_composer (composer, TRUE); +} - May be we can do it now itself by invoking local CamelTransport. - But all that is not needed for the first release. +static void +disable_composer (EMsgComposer *composer) +{ + enable_disable_composer (composer, FALSE); +} - People might want to format mails using their editor (80 cols width etc.) - But might want to use evolution addressbook for auto-completion etc. - So starting the composer window anyway. - */ +/* needed because the new thread needs to call g_idle_add () */ +static gboolean +update_composer_text (GArray *array) +{ + EMsgComposer *composer; + gchar *text; - composer = e_msg_composer_new_with_message (message); - g_signal_connect (GTK_OBJECT (composer), "send", G_CALLBACK (em_utils_composer_send_cb), NULL); - g_signal_connect (GTK_OBJECT (composer), "save-draft", G_CALLBACK (em_utils_composer_save_draft_cb), NULL); + composer = g_array_index (array, gpointer, 0); + text = g_array_index (array, gpointer, 1); - gtk_widget_show (GTK_WIDGET (composer)); + e_msg_composer_set_body_text (composer, text, -1); - g_strfreev (tokens); + enable_composer (composer); - /* We no longer need that temporary file */ - g_remove (filename); - } + g_free (text); - g_free (filename); + return FALSE; +} +/* needed because the new thread needs to call g_idle_add () */ +static gboolean +run_error_dialog (gchar *text) +{ + e_error_run (NULL, text, NULL); return FALSE; } -static void -async_external_editor (GArray *array) + +void +async_external_editor (EMsgComposer *composer) { char *filename = NULL; - gchar *argv[5]; int status = 0; + GConfClient *gconf; + gchar *editor_cmd_line = NULL; + gint fd; - argv[0] = g_array_index (array, gpointer, 0); - argv[1] = g_array_index (array, gpointer, 1); - argv[2] = NULL; + fd = g_file_open_tmp (NULL, &filename, NULL); + if (fd > 0) { + close (fd); + /* Push the text (if there is one) from the composer to the file */ + g_file_set_contents (filename, gtkhtml_editor_get_text_plain( + GTKHTML_EDITOR(composer), NULL), + -1, NULL); + d(printf ("\n\aTemporary-file Name is : [%s] \n\a", filename)); + } else { + g_warning ("Temporary file fd is null"); + g_idle_add ((GSourceFunc) run_error_dialog, + "org.gnome.evolution.plugins.external-editor:no-temp-file"); + g_idle_add ((GSourceFunc) enable_composer, composer); + return ; + } + + gconf = gconf_client_get_default (); + editor_cmd_line = gconf_client_get_string (gconf, EDITOR_GCONF_KEY_COMMAND, NULL); + if (!editor_cmd_line) { + if (! (editor_cmd_line = g_strdup(g_getenv ("EDITOR"))) ) + /* Make gedit the default external editor, + if the default schemas are not installed + and no $EDITOR is set. */ + editor_cmd_line = g_strdup("gedit"); + } + g_object_unref (gconf); - filename = g_strdup (argv[1]); + editor_cmd_line = g_strconcat(editor_cmd_line, " ", filename, NULL); - if (!g_spawn_sync (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL, &status, NULL)) + if (!g_spawn_command_line_sync(editor_cmd_line, NULL, NULL, &status, NULL)) { - g_warning ("Unable to launch %s: ", argv[0]); - g_idle_add ((GSourceFunc)show_error, "org.gnome.evolution.plugins.external-editor:editor-not-launchable"); + g_warning ("Unable to launch %s: ", editor_cmd_line); + g_idle_add ((GSourceFunc) run_error_dialog, + "org.gnome.evolution.plugins.external-editor:editor-not-launchable"); + g_idle_add ((GSourceFunc) enable_composer, composer); + g_free (filename); - return; + g_free (editor_cmd_line); + return ; } - + g_free (editor_cmd_line); + #ifdef HAVE_SYS_WAIT_H if (WEXITSTATUS (status) != 0) { #else if (status) { #endif d(printf ("\n\nsome problem here with external editor\n\n")); - g_free (filename); - return; + g_idle_add ((GSourceFunc) enable_composer, composer); + return ; } else { - g_idle_add ((GSourceFunc)read_file, filename); + gchar *buf; + + if (g_file_get_contents (filename, &buf, NULL, NULL)) { + gchar *htmltext; + GArray *array; + + htmltext = camel_text_to_html(buf, CAMEL_MIME_FILTER_TOHTML_PRE, 0); + + array = g_array_sized_new (TRUE, TRUE, + sizeof (gpointer), 2 * sizeof(gpointer)); + array = g_array_append_val (array, composer); + array = g_array_append_val (array, htmltext); + + g_idle_add ((GSourceFunc) update_composer_text, array); + + /* We no longer need that temporary file */ + g_remove (filename); + g_free (filename); + } } } -void org_gnome_external_editor (EPlugin *ep, EMMenuTargetSelect *select) +static void launch_editor (GtkAction *action, EMsgComposer *composer) { - /* The template to be used in the external editor */ + d(printf ("\n\nexternal_editor plugin is launched \n\n")); - /* README: I have not marked this for translation. - As I might change this string to make it more meaningful and friendlier based on feedback. */ + if (editor_running()) { + d(printf("not opening editor, because it's still running\n")); + return ; + } - char template[] = "###|||Insert , seperated TO addresses below this line. Do not edit or delete this line. Optional field\n\n###||| Insert , seperated CC addresses below this line. Do not edit or delete this line. Optional field\n\n###|||Insert , seperated BCC addresses below this line. Do not edit or delete this line. Optional field\n\n###|||Insert SUBJECT below this line. Do not edit or delete this line. Optional field\n\n###|||Insert BODY of mail below this line. Do not edit or delete this line.\n\n"; + disable_composer (composer); - gint fd; - char *filename = NULL; - char *editor = NULL; - GConfClient *gconf; - GArray *array; + editor_thread = g_thread_create ((GThreadFunc)async_external_editor, composer, FALSE, NULL); +} - d(printf ("\n\nexternal_editor plugin is launched \n\n")); +static GtkActionEntry entries[] = { + { "ExternalEditor", + GTK_STOCK_EDIT, + N_("Compose in External Editor"), + "e", + N_("Compose in External Editor"), + G_CALLBACK (launch_editor) } +}; - fd = g_file_open_tmp (NULL, &filename, NULL); - if (fd > 0) { - close (fd); - /* Push the template contents to the intermediate file */ - g_file_set_contents (filename, template, strlen (template), NULL); - d(printf ("\n\aTemporary-file Name is : [%s] \n\a", filename)); - } else { - g_warning ("Temporary file fd is null"); - e_error_run (NULL, "org.gnome.evolution.plugins.external-editor:no-temp-file", NULL); - return ; +static gboolean +key_press_cb(GtkWidget * widget, GdkEventKey * event, EMsgComposer *composer) +{ + GConfClient *gconf; + gboolean immediately; + + /* we don't want to start the editor on any modifier keys */ + switch (event->keyval) { + case GDK_Alt_L: + case GDK_Alt_R: + case GDK_Super_L: + case GDK_Super_R: + case GDK_Control_L: + case GDK_Control_R: + return FALSE; + default: + break; } gconf = gconf_client_get_default (); - editor = gconf_client_get_string (gconf, EDITOR_GCONF_KEY, NULL); - if (!editor) { + immediately = gconf_client_get_bool (gconf, EDITOR_GCONF_KEY_IMMEDIATE, NULL); + g_object_unref (gconf); + if (!immediately) + return FALSE; - if (! (editor = g_strdup(g_getenv ("EDITOR"))) ) - /* Make gedit the default external editor, - if the default schemas are not installed - and no $EDITOR is set. */ - editor = g_strdup("gedit"); + launch_editor (NULL, composer); + + return TRUE; +} + +static void +editor_running_thread_func (GThread *thread, gpointer running) +{ + if (thread == editor_thread) + *(gboolean*)running = TRUE; +} + +/* Racy? */ +static gboolean +editor_running (void) +{ + gboolean running = FALSE; + + g_thread_foreach ((GFunc)editor_running_thread_func, &running); + + return running; +} + +static gboolean +delete_cb (GtkWidget *widget, EMsgComposer *composer) +{ + if (editor_running()) { + e_error_run (NULL, "org.gnome.evolution.plugins.external-editor:editor-still-running", NULL); + return TRUE; } - g_object_unref (gconf); - array = g_array_sized_new (TRUE, TRUE, sizeof (gpointer), 2 * sizeof(gpointer)); - array = g_array_append_val (array, editor); - array = g_array_append_val (array, filename); + return FALSE; +} + +gboolean +e_plugin_ui_init (GtkUIManager *manager, EMsgComposer *composer) +{ + GtkhtmlEditor *editor; + GtkHTML *html; + + editor = GTKHTML_EDITOR (composer); + + /* Add actions to the "composer" action group. */ + gtk_action_group_add_actions ( + gtkhtml_editor_get_action_group (editor, "composer"), + entries, G_N_ELEMENTS (entries), composer); + + html = gtkhtml_editor_get_html (editor); + + g_signal_connect (G_OBJECT(html), "key_press_event", + G_CALLBACK(key_press_cb), composer); - g_thread_create ( (GThreadFunc) async_external_editor, array, FALSE, NULL); + g_signal_connect (G_OBJECT(composer), "delete-event", + G_CALLBACK(delete_cb), composer); - return ; + return TRUE; } diff --git a/plugins/external-editor/org-gnome-external-editor.eplug.xml b/plugins/external-editor/org-gnome-external-editor.eplug.xml index 68c56d83de..861535d6cf 100644 --- a/plugins/external-editor/org-gnome-external-editor.eplug.xml +++ b/plugins/external-editor/org-gnome-external-editor.eplug.xml @@ -1,27 +1,25 @@ - + - - + + - <_description>A plugin for using an external editor as the composer. You can send only plain-text messages. + A plugin for using an external editor as the composer. You can send only plain-text messages. - - - - - - - - - + + + + + + + + + + + + + diff --git a/plugins/external-editor/org-gnome-external-editor.error.xml b/plugins/external-editor/org-gnome-external-editor.error.xml index c6f0bebfa3..efe1c4408d 100644 --- a/plugins/external-editor/org-gnome-external-editor.error.xml +++ b/plugins/external-editor/org-gnome-external-editor.error.xml @@ -1,6 +1,6 @@ - + <_primary>Editor not launchable <_secondary>The external editor set in your plugin preferences cannot be launched. Try setting a different editor. @@ -11,4 +11,9 @@ <_secondary>Evolution is unable to create a temporary file to save your mail. Retry later. + + <_primary>External editor still running + <_secondary>The external editor is still running. The mail composer window cannot be closed as long as the editor is active. + + -- cgit v1.2.3 From 3def4a7952f8f7a784b91eb626fb2a71a4fe6a07 Mon Sep 17 00:00:00 2001 From: David Ronis Date: Wed, 29 Apr 2009 19:24:24 +0200 Subject: BUGFIX: bug #579774 Use spamc to learn junk if available --- plugins/sa-junk-plugin/em-junk-filter.c | 65 +++++++++++++++++++++++++++++---- 1 file changed, 57 insertions(+), 8 deletions(-) (limited to 'plugins') diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c index 4cb554eb17..fb30833080 100644 --- a/plugins/sa-junk-plugin/em-junk-filter.c +++ b/plugins/sa-junk-plugin/em-junk-filter.c @@ -90,13 +90,17 @@ static volatile gboolean em_junk_sa_local_only; static volatile gboolean em_junk_sa_use_daemon; static char * em_junk_sa_preferred_socket_path; -static char *em_junk_sa_spamc_binaries [3] = {"spamc", "/usr/sbin/spamc", NULL}; -static char *em_junk_sa_spamd_binaries [3] = {"spamd", "/usr/sbin/spamd", NULL}; +static char *em_junk_sa_spamc_binaries [4] = {"spamc", "/usr/bin/spamc", "/usr/sbin/spamc", NULL}; +static char *em_junk_sa_spamd_binaries [4] = {"spamd", "/usr/bin/spamd", "/usr/sbin/spamd", NULL}; #define SPAMD_RESTARTS_SIZE 8 static time_t em_junk_sa_spamd_restarts [SPAMD_RESTARTS_SIZE] = {0, 0, 0, 0, 0, 0, 0, 0}; static int em_junk_sa_spamd_restarts_count = 0; +/* Variables to indicate whether spamd is running with --allow-tell */ +static int no_allow_tell; +static gboolean em_junk_sa_allow_tell_tested = FALSE; + char *em_junk_sa_spamc_gconf_binary = NULL; char *em_junk_sa_spamd_gconf_binary = NULL; @@ -303,6 +307,26 @@ em_junk_sa_test_spamd_running (char *binary, gboolean system) return rv; } + +/* + One time test to see if spamd is running with --allow-tell. The call + to spamc should return 0 if it is. (Thanks to Karsten Bräckelmann + for the idea). +*/ +static void +em_junk_sa_test_allow_tell (void) +{ + char *argv [4] = { + "spamc", + "-L", + "forget", + NULL + }; + + no_allow_tell = pipe_to_sa (NULL, "\n" , argv, NULL); + em_junk_sa_allow_tell_tested = TRUE; +} + static void em_junk_sa_test_spamassassin (void) { @@ -496,6 +520,10 @@ em_junk_sa_is_available (GError **error) if (!em_junk_sa_available) g_set_error (error, EM_JUNK_ERROR, 1, _("SpamAssassin is not available.")); + /* While we're at it, see if spamd is running with --allow-tell */ + if (!em_junk_sa_allow_tell_tested) + em_junk_sa_test_allow_tell () ; + pthread_mutex_unlock (&em_junk_sa_init_lock); return em_junk_sa_available; @@ -670,6 +698,13 @@ em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target) NULL, NULL }; + /* Call setup for spamc */ + char *argv2[4] = { + "spamc", + "-L", + "spam", + NULL + }; gchar *sub = NULL; CamelMimeMessage *msg = target->m; @@ -677,13 +712,14 @@ em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target) g_print ("\nreport junk?? %s\n", sub); d(fprintf (stderr, "em_junk_sa_report_junk\n")); - if (em_junk_sa_is_available (&target->error)) { - if (em_junk_sa_local_only) + if (no_allow_tell && em_junk_sa_local_only) argv[4] = "--local"; pthread_mutex_lock (&em_junk_sa_report_lock); - pipe_to_sa (msg, NULL, argv, &target->error); + pipe_to_sa (msg, NULL, + (no_allow_tell ? argv : argv2), + &target->error); pthread_mutex_unlock (&em_junk_sa_report_lock); } } @@ -700,16 +736,25 @@ em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target) NULL, NULL }; + /* Setup for spamc */ + char *argv2[4] = { + "spamc", + "-L", + "ham", + NULL + }; CamelMimeMessage *msg = target->m; d(fprintf (stderr, "em_junk_sa_report_notjunk\n")); if (em_junk_sa_is_available (&target->error)) { - if (em_junk_sa_local_only) - argv[4] = "--local"; + if (no_allow_tell && em_junk_sa_local_only) + argv[4] = "--local"; pthread_mutex_lock (&em_junk_sa_report_lock); - pipe_to_sa (msg, NULL, argv, &target->error); + pipe_to_sa (msg, NULL, + (no_allow_tell ? argv : argv2), + &target->error); pthread_mutex_unlock (&em_junk_sa_report_lock); } } @@ -717,6 +762,10 @@ em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target) void em_junk_sa_commit_reports (EPlugin *ep) { + /* Only meaningful if we're using sa-learn */ + if (!no_allow_tell) + return; + char *sync_op = ((get_spamassassin_version () >= 3) ? "--sync": "--rebuild"); char *argv[4] = { "sa-learn", -- cgit v1.2.3 From c3191ec86b0f711af58a9a902b7464f8f958fe2c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 30 Apr 2009 15:22:22 -0400 Subject: Bump the required GLib and GTK+ versions to latest stable. We now require GLib >= 2.20 and GTK+ >= 2.16. Also removed all GLIB_CHECK_VERSION and GTK_CHECK_VERSION workarounds for older versions. --- plugins/mail-notification/mail-notification.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'plugins') diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index 89f9daaccb..e7d0f2f898 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -54,10 +54,6 @@ #define GCONF_KEY_ENABLED_STATUS GCONF_KEY_ROOT "status-enabled" #define GCONF_KEY_ENABLED_SOUND GCONF_KEY_ROOT "sound-enabled" -#if !GTK_CHECK_VERSION(2,16,0) -#define gtk_status_icon_set_tooltip_text gtk_status_icon_set_tooltip -#endif - static gboolean enabled = FALSE; static GtkWidget *get_cfg_widget (void); static GStaticMutex mlock = G_STATIC_MUTEX_INIT; -- cgit v1.2.3 From 5e479d0a2d40200a1edce50a659d1ada8fe721f7 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 30 Apr 2009 16:11:52 -0400 Subject: =?UTF-8?q?Bug=20580894=20=E2=80=93=20Kill=20libgnome/gnome-util?= =?UTF-8?q?=20(partial=20fix)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Migrate the evolution-backup utility from gnome_program_init() to gtk_init_with_args(). --- plugins/backup-restore/backup.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'plugins') diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c index ac0b257d17..47d439c7ae 100644 --- a/plugins/backup-restore/backup.c +++ b/plugins/backup-restore/backup.c @@ -29,7 +29,6 @@ #include #include -#include #include #include @@ -431,22 +430,22 @@ dlg_response (GtkWidget *dlg, gint response, gpointer data) int main (int argc, char **argv) { - GnomeProgram *program; - GOptionContext *context; char *file = NULL, *oper = NULL; gint i; + GError *error = NULL; - gtk_init (&argc, &argv); bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); - context = g_option_context_new (NULL); - g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE); - program = gnome_program_init (PACKAGE, VERSION, LIBGNOME_MODULE, argc, argv, - GNOME_PROGRAM_STANDARD_PROPERTIES, - GNOME_PARAM_GOPTION_CONTEXT, context, - GNOME_PARAM_NONE); + g_thread_init (NULL); + + gtk_init_with_args ( + &argc, &argv, NULL, options, GETTEXT_PACKAGE, &error); + if (error != NULL) { + g_printerr ("%s\n", error->message); + exit (1); + } if (opt_remaining) { for (i = 0; i < g_strv_length (opt_remaining); i++) { -- cgit v1.2.3 From 4ce3d9c321888226b2bcbf67e189261d0edb5a53 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 30 Apr 2009 22:03:28 -0400 Subject: =?UTF-8?q?Bug=20580892=20=E2=80=93=20Kill=20libgnomeui/gnome-app?= =?UTF-8?q?=20and=20gnome-app-helper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The only remaining case is widgets/test/test-dropdown-button.c, but this file will be removed when the kill-bonobo branch is merged. --- plugins/backup-restore/backup.c | 1 + 1 file changed, 1 insertion(+) (limited to 'plugins') diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c index 47d439c7ae..99d7f8d41f 100644 --- a/plugins/backup-restore/backup.c +++ b/plugins/backup-restore/backup.c @@ -444,6 +444,7 @@ main (int argc, char **argv) &argc, &argv, NULL, options, GETTEXT_PACKAGE, &error); if (error != NULL) { g_printerr ("%s\n", error->message); + g_error_free (error); exit (1); } -- cgit v1.2.3 From b915f8b5bd5e2da3711f08ac4b18d28bc9e7a21b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 30 Apr 2009 22:21:49 -0400 Subject: More gnome-init cleanup for bug #567283. --- plugins/groupwise-features/junk-settings.c | 2 -- plugins/groupwise-features/proxy.c | 2 -- plugins/groupwise-features/share-folder.c | 2 -- 3 files changed, 6 deletions(-) (limited to 'plugins') diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c index 460883a61a..bff2abc35a 100644 --- a/plugins/groupwise-features/junk-settings.c +++ b/plugins/groupwise-features/junk-settings.c @@ -26,8 +26,6 @@ #include #include "junk-settings.h" #include -#include -#include #include #include #include diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c index a7eed9b963..8bf212ee24 100644 --- a/plugins/groupwise-features/proxy.c +++ b/plugins/groupwise-features/proxy.c @@ -31,8 +31,6 @@ #include -#include -#include #include #include #include diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c index 87d6564f0e..d16c205758 100644 --- a/plugins/groupwise-features/share-folder.c +++ b/plugins/groupwise-features/share-folder.c @@ -27,8 +27,6 @@ #include "share-folder.h" #include #include -#include -#include #include #include #include -- cgit v1.2.3 From 71c5738707028d12a3129a94a1b3823a7fab573c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 30 Apr 2009 23:30:00 -0400 Subject: Only #include specific libgnome[ui] headers; easier to track. Stop including top-level libgnome[ui] headers -- , and . Instead, include specific header files so we can track them easier. Also, remove several unshipped test programs. Mostly ETable stuff. --- plugins/backup-restore/backup-restore.c | 3 ++- plugins/groupwise-features/install-shared.c | 4 ++-- plugins/groupwise-features/share-folder-common.c | 1 - plugins/ipod-sync/sync.c | 3 ++- plugins/mail-notification/mail-notification.c | 2 +- plugins/startup-wizard/startup-wizard.c | 5 ++++- 6 files changed, 11 insertions(+), 7 deletions(-) (limited to 'plugins') diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c index 400dd85898..5d4a911c9a 100644 --- a/plugins/backup-restore/backup-restore.c +++ b/plugins/backup-restore/backup-restore.c @@ -31,7 +31,8 @@ #include #include #include -#include +#include +#include #include "shell/es-menu.h" #include "mail/em-config.h" #include "mail/em-account-editor.h" diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c index 35e3ae6c68..2f60b34bff 100644 --- a/plugins/groupwise-features/install-shared.c +++ b/plugins/groupwise-features/install-shared.c @@ -26,9 +26,9 @@ #include #include -#include #include -#include +#include +#include #include #include #include diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c index cdea5a7265..0b811d0787 100644 --- a/plugins/groupwise-features/share-folder-common.c +++ b/plugins/groupwise-features/share-folder-common.c @@ -48,7 +48,6 @@ #include #include #include -#include #include "share-folder.h" #define d(x) diff --git a/plugins/ipod-sync/sync.c b/plugins/ipod-sync/sync.c index 1da7ecd983..a444af1bd9 100644 --- a/plugins/ipod-sync/sync.c +++ b/plugins/ipod-sync/sync.c @@ -20,8 +20,9 @@ #include "config.h" #include "evolution-ipod-sync.h" -#include +#include +#include #include #include #include diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index e7d0f2f898..5bb65cef18 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #ifdef HAVE_DBUS #include diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c index 6289a63489..34d5961d4b 100644 --- a/plugins/startup-wizard/startup-wizard.c +++ b/plugins/startup-wizard/startup-wizard.c @@ -20,10 +20,13 @@ * */ +#include #include #include #include -#include +#include +#include +#include #include "e-util/e-error.h" #include "e-util/e-import.h" #include "shell/es-event.h" -- cgit v1.2.3 From 46344c733053d1f9a31eb5bac1a801a40719823a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 1 May 2009 09:14:16 -0400 Subject: Fix distcheck errors. --- plugins/external-editor/org-gnome-external-editor.xml | 17 ----------------- plugins/groupwise-features/Makefile.am | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 plugins/external-editor/org-gnome-external-editor.xml (limited to 'plugins') diff --git a/plugins/external-editor/org-gnome-external-editor.xml b/plugins/external-editor/org-gnome-external-editor.xml deleted file mode 100644 index e472f8bd1c..0000000000 --- a/plugins/external-editor/org-gnome-external-editor.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am index d18a7c87f4..eb8c7aeba2 100644 --- a/plugins/groupwise-features/Makefile.am +++ b/plugins/groupwise-features/Makefile.am @@ -70,7 +70,7 @@ error_DATA = \ errordir = $(privdatadir)/errors -BUILT_SOURCES = org-gnome-groupwise-features.eplug $(error_i18n) +BUILT_SOURCES = org-gnome-groupwise-features.eplug $(error_DATA) EXTRA_DIST = \ $(glade_DATA) \ -- cgit v1.2.3 From d523f10dfe2a6ba53c068189f10055d46e71e10f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 2 May 2009 11:09:30 -0400 Subject: Use Behdad's brilliant git.mk to generate .gitignore files. --- plugins/.gitignore | 1 - plugins/Makefile.am | 2 ++ plugins/addressbook-file/Makefile.am | 2 ++ plugins/attachment-reminder/Makefile.am | 2 ++ plugins/audio-inline/Makefile.am | 2 ++ plugins/backup-restore/Makefile.am | 2 ++ plugins/bbdb/Makefile.am | 2 ++ plugins/bogo-junk-plugin/Makefile.am | 2 ++ plugins/caldav/Makefile.am | 2 ++ plugins/calendar-file/Makefile.am | 2 ++ plugins/calendar-http/Makefile.am | 2 ++ plugins/calendar-weather/Makefile.am | 2 ++ plugins/copy-tool/Makefile.am | 2 ++ plugins/default-mailer/Makefile.am | 2 ++ plugins/default-source/Makefile.am | 2 ++ plugins/email-custom-header/Makefile.am | 2 ++ plugins/exchange-operations/Makefile.am | 2 ++ plugins/external-editor/Makefile.am | 2 ++ plugins/face/Makefile.am | 2 ++ plugins/folder-unsubscribe/Makefile.am | 2 ++ plugins/google-account-setup/Makefile.am | 2 ++ plugins/groupwise-account-setup/Makefile.am | 2 ++ plugins/groupwise-features/Makefile.am | 2 ++ plugins/hula-account-setup/Makefile.am | 2 ++ plugins/imap-features/Makefile.am | 2 ++ plugins/ipod-sync/Makefile.am | 2 ++ plugins/itip-formatter/Makefile.am | 2 ++ plugins/mail-account-disable/Makefile.am | 2 ++ plugins/mail-notification/Makefile.am | 2 ++ plugins/mail-to-task/Makefile.am | 2 ++ plugins/mailing-list-actions/Makefile.am | 2 ++ plugins/mark-all-read/Makefile.am | 2 ++ plugins/mono/Makefile.am | 2 ++ plugins/plugin-manager/Makefile.am | 2 ++ plugins/prefer-plain/Makefile.am | 2 ++ plugins/profiler/Makefile.am | 2 ++ plugins/pst-import/Makefile.am | 2 ++ plugins/publish-calendar/Makefile.am | 2 ++ plugins/python/Makefile.am | 2 ++ plugins/python/example/Makefile.am | 2 ++ plugins/sa-junk-plugin/Makefile.am | 2 ++ plugins/save-calendar/Makefile.am | 2 ++ plugins/select-one-source/Makefile.am | 2 ++ plugins/startup-wizard/Makefile.am | 2 ++ plugins/subject-thread/Makefile.am | 2 ++ plugins/templates/Makefile.am | 2 ++ plugins/tnef-attachments/Makefile.am | 2 ++ plugins/webdav-account-setup/Makefile.am | 2 ++ 48 files changed, 94 insertions(+), 1 deletion(-) delete mode 100644 plugins/.gitignore (limited to 'plugins') diff --git a/plugins/.gitignore b/plugins/.gitignore deleted file mode 100644 index f92a4cec77..0000000000 --- a/plugins/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.eplug diff --git a/plugins/Makefile.am b/plugins/Makefile.am index d78cb63d83..88edda37f0 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -1,2 +1,4 @@ SUBDIRS = $(plugins_enabled) DIST_SUBDIRS = $(all_plugins_base) $(all_plugins_standard) $(all_plugins_experimental) profiler python + +-include $(top_srcdir)/git.mk diff --git a/plugins/addressbook-file/Makefile.am b/plugins/addressbook-file/Makefile.am index 5b6216bb77..b195514b66 100644 --- a/plugins/addressbook-file/Makefile.am +++ b/plugins/addressbook-file/Makefile.am @@ -18,3 +18,5 @@ EXTRA_DIST = org-gnome-addressbook-file.eplug.xml BUILT_SOURCES = $(plugin_DATA) CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am index d6e9fb8809..c6ce86e17e 100644 --- a/plugins/attachment-reminder/Makefile.am +++ b/plugins/attachment-reminder/Makefile.am @@ -63,3 +63,5 @@ BUILT_SOURCES = org-gnome-evolution-attachment-reminder.eplug \ CLEANFILES = $(BUILT_SOURCES) DISTCLEANFILES = $(schema_DATA) + +-include $(top_srcdir)/git.mk diff --git a/plugins/audio-inline/Makefile.am b/plugins/audio-inline/Makefile.am index 0780bf0bfc..73e0b988d6 100644 --- a/plugins/audio-inline/Makefile.am +++ b/plugins/audio-inline/Makefile.am @@ -18,3 +18,5 @@ EXTRA_DIST = org-gnome-audio-inline.eplug.xml BUILT_SOURCES = $(plugin_DATA) CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/backup-restore/Makefile.am b/plugins/backup-restore/Makefile.am index f93a3c7460..ceb6fdb41c 100644 --- a/plugins/backup-restore/Makefile.am +++ b/plugins/backup-restore/Makefile.am @@ -40,3 +40,5 @@ EXTRA_DIST = \ BUILT_SOURCES = org-gnome-backup-restore.eplug \ org-gnome-backup-restore.error CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am index 1f1ddfea46..1987a32efa 100644 --- a/plugins/bbdb/Makefile.am +++ b/plugins/bbdb/Makefile.am @@ -19,3 +19,5 @@ EXTRA_DIST = org-gnome-evolution-bbdb.eplug.xml BUILT_SOURCES = $(plugin_DATA) CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/bogo-junk-plugin/Makefile.am b/plugins/bogo-junk-plugin/Makefile.am index 24eb99fdd5..5dc0cc626c 100644 --- a/plugins/bogo-junk-plugin/Makefile.am +++ b/plugins/bogo-junk-plugin/Makefile.am @@ -38,3 +38,5 @@ EXTRA_DIST = \ org-gnome-bogo-junk-plugin.eplug.xml \ $(schema_in_files) + +-include $(top_srcdir)/git.mk diff --git a/plugins/caldav/Makefile.am b/plugins/caldav/Makefile.am index d812af7540..cb18c5b0be 100644 --- a/plugins/caldav/Makefile.am +++ b/plugins/caldav/Makefile.am @@ -22,3 +22,5 @@ EXTRA_DIST = \ org-gnome-evolution-caldav.eplug.xml CLEANFILES = org-gnome-evolution-caldav.eplug + +-include $(top_srcdir)/git.mk diff --git a/plugins/calendar-file/Makefile.am b/plugins/calendar-file/Makefile.am index 9f83dd8b48..7d40192c6f 100644 --- a/plugins/calendar-file/Makefile.am +++ b/plugins/calendar-file/Makefile.am @@ -18,3 +18,5 @@ EXTRA_DIST = org-gnome-calendar-file.eplug.xml BUILT_SOURCES = $(plugin_DATA) CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/calendar-http/Makefile.am b/plugins/calendar-http/Makefile.am index 69d6ab50a6..4edd28c8a0 100644 --- a/plugins/calendar-http/Makefile.am +++ b/plugins/calendar-http/Makefile.am @@ -18,3 +18,5 @@ EXTRA_DIST = org-gnome-calendar-http.eplug.xml BUILT_SOURCES = $(plugin_DATA) CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/calendar-weather/Makefile.am b/plugins/calendar-weather/Makefile.am index 2e2be150e3..0e43fa1717 100644 --- a/plugins/calendar-weather/Makefile.am +++ b/plugins/calendar-weather/Makefile.am @@ -36,3 +36,5 @@ EXTRA_DIST = \ BUILT_SOURCES = $(plugin_DATA) CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/copy-tool/Makefile.am b/plugins/copy-tool/Makefile.am index d0011ab0fa..5f9e3bb463 100644 --- a/plugins/copy-tool/Makefile.am +++ b/plugins/copy-tool/Makefile.am @@ -16,3 +16,5 @@ EXTRA_DIST = org-gnome-copy-tool.eplug.xml BUILT_SOURCES = $(plugin_DATA) CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/default-mailer/Makefile.am b/plugins/default-mailer/Makefile.am index 45f4e29c2b..78766909c5 100644 --- a/plugins/default-mailer/Makefile.am +++ b/plugins/default-mailer/Makefile.am @@ -54,3 +54,5 @@ BUILT_SOURCES = org-gnome-default-mailer.eplug \ CLEANFILES = $(BUILT_SOURCES) DISTCLEANFILES = $(schema_DATA) + +-include $(top_srcdir)/git.mk diff --git a/plugins/default-source/Makefile.am b/plugins/default-source/Makefile.am index 94f33c7ade..235f615251 100644 --- a/plugins/default-source/Makefile.am +++ b/plugins/default-source/Makefile.am @@ -21,3 +21,5 @@ EXTRA_DIST = org-gnome-default-source.eplug.xml BUILT_SOURCES = $(plugin_DATA) CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am index ccc9c787f8..19539907fa 100644 --- a/plugins/email-custom-header/Makefile.am +++ b/plugins/email-custom-header/Makefile.am @@ -70,3 +70,5 @@ BUILT_SOURCES = \ CLEANFILES = $(BUILT_SOURCES) DISTCLEANFILES = $(schema_DATA) + +-include $(top_srcdir)/git.mk diff --git a/plugins/exchange-operations/Makefile.am b/plugins/exchange-operations/Makefile.am index 38d342452b..2e4a825771 100644 --- a/plugins/exchange-operations/Makefile.am +++ b/plugins/exchange-operations/Makefile.am @@ -86,3 +86,5 @@ EXTRA_DIST = \ BUILT_SOURCES = $(error_DATA) org-gnome-exchange-operations.eplug CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am index 36cba20344..0a39bc41e4 100644 --- a/plugins/external-editor/Makefile.am +++ b/plugins/external-editor/Makefile.am @@ -61,3 +61,5 @@ BUILT_SOURCES = org-gnome-external-editor.eplug \ CLEANFILES = $(BUILT_SOURCES) DISTCLEANFILES = $(schema_DATA) + +-include $(top_srcdir)/git.mk diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am index a29c6585ea..2b6bfdb7be 100644 --- a/plugins/face/Makefile.am +++ b/plugins/face/Makefile.am @@ -42,3 +42,5 @@ BUILT_SOURCES = \ org-gnome-face.error CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/folder-unsubscribe/Makefile.am b/plugins/folder-unsubscribe/Makefile.am index 2c11596c51..b3f1ba12bf 100644 --- a/plugins/folder-unsubscribe/Makefile.am +++ b/plugins/folder-unsubscribe/Makefile.am @@ -14,3 +14,5 @@ liborg_gnome_mail_folder_unsubscribe_la_LIBADD = \ $(EVOLUTION_MAIL_LIBS) EXTRA_DIST = org-gnome-mail-folder-unsubscribe.eplug.xml + +-include $(top_srcdir)/git.mk diff --git a/plugins/google-account-setup/Makefile.am b/plugins/google-account-setup/Makefile.am index 0d39004593..d8153a9c5b 100644 --- a/plugins/google-account-setup/Makefile.am +++ b/plugins/google-account-setup/Makefile.am @@ -25,3 +25,5 @@ EXTRA_DIST = \ org-gnome-evolution-google.eplug.xml CLEANFILES = org-gnome-evolution-google.eplug + +-include $(top_srcdir)/git.mk diff --git a/plugins/groupwise-account-setup/Makefile.am b/plugins/groupwise-account-setup/Makefile.am index ac0f18f590..9770782d69 100644 --- a/plugins/groupwise-account-setup/Makefile.am +++ b/plugins/groupwise-account-setup/Makefile.am @@ -30,3 +30,5 @@ EXTRA_DIST = org-gnome-gw-account-setup.eplug.xml BUILT_SOURCES = $(plugin_DATA) CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am index eb8c7aeba2..3b0a83021d 100644 --- a/plugins/groupwise-features/Makefile.am +++ b/plugins/groupwise-features/Makefile.am @@ -82,3 +82,5 @@ EXTRA_DIST = \ org-gnome-mail-retract.error.xml CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/hula-account-setup/Makefile.am b/plugins/hula-account-setup/Makefile.am index ce6d3b9bd6..205a3a7d30 100644 --- a/plugins/hula-account-setup/Makefile.am +++ b/plugins/hula-account-setup/Makefile.am @@ -27,3 +27,5 @@ EXTRA_DIST = org-gnome-evolution-hula-account-setup.eplug.xml BUILT_SOURCES = $(plugin_DATA) CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/imap-features/Makefile.am b/plugins/imap-features/Makefile.am index d84f600702..3b73e2741d 100644 --- a/plugins/imap-features/Makefile.am +++ b/plugins/imap-features/Makefile.am @@ -38,3 +38,5 @@ EXTRA_DIST = \ org-gnome-imap-features.eplug.xml CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/ipod-sync/Makefile.am b/plugins/ipod-sync/Makefile.am index 51acd0db9f..570683442e 100644 --- a/plugins/ipod-sync/Makefile.am +++ b/plugins/ipod-sync/Makefile.am @@ -25,3 +25,5 @@ EXTRA_DIST = org-gnome-ipod-sync-evolution.eplug.xml BUILT_SOURCES = $(plugin_DATA) CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/itip-formatter/Makefile.am b/plugins/itip-formatter/Makefile.am index 32cc7d2f33..cbbc061833 100644 --- a/plugins/itip-formatter/Makefile.am +++ b/plugins/itip-formatter/Makefile.am @@ -29,3 +29,5 @@ EXTRA_DIST = \ org-gnome-itip-formatter.error.xml + +-include $(top_srcdir)/git.mk diff --git a/plugins/mail-account-disable/Makefile.am b/plugins/mail-account-disable/Makefile.am index 7ec8a1124e..5616f273ea 100644 --- a/plugins/mail-account-disable/Makefile.am +++ b/plugins/mail-account-disable/Makefile.am @@ -19,3 +19,5 @@ EXTRA_DIST = org-gnome-mail-account-disable.eplug.xml BUILT_SOURCES = $(plugin_DATA) CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am index 8915fe92ad..4228a90be5 100644 --- a/plugins/mail-notification/Makefile.am +++ b/plugins/mail-notification/Makefile.am @@ -67,3 +67,5 @@ DISTCLEANFILES = $(schema_DATA) EXTRA_DIST = \ org-gnome-mail-notification.eplug.xml \ $(schema_in_files) + +-include $(top_srcdir)/git.mk diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am index 42e1e6fb65..9a3749d676 100644 --- a/plugins/mail-to-task/Makefile.am +++ b/plugins/mail-to-task/Makefile.am @@ -22,3 +22,5 @@ EXTRA_DIST = org-gnome-mail-to-task.eplug.xml \ BUILT_SOURCES = org-gnome-mail-to-task.eplug CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/mailing-list-actions/Makefile.am b/plugins/mailing-list-actions/Makefile.am index 7d6560d716..dffd4f1d44 100644 --- a/plugins/mailing-list-actions/Makefile.am +++ b/plugins/mailing-list-actions/Makefile.am @@ -28,3 +28,5 @@ EXTRA_DIST = \ org-gnome-mailing-list-actions.eplug.xml \ org-gnome-mailing-list-actions.error.xml \ org-gnome-mailing-list-actions.xml + +-include $(top_srcdir)/git.mk diff --git a/plugins/mark-all-read/Makefile.am b/plugins/mark-all-read/Makefile.am index 756e945d00..352c2a0fab 100644 --- a/plugins/mark-all-read/Makefile.am +++ b/plugins/mark-all-read/Makefile.am @@ -19,3 +19,5 @@ EXTRA_DIST = org-gnome-mark-all-read.eplug.xml BUILT_SOURCES = $(plugin_DATA) CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/mono/Makefile.am b/plugins/mono/Makefile.am index aa20b100e3..f98e8be2ab 100644 --- a/plugins/mono/Makefile.am +++ b/plugins/mono/Makefile.am @@ -18,3 +18,5 @@ EXTRA_DIST = org-gnome-evolution-mono.eplug.xml BUILT_SOURCES = $(plugin_DATA) CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/plugin-manager/Makefile.am b/plugins/plugin-manager/Makefile.am index f9d6642521..645581e11d 100644 --- a/plugins/plugin-manager/Makefile.am +++ b/plugins/plugin-manager/Makefile.am @@ -20,3 +20,5 @@ EXTRA_DIST = \ BUILT_SOURCES = org-gnome-plugin-manager.eplug CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/prefer-plain/Makefile.am b/plugins/prefer-plain/Makefile.am index ec597e4d4c..37a49a38e7 100644 --- a/plugins/prefer-plain/Makefile.am +++ b/plugins/prefer-plain/Makefile.am @@ -17,3 +17,5 @@ EXTRA_DIST = org-gnome-prefer-plain.eplug.xml BUILT_SOURCES = $(plugin_DATA) CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/profiler/Makefile.am b/plugins/profiler/Makefile.am index e39b4f6642..037219c5ed 100644 --- a/plugins/profiler/Makefile.am +++ b/plugins/profiler/Makefile.am @@ -16,3 +16,5 @@ EXTRA_DIST = org-gnome-evolution-profiler.eplug.xml BUILT_SOURCES = $(plugin_DATA) CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am index 9f3061e241..0bb5fe43e1 100644 --- a/plugins/pst-import/Makefile.am +++ b/plugins/pst-import/Makefile.am @@ -33,3 +33,5 @@ BUILT_SOURCES = org-gnome-pst-import.eplug CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/publish-calendar/Makefile.am b/plugins/publish-calendar/Makefile.am index 954333c11c..3c794393b2 100644 --- a/plugins/publish-calendar/Makefile.am +++ b/plugins/publish-calendar/Makefile.am @@ -40,3 +40,5 @@ EXTRA_DIST = \ $(glade_DATA) CLEANFILES = org-gnome-publish-calendar.eplug + +-include $(top_srcdir)/git.mk diff --git a/plugins/python/Makefile.am b/plugins/python/Makefile.am index 7a65c4586a..77441e0e9b 100644 --- a/plugins/python/Makefile.am +++ b/plugins/python/Makefile.am @@ -26,3 +26,5 @@ EXTRA_DIST = org-gnome-evolution-python.eplug.xml \ BUILT_SOURCES = $(plugin_DATA) CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/python/example/Makefile.am b/plugins/python/example/Makefile.am index 5defe418c6..b3530d841c 100644 --- a/plugins/python/example/Makefile.am +++ b/plugins/python/example/Makefile.am @@ -28,3 +28,5 @@ EXTRA_DIST = \ org-gnome-hello-python.eplug.xml CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/sa-junk-plugin/Makefile.am b/plugins/sa-junk-plugin/Makefile.am index 3af1f721c7..4e44fa5c3b 100644 --- a/plugins/sa-junk-plugin/Makefile.am +++ b/plugins/sa-junk-plugin/Makefile.am @@ -19,3 +19,5 @@ EXTRA_DIST = \ org-gnome-sa-junk-plugin.eplug.xml + +-include $(top_srcdir)/git.mk diff --git a/plugins/save-calendar/Makefile.am b/plugins/save-calendar/Makefile.am index 461bf0492d..6894e6b21e 100644 --- a/plugins/save-calendar/Makefile.am +++ b/plugins/save-calendar/Makefile.am @@ -23,3 +23,5 @@ EXTRA_DIST = org-gnome-save-calendar.eplug.xml BUILT_SOURCES = $(plugin_DATA) CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/select-one-source/Makefile.am b/plugins/select-one-source/Makefile.am index 7bd40ef4f7..8c872f23a5 100644 --- a/plugins/select-one-source/Makefile.am +++ b/plugins/select-one-source/Makefile.am @@ -16,3 +16,5 @@ EXTRA_DIST = org-gnome-select-one-source.eplug.xml BUILT_SOURCES = $(plugin_DATA) CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/startup-wizard/Makefile.am b/plugins/startup-wizard/Makefile.am index a8e4191ebf..fea7f7232f 100644 --- a/plugins/startup-wizard/Makefile.am +++ b/plugins/startup-wizard/Makefile.am @@ -27,3 +27,5 @@ EXTRA_DIST = org-gnome-evolution-startup-wizard.eplug.xml BUILT_SOURCES = $(plugin_DATA) CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/subject-thread/Makefile.am b/plugins/subject-thread/Makefile.am index 0ff0fc49a5..751e0eee15 100644 --- a/plugins/subject-thread/Makefile.am +++ b/plugins/subject-thread/Makefile.am @@ -16,3 +16,5 @@ EXTRA_DIST = org-gnome-subject-thread.eplug.xml BUILT_SOURCES = $(plugin_DATA) CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am index 5a36917fa2..6b01e15767 100644 --- a/plugins/templates/Makefile.am +++ b/plugins/templates/Makefile.am @@ -56,3 +56,5 @@ BUILT_SOURCES = org-gnome-templates.eplug CLEANFILES = $(BUILT_SOURCES) DISTCLEANFILES = $(schema_DATA) + +-include $(top_srcdir)/git.mk diff --git a/plugins/tnef-attachments/Makefile.am b/plugins/tnef-attachments/Makefile.am index 809d1ed1f4..6ea2ce1f3e 100644 --- a/plugins/tnef-attachments/Makefile.am +++ b/plugins/tnef-attachments/Makefile.am @@ -28,3 +28,5 @@ EXTRA_DIST = org-gnome-tnef-attachments.eplug.xml BUILT_SOURCES = $(plugin_DATA) CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/webdav-account-setup/Makefile.am b/plugins/webdav-account-setup/Makefile.am index a979ed08e5..c143b8f667 100644 --- a/plugins/webdav-account-setup/Makefile.am +++ b/plugins/webdav-account-setup/Makefile.am @@ -21,3 +21,5 @@ EXTRA_DIST = \ org-gnome-evolution-webdav.eplug.xml CLEANFILES = org-gnome-evolution-webdav.eplug + +-include $(top_srcdir)/git.mk -- cgit v1.2.3 From 20533c3be54a4e3fcb0ab23a15744d3093f8ad6f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 2 May 2009 22:59:06 -0400 Subject: =?UTF-8?q?Bug=20542685=20=E2=80=93=20[default-mailer]=20Leaking?= =?UTF-8?q?=20GConfValue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/default-mailer/default-mailer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins') diff --git a/plugins/default-mailer/default-mailer.c b/plugins/default-mailer/default-mailer.c index 7069f46e7b..f52bd30855 100644 --- a/plugins/default-mailer/default-mailer.c +++ b/plugins/default-mailer/default-mailer.c @@ -78,10 +78,10 @@ org_gnome_default_mailer_check_default (EPlugin *ep, ESEventTargetUpgrade *targe /* See whether the check default mailer key has already been set */ is_key = gconf_client_get(client, GCONF_KEY_CHECKDEFAULT, NULL); - if(!is_key) { + if(!is_key) gconf_client_set_bool(client, GCONF_KEY_CHECKDEFAULT, TRUE, NULL); + else gconf_value_free (is_key); - } /* Check whether we're supposed to check whether or not we are the default mailer */ if(gconf_client_get_bool(client, GCONF_KEY_CHECKDEFAULT, NULL)) { -- cgit v1.2.3 From b4d7c0892ef5b329476a6c3689585ca60ca2d8b0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 2 May 2009 23:11:12 -0400 Subject: =?UTF-8?q?Bug=20572977=20=E2=80=93=20Use=20g=5Fstrerror()=20inste?= =?UTF-8?q?ad=20of=20strerror()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/ipod-sync/sync.c | 2 +- plugins/sa-junk-plugin/em-junk-filter.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins') diff --git a/plugins/ipod-sync/sync.c b/plugins/ipod-sync/sync.c index a444af1bd9..42f3bdfa0b 100644 --- a/plugins/ipod-sync/sync.c +++ b/plugins/ipod-sync/sync.c @@ -184,7 +184,7 @@ write_to_ipod (GString *str, char *path, char *filename) if (f == NULL) { - critical_error (_("Could not export data!"), strerror (errno)); + critical_error (_("Could not export data!"), g_strerror (errno)); } /* Convert the input string into UTF16 */ diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c index fb30833080..5114e9b386 100644 --- a/plugins/sa-junk-plugin/em-junk-filter.c +++ b/plugins/sa-junk-plugin/em-junk-filter.c @@ -141,16 +141,16 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err, if (pipe (fds) == -1) { errnosav = errno; - d(printf ("failed to create a pipe (for use with SpamAssassin: %s\n", strerror (errno))); - g_set_error (error, EM_JUNK_ERROR, errnosav, _("Failed to create pipe: %s"), strerror (errnosav)); + d(printf ("failed to create a pipe (for use with SpamAssassin: %s\n", g_strerror (errno))); + g_set_error (error, EM_JUNK_ERROR, errnosav, _("Failed to create pipe: %s"), g_strerror (errnosav)); errno = errnosav; return rv_err; } if (output_buffer && pipe (out_fds) == -1) { errnosav = errno; - d(printf ("failed to create a pipe (for use with SpamAssassin: %s\n", strerror (errno))); - g_set_error (error, EM_JUNK_ERROR, errnosav, _("Failed to create pipe: %s"), strerror (errnosav)); + d(printf ("failed to create a pipe (for use with SpamAssassin: %s\n", g_strerror (errno))); + g_set_error (error, EM_JUNK_ERROR, errnosav, _("Failed to create pipe: %s"), g_strerror (errnosav)); close (fds [0]); close (fds [1]); errno = errnosav; @@ -189,7 +189,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err, close (out_fds [1]); } if (errnosav != 0 && errnosav != -1) - g_set_error (error, EM_JUNK_ERROR, errnosav, _("Error after fork: %s"), strerror (errnosav)); + g_set_error (error, EM_JUNK_ERROR, errnosav, _("Error after fork: %s"), g_strerror (errnosav)); errno = errnosav; return rv_err; } -- cgit v1.2.3 From c0f9d291fccbe0608cfd1d1765aa87592349ead3 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 2 May 2009 23:16:08 -0400 Subject: =?UTF-8?q?Bug=20577482=20=E2=80=93=20Bad=20strings=20in=20plugins?= =?UTF-8?q?/itip-formatter/itip-view.c?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/itip-formatter/itip-view.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins') diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c index 3e7ebc6e38..32fa3104cc 100644 --- a/plugins/itip-formatter/itip-view.c +++ b/plugins/itip-formatter/itip-view.c @@ -1909,9 +1909,9 @@ itip_view_set_source_list (ItipView *view, ESourceList *source_list) if (priv->type == E_CAL_SOURCE_TYPE_EVENT) priv->escb_header = gtk_label_new_with_mnemonic (_("_Calendar:")); else if (priv->type == E_CAL_SOURCE_TYPE_TODO) - priv->escb_header = gtk_label_new_with_mnemonic (_("_Tasks :")); + priv->escb_header = gtk_label_new_with_mnemonic (_("_Tasks:")); else if (priv->type == E_CAL_SOURCE_TYPE_JOURNAL) - priv->escb_header = gtk_label_new_with_mnemonic (_("Memos :")); + priv->escb_header = gtk_label_new_with_mnemonic (_("_Memos:")); gtk_label_set_selectable (GTK_LABEL (priv->escb_header), TRUE); gtk_label_set_mnemonic_widget (GTK_LABEL (priv->escb_header), priv->escb); -- cgit v1.2.3 From d3a924613f68c255c1f58b9a622c02a00aaf7850 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 3 May 2009 09:03:24 -0400 Subject: =?UTF-8?q?Bug=20575124=20=E2=80=93=20Clarify=20"S=5Fpecify=20the?= =?UTF-8?q?=20mailbox=20name"=20string?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/exchange-operations/exchange-account-setup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c index 5b3d0b9653..ae889247c8 100644 --- a/plugins/exchange-operations/exchange-account-setup.c +++ b/plugins/exchange-operations/exchange-account-setup.c @@ -774,7 +774,8 @@ org_gnome_exchange_owa_url(EPlugin *epl, EConfigHookItemFactoryData *data) owa_editor_entry_changed (owa_entry, data->config); row++; - want_mailbox_check = gtk_check_button_new_with_mnemonic (_("S_pecify the mailbox name")); + want_mailbox_check = gtk_check_button_new_with_mnemonic ( + _("Mailbox name is _different than user name")); gtk_widget_show (want_mailbox_check); gtk_table_attach (GTK_TABLE (data->parent), want_mailbox_check, 1, 2, row, row+1, GTK_FILL, GTK_FILL, 0, 0); if (!username || !*username || !mailbox_name || !*mailbox_name || -- cgit v1.2.3 From 6e72a236dcb592a942881e118d6a71888ea1581b Mon Sep 17 00:00:00 2001 From: Marcel Stimberg Date: Mon, 4 May 2009 10:10:55 +0530 Subject: ** BUGFIX: 573830 - g_timeout_add_seconds should be preferred to g_timeout_add According to https://wiki.ubuntu.com/SavingTheWorld (and of course according to the gtk docs) using g_timeout_add_seconds is preferred over g_timeout_add if a timeout in seconds is desired. --- plugins/bbdb/bbdb.c | 2 +- plugins/bbdb/bbdb.h | 2 +- plugins/publish-calendar/publish-calendar.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins') diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c index 547a779961..adc89dbcb2 100644 --- a/plugins/bbdb/bbdb.c +++ b/plugins/bbdb/bbdb.c @@ -115,7 +115,7 @@ e_plugin_lib_enable (EPluginLib *ep, int enable) if (bbdb_check_gaim_enabled ()) bbdb_sync_buddy_list_check (); - g_timeout_add (BBDB_BLIST_CHECK_INTERVAL, + g_timeout_add_seconds (BBDB_BLIST_CHECK_INTERVAL, (GSourceFunc) bbdb_timeout, NULL); } diff --git a/plugins/bbdb/bbdb.h b/plugins/bbdb/bbdb.h index e36a7737c3..55c88709b0 100644 --- a/plugins/bbdb/bbdb.h +++ b/plugins/bbdb/bbdb.h @@ -33,7 +33,7 @@ /* How often to poll the buddy list for changes (every two minutes) */ -#define BBDB_BLIST_CHECK_INTERVAL (2 * 60 * 1000) +#define BBDB_BLIST_CHECK_INTERVAL (2 * 60) /* bbdb.c */ EBook *bbdb_open_addressbook (int type); diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index 4adbe0d726..a901317dfb 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -352,11 +352,11 @@ add_timeout (EPublishUri *uri) /* Set the timeout for now+frequency */ switch (uri->publish_frequency) { case URI_PUBLISH_DAILY: - id = g_timeout_add (24 * 60 * 60 * 1000, (GSourceFunc) publish_no_succ_info, uri); + id = g_timeout_add_seconds (24 * 60 * 60, (GSourceFunc) publish, uri); g_hash_table_insert (uri_timeouts, uri, GUINT_TO_POINTER (id)); break; case URI_PUBLISH_WEEKLY: - id = g_timeout_add (7 * 24 * 60 * 60 * 1000, (GSourceFunc) publish_no_succ_info, uri); + id = g_timeout_add_seconds (7 * 24 * 60 * 60, (GSourceFunc) publish, uri); g_hash_table_insert (uri_timeouts, uri, GUINT_TO_POINTER (id)); break; } @@ -419,7 +419,7 @@ add_offset_timeout (EPublishUri *uri) publish (uri, FALSE); add_timeout (uri); } else { - id = g_timeout_add (((24 * 60 * 60) - elapsed) * 1000, (GSourceFunc) publish_no_succ_info, uri); + id = g_timeout_add_seconds (24 * 60 * 60 - elapsed, (GSourceFunc) publish, uri); g_hash_table_insert (uri_timeouts, uri, GUINT_TO_POINTER (id)); break; } @@ -429,7 +429,7 @@ add_offset_timeout (EPublishUri *uri) publish (uri, FALSE); add_timeout (uri); } else { - id = g_timeout_add (((7 * 24 * 60 * 60) - elapsed) * 1000, (GSourceFunc) publish_no_succ_info, uri); + id = g_timeout_add_seconds (7 * 24 * 60 * 60 - elapsed, (GSourceFunc) publish, uri); g_hash_table_insert (uri_timeouts, uri, GUINT_TO_POINTER (id)); break; } -- cgit v1.2.3