[evolution-data-server/openismus-work: 90/122] Fixing GTK+ dependency removal patch

[Tristan Van Berkom <tvb src gnome org>]

commit 016ad78f22e29f9ee45eeacd1c59f538b04acc2a
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Tue Dec 11 15:39:48 2012 +0900

    Fixing GTK+ dependency removal patch
    
    Reverting part of the #ifdef ENABLE_AUTHENTICATION bits which crept
    into the last patch.

 libedataserver/e-source-registry.c |   16 ----------------
 1 files changed, 0 insertions(+), 16 deletions(-)
---
diff --git a/libedataserver/e-source-registry.c b/libedataserver/e-source-registry.c
index a82b9e3..681754b 100644
--- a/libedataserver/e-source-registry.c
+++ b/libedataserver/e-source-registry.c
@@ -44,12 +44,10 @@
 #include <glib/gstdio.h>
 #include <glib/gi18n-lib.h>
 
-#ifdef ENABLE_AUTHENTICATION
 /* XXX Yeah, yeah... */
 #define GCR_API_SUBJECT_TO_CHANGE
 
 #include <gcr/gcr-base.h>
-#endif
 
 /* Private D-Bus classes. */
 #include <e-dbus-source.h>
@@ -131,9 +129,7 @@ struct _AuthContext {
 	GCancellable *cancellable;
 	GMainLoop *main_loop;
 	ESourceAuthenticationResult auth_result;
-#ifdef ENABLE_AUTHENTICATION
 	GcrSecretExchange *secret_exchange;
-#endif
 	gboolean authenticating;
 	gboolean success;
 	GError **error;
@@ -206,7 +202,6 @@ async_context_free (AsyncContext *async_context)
 	g_slice_free (AsyncContext, async_context);
 }
 
-#ifdef ENABLE_AUTHENTICATION
 static void
 auth_context_free (AuthContext *auth_context)
 {
@@ -227,7 +222,6 @@ auth_context_free (AuthContext *auth_context)
 
 	g_slice_free (AuthContext, auth_context);
 }
-#endif
 
 static void
 source_closure_free (SourceClosure *closure)
@@ -1412,7 +1406,6 @@ source_registry_authenticate_thread (GSimpleAsyncResult *simple,
 		g_simple_async_result_take_error (simple, error);
 }
 
-#ifdef ENABLE_AUTHENTICATION
 /* Helper for e_source_registry_authenticate_sync() */
 static gboolean
 source_registry_authenticate_respond_cb (AuthContext *auth_context)
@@ -1617,7 +1610,6 @@ source_registry_call_authenticate_for_source (ESourceRegistry *registry,
 
 	return success;
 }
-#endif /* ENABLE_AUTHENTICATION */
 
 /**
  * e_source_registry_authenticate_sync:
@@ -1650,7 +1642,6 @@ e_source_registry_authenticate_sync (ESourceRegistry *registry,
                                      GCancellable *cancellable,
                                      GError **error)
 {
-#ifdef ENABLE_AUTHENTICATION
 	AuthContext *auth_context;
 	GMainContext *main_context;
 	EDBusAuthenticator *dbus_auth;
@@ -1748,13 +1739,6 @@ exit:
 	g_main_context_unref (main_context);
 
 	return success;
-#else
-	g_set_error_literal (error,
-			     G_IO_ERROR, G_IO_ERROR_CANCELLED,
-			     _("Authentication support not enabled in EDS"));
-	return FALSE;
-
-#endif /* ENABLE_AUTHENTICATION */
 }
 
 /**