diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2009-08-30 13:37:36 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2009-08-30 13:40:49 +0800 |
commit | cfb9c32b6657165e4d5e11aa7b47804f679a61f8 (patch) | |
tree | 1f9c8954df7a357b5dc20a13ac82bf31c1112083 /plugins/google-account-setup | |
parent | fefeb30f58447f2fa7bcbee16dbe68a9333ce89d (diff) | |
parent | 0f7f4cfe38b3c4cd83efbe9922ae15c5aee00317 (diff) | |
download | gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.gz gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.bz2 gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.lz gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.xz gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.zst gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.zip |
Merge commit 'origin/kill-bonobo'
Diffstat (limited to 'plugins/google-account-setup')
-rw-r--r-- | plugins/google-account-setup/Makefile.am | 4 | ||||
-rw-r--r-- | plugins/google-account-setup/google-source.c | 13 |
2 files changed, 7 insertions, 10 deletions
diff --git a/plugins/google-account-setup/Makefile.am b/plugins/google-account-setup/Makefile.am index 67a7c2c152..3434dbb331 100644 --- a/plugins/google-account-setup/Makefile.am +++ b/plugins/google-account-setup/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -I . \ - -I$(top_srcdir) \ - -I$(top_builddir)/shell \ + -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ -DCALDAV_GLADEDIR=\""$(gladedir)"\" \ $(EVOLUTION_CALENDAR_CFLAGS) \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c index 2a8b6c46e5..1dc76a0431 100644 --- a/plugins/google-account-setup/google-source.c +++ b/plugins/google-account-setup/google-source.c @@ -37,7 +37,6 @@ #include <calendar/gui/e-cal-config.h> #include <calendar/gui/e-cal-event.h> -#include <calendar/gui/calendar-component.h> #include <libedataserver/e-url.h> #include <libedataserver/e-account-list.h> @@ -61,9 +60,9 @@ /*****************************************************************************/ /* prototypes */ -gint e_plugin_lib_enable (EPluginLib *ep, gint enable); +gint e_plugin_lib_enable (EPlugin *ep, gint enable); GtkWidget *plugin_google (EPlugin *epl, EConfigHookItemFactoryData *data); -void e_calendar_google_migrate (EPlugin *epl, ECalEventTargetComponent *data); +void e_calendar_google_migrate (EPlugin *epl, ECalEventTargetBackend *data); /*****************************************************************************/ /* plugin intialization */ @@ -83,7 +82,7 @@ ensure_google_source_group (void) } gint -e_plugin_lib_enable (EPluginLib *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, gint enable) { if (enable) { @@ -785,15 +784,13 @@ plugin_google (EPlugin *epl, } void -e_calendar_google_migrate (EPlugin *epl, ECalEventTargetComponent *data) +e_calendar_google_migrate (EPlugin *epl, ECalEventTargetBackend *data) { - CalendarComponent *component; ESourceList *source_list; ESourceGroup *google = NULL; gboolean changed = FALSE; - component = data->component; - source_list = calendar_component_peek_source_list (component); + source_list = data->source_list; google = e_source_list_peek_group_by_base_uri (source_list, GOOGLE_BASE_URI); if (google) { |