[libgda] LDAP: Fix provider build

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 2abdf79ee732f9a3368291a5c1e5258714b205a4
Author: Daniel Espinosa <esodan gmail com>
Date:   Tue Apr 23 10:11:13 2019 -0500

    LDAP: Fix provider build

 providers/ldap/gda-data-model-ldap.c     |  4 ++--
 providers/ldap/gda-ldap-connection.h     |  2 +-
 providers/ldap/gda-ldap-provider.c       |  2 +-
 providers/ldap/gda-ldap-util.h           |  2 +-
 providers/ldap/gda-ldap.h                |  2 +-
 providers/ldap/gda-tree-mgr-ldap.c       |  2 +-
 providers/ldap/gdaprov-data-model-ldap.c |  4 ++--
 providers/ldap/gdaprov-data-model-ldap.h |  2 +-
 providers/ldap/libmain.c                 | 30 ++++--------------------------
 9 files changed, 14 insertions(+), 36 deletions(-)
---
diff --git a/providers/ldap/gda-data-model-ldap.c b/providers/ldap/gda-data-model-ldap.c
index badd25b21..e5da5168f 100644
--- a/providers/ldap/gda-data-model-ldap.c
+++ b/providers/ldap/gda-data-model-ldap.c
@@ -19,10 +19,10 @@
  */
 
 #include <string.h>
-#include <libgda/gda-data-model-ldap.h>
+#include "gda-data-model-ldap.h"
 #include <libgda/gda-connection.h>
 #include <libgda/gda-config.h>
-#include <virtual/gda-ldap-connection.h>
+#include "gda-ldap-connection.h"
 #include <gmodule.h>
 #include <glib/gi18n-lib.h>
 
diff --git a/providers/ldap/gda-ldap-connection.h b/providers/ldap/gda-ldap-connection.h
index 10315f5c0..f1b2e4d23 100644
--- a/providers/ldap/gda-ldap-connection.h
+++ b/providers/ldap/gda-ldap-connection.h
@@ -22,7 +22,7 @@
 #define __GDA_LDAP_CONNECTION_H__
 
 #include <virtual/gda-vconnection-data-model.h>
-#include <libgda/gda-data-model-ldap.h>
+#include "gda-data-model-ldap.h"
 
 #define GDA_TYPE_LDAP_CONNECTION            (gda_ldap_connection_get_type())
 G_DECLARE_DERIVABLE_TYPE(GdaLdapConnection, gda_ldap_connection, GDA, LDAP_CONNECTION, 
GdaVconnectionDataModel)
diff --git a/providers/ldap/gda-ldap-provider.c b/providers/ldap/gda-ldap-provider.c
index 0d545595d..4fddcd30f 100644
--- a/providers/ldap/gda-ldap-provider.c
+++ b/providers/ldap/gda-ldap-provider.c
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib/gi18n-lib.h>
-#include <virtual/gda-ldap-connection.h>
+#include "gda-ldap-connection.h"
 #include <libgda/gda-server-provider-impl.h>
 #include <libgda/gda-data-model-iter.h>
 #include <libgda/gda-util.h>
diff --git a/providers/ldap/gda-ldap-util.h b/providers/ldap/gda-ldap-util.h
index 02001a3a5..2bd8c2388 100644
--- a/providers/ldap/gda-ldap-util.h
+++ b/providers/ldap/gda-ldap-util.h
@@ -26,7 +26,7 @@
 
 #include <glib.h>
 #include "gda-ldap.h"
-#include <virtual/gda-ldap-connection.h>
+#include "gda-ldap-connection.h"
 
 /*
  * Attributes
diff --git a/providers/ldap/gda-ldap.h b/providers/ldap/gda-ldap.h
index 77a81a5f1..d31091cfb 100644
--- a/providers/ldap/gda-ldap.h
+++ b/providers/ldap/gda-ldap.h
@@ -33,7 +33,7 @@
 #include <glib.h>
 #include <libgda/libgda.h>
 #include <libgda/gda-connection-private.h>
-#include <virtual/gda-ldap-connection.h>
+#include "gda-ldap-connection.h"
 
 /*
  * Note about thread safety:
diff --git a/providers/ldap/gda-tree-mgr-ldap.c b/providers/ldap/gda-tree-mgr-ldap.c
index e59758810..fd4020e63 100644
--- a/providers/ldap/gda-tree-mgr-ldap.c
+++ b/providers/ldap/gda-tree-mgr-ldap.c
@@ -21,7 +21,7 @@
 #include <libgda/libgda.h>
 #include "gda-tree-mgr-ldap.h"
 #include "gda-tree-node.h"
-#include <sqlite/virtual/gda-ldap-connection.h>
+#include "gda-ldap-connection.h"
 
 static void gda_tree_mgr_ldap_class_init (GdaTreeMgrLdapClass *klass);
 static void gda_tree_mgr_ldap_init       (GdaTreeMgrLdap *tmgr1);
diff --git a/providers/ldap/gdaprov-data-model-ldap.c b/providers/ldap/gdaprov-data-model-ldap.c
index 8b879adf1..d1a2f79bd 100644
--- a/providers/ldap/gdaprov-data-model-ldap.c
+++ b/providers/ldap/gdaprov-data-model-ldap.c
@@ -20,13 +20,13 @@
 
 #include <string.h>
 #include <glib/gi18n-lib.h>
-#include <libgda/gda-data-model-ldap.h>
+#include "gda-data-model-ldap.h"
 #include <libgda/gda-connection.h>
 #include <libgda/gda-data-model-iter.h>
 #include <libgda/gda-holder.h>
 #include <libgda/gda-util.h>
 #include <libgda/sqlite/virtual/gda-virtual-connection.h>
-#include <libgda/sqlite/virtual/gda-ldap-connection.h>
+#include "gda-ldap-connection.h"
 #include "gda-ldap.h"
 #include "gda-ldap-util.h"
 #include "gdaprov-data-model-ldap.h"
diff --git a/providers/ldap/gdaprov-data-model-ldap.h b/providers/ldap/gdaprov-data-model-ldap.h
index 8e74719c0..18dc9f070 100644
--- a/providers/ldap/gdaprov-data-model-ldap.h
+++ b/providers/ldap/gdaprov-data-model-ldap.h
@@ -25,7 +25,7 @@
 #ifndef __GDA_PROXY_DATA_MODEL_LDAP_H__
 #define __GDA_PROXY_DATA_MODEL_LDAP_H__
 
-#include <libgda/gda-data-model-ldap.h>
+#include "gda-data-model-ldap.h"
 
 G_BEGIN_DECLS
 
diff --git a/providers/ldap/libmain.c b/providers/ldap/libmain.c
index 05b9ea39c..8433fd3e3 100644
--- a/providers/ldap/libmain.c
+++ b/providers/ldap/libmain.c
@@ -31,7 +31,6 @@
 #include "gda-ldap.h"
 #include "gda-ldap-provider.h"
 
-static gchar      *module_path = NULL;
 const gchar       *plugin_get_name (void);
 const gchar       *plugin_get_description (void);
 gchar             *plugin_get_dsn_spec (void);
@@ -49,8 +48,6 @@ g_module_check_init (G_GNUC_UNUSED GModule *module)
 void
 g_module_unload (G_GNUC_UNUSED GModule *module)
 {
-        g_free (module_path);
-        module_path = NULL;
 }
 
 /*
@@ -59,8 +56,6 @@ g_module_unload (G_GNUC_UNUSED GModule *module)
 void
 plugin_init (const gchar *real_path)
 {
-        if (real_path)
-                module_path = g_strdup (real_path);
 }
 
 const gchar *
@@ -78,29 +73,13 @@ plugin_get_description (void)
 gchar *
 plugin_get_dsn_spec (void)
 {
-       gchar *ret, *dir;
-
-       dir = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, NULL);
-       ret = gda_server_provider_load_file_contents (module_path, dir, "ldap_specs_dsn.xml");
-       g_free (dir);
-       if (ret)
-               return ret;
-       else
-               return gda_server_provider_load_resource_contents ("ldap", "ldap_specs_dsn.raw.xml");
+       return gda_server_provider_load_resource_contents ("ldap", "ldap_specs_dsn.raw.xml");
 }
 
 gchar *
 plugin_get_auth_spec (void)
 {
-       gchar *ret, *dir;
-
-       dir = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, NULL);
-       ret = gda_server_provider_load_file_contents (module_path, dir, "ldap_specs_auth.xml");
-       g_free (dir);
-       if (ret)
-               return ret;
-       else
-               return gda_server_provider_load_resource_contents ("ldap", "ldap_specs_auth.raw.xml");
+       return gda_server_provider_load_resource_contents ("ldap", "ldap_specs_auth.raw.xml");
 }
 
 GdaServerProvider *
@@ -108,7 +87,6 @@ plugin_create_provider (void)
 {
        GdaServerProvider *prov;
 
-        prov = (GdaServerProvider *) g_object_new (GDA_TYPE_LDAP_PROVIDER, NULL);
-        g_object_set_data ((GObject *) prov, "GDA_PROVIDER_DIR", module_path);
-        return prov;
+  prov = (GdaServerProvider *) g_object_new (GDA_TYPE_LDAP_PROVIDER, NULL);
+  return prov;
 }