daemon: move app-context to dbus

diff --git a/src/daemon/dbus/gsignond-dbus-auth-service-adapter.c b/src/daemon/dbus/gsignond-dbus-auth-service-adapter.c
index 40bc974..7e01831 100644 (file)
--- a/src/daemon/dbus/gsignond-dbus-auth-service-adapter.c
+++ b/src/daemon/dbus/gsignond-dbus-auth-service-adapter.c
@@ -266,7 +266,7 @@ _handle_register_new_identity (GSignondDbusAuthServiceAdapter *self,
         guint identity_timeout = gsignond_daemon_get_identity_timeout (self->priv->auth_service);
  
         dbus_identity = gsignond_dbus_identity_adapter_new_with_connection (
-                            g_object_ref (connection), identity, identity_timeout);
+                            g_object_ref (connection), identity, app_context, identity_timeout);
 #ifndef USE_P2P
         g_bus_watch_name_on_connection (connection, sender, G_BUS_NAME_WATCHER_FLAGS_NONE, 
                                         NULL, _on_connnection_lost, dbus_identity, NULL);
@@ -327,7 +327,7 @@ _handle_get_identity (GSignondDbusAuthServiceAdapter *self,
 
         identity_timeout = gsignond_daemon_get_identity_timeout (self->priv->auth_service);
         dbus_identity = gsignond_dbus_identity_adapter_new_with_connection (
-                            g_object_ref(connection), identity, identity_timeout);
+                            g_object_ref(connection), identity, app_context, identity_timeout);
         info = gsignond_identity_get_identity_info (identity);
 #ifndef USE_P2P
         g_bus_watch_name_on_connection (connection, sender, G_BUS_NAME_WATCHER_FLAGS_NONE, 

diff --git a/src/daemon/dbus/gsignond-dbus-auth-session-adapter.c b/src/daemon/dbus/gsignond-dbus-auth-session-adapter.c
index 5742c39..f048a50 100644 (file)
--- a/src/daemon/dbus/gsignond-dbus-auth-session-adapter.c
+++ b/src/daemon/dbus/gsignond-dbus-auth-session-adapter.c
@@ -33,6 +33,7 @@ enum
     PROP_0,
     PROP_SESSION,
     PROP_CONNECTION,
+    PROP_APP_CONTEXT,
     N_PROPERTIES
 };
 
@@ -42,8 +43,9 @@ struct _GSignondDbusAuthSessionAdapterPrivate
 {
     GDBusConnection     *connection;
     GSignondDbusAuthSession *dbus_auth_session;
-    GSignondSecurityContext ctx;
     GSignondAuthSession *session;
+    gchar *app_context;
+    GSignondSecurityContext ctx;
     /* signal handlers */
     guint state_changed_handler_id;
     guint process_result_handler_id;
@@ -71,7 +73,7 @@ G_DEFINE_TYPE (GSignondDbusAuthSessionAdapter, gsignond_dbus_auth_session_adapte
             &priv->ctx, \
             fd, \
             sender, \
-            gsignond_auth_session_get_context (priv->session)); \
+            priv->app_context); \
 }
 
 static gboolean _handle_query_available_mechanisms (GSignondDbusAuthSessionAdapter *, GDBusMethodInvocation *, const gchar **, gpointer);
@@ -107,6 +109,11 @@ gsignond_dbus_auth_session_adapter_set_property (GObject *object,
             self->priv->connection = G_DBUS_CONNECTION (g_value_get_object (value));
             break;
         }
+        case PROP_APP_CONTEXT: {
+            if (self->priv->app_context) g_free (self->priv->app_context);
+            self->priv->app_context = g_strdup (g_value_get_string (value));
+            break;
+        }
         default:
             G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
     }
@@ -128,6 +135,9 @@ gsignond_dbus_auth_session_adapter_get_property (GObject *object,
         case PROP_CONNECTION:
             g_value_set_object (value, self->priv->connection);
             break;
+        case PROP_APP_CONTEXT:
+            g_value_set_string (value, self->priv->app_context);
+            break;
         default:
             G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
     }
@@ -178,6 +188,12 @@ gsignond_dbus_auth_session_adapter_dispose (GObject *object)
 static void
 gsignond_dbus_auth_session_adapter_finalize (GObject *object)
 {
+    GSignondDbusAuthSessionAdapter *self = GSIGNOND_DBUS_AUTH_SESSION_ADAPTER (object);
+
+    if (self->priv->app_context) {
+        g_free (self->priv->app_context);
+        self->priv->app_context = NULL;
+    }
 
     G_OBJECT_CLASS (gsignond_dbus_auth_session_adapter_parent_class)->finalize (object);
 }
@@ -209,6 +225,12 @@ gsignond_dbus_auth_session_adapter_class_init (GSignondDbusAuthSessionAdapterCla
                                                        G_PARAM_READWRITE |
                                                        G_PARAM_CONSTRUCT_ONLY | 
                                                        G_PARAM_STATIC_STRINGS);
+    properties[PROP_APP_CONTEXT] = g_param_spec_string (
+                "app-context",
+                "application security context",
+                "Application security context of the identity object creater",
+                NULL,
+                G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
 
     g_object_class_install_properties (object_class, N_PROPERTIES, properties);
 }
@@ -220,6 +242,7 @@ gsignond_dbus_auth_session_adapter_init (GSignondDbusAuthSessionAdapter *self)
 
     self->priv->connection = 0;
     self->priv->session = 0;
+    self->priv->app_context = 0;
     self->priv->state_changed_handler_id = 0;
     self->priv->process_result_handler_id = 0;
     self->priv->process_erroror_handler_id = 0;
@@ -417,6 +440,7 @@ gsignond_dbus_auth_session_adapter_get_object_path (GSignondDbusAuthSessionAdapt
 GSignondDbusAuthSessionAdapter *
 gsignond_dbus_auth_session_adapter_new_with_connection (GDBusConnection *connection, 
                                                         GSignondAuthSession *session,
+                                                        const gchar *app_context,
                                                         guint timeout)
 {
     static guint32 object_counter;
@@ -426,7 +450,7 @@ gsignond_dbus_auth_session_adapter_new_with_connection (GDBusConnection *connect
     
     adapter = GSIGNOND_DBUS_AUTH_SESSION_ADAPTER (
         g_object_new (GSIGNOND_TYPE_DBUS_AUTH_SESSION_ADAPTER, 
-            "connection", connection, "auth-session", session, NULL));
+            "connection", connection, "auth-session", session, "app-context", app_context, NULL));
 
     if (!adapter) return NULL;
 
@@ -451,7 +475,7 @@ gsignond_dbus_auth_session_adapter_new_with_connection (GDBusConnection *connect
 
 #ifndef USE_P2P
 GSignondDbusAuthSessionAdapter *
-gsignond_dbus_auth_session_adapter_new (GSignondAuthSession *session, guint timeout)
+gsignond_dbus_auth_session_adapter_new (GSignondAuthSession *session, const gchar *app_context, guint timeout)
 {
     GError *error = NULL;
     GDBusConnection *connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
@@ -461,6 +485,6 @@ gsignond_dbus_auth_session_adapter_new (GSignondAuthSession *session, guint time
         return NULL;
     }
 
-    return gsignond_dbus_auth_session_adapter_new_with_connection (connection, session, timeout);
+    return gsignond_dbus_auth_session_adapter_new_with_connection (connection, session, app_context, timeout);
 }
 #endif

diff --git a/src/daemon/dbus/gsignond-dbus-auth-session-adapter.h b/src/daemon/dbus/gsignond-dbus-auth-session-adapter.h
index 805b7c5..1b47cc2 100644 (file)
--- a/src/daemon/dbus/gsignond-dbus-auth-session-adapter.h
+++ b/src/daemon/dbus/gsignond-dbus-auth-session-adapter.h
@@ -63,11 +63,13 @@ GType gsignond_dbus_auth_session_adapter_get_type (void) G_GNUC_CONST;
 GSignondDbusAuthSessionAdapter *
 gsignond_dbus_auth_session_adapter_new_with_connection (GDBusConnection *connection,
                                                         GSignondAuthSession *session,
+                                                        const gchar *app_context,
                                                         guint timeout);
 
 #ifndef USE_P2P
 GSignondDbusAuthSessionAdapter *
 gsignond_dbus_auth_session_adapter_new (GSignondAuthSession *session,
+                                        const gchar *app_context,
                                         guint timeout);
 #endif
 

diff --git a/src/daemon/dbus/gsignond-dbus-identity-adapter.c b/src/daemon/dbus/gsignond-dbus-identity-adapter.c
index 7786719..62465bf 100644 (file)
--- a/src/daemon/dbus/gsignond-dbus-identity-adapter.c
+++ b/src/daemon/dbus/gsignond-dbus-identity-adapter.c
@@ -35,6 +35,7 @@ enum
 
     PROP_CONNECTION,
     PROP_IDENTITY,
+    PROP_APP_CONTEXT,
     N_PROPERTIES
 };
 
@@ -74,6 +75,7 @@ struct _GSignondDbusIdentityAdapterPrivate
     GDBusConnection   *connection;
     GSignondDbusIdentity *dbus_identity;
     GSignondIdentity  *identity;
+    gchar *app_context;
     GSignondSecurityContext sec_context;
     GList *sessions;
     /* signal handler ids */
@@ -104,7 +106,7 @@ G_DEFINE_TYPE (GSignondDbusIdentityAdapter, gsignond_dbus_identity_adapter, GSIG
             &priv->sec_context, \
             fd, \
             sender, \
-            gsignond_identity_get_app_context(priv->identity)); \
+            priv->app_context); \
 }
 
 static gboolean _handle_request_credentials_update (GSignondDbusIdentityAdapter *, GDBusMethodInvocation *, const gchar*, gpointer);
@@ -160,6 +162,11 @@ gsignond_dbus_identity_adapter_set_property (GObject *object,
             }
             break;
         }
+        case PROP_APP_CONTEXT: {
+            if (self->priv->app_context) g_free (self->priv->app_context);
+            self->priv->app_context = g_strdup (g_value_get_string (value));
+            break;
+        }
         default:
             G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
     }
@@ -182,6 +189,10 @@ gsignond_dbus_identity_adapter_get_property (GObject *object,
             g_value_set_object (value, self->priv->connection);
             break;
         }
+        case PROP_APP_CONTEXT:{
+            g_value_set_string (value, self->priv->app_context);
+            break;
+        }
         default:
             G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
     }
@@ -253,6 +264,11 @@ gsignond_dbus_identity_adapter_finalize (GObject *object)
         self->priv->sessions = NULL;
     }
 
+    if (self->priv->app_context) {
+        g_free (self->priv->app_context);
+        self->priv->app_context = NULL;
+    }
+
     G_OBJECT_CLASS (gsignond_dbus_identity_adapter_parent_class)->finalize (object);
 }
 
@@ -282,7 +298,13 @@ gsignond_dbus_identity_adapter_class_init (GSignondDbusIdentityAdapterClass *kla
                                                        G_PARAM_READWRITE |
                                                        G_PARAM_CONSTRUCT_ONLY |
                                                        G_PARAM_STATIC_STRINGS);
-    
+    properties[PROP_APP_CONTEXT] = g_param_spec_string (
+                "app-context",
+                "application security context",
+                "Application security context of the identity object creater",
+                NULL,
+                G_PARAM_READWRITE |G_PARAM_STATIC_STRINGS);
+
     g_object_class_install_properties (object_class, N_PROPERTIES, properties);
 }
 
@@ -293,6 +315,7 @@ gsignond_dbus_identity_adapter_init (GSignondDbusIdentityAdapter *self)
 
     self->priv->connection = 0;
     self->priv->identity = 0;
+    self->priv->app_context = 0;
     self->priv->dbus_identity = gsignond_dbus_identity_skeleton_new();
 
     g_signal_connect_swapped (self->priv->dbus_identity,
@@ -430,7 +453,7 @@ _handle_get_auth_session (GSignondDbusIdentityAdapter *self,
     if (session) {
         guint timeout =gsignond_identity_get_auth_session_timeout (self->priv->identity);
         GSignondDbusAuthSessionAdapter *dbus_session = gsignond_dbus_auth_session_adapter_new_with_connection (
-            g_object_ref (self->priv->connection), session, timeout);
+            g_object_ref (self->priv->connection), session, self->priv->app_context, timeout);
 
         self->priv->sessions = g_list_append (self->priv->sessions, dbus_session);
 
@@ -721,6 +744,7 @@ gsignond_dbus_identity_adapter_get_object_path(GSignondDbusIdentityAdapter *self
 GSignondDbusIdentityAdapter *
 gsignond_dbus_identity_adapter_new_with_connection (GDBusConnection *connection,
                                                     GSignondIdentity *identity,
+                                                    const gchar *app_context,
                                                     guint timeout)
 {
     static guint32 object_counter;
@@ -728,7 +752,7 @@ gsignond_dbus_identity_adapter_new_with_connection (GDBusConnection *connection,
     GError *err = NULL;
     GSignondDbusIdentityAdapter *adapter = GSIGNOND_DBUS_IDENTITY_ADAPTER (
         g_object_new (GSIGNOND_TYPE_DBUS_IDENTITY_ADAPTER, 
-            "identity", identity, "connection", connection, NULL));
+            "identity", identity, "connection", connection, "app-context", app_context, NULL));
 
     if (!adapter) return NULL;
 
@@ -761,7 +785,7 @@ gsignond_dbus_identity_adapter_new_with_connection (GDBusConnection *connection,
  * Retrurns: (transfer full) new instance of #GSignondDbusIdentityAdapter
  */
 GSignondDbusIdentityAdapter * 
-gsignond_dbus_identity_adapter_new (GSignondIdentity *identity, guint timeout)
+gsignond_dbus_identity_adapter_new (GSignondIdentity *identity, const gchar *app_context, guint timeout)
 {
     GError *error = NULL;
     GDBusConnection *connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
@@ -772,7 +796,7 @@ gsignond_dbus_identity_adapter_new (GSignondIdentity *identity, guint timeout)
         return NULL;
     }
 
-    return gsignond_dbus_identity_adapter_new_with_connection (connection, identity, timeout);
+    return gsignond_dbus_identity_adapter_new_with_connection (connection, identity, app_context, timeout);
 }
 
 #endif

diff --git a/src/daemon/dbus/gsignond-dbus-identity-adapter.h b/src/daemon/dbus/gsignond-dbus-identity-adapter.h
index fc6528d..83db60a 100644 (file)
--- a/src/daemon/dbus/gsignond-dbus-identity-adapter.h
+++ b/src/daemon/dbus/gsignond-dbus-identity-adapter.h
@@ -63,11 +63,13 @@ GType gsignond_dbus_identity_adapter_get_type (void) G_GNUC_CONST;
 GSignondDbusIdentityAdapter * 
 gsignond_dbus_identity_adapter_new_with_connection (GDBusConnection *connection,
                                                     GSignondIdentity *identity,
+                                                    const gchar *app_context,
                                                     guint timeout);
 
 #ifndef USE_P2P
 GSignondDbusIdentityAdapter *
 gsignond_dbus_identity_adapter_new (GSignondIdentity *identity,
+                                    const gchar *app_context,
                                     guint timeout);
 #endif
 

diff --git a/src/daemon/gsignond-auth-session.c b/src/daemon/gsignond-auth-session.c
index 3584ecb..87451a4 100644 (file)
--- a/src/daemon/gsignond-auth-session.c
+++ b/src/daemon/gsignond-auth-session.c
@@ -35,7 +35,6 @@ enum
 {
     PROP_0,
     PROP_METHOD,
-    PROP_APP_CONTEXT,
     N_PROPERTIES
 };
 
@@ -57,7 +56,6 @@ static guint signals[SIG_MAX] = { 0 };
 struct _GSignondAuthSessionPrivate
 {
     gchar *method;
-    gchar *app_context;
     GSignondPluginProxy *proxy;
     GSequence *available_mechanisms;
     GSignondIdentityInfo *identity_info;
@@ -287,9 +285,6 @@ _get_property (GObject *object, guint property_id, GValue *value,
         case PROP_METHOD:
             g_value_set_string (value, self->priv->method);
             break;
-        case PROP_APP_CONTEXT:
-            g_value_set_string (value, self->priv->app_context);
-            break;
         default:
             G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
     }
@@ -306,9 +301,6 @@ _set_property (GObject *object, guint property_id, const GValue *value,
         case PROP_METHOD:
             self->priv->method = g_value_dup_string (value);
             break;
-        case PROP_APP_CONTEXT:
-            self->priv->app_context = g_value_dup_string (value);
-            break;
         default:
             G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
     }
@@ -379,15 +371,7 @@ gsignond_auth_session_class_init (GSignondAuthSessionClass *klass)
                              "Authentication method used",
                              NULL,
                              G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY
-                              | G_PARAM_STATIC_STRINGS);
-
-    properties[PROP_APP_CONTEXT] =
-        g_param_spec_string ("app-context",
-                             "application security context",
-                             "Application security context",
-                             NULL,
-                             G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY
-                              | G_PARAM_STATIC_STRINGS);
+                             | G_PARAM_STATIC_STRINGS);
 
     g_object_class_install_properties (object_class, N_PROPERTIES, properties);
 
@@ -476,14 +460,6 @@ gsignond_auth_session_get_method (GSignondAuthSession *session)
     return session->priv->method;
 }
 
-const gchar *
-gsignond_auth_session_get_context (GSignondAuthSession *session)
-{
-    g_return_val_if_fail (session && GSIGNOND_IS_AUTH_SESSION (session), NULL);
-
-    return session->priv->app_context;
-}
-
 void
 gsignond_auth_session_notify_process_result (GSignondAuthSession *iface,
                                              GSignondSessionData *result)
@@ -530,7 +506,6 @@ gsignond_auth_session_notify_state_changed (GSignondAuthSession *self,
 /**
  * gsignond_auth_session_new:
  * @info: instance of #GSignondIdentityInfo
- * @app_context: application security
  * @method: authentication method
  *
  * Creates instance of #GSignondAuthSession.
@@ -538,7 +513,7 @@ gsignond_auth_session_notify_state_changed (GSignondAuthSession *self,
  * Returns: (transfer full) newly created object 
  */
 GSignondAuthSession * 
-gsignond_auth_session_new (GSignondIdentityInfo *info, const gchar *app_context, const gchar *method)
+gsignond_auth_session_new (GSignondIdentityInfo *info, const gchar *method)
 {
     GSignondPluginProxy* proxy = NULL;
 
@@ -550,8 +525,7 @@ gsignond_auth_session_new (GSignondIdentityInfo *info, const gchar *app_context,
 
     GSignondAuthSession *auth_session =
         g_object_new (GSIGNOND_TYPE_AUTH_SESSION,
-                      "method", method,
-                      "app-context", app_context, NULL);
+                      "method", method, NULL);
     auth_session->priv->proxy = proxy;
     auth_session->priv->identity_info = g_hash_table_ref ((GHashTable *)info);
 

diff --git a/src/daemon/gsignond-auth-session.h b/src/daemon/gsignond-auth-session.h
index 3953a08..1f10ccb 100644 (file)
--- a/src/daemon/gsignond-auth-session.h
+++ b/src/daemon/gsignond-auth-session.h
@@ -101,9 +101,6 @@ gsignond_auth_session_refresh (GSignondAuthSession *self,
 const gchar *
 gsignond_auth_session_get_method (GSignondAuthSession *session);
 
-const gchar *
-gsignond_auth_session_get_context (GSignondAuthSession *session);
-
 GSignondAccessControlManager *
 gsignond_auth_session_get_acm (GSignondAuthSession *session);
 
@@ -137,7 +134,6 @@ gsignond_auth_session_notify_state_changed (GSignondAuthSession *self,
 
 GSignondAuthSession * 
 gsignond_auth_session_new (GSignondIdentityInfo *info,
-                           const gchar *app_context,
                            const gchar *method);
 
 G_END_DECLS

diff --git a/src/daemon/gsignond-daemon.c b/src/daemon/gsignond-daemon.c
index 4846461..47770bb 100644 (file)
--- a/src/daemon/gsignond-daemon.c
+++ b/src/daemon/gsignond-daemon.c
@@ -374,7 +374,6 @@ gsignond_daemon_register_new_identity (GSignondDaemon *daemon,
         return NULL;
     }
 
-    const gchar *app_context = ctx ? gsignond_security_context_get_application_context (ctx) : "";
     GSignondIdentityInfo *info = gsignond_identity_info_new ();
     GSignondIdentity *identity = NULL;
     GSignondSecurityContext *owner = NULL;
@@ -391,7 +390,7 @@ gsignond_daemon_register_new_identity (GSignondDaemon *daemon,
     g_list_free (acl);
 
     DBG("register_new_identity: cache size : %d", g_hash_table_size(daemon->priv->identities));
-    identity = gsignond_identity_new (daemon, info, app_context);
+    identity = gsignond_identity_new (daemon, info);
     if (identity == NULL) {
         gsignond_dictionary_unref (info);
         ERR("Unable to register new identity");
@@ -421,7 +420,6 @@ gsignond_daemon_get_identity (GSignondDaemon *daemon,
 
     GSignondIdentity *identity = NULL;
     GSignondIdentityInfo *identity_info = NULL;
-    const gchar *app_context = ctx ? gsignond_security_context_get_application_context (ctx) : "" ;
 
 #define VALIDATE_IDENTITY_READ_ACCESS(info, ctx, ret) \
 { \
@@ -462,7 +460,7 @@ gsignond_daemon_get_identity (GSignondDaemon *daemon,
 
     VALIDATE_IDENTITY_READ_ACCESS (identity_info, ctx, NULL);
 
-    identity = gsignond_identity_new (daemon, identity_info, app_context);
+    identity = gsignond_identity_new (daemon, identity_info);
     if (!identity) {
         gsignond_identity_info_unref (identity_info);
         if (error) *error = gsignond_get_gerror_for_id (GSIGNOND_ERROR_INTERNAL_SERVER, "Internal server error");

diff --git a/src/daemon/gsignond-identity.c b/src/daemon/gsignond-identity.c
index 1ad4925..2f8d833 100644 (file)
--- a/src/daemon/gsignond-identity.c
+++ b/src/daemon/gsignond-identity.c
@@ -40,7 +40,6 @@ enum
 {
     PROP_0,
     PROP_INFO,
-    PROP_APP_CONTEXT,
     N_PROPERTIES
 };
 
@@ -62,7 +61,6 @@ static guint signals[SIG_MAX];
 struct _GSignondIdentityPrivate
 {
     GSignondIdentityInfo *info;
-    gchar *app_context;
     GSignondDaemon *owner;
     GHashTable *auth_sessions; // (auth_method,auth_session) table
 };
@@ -133,9 +131,6 @@ _get_property (GObject *object, guint property_id, GValue *value,
         case PROP_INFO:
             g_value_set_boxed (value, self->priv->info);
             break;
-        case PROP_APP_CONTEXT:
-            g_value_set_string (value, self->priv->app_context);
-            break;
         default:
             G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
     }
@@ -153,9 +148,6 @@ _set_property (GObject *object, guint property_id, const GValue *value,
             self->priv->info =
                (GSignondIdentityInfo *)g_value_get_boxed (value);
             break;
-        case PROP_APP_CONTEXT:
-            self->priv->app_context = g_value_dup_string (value);
-            break;
         default:
             G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
     }
@@ -226,15 +218,6 @@ gsignond_identity_class_init (GSignondIdentityClass *klass)
                             G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
                             G_PARAM_STATIC_STRINGS);
     
-    properties[PROP_APP_CONTEXT] = g_param_spec_string (
-                "app-context",
-                "application security context",
-                "Application security context of the identity object creater",
-                NULL,
-                G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
-                G_PARAM_STATIC_STRINGS);
-
-
     g_object_class_install_properties (object_class, N_PROPERTIES, properties);
 
     signals[SIG_SIGNOUT] = g_signal_new ("signout",
@@ -470,9 +453,7 @@ gsignond_identity_get_auth_session (GSignondIdentity *identity,
         return NULL;
     }
 
-    session = gsignond_auth_session_new (identity->priv->info,
-                                         identity->priv->app_context,
-                                         method);
+    session = gsignond_auth_session_new (identity->priv->info, method);
 
     if (!session) {
         if (error) *error = gsignond_get_gerror_for_id (GSIGNOND_ERROR_UNKNOWN, "Unknown error");
@@ -884,14 +865,6 @@ gsignond_identity_get_acm (GSignondIdentity *identity)
     return gsignond_daemon_get_access_control_manager (identity->priv->owner);
 }
 
-const gchar *
-gsignond_identity_get_app_context (GSignondIdentity *identity)
-{
-    g_return_val_if_fail (identity && GSIGNOND_IS_IDENTITY(identity), NULL);
-
-    return identity->priv->app_context;
-}
-
 guint
 gsignond_identity_get_auth_session_timeout (GSignondIdentity *identity)
 {
@@ -937,20 +910,17 @@ gsignond_identity_get_identity_info (GSignondIdentity *identity)
  * gsignond_identity_new:
  * @owner: Owner of this object, instance of #GSignondAuthServiceIface
  * @info (transfer full): Identity info, instance of #GSignondIdentityInfo
- * @app_context: application security context
  * 
  * Creates new instance of #GSignondIdentity
  *
  * Returns[transfer full]: new instance of #GSignondIdentity
  */
 GSignondIdentity * gsignond_identity_new (GSignondDaemon *owner,
-                                          GSignondIdentityInfo *info,
-                                          const gchar *app_context)
+                                          GSignondIdentityInfo *info)
 {
     GSignondIdentity *identity =
         GSIGNOND_IDENTITY(g_object_new (GSIGNOND_TYPE_IDENTITY,
                                         "info", info,
-                                        "app-context", app_context,
                                         NULL));
 
     identity->priv->owner = g_object_ref (owner);

diff --git a/src/daemon/gsignond-identity.h b/src/daemon/gsignond-identity.h
index e0f570b..a46fb97 100644 (file)
--- a/src/daemon/gsignond-identity.h
+++ b/src/daemon/gsignond-identity.h
@@ -73,8 +73,7 @@ gsignond_identity_get_type (void) G_GNUC_CONST;
 
 GSignondIdentity *
 gsignond_identity_new (GSignondDaemon *owner,
-                       GSignondIdentityInfo *info,
-                       const gchar *app_context);
+                       GSignondIdentityInfo *info);
 
 GVariant * 
 gsignond_identity_get_info (GSignondIdentity *identity,
@@ -145,9 +144,6 @@ gsignond_identity_get_id (GSignondIdentity *identity);
 GSignondIdentityInfo *
 gsignond_identity_get_identity_info (GSignondIdentity *identity);
 
-const gchar *
-gsignond_identity_get_app_context (GSignondIdentity *identity);
-
 G_END_DECLS
 
 #endif /* __GSIGNOND_IDENTITY_H_ */