common: Moving Disposable object to common.

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 283d783..66d4fb3 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -62,6 +62,8 @@ libgsignond_common_la_SOURCES = \
     gsignond-plugin-loader.c \
     gsignond-utils.c \
     gsignond-pipe-stream.c \
+    gsignond-disposable.h \
+    gsignond-disposable.c \
     $(BUILT_SOURCES) \
     $(NULL)
 

diff --git a/src/daemon/dbus/gsignond-disposable.c b/src/common/gsignond-disposable.c
similarity index 100%
rename from src/daemon/dbus/gsignond-disposable.c
rename to src/common/gsignond-disposable.c

diff --git a/src/daemon/dbus/gsignond-disposable.h b/src/common/gsignond-disposable.h
similarity index 100%
rename from src/daemon/dbus/gsignond-disposable.h
rename to src/common/gsignond-disposable.h

diff --git a/src/daemon/dbus/Makefile.am b/src/daemon/dbus/Makefile.am
index ae0eeea..24674a9 100644 (file)
--- a/src/daemon/dbus/Makefile.am
+++ b/src/daemon/dbus/Makefile.am
@@ -92,8 +92,6 @@ libgsignond_dbus_la_LIBADD = \
 
 libgsignond_dbus_la_SOURCES = \
    $(DBUS_BUILT_SOURCES) \
-   gsignond-disposable.h \
-   gsignond-disposable.c \
    gsignond-dbus.h \
    gsignond-dbus-server.c \
    gsignond-dbus-server.h \

diff --git a/src/daemon/dbus/gsignond-dbus-auth-service-adapter.h b/src/daemon/dbus/gsignond-dbus-auth-service-adapter.h
index 9323f1d..adf956b 100644 (file)
--- a/src/daemon/dbus/gsignond-dbus-auth-service-adapter.h
+++ b/src/daemon/dbus/gsignond-dbus-auth-service-adapter.h
@@ -29,7 +29,7 @@
 #include <config.h>
 #include <glib.h>
 #include <daemon/gsignond-daemon.h>
-#include "gsignond-disposable.h"
+#include "common/gsignond-disposable.h"
 #include "gsignond-dbus-auth-service-gen.h"
 
 G_BEGIN_DECLS

diff --git a/src/daemon/dbus/gsignond-dbus-auth-session-adapter.h b/src/daemon/dbus/gsignond-dbus-auth-session-adapter.h
index 1b47cc2..9405a4b 100644 (file)
--- a/src/daemon/dbus/gsignond-dbus-auth-session-adapter.h
+++ b/src/daemon/dbus/gsignond-dbus-auth-session-adapter.h
@@ -29,7 +29,7 @@
 #include <config.h>
 #include <glib.h>
 #include <daemon/gsignond-auth-session.h>
-#include "gsignond-disposable.h"
+#include "common/gsignond-disposable.h"
 #include "gsignond-dbus-auth-session-gen.h"
 
 G_BEGIN_DECLS

diff --git a/src/daemon/dbus/gsignond-dbus-identity-adapter.h b/src/daemon/dbus/gsignond-dbus-identity-adapter.h
index 83db60a..d900c21 100644 (file)
--- a/src/daemon/dbus/gsignond-dbus-identity-adapter.h
+++ b/src/daemon/dbus/gsignond-dbus-identity-adapter.h
@@ -29,7 +29,7 @@
 #include <config.h>
 #include <glib.h>
 #include <daemon/gsignond-identity.h>
-#include "gsignond-disposable.h"
+#include "common/gsignond-disposable.h"
 #include "gsignond-dbus-identity-gen.h"
 
 G_BEGIN_DECLS