libfreerdp-utils: moved registry out of the core to the utils

diff --git a/libfreerdp-core/registry.h b/include/freerdp/utils/registry.h
similarity index 93%
rename from libfreerdp-core/registry.h
rename to include/freerdp/utils/registry.h
index 64c3df6..58b1b39 100644 (file)
--- a/libfreerdp-core/registry.h
+++ b/include/freerdp/utils/registry.h
@@ -1,6 +1,6 @@
 /**
  * FreeRDP: A Remote Desktop Protocol Client
- * Configuration Registry
+ * Registry Utils
  *
  * Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
  *
@@ -17,8 +17,8 @@
  * limitations under the License.
  */
 
-#ifndef __REGISTRY_H
-#define __REGISTRY_H
+#ifndef __REGISTRY_UTILS_H
+#define __REGISTRY_UTILS_H
 
 typedef struct rdp_registry rdpRegistry;
 
@@ -68,4 +68,4 @@ void registry_init(rdpRegistry* registry);
 rdpRegistry* registry_new(rdpSettings* settings);
 void registry_free(rdpRegistry* registry);
 
-#endif /* __REGISTRY_H */
+#endif /* __REGISTRY_UTILS_H */

diff --git a/libfreerdp-core/CMakeLists.txt b/libfreerdp-core/CMakeLists.txt
index 604d953..cbe7637 100644 (file)
--- a/libfreerdp-core/CMakeLists.txt
+++ b/libfreerdp-core/CMakeLists.txt
@@ -48,8 +48,6 @@ set(LIBFREERDP_CORE_SRCS
        license.h
        errinfo.c
        errinfo.h
-       registry.c
-       registry.h
        security.c
        security.h
        settings.c

diff --git a/libfreerdp-core/rdp.c b/libfreerdp-core/rdp.c
index b28b9f9..13f6b3e 100644 (file)
--- a/libfreerdp-core/rdp.c
+++ b/libfreerdp-core/rdp.c
@@ -523,7 +523,6 @@ rdpRdp* rdp_new(freerdp* instance)
        {
                rdp->licensed = False;
                rdp->settings = settings_new();
-               rdp->registry = registry_new(rdp->settings);
                rdp->transport = transport_new(rdp->settings);
                rdp->license = license_new(rdp);
                rdp->input = input_new(rdp);

diff --git a/libfreerdp-core/rdp.h b/libfreerdp-core/rdp.h
index bac8ad6..ee7c714 100644 (file)
--- a/libfreerdp-core/rdp.h
+++ b/libfreerdp-core/rdp.h
@@ -32,7 +32,6 @@ typedef struct rdp_rdp rdpRdp;
 #include "license.h"
 #include "errinfo.h"
 #include "security.h"
-#include "registry.h"
 #include "transport.h"
 #include "connection.h"
 #include "capabilities.h"
@@ -123,7 +122,6 @@ struct rdp_rdp
        struct rdp_fastpath* fastpath;
        struct rdp_license* license;
        struct rdp_settings* settings;
-       struct rdp_registry* registry;
        struct rdp_transport* transport;
        struct rdp_vchan* vchan;
 };

diff --git a/libfreerdp-utils/CMakeLists.txt b/libfreerdp-utils/CMakeLists.txt
index d944623..938ba81 100644 (file)
--- a/libfreerdp-utils/CMakeLists.txt
+++ b/libfreerdp-utils/CMakeLists.txt
@@ -32,6 +32,7 @@ set(FREERDP_UTILS_SRCS
        mutex.c
        profiler.c
        rail.c
+       registry.c
        semaphore.c
        sleep.c
        stopwatch.c

diff --git a/libfreerdp-core/registry.c b/libfreerdp-utils/registry.c
similarity index 98%
rename from libfreerdp-core/registry.c
rename to libfreerdp-utils/registry.c
index 67b1740..f7322c7 100644 (file)
--- a/libfreerdp-core/registry.c
+++ b/libfreerdp-utils/registry.c
@@ -1,6 +1,6 @@
 /**
  * FreeRDP: A Remote Desktop Protocol Client
- * Configuration Registry
+ * Registry Utils
  *
  * Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
  *
@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 
-#include "registry.h"
-
-#include <windows.h>
+#include <freerdp/utils/registry.h>
 
 static char registry_dir[] = "freerdp";
 static char registry_file[] = "config.txt";