common: make gsignond-identity-info.h private, as it's not used by anything in the...

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 6d0fc24..f9bf52e 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -60,6 +60,7 @@ EXTRA_HFILES=
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code
 IGNORE_HFILES=\
 gsignond-disposable.h\
+gsignond-identity-info.h\
 gsignond-identity-info-internal.h\
 gsignond-pipe-stream.h\
 gsignond-plugin-enum-types.h\

diff --git a/docs/gsignond-docs.sgml b/docs/gsignond-docs.sgml
index b7f72f3..631193a 100644 (file)
--- a/docs/gsignond-docs.sgml
+++ b/docs/gsignond-docs.sgml
@@ -25,7 +25,6 @@
     <xi:include href="xml/gsignond-dictionary.xml"/>
     <xi:include href="xml/gsignond-error.xml"/>
     <xi:include href="xml/gsignond-extension-interface.xml"/>
-    <xi:include href="xml/gsignond-identity-info.xml"/>
     <xi:include href="xml/gsignond-log.xml"/>
     <xi:include href="xml/gsignond-plugin-interface.xml"/>
     <xi:include href="xml/gsignond-secret-storage.xml"/>

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index a96944b..b89d47e 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -52,6 +52,7 @@ libgsignond_common_la_SOURCES = \
     gsignond-access-control-manager.c \
     gsignond-extension-interface.c \
     gsignond-storage-manager.c \
+    gsignond-identity-info.h \
     gsignond-identity-info-internal.h \
     gsignond-identity-info.c \
     gsignond-credentials.c \

diff --git a/src/common/gsignond-identity-info-internal.h b/src/common/gsignond-identity-info-internal.h
index 2375cbe..60ce7a1 100644 (file)
--- a/src/common/gsignond-identity-info-internal.h
+++ b/src/common/gsignond-identity-info-internal.h
@@ -27,7 +27,7 @@
 #define __GSIGNOND_IDENTITY_INFO_INTERNAL_H__
 
 #include <glib.h>
-#include <gsignond/gsignond-identity-info.h>
+#include "gsignond-identity-info.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/common/gsignond-identity-info.c b/src/common/gsignond-identity-info.c
index f87d7f2..02af6c3 100644 (file)
--- a/src/common/gsignond-identity-info.c
+++ b/src/common/gsignond-identity-info.c
@@ -23,7 +23,7 @@
  * 02110-1301 USA
  */
 
-#include <gsignond/gsignond-identity-info.h>
+#include "gsignond-identity-info.h"
 #include "gsignond-identity-info-internal.h"
 
 

diff --git a/include/gsignond/gsignond-identity-info.h b/src/common/gsignond-identity-info.h
similarity index 100%
rename from include/gsignond/gsignond-identity-info.h
rename to src/common/gsignond-identity-info.h

diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index 3c00078..2feb112 100644 (file)
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -33,7 +33,6 @@ gsignond_include_HEADERS = \
        $(gsignond_pubhdr)/gsignond-dictionary.h \
        $(gsignond_pubhdr)/gsignond-error.h \
        $(gsignond_pubhdr)/gsignond-extension-interface.h \
-       $(gsignond_pubhdr)/gsignond-identity-info.h \
        $(gsignond_pubhdr)/gsignond-log.h \
        $(gsignond_pubhdr)/gsignond-plugin-interface.h \
        $(gsignond_pubhdr)/gsignond-secret-storage.h \

diff --git a/src/daemon/db/gsignond-db-credentials-database.h b/src/daemon/db/gsignond-db-credentials-database.h
index d4296d1..5cd481c 100644 (file)
--- a/src/daemon/db/gsignond-db-credentials-database.h
+++ b/src/daemon/db/gsignond-db-credentials-database.h
@@ -28,7 +28,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gsignond/gsignond-identity-info.h>
+#include "common/gsignond-identity-info.h"
 #include <gsignond/gsignond-config.h>
 #include <gsignond/gsignond-secret-storage.h>
 

diff --git a/src/daemon/db/gsignond-db-metadata-database.h b/src/daemon/db/gsignond-db-metadata-database.h
index 0a787af..4e5a943 100644 (file)
--- a/src/daemon/db/gsignond-db-metadata-database.h
+++ b/src/daemon/db/gsignond-db-metadata-database.h
@@ -28,7 +28,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gsignond/gsignond-identity-info.h>
+#include "common/gsignond-identity-info.h"
 #include <gsignond/gsignond-config.h>
 #include <common/db/gsignond-db-sql-database.h>
 

diff --git a/src/daemon/gsignond-auth-session.c b/src/daemon/gsignond-auth-session.c
index d3c14f0..f165a26 100644 (file)
--- a/src/daemon/gsignond-auth-session.c
+++ b/src/daemon/gsignond-auth-session.c
@@ -27,7 +27,6 @@
 #include "gsignond/gsignond-error.h"
 #include "gsignond/gsignond-log.h"
 #include "gsignond/gsignond-session-data.h"
-#include "gsignond/gsignond-identity-info.h"
 #include "plugins/gsignond-plugin-proxy-factory.h"
 #include "gsignond-daemon.h"
 

diff --git a/src/daemon/gsignond-auth-session.h b/src/daemon/gsignond-auth-session.h
index 300da28..d59a3d2 100644 (file)
--- a/src/daemon/gsignond-auth-session.h
+++ b/src/daemon/gsignond-auth-session.h
@@ -30,7 +30,7 @@
 
 #include "gsignond-types.h"
 #include <gsignond/gsignond-dictionary.h>
-#include <gsignond/gsignond-identity-info.h>
+#include "common/gsignond-identity-info.h"
 #include <gsignond/gsignond-signonui-data.h>
 #include <gsignond/gsignond-session-data.h>
 #include <gsignond/gsignond-access-control-manager.h>

diff --git a/src/daemon/gsignond-daemon.h b/src/daemon/gsignond-daemon.h
index 2dd8fa5..de77d28 100644 (file)
--- a/src/daemon/gsignond-daemon.h
+++ b/src/daemon/gsignond-daemon.h
@@ -30,7 +30,7 @@
 
 #include "gsignond-types.h"
 #include <gsignond/gsignond-access-control-manager.h>
-#include <gsignond/gsignond-identity-info.h>
+#include "common/gsignond-identity-info.h"
 #include "gsignond-signonui-proxy.h"
 #include "plugins/gsignond-plugin-proxy-factory.h"
 

diff --git a/src/daemon/gsignond-identity.h b/src/daemon/gsignond-identity.h
index 585042f..11b7654 100644 (file)
--- a/src/daemon/gsignond-identity.h
+++ b/src/daemon/gsignond-identity.h
@@ -30,7 +30,7 @@
 #include <glib-object.h>
 
 #include "gsignond-types.h"
-#include <gsignond/gsignond-identity-info.h>
+#include "common/gsignond-identity-info.h"
 #include <gsignond/gsignond-access-control-manager.h>
 
 G_BEGIN_DECLS

diff --git a/test/daemon/daemon-test.c b/test/daemon/daemon-test.c
index 3d5d396..e9a9a3b 100644 (file)
--- a/test/daemon/daemon-test.c
+++ b/test/daemon/daemon-test.c
@@ -37,7 +37,7 @@
 #include "daemon/dbus/gsignond-dbus-auth-service-gen.h"
 #include "daemon/dbus/gsignond-dbus-identity-gen.h"
 #include "daemon/dbus/gsignond-dbus-auth-session-gen.h"
-#include "gsignond/gsignond-identity-info.h"
+#include "common/gsignond-identity-info.h"
 #include "gsignond/gsignond-log.h"
 
 #ifdef USE_P2P