aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/google-account-setup
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/google-account-setup')
-rw-r--r--plugins/google-account-setup/Makefile.am4
-rw-r--r--plugins/google-account-setup/google-source.c13
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) {