diff options
| author | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-13 18:55:34 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-13 18:55:34 +0800 |
| commit | cb3e037f8f55f95892104326807d9988be87fbe4 (patch) | |
| tree | acac7b63e7a8b1ea4f37273363cb423dbff491ed /plugins/google-account-setup/google-source.c | |
| parent | b77871e4fd7a4464e3a2e4e458f0d10e71805a02 (diff) | |
| parent | ee5ca188d56abc91ca9fce034322466d5b0f4b9f (diff) | |
| download | gsoc2013-evolution-cb3e037f8f55f95892104326807d9988be87fbe4.tar gsoc2013-evolution-cb3e037f8f55f95892104326807d9988be87fbe4.tar.gz gsoc2013-evolution-cb3e037f8f55f95892104326807d9988be87fbe4.tar.bz2 gsoc2013-evolution-cb3e037f8f55f95892104326807d9988be87fbe4.tar.lz gsoc2013-evolution-cb3e037f8f55f95892104326807d9988be87fbe4.tar.xz gsoc2013-evolution-cb3e037f8f55f95892104326807d9988be87fbe4.tar.zst gsoc2013-evolution-cb3e037f8f55f95892104326807d9988be87fbe4.zip | |
Merge branch 'master' into wip/gsettings
Diffstat (limited to 'plugins/google-account-setup/google-source.c')
| -rw-r--r-- | plugins/google-account-setup/google-source.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c index e8d3f5a410..a9785ad844 100644 --- a/plugins/google-account-setup/google-source.c +++ b/plugins/google-account-setup/google-source.c @@ -434,9 +434,7 @@ retrieve_list_clicked (GtkButton *button, GtkComboBox *combo) { ESource *source; - #ifdef HAVE_LIBGDATA_0_9 GDataClientLoginAuthorizer *authorizer; - #endif GDataCalendarService *service; GDataFeed *feed; gchar *user, *password, *tmp; @@ -467,14 +465,9 @@ retrieve_list_clicked (GtkButton *button, return; } - #ifdef HAVE_LIBGDATA_0_9 authorizer = gdata_client_login_authorizer_new ("evolution-client-0.1.0", GDATA_TYPE_CALENDAR_SERVICE); service = gdata_calendar_service_new (GDATA_AUTHORIZER (authorizer)); if (!gdata_client_login_authorizer_authenticate (authorizer, user, password, NULL, &error)) { - #else - service = gdata_calendar_service_new ("evolution-client-0.1.0"); - if (!gdata_service_authenticate (GDATA_SERVICE (service), user, password, NULL, &error)) { - #endif /* Error! */ claim_error (parent, error->message); g_error_free (error); @@ -584,9 +577,7 @@ retrieve_list_clicked (GtkButton *button, } g_object_unref (service); - #ifdef HAVE_LIBGDATA_0_9 g_object_unref (authorizer); - #endif g_free (user); } |