[gnome-keyring/wip/cosimoc/gdbus-fixes: 10/11] dbus: cosmetic cleanups

[Cosimo Cecchi <cosimoc src gnome org>]

commit 2f5e38abe67a34d3f068d1203c9b4c678b362b68
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Aug 28 22:30:53 2015 -0700

    dbus: cosmetic cleanups

 daemon/dbus/gkd-secret-objects.c |   13 -------------
 daemon/dbus/gkd-secret-session.c |   23 -----------------------
 daemon/dbus/gkd-secret-session.h |    2 --
 3 files changed, 0 insertions(+), 38 deletions(-)
---
diff --git a/daemon/dbus/gkd-secret-objects.c b/daemon/dbus/gkd-secret-objects.c
index db4d815..0adf315 100644
--- a/daemon/dbus/gkd-secret-objects.c
+++ b/daemon/dbus/gkd-secret-objects.c
@@ -965,17 +965,6 @@ gkd_secret_objects_dispose (GObject *obj)
 }
 
 static void
-gkd_secret_objects_finalize (GObject *obj)
-{
-       GkdSecretObjects *self = GKD_SECRET_OBJECTS (obj);
-
-       g_assert (!self->pkcs11_slot);
-       g_assert (!self->service);
-
-       G_OBJECT_CLASS (gkd_secret_objects_parent_class)->finalize (obj);
-}
-
-static void
 gkd_secret_objects_set_property (GObject *obj, guint prop_id, const GValue *value,
                                 GParamSpec *pspec)
 {
@@ -1025,7 +1014,6 @@ gkd_secret_objects_class_init (GkdSecretObjectsClass *klass)
        GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
        gobject_class->dispose = gkd_secret_objects_dispose;
-       gobject_class->finalize = gkd_secret_objects_finalize;
        gobject_class->set_property = gkd_secret_objects_set_property;
        gobject_class->get_property = gkd_secret_objects_get_property;
 
@@ -1232,7 +1220,6 @@ gkd_secret_objects_foreach_collection (GkdSecretObjects *self,
        }
 
        for (l = collections; l; l = g_list_next (l)) {
-
                identifier = gck_object_get_data (l->data, CKA_ID, NULL, &n_identifier, &error);
                if (identifier == NULL) {
                        g_warning ("couldn't get collection identifier: %s", egg_error_message (error));
diff --git a/daemon/dbus/gkd-secret-session.c b/daemon/dbus/gkd-secret-session.c
index 08d47c4..f84076d 100644
--- a/daemon/dbus/gkd-secret-session.c
+++ b/daemon/dbus/gkd-secret-session.c
@@ -40,7 +40,6 @@
 enum {
        PROP_0,
        PROP_CALLER,
-       PROP_CALLER_EXECUTABLE,
        PROP_OBJECT_PATH,
        PROP_SERVICE
 };
@@ -52,7 +51,6 @@ struct _GkdSecretSession {
        gchar *object_path;
        GkdSecretService *service;
        GkdExportedSession *skeleton;
-       gchar *caller_exec;
        gchar *caller;
 
        /* While negotiating with a prompt, set to private key */
@@ -372,9 +370,6 @@ gkd_secret_session_finalize (GObject *obj)
        g_assert (!self->service);
        g_assert (!self->key);
 
-       g_free (self->caller_exec);
-       self->caller_exec = NULL;
-
        g_free (self->caller);
        self->caller = NULL;
 
@@ -392,10 +387,6 @@ gkd_secret_session_set_property (GObject *obj, guint prop_id, const GValue *valu
                g_return_if_fail (!self->caller);
                self->caller = g_value_dup_string (value);
                break;
-       case PROP_CALLER_EXECUTABLE:
-               g_return_if_fail (!self->caller_exec);
-               self->caller_exec = g_value_dup_string (value);
-               break;
        case PROP_SERVICE:
                g_return_if_fail (!self->service);
                self->service = g_value_get_object (value);
@@ -419,9 +410,6 @@ gkd_secret_session_get_property (GObject *obj, guint prop_id, GValue *value,
        case PROP_CALLER:
                g_value_set_string (value, gkd_secret_session_get_caller (self));
                break;
-       case PROP_CALLER_EXECUTABLE:
-               g_value_set_string (value, gkd_secret_session_get_caller_executable (self));
-               break;
        case PROP_OBJECT_PATH:
                g_value_set_pointer (value, self->object_path);
                break;
@@ -449,10 +437,6 @@ gkd_secret_session_class_init (GkdSecretSessionClass *klass)
                g_param_spec_string ("caller", "Caller", "DBus caller name",
                                     NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY ));
 
-       g_object_class_install_property (gobject_class, PROP_CALLER_EXECUTABLE,
-               g_param_spec_string ("caller-executable", "Caller Executable", "Executable of caller",
-                                    NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY ));
-
        g_object_class_install_property (gobject_class, PROP_OBJECT_PATH,
                g_param_spec_pointer ("object-path", "Object Path", "DBus Object Path",
                                      G_PARAM_READABLE));
@@ -586,13 +570,6 @@ gkd_secret_session_get_caller (GkdSecretSession *self)
        return self->caller;
 }
 
-const gchar*
-gkd_secret_session_get_caller_executable (GkdSecretSession *self)
-{
-       g_return_val_if_fail (GKD_SECRET_IS_SESSION (self), NULL);
-       return self->caller_exec;
-}
-
 GckSession*
 gkd_secret_session_get_pkcs11_session (GkdSecretSession *self)
 {
diff --git a/daemon/dbus/gkd-secret-session.h b/daemon/dbus/gkd-secret-session.h
index 0090f56..64c2cff 100644
--- a/daemon/dbus/gkd-secret-session.h
+++ b/daemon/dbus/gkd-secret-session.h
@@ -53,8 +53,6 @@ gboolean            gkd_secret_session_complete                (GkdSecretSession
 
 const gchar*        gkd_secret_session_get_caller              (GkdSecretSession *self);
 
-const gchar*        gkd_secret_session_get_caller_executable   (GkdSecretSession *self);
-
 GckSession*         gkd_secret_session_get_pkcs11_session      (GkdSecretSession *self);
 
 GkdSecretSecret*    gkd_secret_session_get_item_secret         (GkdSecretSession *self,