docs: remove unnecessary gsignond-signonui.h header

diff --git a/docs/gsignond-docs.sgml b/docs/gsignond-docs.sgml
index 94f9f86..577a71a 100644 (file)
--- a/docs/gsignond-docs.sgml
+++ b/docs/gsignond-docs.sgml
@@ -41,7 +41,6 @@
     <xi:include href="xml/gsignond-secret-storage.xml"/>
     <xi:include href="xml/gsignond-security-context.xml"/>
     <xi:include href="xml/gsignond-session-data.xml"/>
-    <xi:include href="xml/gsignond-signonui.xml"/>
     <xi:include href="xml/gsignond-signonui-data.xml"/>
     <xi:include href="xml/gsignond-storage-manager.xml"/>
     <xi:include href="xml/gsignond-utils.xml"/>

diff --git a/include/gsignond/gsignond-signonui-data.h b/include/gsignond/gsignond-signonui-data.h
index e6fc74d..9b4839f 100644 (file)
--- a/include/gsignond/gsignond-signonui-data.h
+++ b/include/gsignond/gsignond-signonui-data.h
@@ -27,7 +27,6 @@
 #define __GSIGNOND_SIGNONUI_DATA_H__
 
 #include <gsignond/gsignond-dictionary.h>
-#include <gsignond/gsignond-signonui.h>
 
 G_BEGIN_DECLS
 
@@ -41,6 +40,36 @@ G_BEGIN_DECLS
 
 typedef GSignondDictionary GSignondSignonuiData;
 
+/**
+ * @GSignondSignonuiError:
+ * @SIGNONUI_ERROR_NONE: No errors
+ * @SIGNONUI_ERROR_GENERAL: Generic error during interaction
+ * @SIGNONUI_ERROR_NO_SIGNONUI: Cannot send request to signon-ui
+ * @SIGNONUI_ERROR_BAD_PARAMETERS:Signon-Ui cannot create dialog based on the given UiSessionData
+ * @SIGNONUI_ERROR_CANCELED: User canceled action. Plugin should not retry automatically after this
+ * @SIGNONUI_ERROR_NOT_AVAILABLE: Requested ui is not available. For example browser cannot be started
+ * @SIGNONUI_ERROR_BAD_URL: Given url was not valid
+ * @SIGNONUI_ERROR_BAD_CAPTCHA: Given captcha image was not valid
+ * @SIGNONUI_ERROR_BAD_CAPTCHA_URL: Given url for capctha loading was not valid
+ * @SIGNONUI_ERROR_REFRESH_FAILED: Refresh failed
+ * @SIGNONUI_ERROR_FORBIDDEN: Showing ui forbidden by ui policy
+ * @SIGNONUI_ERROR_FORGOT_PASSWORD: User pressed forgot password
+ */
+typedef enum {
+    SIGNONUI_ERROR_NONE = 0, 
+    SIGNONUI_ERROR_GENERAL,
+    SIGNONUI_ERROR_NO_SIGNONUI,
+    SIGNONUI_ERROR_BAD_PARAMETERS,
+    SIGNONUI_ERROR_CANCELED,
+    SIGNONUI_ERROR_NOT_AVAILABLE, 
+    SIGNONUI_ERROR_BAD_URL, 
+    SIGNONUI_ERROR_BAD_CAPTCHA,
+    SIGNONUI_ERROR_BAD_CAPTCHA_URL,
+    SIGNONUI_ERROR_REFRESH_FAILED, 
+    SIGNONUI_ERROR_FORBIDDEN,
+    SIGNONUI_ERROR_FORGOT_PASSWORD
+} GSignondSignonuiError;
+
 #define gsignond_signonui_data_new() gsignond_dictionary_new()
 
 #define gsignond_signonui_data_new_from_variant(variantmap) gsignond_dictionary_new_from_variant(variantmap)

diff --git a/include/gsignond/gsignond-signonui.h b/include/gsignond/gsignond-signonui.h
deleted file mode 100644 (file)
index 72c5393..0000000
--- a/include/gsignond/gsignond-signonui.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef _GSIGNOND_SIGNONUI_H_
-#define _GSIGNOND_SIGNONUI_H_
-
-/**
- * @GSignondSignonuiError:
- * @SIGNONUI_ERROR_NONE: No errors
- * @SIGNONUI_ERROR_GENERAL: Generic error during interaction
- * @SIGNONUI_ERROR_NO_SIGNONUI: Cannot send request to signon-ui
- * @SIGNONUI_ERROR_BAD_PARAMETERS:Signon-Ui cannot create dialog based on the given UiSessionData
- * @SIGNONUI_ERROR_CANCELED: User canceled action. Plugin should not retry automatically after this
- * @SIGNONUI_ERROR_NOT_AVAILABLE: Requested ui is not available. For example browser cannot be started
- * @SIGNONUI_ERROR_BAD_URL: Given url was not valid
- * @SIGNONUI_ERROR_BAD_CAPTCHA: Given captcha image was not valid
- * @SIGNONUI_ERROR_BAD_CAPTCHA_URL: Given url for capctha loading was not valid
- * @SIGNONUI_ERROR_REFRESH_FAILED: Refresh failed
- * @SIGNONUI_ERROR_FORBIDDEN: Showing ui forbidden by ui policy
- * @SIGNONUI_ERROR_FORGOT_PASSWORD: User pressed forgot password
- */
-typedef enum {
-    SIGNONUI_ERROR_NONE = 0, 
-    SIGNONUI_ERROR_GENERAL,
-    SIGNONUI_ERROR_NO_SIGNONUI,
-    SIGNONUI_ERROR_BAD_PARAMETERS,
-    SIGNONUI_ERROR_CANCELED,
-    SIGNONUI_ERROR_NOT_AVAILABLE, 
-    SIGNONUI_ERROR_BAD_URL, 
-    SIGNONUI_ERROR_BAD_CAPTCHA,
-    SIGNONUI_ERROR_BAD_CAPTCHA_URL,
-    SIGNONUI_ERROR_REFRESH_FAILED, 
-    SIGNONUI_ERROR_FORBIDDEN,
-    SIGNONUI_ERROR_FORGOT_PASSWORD
-} GSignondSignonuiError;
-
-#endif //_GSIGNOND_SIGNONUI_H_

diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index e34ed20..b67ac11 100644 (file)
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -40,7 +40,6 @@ gsignond_include_HEADERS = \
        $(gsignond_pubhdr)/gsignond-security-context.h \
        $(gsignond_pubhdr)/gsignond-session-data.h \
        $(gsignond_pubhdr)/gsignond-signonui-data.h \
-       $(gsignond_pubhdr)/gsignond-signonui.h \
        $(gsignond_pubhdr)/gsignond-storage-manager.h \
        $(gsignond_pubhdr)/gsignond-utils.h
 

diff --git a/src/daemon/gsignond-identity.c b/src/daemon/gsignond-identity.c
index cdfde66..3ca83fc 100644 (file)
--- a/src/daemon/gsignond-identity.c
+++ b/src/daemon/gsignond-identity.c
@@ -33,7 +33,6 @@
 #include "gsignond-identity-enum-types.h"
 #include "gsignond-auth-session.h"
 #include "gsignond/gsignond-config-dbus.h"
-#include "gsignond/gsignond-signonui.h"
 #include "common/gsignond-identity-info-internal.h"
 #include "plugins/gsignond-plugin-proxy-factory.h"
 

diff --git a/src/daemon/gsignond-signonui-proxy.c b/src/daemon/gsignond-signonui-proxy.c
index 80cb8aa..21a28de 100644 (file)
--- a/src/daemon/gsignond-signonui-proxy.c
+++ b/src/daemon/gsignond-signonui-proxy.c
@@ -25,7 +25,6 @@
 
 #include "gsignond-signonui-proxy.h"
 #include <gsignond/gsignond-log.h>
-#include <gsignond/gsignond-signonui.h>
 #include "dbus/gsignond-dbus-signonui-adapter.h"
 
 static void _process_next_request (GSignondSignonuiProxy *proxy);