diff options
Diffstat (limited to 'plugins')
49 files changed, 536 insertions, 88 deletions
diff --git a/plugins/backup-restore/ChangeLog b/plugins/backup-restore/ChangeLog index 4bea33f456..7413e0e564 100644 --- a/plugins/backup-restore/ChangeLog +++ b/plugins/backup-restore/ChangeLog @@ -1,3 +1,23 @@ +2009-01-30 Milan Crha <mcrha@redhat.com> + + * backup-restore.c: (sanity_check): Removed dangling '*/'. + +2009-01-28 Tor Lillqvist <tml@novell.com> + + Make it compile on Windows, by Fridrich Strbra. (Just compile; + little chance of it actually doing anything sensible on Windows at + this point...) + + * Makefile.am: Use -no-undefined on Windows. Link with libeutil. + + * backup.c: Remove unused <sys/wait.h>. + + * backup-restore.c: Check HAVE_SYS_WAIT_H. + +2009-01-21 Milan Crha <mcrha@redhat.com> + + * Makefile.am: Use also EVOLUTION_CALENDAR_CFLAGS. + 2008-08-27 Sankar P <psankar@novell.com> License Changes diff --git a/plugins/backup-restore/Makefile.am b/plugins/backup-restore/Makefile.am index eaa5963a4f..f93a3c7460 100644 --- a/plugins/backup-restore/Makefile.am +++ b/plugins/backup-restore/Makefile.am @@ -6,6 +6,7 @@ INCLUDES = \ -DDATADIR=\""$(datadir)"\" \ -DLIBDIR=\""$(libdir)"\" \ -I$(top_srcdir) \ + $(EVOLUTION_CALENDAR_CFLAGS) \ $(SHELL_CFLAGS) \ $(E_UTIL_CFLAGS) @@ -20,7 +21,8 @@ plugin_LTLIBRARIES = liborg-gnome-backup-restore.la liborg_gnome_backup_restore_la_SOURCES = backup-restore.c liborg_gnome_backup_restore_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_backup_restore_la_LIBADD = \ - $(EVOLUTION_MAIL_LIBS) + $(EVOLUTION_MAIL_LIBS) \ + $(top_builddir)/e-util/libeutil.la privlibexec_PROGRAMS = evolution-backup evolution_backup_SOURCES = backup.c diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c index 3486844cc3..400dd85898 100644 --- a/plugins/backup-restore/backup-restore.c +++ b/plugins/backup-restore/backup-restore.c @@ -18,9 +18,16 @@ * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <unistd.h> #include <sys/types.h> -#include <sys/wait.h> +#ifdef HAVE_SYS_WAIT_H +# include <sys/wait.h> +#endif +#include <stdlib.h> #include <gtk/gtk.h> #include <glib/gi18n.h> #include <glib/gstdio.h> @@ -71,9 +78,13 @@ sanity_check (const char *filename) result = system (command); g_free (command); +#ifdef HAVE_SYS_WAIT_H g_message ("Sanity check result %d:%d %d", WIFEXITED (result), WEXITSTATUS (result), result); return WIFEXITED (result) && (WEXITSTATUS (result) == 0); +#else + return result; +#endif } static guint32 diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c index 26c4fb958f..f7a42114aa 100644 --- a/plugins/backup-restore/backup.c +++ b/plugins/backup-restore/backup.c @@ -26,7 +26,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <sys/wait.h> #include <glib/gi18n.h> #include <gtk/gtk.h> diff --git a/plugins/bogo-junk-plugin/ChangeLog b/plugins/bogo-junk-plugin/ChangeLog index e4007d4525..b24ac0db6c 100644 --- a/plugins/bogo-junk-plugin/ChangeLog +++ b/plugins/bogo-junk-plugin/ChangeLog @@ -1,3 +1,11 @@ +2009-01-28 Tor Lillqvist <tml@novell.com> + + * Makefile.am: Use -no-undefined on Windows. Link with libeutil. + + * bf-junk-filter.c: Tentative port to Windows even though this + plugin isn't even compiled on Windows for now. Just for + completeness. + 2008-12-15 srinivasa ragavan <sragavan@novell.com> * makefile.am: diff --git a/plugins/bogo-junk-plugin/Makefile.am b/plugins/bogo-junk-plugin/Makefile.am index 886d60392d..24eb99fdd5 100644 --- a/plugins/bogo-junk-plugin/Makefile.am +++ b/plugins/bogo-junk-plugin/Makefile.am @@ -10,6 +10,9 @@ plugin_LTLIBRARIES = liborg-gnome-bogo-junk-plugin.la liborg_gnome_bogo_junk_plugin_la_SOURCES = bf-junk-filter.c liborg_gnome_bogo_junk_plugin_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_bogo_junk_plugin_la_LIBADD = \ + $(GNOME_PLATFORM_LIBS) \ + $(top_builddir)/e-util/libeutil.la schemadir = $(GCONF_SCHEMA_FILE_DIR) schema_in_files = bogo-junk-plugin.schemas.in diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c index aca10643e8..848e4f4fb5 100644 --- a/plugins/bogo-junk-plugin/bf-junk-filter.c +++ b/plugins/bogo-junk-plugin/bf-junk-filter.c @@ -25,7 +25,6 @@ #include "config.h" #endif -#include <sys/wait.h> #include <signal.h> #include <unistd.h> #include <errno.h> @@ -34,6 +33,13 @@ #define G_LOG_DOMAIN "bf-junk-filter" #include <glib.h> + +#ifndef G_OS_WIN32 +# include <sys/wait.h> +#else +# include <windows.h> +#endif + #include <glib/gi18n.h> #include <gtk/gtk.h> #include <e-util/e-plugin.h> @@ -163,6 +169,7 @@ retry: camel_stream_close (stream); camel_object_unref (stream); +#ifndef G_OS_WIN32 waitres = waitpid (child_pid, &status, 0); if (waitres < 0 && errno == EINTR) { /* child process is hanging... */ @@ -181,13 +188,17 @@ retry: g_set_error (error, EM_JUNK_ERROR, -3, _("Wait for Bogofilter child process interrupted, terminating...")); } - g_spawn_close_pid (child_pid); - if (waitres >= 0 && WIFEXITED (status)) { res = WEXITSTATUS (status); } else { res = BOGOFILTER_ERROR; } +#else + WaitForSingleObject (child_pid, INFINITE); + GetExitCodeProcess (child_pid, &res); +#endif + + g_spawn_close_pid (child_pid); if (res < 0 || res > 2) { if (!only_once) { diff --git a/plugins/external-editor/ChangeLog b/plugins/external-editor/ChangeLog index 694cd53c64..3bf30a612f 100644 --- a/plugins/external-editor/ChangeLog +++ b/plugins/external-editor/ChangeLog @@ -1,3 +1,12 @@ +2009-01-28 Tor Lillqvist <tml@novell.com> + + Windows port by Fridrich Strba. + + * Makefile.am: Use -no-undefined and link with more libraries on + Windows. + + * external-editor.c: Check HAVE_SYS_WAIT_H. + 2008-08-27 Sankar P <psankar@novell.com> License Changes diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am index 0c7c22ab8b..bae2c640a5 100644 --- a/plugins/external-editor/Makefile.am +++ b/plugins/external-editor/Makefile.am @@ -1,3 +1,11 @@ +if OS_WIN32 +NO_UNDEFINED_REQUIRED_LIBS = \ + $(EVOLUTION_MAIL_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/mail/libevolution-mail.la +endif + INCLUDES = \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\" \ @@ -25,7 +33,10 @@ plugin_LTLIBRARIES = liborg-gnome-external-editor.la liborg_gnome_external_editor_la_SOURCES = \ external-editor.c -liborg_gnome_external_editor_la_LDFLAGS = -module -avoid-version +liborg_gnome_external_editor_la_LDFLAGS = \ + -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_external_editor_la_LIBADD = \ + $(NO_UNDEFINED_REQUIRED_LIBS) schemadir = $(GCONF_SCHEMA_FILE_DIR) schema_in_files = apps-evolution-external-editor.schemas.in diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c index 6f5b520465..5ba4ca7830 100644 --- a/plugins/external-editor/external-editor.c +++ b/plugins/external-editor/external-editor.c @@ -38,7 +38,9 @@ #include <glib/gstdio.h> #include <sys/stat.h> -#include <sys/wait.h> +#ifdef HAVE_SYS_WAIT_H +# include <sys/wait.h> +#endif #include <stdlib.h> #include <string.h> @@ -151,7 +153,11 @@ async_external_editor (GArray *array) return ; } +#ifdef HAVE_SYS_WAIT_H if (WEXITSTATUS (status) != 0) { +#else + if (status) { +#endif d(printf ("\n\nsome problem here with external editor\n\n")); return ; } else { diff --git a/plugins/google-account-setup/ChangeLog b/plugins/google-account-setup/ChangeLog index a59a5aad19..628455a523 100644 --- a/plugins/google-account-setup/ChangeLog +++ b/plugins/google-account-setup/ChangeLog @@ -1,3 +1,14 @@ +2009-01-29 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #539467 + + * google-contacts-source.h: (manage_google_group): + * google-contacts-source.c: (manage_google_group), + (ensure_google_contacts_source_group), + (remove_google_contacts_source_group): + * google-source.c: (ensure_google_source_group): + Find group by its base uri, not by a localized name. + 2008-11-07 Matthew Barnes <mbarnes@redhat.com> ** Fix for bug #559518 diff --git a/plugins/google-account-setup/google-contacts-source.c b/plugins/google-account-setup/google-contacts-source.c index b33ac86856..f76b7e56ee 100644 --- a/plugins/google-account-setup/google-contacts-source.c +++ b/plugins/google-account-setup/google-contacts-source.c @@ -37,36 +37,64 @@ #include "google-contacts-source.h" - -void -ensure_google_contacts_source_group (void) +/** + * manage_google_group: + * Searches for a 'Google' source group and ensures it has the correct + * name. If only_return is set to true, then only returns found group. + * Otherwise returns NULL. + **/ +ESourceGroup * +manage_google_group (ESourceList *slist, gboolean only_return) { - ESourceList *source_list; - ESourceGroup *group; + GSList *groups, *g; + ESourceGroup *group = NULL; - source_list = e_source_list_new_for_gconf_default ("/apps/evolution/addressbook/sources"); + g_return_val_if_fail (slist != NULL, NULL); - if (source_list == NULL) { - return; - } + groups = e_source_list_peek_groups (slist); + for (g = groups; g; g = g->next) { + group = E_SOURCE_GROUP (g->data); - group = e_source_list_peek_group_by_name (source_list, _("Google")); + if (group && e_source_group_peek_base_uri (group) && + g_ascii_strncasecmp ("google://", e_source_group_peek_base_uri (group), 9) == 0) + break; - if (group == NULL) { - gboolean res; + group = NULL; + } - group = e_source_group_new (_("Google"), "google://"); - res = e_source_list_add_group (source_list, group, -1); + if (only_return) + return group; - if (res == FALSE) { - g_warning ("Could not add Google source group!"); - } else { - e_source_list_sync (source_list, NULL); - } + if (group) { + e_source_group_set_name (group, _("Google")); + } else { + group = e_source_group_new (_("Google"), "google://"); - g_object_unref (group); - } - g_object_unref (source_list); + if (!e_source_list_add_group (slist, group, -1)) { + g_warning ("Could not add Google source group!"); + } else { + e_source_list_sync (slist, NULL); + } + + g_object_unref (group); + } + + return NULL; +} + +void +ensure_google_contacts_source_group (void) +{ + ESourceList *source_list; + + source_list = e_source_list_new_for_gconf_default ("/apps/evolution/addressbook/sources"); + + if (source_list == NULL) { + return; + } + + manage_google_group (source_list, FALSE); + g_object_unref (source_list); } void @@ -81,7 +109,7 @@ remove_google_contacts_source_group (void) return; } - group = e_source_list_peek_group_by_name (source_list, _("Google")); + group = manage_google_group (source_list, TRUE); if (group) { GSList *sources; diff --git a/plugins/google-account-setup/google-contacts-source.h b/plugins/google-account-setup/google-contacts-source.h index 54c21d18a6..b4fd5d6b77 100644 --- a/plugins/google-account-setup/google-contacts-source.h +++ b/plugins/google-account-setup/google-contacts-source.h @@ -28,4 +28,6 @@ void ensure_google_contacts_source_group (void); void remove_google_contacts_source_group (void); +ESourceGroup *manage_google_group (ESourceList *slist, gboolean only_return); + #endif diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c index dd86d1723b..02f08da5e5 100644 --- a/plugins/google-account-setup/google-source.c +++ b/plugins/google-account-setup/google-source.c @@ -69,36 +69,17 @@ GtkWidget * plugin_google (EPlugin *epl, static void -ensure_google_source_group () +ensure_google_source_group (void) { ESourceList *slist; - ESourceGroup *group; - if (!e_cal_get_sources (&slist, E_CAL_SOURCE_TYPE_EVENT, NULL)) { g_warning ("Could not get calendar source list from GConf!"); return; } - group = e_source_list_peek_group_by_name (slist, _("Google")); - - if (group == NULL) - g_message ("\n Google Group Not found "); - - if (group == NULL) { - gboolean res; - group = e_source_group_new (_("Google"), "Google://"); - res = e_source_list_add_group (slist, group, -1); - - if (res == FALSE) { - g_warning ("Could not add Google source group!"); - } else { - e_source_list_sync (slist, NULL); - } - - g_object_unref (group); - g_object_unref (slist); - } + manage_google_group (slist, FALSE); + g_object_unref (slist); } int diff --git a/plugins/groupwise-account-setup/ChangeLog b/plugins/groupwise-account-setup/ChangeLog index 474e27d7ec..cde1135294 100644 --- a/plugins/groupwise-account-setup/ChangeLog +++ b/plugins/groupwise-account-setup/ChangeLog @@ -1,3 +1,10 @@ +2009-01-29 Bharath Acharya <abharath@novell.com> + + ** Fix for bug #470474 (bugzilla.novell.com) + + * groupwise-account-setup.c (set_esource_props): a corruption. Cleanup + unused strings. + 2008-11-11 Suman Manjunath <msuman@novell.com> ** Fix for bug #440646 (bugzilla.novell.com) diff --git a/plugins/groupwise-account-setup/groupwise-account-setup.c b/plugins/groupwise-account-setup/groupwise-account-setup.c index 5ca57d7c7f..fca171aab5 100644 --- a/plugins/groupwise-account-setup/groupwise-account-setup.c +++ b/plugins/groupwise-account-setup/groupwise-account-setup.c @@ -51,17 +51,9 @@ set_esource_props (const char *path, EAccount *a, GConfClient *client, const cha { ESourceList *list; GSList *groups; - char *old_relative_uri; - const char *poa_address; - CamelURL *url = camel_url_new (a->source->url, NULL); - old_relative_uri = g_strdup_printf ("%s@%s/", url->user, poa_address); list = e_source_list_new_for_gconf (client, path); groups = e_source_list_peek_groups (list); - poa_address = url->host; - - if (!poa_address || !*poa_address) - return; for ( ; groups != NULL; groups = g_slist_next (groups)) { ESourceGroup *group = E_SOURCE_GROUP (groups->data); @@ -87,9 +79,6 @@ set_esource_props (const char *path, EAccount *a, GConfClient *client, const cha e_source_list_sync (list, NULL); g_object_unref (list); - g_free (old_relative_uri); - camel_url_free (url); - } void diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog index 9db857dbcc..2afaec6080 100644 --- a/plugins/groupwise-features/ChangeLog +++ b/plugins/groupwise-features/ChangeLog @@ -1,3 +1,45 @@ +2009-01-21 Suman Manjunath <msuman@novell.com> + + ** Fix for bug #541209 + + ** Adapt to the new APIs from upstream libical. Changes made include + using the "_r" counterpart for the following APIs: + + icalproperty_as_ical_string () + + icalvalue_as_ical_string () + + icalcomponent_as_ical_string () + + icalparameter_as_ical_string () + + icaldurationtype_as_ical_string () + + icalenum_reqstat_code () + + icallangbind_property_eval_string () + + icallangbind_quote_as_ical () + + icalmime_text_end_part () + + icalperiodtype_as_ical_string () + + icalproperty_enum_to_string () + + icalproperty_get_parameter_as_string () + + icalproperty_get_value_as_string () + + icalproperty_get_property_name () + + icalrecurrencetype_as_string () + + icaltime_as_ical_string () + + icalreqstattype_as_string () + + icalvalue_binary_as_ical_string () + + icalvalue_int_as_ical_string () + + icalvalue_utcoffset_as_ical_string () + + icalvalue_string_as_ical_string () + + icalvalue_recur_as_ical_string () + + icalvalue_text_as_ical_string () + + icalvalue_attach_as_ical_string () + + icalvalue_duration_as_ical_string () + + icalvalue_date_as_ical_string () + + icalvalue_datetime_as_ical_string () + + icalvalue_float_as_ical_string () + + icalvalue_geo_as_ical_string () + + icalvalue_datetimeperiod_as_ical_string () + + icalvalue_period_as_ical_string () + + icalvalue_trigger_as_ical_string () + + icalvalue_as_ical_string () + + * send-options.c (put_options_in_source): + 2009-01-14 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #567744 diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c index 8a15d954dc..ed8e6093a2 100644 --- a/plugins/groupwise-features/send-options.c +++ b/plugins/groupwise-features/send-options.c @@ -454,7 +454,7 @@ put_options_in_source (ESource *source, EGwSendOptionsGeneral *gopts, EGwSendOpt if (gopts->delay_enabled) { tt = icaltime_today (); icaltime_adjust (&tt, gopts->delay_until, 0, 0, 0); - val = icaltime_as_ical_string (tt); + val = icaltime_as_ical_string_r (tt); } else val = "none"; e_source_set_property (source, "delay-delivery", val); diff --git a/plugins/import-ics-attachments/ChangeLog b/plugins/import-ics-attachments/ChangeLog index 7dcf98134d..21a9408c9c 100644 --- a/plugins/import-ics-attachments/ChangeLog +++ b/plugins/import-ics-attachments/ChangeLog @@ -1,3 +1,7 @@ +2009-01-21 Milan Crha <mcrha@redhat.com> + + * Makefile.am: Use also EVOLUTION_CALENDAR_CFLAGS. + 2008-09-02 Sankar P <psankar@novell.com> License Changes diff --git a/plugins/import-ics-attachments/Makefile.am b/plugins/import-ics-attachments/Makefile.am index 7f7caf3a21..baded42123 100644 --- a/plugins/import-ics-attachments/Makefile.am +++ b/plugins/import-ics-attachments/Makefile.am @@ -3,6 +3,7 @@ INCLUDES = \ -I$(top_srcdir)/camel \ -I$(top_srcdir)/widgets/misc \ $(EVOLUTION_MAIL_CFLAGS) \ + $(EVOLUTION_CALENDAR_CFLAGS) \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ -DEVOLUTION_ICONSDIR=\""$(imagesdir)"\" \ diff --git a/plugins/ipod-sync/ChangeLog b/plugins/ipod-sync/ChangeLog index e2fa79fb9c..be39031895 100644 --- a/plugins/ipod-sync/ChangeLog +++ b/plugins/ipod-sync/ChangeLog @@ -1,3 +1,45 @@ +2009-01-21 Suman Manjunath <msuman@novell.com> + + ** Fix for bug #541209 + + ** Adapt to the new APIs from upstream libical. Changes made include + using the "_r" counterpart for the following APIs: + + icalproperty_as_ical_string () + + icalvalue_as_ical_string () + + icalcomponent_as_ical_string () + + icalparameter_as_ical_string () + + icaldurationtype_as_ical_string () + + icalenum_reqstat_code () + + icallangbind_property_eval_string () + + icallangbind_quote_as_ical () + + icalmime_text_end_part () + + icalperiodtype_as_ical_string () + + icalproperty_enum_to_string () + + icalproperty_get_parameter_as_string () + + icalproperty_get_value_as_string () + + icalproperty_get_property_name () + + icalrecurrencetype_as_string () + + icaltime_as_ical_string () + + icalreqstattype_as_string () + + icalvalue_binary_as_ical_string () + + icalvalue_int_as_ical_string () + + icalvalue_utcoffset_as_ical_string () + + icalvalue_string_as_ical_string () + + icalvalue_recur_as_ical_string () + + icalvalue_text_as_ical_string () + + icalvalue_attach_as_ical_string () + + icalvalue_duration_as_ical_string () + + icalvalue_date_as_ical_string () + + icalvalue_datetime_as_ical_string () + + icalvalue_float_as_ical_string () + + icalvalue_geo_as_ical_string () + + icalvalue_datetimeperiod_as_ical_string () + + icalvalue_period_as_ical_string () + + icalvalue_trigger_as_ical_string () + + icalvalue_as_ical_string () + + * ical-format.c (do_save_calendar_ical): + 2008-09-19 Sankar P <psankar@novell.com> License Changes diff --git a/plugins/ipod-sync/ical-format.c b/plugins/ipod-sync/ical-format.c index f6f96b1125..576c8651aa 100644 --- a/plugins/ipod-sync/ical-format.c +++ b/plugins/ipod-sync/ical-format.c @@ -89,7 +89,7 @@ do_save_calendar_ical (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSourc stream = open_for_writing (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (target->selector))), dest_uri, &error); if (stream && !error) { - char *ical_str = icalcomponent_as_ical_string (top_level); + char *ical_str = icalcomponent_as_ical_string_r (top_level); g_output_stream_write_all (stream, ical_str, strlen (ical_str), NULL, NULL, &error); g_output_stream_close (stream, NULL, NULL); diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog index 874875d906..7bd94c1240 100644 --- a/plugins/itip-formatter/ChangeLog +++ b/plugins/itip-formatter/ChangeLog @@ -1,3 +1,46 @@ +2009-01-21 Suman Manjunath <msuman@novell.com> + + ** Fix for bug #541209 + + ** Adapt to the new APIs from upstream libical. Changes made include + using the "_r" counterpart for the following APIs: + + icalproperty_as_ical_string () + + icalvalue_as_ical_string () + + icalcomponent_as_ical_string () + + icalparameter_as_ical_string () + + icaldurationtype_as_ical_string () + + icalenum_reqstat_code () + + icallangbind_property_eval_string () + + icallangbind_quote_as_ical () + + icalmime_text_end_part () + + icalperiodtype_as_ical_string () + + icalproperty_enum_to_string () + + icalproperty_get_parameter_as_string () + + icalproperty_get_value_as_string () + + icalproperty_get_property_name () + + icalrecurrencetype_as_string () + + icaltime_as_ical_string () + + icalreqstattype_as_string () + + icalvalue_binary_as_ical_string () + + icalvalue_int_as_ical_string () + + icalvalue_utcoffset_as_ical_string () + + icalvalue_string_as_ical_string () + + icalvalue_recur_as_ical_string () + + icalvalue_text_as_ical_string () + + icalvalue_attach_as_ical_string () + + icalvalue_duration_as_ical_string () + + icalvalue_date_as_ical_string () + + icalvalue_datetime_as_ical_string () + + icalvalue_float_as_ical_string () + + icalvalue_geo_as_ical_string () + + icalvalue_datetimeperiod_as_ical_string () + + icalvalue_period_as_ical_string () + + icalvalue_trigger_as_ical_string () + + icalvalue_as_ical_string () + + * itip-formatter.c (find_attendee), (find_to_address), + (find_from_address), (update_item): + 2009-01-19 Milan Crha <mcrha@redhat.com> ** Fix for bug #225712 diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index 83ea0036fb..6eebfdee92 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -169,7 +169,7 @@ find_attendee (icalcomponent *ical_comp, const char *address) char *attendee; char *text; - attendee = icalproperty_get_value_as_string (prop); + attendee = icalproperty_get_value_as_string_r (prop); if (!attendee) continue; @@ -253,7 +253,7 @@ find_to_address (struct _itip_puri *pitip, icalcomponent *ical_comp, icalparamet if (param) pitip->to_name = g_strdup (icalparameter_get_cn (param)); - text = icalproperty_get_value_as_string (prop); + text = icalproperty_get_value_as_string_r (prop); pitip->to_address = g_strdup (itip_strip_mailto (text)); g_free (text); @@ -309,7 +309,7 @@ find_to_address (struct _itip_puri *pitip, icalcomponent *ical_comp, icalparamet if (param) pitip->to_name = g_strdup (icalparameter_get_cn (param)); - text = icalproperty_get_value_as_string (prop); + text = icalproperty_get_value_as_string_r (prop); pitip->to_address = g_strdup (itip_strip_mailto (text)); g_free (text); @@ -352,7 +352,7 @@ find_from_address (struct _itip_puri *pitip, icalcomponent *ical_comp) if (!prop) return; - organizer = icalproperty_get_value_as_string (prop); + organizer = icalproperty_get_value_as_string_r (prop); if (organizer) { organizer_clean = g_strdup (itip_strip_mailto (organizer)); organizer_clean = g_strstrip (organizer_clean); @@ -992,7 +992,7 @@ update_item (struct _itip_puri *pitip, ItipViewResponse response) * and you then look at it in Outlook). */ stamp = icaltime_current_time_with_zone (icaltimezone_get_utc_timezone ()); - str = icaltime_as_ical_string (stamp); + str = icaltime_as_ical_string_r (stamp); prop = icalproperty_new_x (str); g_free (str); icalproperty_set_x_name (prop, "X-MICROSOFT-CDO-REPLYTIME"); diff --git a/plugins/mail-notification/ChangeLog b/plugins/mail-notification/ChangeLog index 96c5abc9e4..ecbc34391d 100644 --- a/plugins/mail-notification/ChangeLog +++ b/plugins/mail-notification/ChangeLog @@ -1,3 +1,8 @@ +2009-01-28 Tor Lillqvist <tml@novell.com> + + * Makefile.am: Use -no-undefined and link with more libraries on + Windows. + 2008-11-19 Srinivasa Ragavan <sragavan@novell.com> * mail-notification.c: Fix compilation error. diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am index 80b4fbcc98..8915fe92ad 100644 --- a/plugins/mail-notification/Makefile.am +++ b/plugins/mail-notification/Makefile.am @@ -1,3 +1,10 @@ +if OS_WIN32 +NO_UNDEFINED_REQUIRED_LIBS = \ + $(top_builddir)/mail/libevolution-mail.la \ + $(top_builddir)/e-util/libeutil.la \ + $(GNOME_PLATFORM_LIBS) +endif + INCLUDES = \ -I$(top_srcdir) \ $(EVOLUTION_MAIL_CFLAGS) \ @@ -16,8 +23,10 @@ plugin_LTLIBRARIES = liborg-gnome-mail-notification.la liborg_gnome_mail_notification_la_SOURCES = mail-notification.c liborg_gnome_mail_notification_la_LDFLAGS = \ - -module -avoid-version \ - $(LIBNOTIFY_LIBS) + -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_mail_notification_la_LIBADD = \ + $(LIBNOTIFY_LIBS) \ + $(NO_UNDEFINED_REQUIRED_LIBS) if ENABLE_DBUS liborg_gnome_mail_notification_la_LDFLAGS += $(NMN_LIBS) diff --git a/plugins/mail-to-meeting/ChangeLog b/plugins/mail-to-meeting/ChangeLog index ef2b70ea17..31fbc638a8 100644 --- a/plugins/mail-to-meeting/ChangeLog +++ b/plugins/mail-to-meeting/ChangeLog @@ -1,3 +1,7 @@ +2009-01-21 Milan Crha <mcrha@redhat.com> + + * Makefile.am: Use also EVOLUTION_CALENDAR_CFLAGS. + 2008-08-27 Sankar P <psankar@novell.com> License Changes diff --git a/plugins/mail-to-meeting/Makefile.am b/plugins/mail-to-meeting/Makefile.am index 5596678783..f3b8f44985 100644 --- a/plugins/mail-to-meeting/Makefile.am +++ b/plugins/mail-to-meeting/Makefile.am @@ -1,5 +1,6 @@ -INCLUDES = \ - -I$(top_srcdir) \ +INCLUDES = \ + -I$(top_srcdir) \ + $(EVOLUTION_CALENDAR_CFLAGS) \ $(EVOLUTION_MAIL_CFLAGS) @EVO_PLUGIN_RULE@ diff --git a/plugins/mail-to-task/ChangeLog b/plugins/mail-to-task/ChangeLog index ad020a8f0c..f3cfe042c6 100644 --- a/plugins/mail-to-task/ChangeLog +++ b/plugins/mail-to-task/ChangeLog @@ -1,3 +1,12 @@ +2009-01-28 Tor Lillqvist <tml@novell.com> + + * Makefile.am: Remove a trailing space after the line continuation + backslash. + +2009-01-21 Milan Crha <mcrha@redhat.com> + + * Makefile.am: Use also EVOLUTION_CALENDAR_CFLAGS. + 2008-10-31 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #558726 (patch by Frederic van Starbmann) diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am index f4241c2fc3..42e1e6fb65 100644 --- a/plugins/mail-to-task/Makefile.am +++ b/plugins/mail-to-task/Makefile.am @@ -1,5 +1,6 @@ INCLUDES = \ -I$(top_srcdir) \ + $(EVOLUTION_CALENDAR_CFLAGS) \ $(EVOLUTION_MAIL_CFLAGS) @EVO_PLUGIN_RULE@ @@ -12,7 +13,7 @@ liborg_gnome_mail_to_task_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_mail_to_task_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/calendar/common/libevolution-calendarprivate.la \ - $(top_builddir)/mail/libevolution-mail.la \ + $(top_builddir)/mail/libevolution-mail.la \ $(EVOLUTION_CALENDAR_LIBS) \ $(EVOLUTION_MAIL_LIBS) diff --git a/plugins/mono/ChangeLog b/plugins/mono/ChangeLog index ff07e79a0b..45b669ec56 100644 --- a/plugins/mono/ChangeLog +++ b/plugins/mono/ChangeLog @@ -1,3 +1,8 @@ +2009-01-28 Suman Manjunath <msuman@novell.com> + + * mono-plugin.c: Include <mono/metadata/threads.h> to fix an implicit- + function-declaration compiler warning. + 2008-10-22 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #549025 diff --git a/plugins/mono/mono-plugin.c b/plugins/mono/mono-plugin.c index 5c5182e378..18b113c614 100644 --- a/plugins/mono/mono-plugin.c +++ b/plugins/mono/mono-plugin.c @@ -28,6 +28,7 @@ #include <mono/metadata/object.h> #include <mono/metadata/appdomain.h> #include <mono/metadata/assembly.h> +#include <mono/metadata/threads.h> #include <mono/jit/jit.h> #define d(x) (x) diff --git a/plugins/pst-import/ChangeLog b/plugins/pst-import/ChangeLog index ca115fa827..0f031b508d 100644 --- a/plugins/pst-import/ChangeLog +++ b/plugins/pst-import/ChangeLog @@ -1,3 +1,16 @@ +2009-01-28 Tor Lillqvist <tml@novell.com> + + * Makefile.am: On Windows use -no-undefined and link with all + required libraries. (Just throw in a bunch of libraries without + cherry-picking. Having "superfluous" ones just slows down the + linking a bit, but doesn't hurt at run-time.) + + Use LIBPST_CFLAGS. + + * pst-importer.c: Include <libpst/define.h> before the other + libpst headers. Otherwise we get compilation errors on Windows, + sigh. + 2009-01-15 Bharath Acharya <abharath@novell.com> Basic functionality implemented by diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am index 031b1b181e..9f3061e241 100644 --- a/plugins/pst-import/Makefile.am +++ b/plugins/pst-import/Makefile.am @@ -1,10 +1,19 @@ +if OS_WIN32 +NO_UNDEFINED_REQUIRED_LIBS = \ + $(top_builddir)/mail/libevolution-mail.la \ + $(top_builddir)/e-util/libeutil.la \ + $(EVOLUTION_CALENDAR_LIBS) \ + $(EVOLUTION_MAIL_LIBS) +endif + INCLUDES = \ -I$(EVOLUTION_SOURCE) \ -I$(top_srcdir) \ -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \ -DLOCALEDIR="\"$(LOCALEDIR)\"" \ $(EVOLUTION_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) + $(EVOLUTION_MAIL_CFLAGS) \ + $(LIBPST_CFLAGS) @EVO_PLUGIN_RULE@ @@ -12,8 +21,10 @@ plugin_DATA = org-gnome-pst-import.eplug plugin_LTLIBRARIES = liborg-gnome-pst-import.la liborg_gnome_pst_import_la_SOURCES = pst-importer.c -liborg_gnome_pst_import_la_LDFLAGS = -module -avoid-version -liborg_gnome_pst_import_la_LIBADD = \ +liborg_gnome_pst_import_la_LDFLAGS = \ + -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_pst_import_la_LIBADD = \ + $(NO_UNDEFINED_REQUIRED_LIBS) \ $(LIBPST_LIBS) EXTRA_DIST = org-gnome-pst-import.eplug.xml diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c index acd84c1a67..8cbf80eb50 100644 --- a/plugins/pst-import/pst-importer.c +++ b/plugins/pst-import/pst-importer.c @@ -66,8 +66,8 @@ #include <mail/mail-tools.h> #include <mail/em-utils.h> -#include <libpst/libpst.h> #include <libpst/define.h> +#include <libpst/libpst.h> #include <libpst/timeconv.h> typedef struct _PstImporter PstImporter; diff --git a/plugins/publish-calendar/ChangeLog b/plugins/publish-calendar/ChangeLog index ad18f9331a..afafa7790c 100644 --- a/plugins/publish-calendar/ChangeLog +++ b/plugins/publish-calendar/ChangeLog @@ -1,3 +1,46 @@ +2009-01-21 Suman Manjunath <msuman@novell.com> + + ** Fix for bug #541209 + + ** Adapt to the new APIs from upstream libical. Changes made include + using the "_r" counterpart for the following APIs: + + icalproperty_as_ical_string () + + icalvalue_as_ical_string () + + icalcomponent_as_ical_string () + + icalparameter_as_ical_string () + + icaldurationtype_as_ical_string () + + icalenum_reqstat_code () + + icallangbind_property_eval_string () + + icallangbind_quote_as_ical () + + icalmime_text_end_part () + + icalperiodtype_as_ical_string () + + icalproperty_enum_to_string () + + icalproperty_get_parameter_as_string () + + icalproperty_get_value_as_string () + + icalproperty_get_property_name () + + icalrecurrencetype_as_string () + + icaltime_as_ical_string () + + icalreqstattype_as_string () + + icalvalue_binary_as_ical_string () + + icalvalue_int_as_ical_string () + + icalvalue_utcoffset_as_ical_string () + + icalvalue_string_as_ical_string () + + icalvalue_recur_as_ical_string () + + icalvalue_text_as_ical_string () + + icalvalue_attach_as_ical_string () + + icalvalue_duration_as_ical_string () + + icalvalue_date_as_ical_string () + + icalvalue_datetime_as_ical_string () + + icalvalue_float_as_ical_string () + + icalvalue_geo_as_ical_string () + + icalvalue_datetimeperiod_as_ical_string () + + icalvalue_period_as_ical_string () + + icalvalue_trigger_as_ical_string () + + icalvalue_as_ical_string () + + * publish-format-fb.c (write_calendar): + * publish-format-ical.c (write_calendar): + 2008-12-16 Milan Crha <mcrha@redhat.com> ** Fix for bug #359010 diff --git a/plugins/publish-calendar/publish-format-fb.c b/plugins/publish-calendar/publish-format-fb.c index f958fe5344..40d0258f8a 100644 --- a/plugins/publish-calendar/publish-format-fb.c +++ b/plugins/publish-calendar/publish-format-fb.c @@ -84,7 +84,7 @@ write_calendar (gchar *uid, ESourceList *source_list, GOutputStream *stream) objects = g_list_remove (objects, comp); } - ical_string = icalcomponent_as_ical_string (top_level); + ical_string = icalcomponent_as_ical_string_r (top_level); res = g_output_stream_write_all (stream, ical_string, strlen (ical_string), NULL, NULL, &error); g_free (ical_string); diff --git a/plugins/publish-calendar/publish-format-ical.c b/plugins/publish-calendar/publish-format-ical.c index 87752e826e..f6dcc461c9 100644 --- a/plugins/publish-calendar/publish-format-ical.c +++ b/plugins/publish-calendar/publish-format-ical.c @@ -113,7 +113,7 @@ write_calendar (gchar *uid, ESourceList *source_list, GOutputStream *stream) g_hash_table_destroy (tdata.zones); tdata.zones = NULL; - ical_string = icalcomponent_as_ical_string (top_level); + ical_string = icalcomponent_as_ical_string_r (top_level); res = g_output_stream_write_all (stream, ical_string, strlen (ical_string), NULL, NULL, &error); g_free (ical_string); } diff --git a/plugins/save-attachments/ChangeLog b/plugins/save-attachments/ChangeLog index a5dede852e..9980fdf13d 100644 --- a/plugins/save-attachments/ChangeLog +++ b/plugins/save-attachments/ChangeLog @@ -1,3 +1,8 @@ +2009-01-28 Tor Lillqvist <tml@novell.com> + + * Makefile.am: Use -no-undefined and link with more libs on + Windows. + 2008-09-19 Sankar P <psankar@novell.com> License Changes diff --git a/plugins/save-attachments/Makefile.am b/plugins/save-attachments/Makefile.am index e3ebc9f9e5..05c724a4e4 100644 --- a/plugins/save-attachments/Makefile.am +++ b/plugins/save-attachments/Makefile.am @@ -1,3 +1,11 @@ +if OS_WIN32 +NO_UNDEFINED_REQUIRED_LIBS = \ + $(top_builddir)/mail/libevolution-mail.la \ + $(EVOLUTION_MAIL_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(top_builddir)/e-util/libeutil.la +endif + INCLUDES = \ -I$(top_srcdir) \ $(EVOLUTION_MAIL_CFLAGS) @@ -8,7 +16,12 @@ plugin_DATA = org-gnome-save-attachments.eplug org-gnome-save-attachments.xml plugin_LTLIBRARIES = liborg-gnome-save-attachments.la liborg_gnome_save_attachments_la_SOURCES = save-attachments.c -liborg_gnome_save_attachments_la_LDFLAGS = -module -avoid-version +liborg_gnome_save_attachments_la_LDFLAGS = -module \ + -avoid-version $(NO_UNDEFINED) + +liborg_gnome_save_attachments_la_LIBADD = \ + $(NO_UNDEFINED_REQUIRED_LIBS) + EXTRA_DIST = \ org-gnome-save-attachments.eplug.xml \ diff --git a/plugins/save-calendar/ChangeLog b/plugins/save-calendar/ChangeLog index d8e69aac67..28e5ad77e1 100644 --- a/plugins/save-calendar/ChangeLog +++ b/plugins/save-calendar/ChangeLog @@ -1,3 +1,45 @@ +2009-01-21 Suman Manjunath <msuman@novell.com> + + ** Fix for bug #541209 + + ** Adapt to the new APIs from upstream libical. Changes made include + using the "_r" counterpart for the following APIs: + + icalproperty_as_ical_string () + + icalvalue_as_ical_string () + + icalcomponent_as_ical_string () + + icalparameter_as_ical_string () + + icaldurationtype_as_ical_string () + + icalenum_reqstat_code () + + icallangbind_property_eval_string () + + icallangbind_quote_as_ical () + + icalmime_text_end_part () + + icalperiodtype_as_ical_string () + + icalproperty_enum_to_string () + + icalproperty_get_parameter_as_string () + + icalproperty_get_value_as_string () + + icalproperty_get_property_name () + + icalrecurrencetype_as_string () + + icaltime_as_ical_string () + + icalreqstattype_as_string () + + icalvalue_binary_as_ical_string () + + icalvalue_int_as_ical_string () + + icalvalue_utcoffset_as_ical_string () + + icalvalue_string_as_ical_string () + + icalvalue_recur_as_ical_string () + + icalvalue_text_as_ical_string () + + icalvalue_attach_as_ical_string () + + icalvalue_duration_as_ical_string () + + icalvalue_date_as_ical_string () + + icalvalue_datetime_as_ical_string () + + icalvalue_float_as_ical_string () + + icalvalue_geo_as_ical_string () + + icalvalue_datetimeperiod_as_ical_string () + + icalvalue_period_as_ical_string () + + icalvalue_trigger_as_ical_string () + + icalvalue_as_ical_string () + + * ical-format.c (do_save_calendar_ical): + 2008-09-16 Sankar P <psankar@novell.com> License Changes diff --git a/plugins/save-calendar/ical-format.c b/plugins/save-calendar/ical-format.c index 1b7ccfb7b1..a537bf4641 100644 --- a/plugins/save-calendar/ical-format.c +++ b/plugins/save-calendar/ical-format.c @@ -136,7 +136,7 @@ do_save_calendar_ical (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSourc stream = open_for_writing (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (target->selector))), dest_uri, &error); if (stream) { - char *ical_str = icalcomponent_as_ical_string (top_level); + char *ical_str = icalcomponent_as_ical_string_r (top_level); g_output_stream_write_all (stream, ical_str, strlen (ical_str), NULL, NULL, &error); g_output_stream_close (stream, NULL, NULL); diff --git a/plugins/startup-wizard/ChangeLog b/plugins/startup-wizard/ChangeLog index 4d636b826a..2147b10a0a 100644 --- a/plugins/startup-wizard/ChangeLog +++ b/plugins/startup-wizard/ChangeLog @@ -1,3 +1,7 @@ +2009-01-21 Milan Crha <mcrha@redhat.com> + + * Makefile.am: Use also EVOLUTION_CALENDAR_CFLAGS. + 2008-09-19 Sankar P <psankar@novell.com> License Changes diff --git a/plugins/startup-wizard/Makefile.am b/plugins/startup-wizard/Makefile.am index 551eb303a8..a8e4191ebf 100644 --- a/plugins/startup-wizard/Makefile.am +++ b/plugins/startup-wizard/Makefile.am @@ -1,6 +1,7 @@ INCLUDES = -I . \ -I$(top_srcdir) \ -I$(top_builddir)/shell \ + $(EVOLUTION_CALENDAR_CFLAGS) \ $(EVOLUTION_MAIL_CFLAGS) @EVO_PLUGIN_RULE@ diff --git a/plugins/tnef-attachments/ChangeLog b/plugins/tnef-attachments/ChangeLog index 6c2f54a396..b90faf0bf8 100644 --- a/plugins/tnef-attachments/ChangeLog +++ b/plugins/tnef-attachments/ChangeLog @@ -1,3 +1,10 @@ +2009-01-28 Tor Lillqvist <tml@novell.com> + + * Makefile.am: Use -no-undefined and link with more libraries on + Windows. + + * tnef-plugin.c: Remove unused <sys/wait.h>. + 2008-09-24 Philip Withnall <philip@tecnocode.co.uk> ** Fixes bug #553479 diff --git a/plugins/tnef-attachments/Makefile.am b/plugins/tnef-attachments/Makefile.am index 7f52413306..809d1ed1f4 100644 --- a/plugins/tnef-attachments/Makefile.am +++ b/plugins/tnef-attachments/Makefile.am @@ -1,3 +1,11 @@ +if OS_WIN32 +NO_UNDEFINED_REQUIRED_LIBS = \ + $(EVOLUTION_MAIL_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/mail/libevolution-mail.la +endif + INCLUDES = \ -I$(top_srcdir) \ -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \ @@ -11,7 +19,10 @@ plugin_DATA = org-gnome-tnef-attachments.eplug plugin_LTLIBRARIES = liborg-gnome-tnef-attachments.la liborg_gnome_tnef_attachments_la_SOURCES = tnef-plugin.c -liborg_gnome_tnef_attachments_la_LDFLAGS = -module -avoid-version -lytnef +liborg_gnome_tnef_attachments_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_tnef_attachments_la_LIBADD = \ + $(NO_UNDEFINED_REQUIRED_LIBS) \ + -lytnef EXTRA_DIST = org-gnome-tnef-attachments.eplug.xml diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c index e7b5d624eb..f0152862f3 100644 --- a/plugins/tnef-attachments/tnef-plugin.c +++ b/plugins/tnef-attachments/tnef-plugin.c @@ -31,7 +31,6 @@ #include <sys/types.h> #include <dirent.h> #include <sys/stat.h> -#include <sys/wait.h> #include <fcntl.h> #include <ctype.h> #include <stdlib.h> diff --git a/plugins/webdav-account-setup/ChangeLog b/plugins/webdav-account-setup/ChangeLog index 38eabf364e..29e3e82796 100644 --- a/plugins/webdav-account-setup/ChangeLog +++ b/plugins/webdav-account-setup/ChangeLog @@ -1,3 +1,12 @@ +2009-01-29 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #539467 + + * webdav-contacts-source.c: (find_webdav_group), + (ensure_webdav_contacts_source_group), + (remove_webdav_contacts_source_group): + Find group by its base uri, not by a localized name. + 2008-09-24 Philip Withnall <philip@tecnocode.co.uk> ** Fixes bug #553479 diff --git a/plugins/webdav-account-setup/webdav-contacts-source.c b/plugins/webdav-account-setup/webdav-contacts-source.c index d85ffa79b6..2242b9050d 100644 --- a/plugins/webdav-account-setup/webdav-contacts-source.c +++ b/plugins/webdav-account-setup/webdav-contacts-source.c @@ -54,6 +54,28 @@ plugin_webdav_contacts(EPlugin *epl, EConfigHookItemFactoryData *data); int e_plugin_lib_enable(EPluginLib *ep, int enable); +static ESourceGroup * +find_webdav_group (ESourceList *slist) +{ + GSList *groups, *g; + ESourceGroup *group = NULL; + + g_return_val_if_fail (slist != NULL, NULL); + + groups = e_source_list_peek_groups (slist); + for (g = groups; g; g = g->next) { + group = E_SOURCE_GROUP (g->data); + + if (group && e_source_group_peek_base_uri (group) && + g_ascii_strncasecmp (BASE_URI, e_source_group_peek_base_uri (group), strlen (BASE_URI)) == 0) + break; + + group = NULL; + } + + return group; +} + static void ensure_webdav_contacts_source_group(void) { @@ -66,7 +88,7 @@ ensure_webdav_contacts_source_group(void) return; } - group = e_source_list_peek_group_by_name(source_list, _("WebDAV")); + group = find_webdav_group (source_list); if (group == NULL) { gboolean res; @@ -81,7 +103,10 @@ ensure_webdav_contacts_source_group(void) } g_object_unref(group); + } else { + e_source_group_set_name (group, _("WebDAV")); } + g_object_unref(source_list); } @@ -97,7 +122,7 @@ remove_webdav_contacts_source_group(void) return; } - group = e_source_list_peek_group_by_name(source_list, _("WebDAV")); + group = find_webdav_group (source_list); if (group) { GSList *sources; |