fixed circular dependencies by moving all types to single type's file

diff --git a/src/daemon/gsignond-auth-session.h b/src/daemon/gsignond-auth-session.h
index 18facc2..300da28 100644 (file)
--- a/src/daemon/gsignond-auth-session.h
+++ b/src/daemon/gsignond-auth-session.h
@@ -28,6 +28,7 @@
 
 #include <glib-object.h>
 
+#include "gsignond-types.h"
 #include <gsignond/gsignond-dictionary.h>
 #include <gsignond/gsignond-identity-info.h>
 #include <gsignond/gsignond-signonui-data.h>
@@ -52,8 +53,6 @@ G_BEGIN_DECLS
     (G_TYPE_INSTANCE_GET_CLASS((obj), GSIGNOND_TYPE_AUTH_SESSION, \
                                GSignondAuthSessionClass))
 
-typedef struct _GSignondAuthSession GSignondAuthSession;
-typedef struct _GSignondAuthSessionClass GSignondAuthSessionClass;
 typedef struct _GSignondAuthSessionPrivate GSignondAuthSessionPrivate;
 typedef void (*ProcessReadyCb) (GSignondSessionData *results, const GError *error, gpointer user_data);
 typedef void (*StateChangeCb) (gint state, const gchar *message, gpointer userdata);

diff --git a/src/daemon/gsignond-daemon.h b/src/daemon/gsignond-daemon.h
index 1feac51..48dcd6c 100644 (file)
--- a/src/daemon/gsignond-daemon.h
+++ b/src/daemon/gsignond-daemon.h
@@ -28,8 +28,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
+#include "gsignond-types.h"
 #include <gsignond/gsignond-access-control-manager.h>
-#include "gsignond-identity.h"
 #include "gsignond-signonui-proxy.h"
 #include "plugins/gsignond-plugin-proxy-factory.h"
 
@@ -42,8 +42,6 @@ G_BEGIN_DECLS
 #define GSIGNOND_IS_DAEMON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GSIGNOND_TYPE_DAEMON))
 #define GSIGNOND_DAEMON_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GSIGNOND_TYPE_DAEMON, GSignondDaemonClass))
 
-typedef struct _GSignondDaemon GSignondDaemon;
-typedef struct _GSignondDaemonClass GSignondDaemonClass;
 typedef struct _GSignondDaemonPrivate GSignondDaemonPrivate;
 
 struct _GSignondDaemon

diff --git a/src/daemon/gsignond-identity.h b/src/daemon/gsignond-identity.h
index 5c2090b..b356d83 100644 (file)
--- a/src/daemon/gsignond-identity.h
+++ b/src/daemon/gsignond-identity.h
@@ -29,6 +29,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
+#include "gsignond-types.h"
 #include <gsignond/gsignond-identity-info.h>
 #include <gsignond/gsignond-access-control-manager.h>
 
@@ -41,13 +42,8 @@ G_BEGIN_DECLS
 #define GSIGNOND_IS_IDENTITY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GSIGNOND_TYPE_IDENTITY))
 #define GSIGNOND_IDENTITY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GSIGNOND_TYPE_IDENTITY, GSignondIdentityClass))
 
-typedef struct _GSignondIdentity GSignondIdentity;
-typedef struct _GSignondIdentityClass GSignondIdentityClass;
 typedef struct _GSignondIdentityPrivate GSignondIdentityPrivate;
 
-typedef struct _GSignondDaemon GSignondDaemon;
-typedef struct _GSignondAuthSession GSignondAuthSession;
-
 typedef enum {
     GSIGNOND_IDENTITY_DATA_UPDATED = 0,
     GSIGNOND_IDENTITY_REMOVED,

diff --git a/src/daemon/gsignond-types.h b/src/daemon/gsignond-types.h
new file mode 100644 (file)
index 0000000..9efcf53
--- /dev/null
+++ b/src/daemon/gsignond-types.h
@@ -0,0 +1,42 @@
+/* vi: set et sw=4 ts=4 cino=t0,(0: */
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of gsignond
+ *
+ * Copyright (C) 2013 Intel Corporation.
+ *
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#ifndef __GSIGNOND_TYPES_H_
+#define __GSIGNOND_TYPES_H_
+
+#include <glib.h>
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+typedef struct _GSignondDaemon GSignondDaemon;
+typedef struct _GSignondDaemonClass GSignondDaemonClass;
+typedef struct _GSignondIdentity GSignondIdentity;
+typedef struct _GSignondIdentityClass GSignondIdentityClass;
+typedef struct _GSignondAuthSession GSignondAuthSession;
+typedef struct _GSignondAuthSessionClass GSignondAuthSessionClass;
+
+G_END_DECLS
+
+#endif /* __GSIGNOND_TYPES_H_ */

diff --git a/src/daemon/plugins/gsignond-plugin-proxy.h b/src/daemon/plugins/gsignond-plugin-proxy.h
index a72d892..66ca0bd 100644 (file)
--- a/src/daemon/plugins/gsignond-plugin-proxy.h
+++ b/src/daemon/plugins/gsignond-plugin-proxy.h
@@ -27,6 +27,8 @@
 #define __GSIGNOND_PLUGIN_PROXY_H__
 
 #include <glib-object.h>
+
+#include "daemon/gsignond-types.h"
 #include <gsignond/gsignond-plugin-interface.h>
 #include <gsignond/gsignond-config.h>
 
@@ -41,7 +43,6 @@
 typedef struct _GSignondPluginProxy        GSignondPluginProxy;
 typedef struct _GSignondPluginProxyClass   GSignondPluginProxyClass;
 typedef struct _GSignondPluginProxyPrivate GSignondPluginProxyPrivate;
-typedef struct _GSignondAuthSession        GSignondAuthSession;
 
 struct _GSignondPluginProxy
 {