[gnome-keyring] dbus: remove unused code path



commit ee081695bf91fe8b9d0888f2f8424c6d36b875d0
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Aug 31 13:47:44 2015 -0700

    dbus: remove unused code path
    
    The "force" parameter is always TRUE.

 daemon/dbus/gkd-secret-service.c |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/daemon/dbus/gkd-secret-service.c b/daemon/dbus/gkd-secret-service.c
index bb4764d..26c5a0e 100644
--- a/daemon/dbus/gkd-secret-service.c
+++ b/daemon/dbus/gkd-secret-service.c
@@ -187,18 +187,11 @@ default_path (GkdSecretService *self)
 }
 
 static void
-update_default (GkdSecretService *self, gboolean force)
+update_default (GkdSecretService *self)
 {
        gchar *contents = NULL;
-       const gchar *identifier;
        gchar *path;
 
-       if (!force) {
-               identifier = g_hash_table_lookup (self->aliases, "default");
-               if (identifier)
-                       return;
-       }
-
        path = default_path (self);
        if (g_file_get_contents (path, &contents, NULL, NULL)) {
                g_strstrip (contents);
@@ -295,7 +288,7 @@ initialize_service_client (GkdSecretService *self,
        g_hash_table_replace (self->clients, client->caller_peer, client);
 
        /* Update default collection each time someone connects */
-       update_default (self, TRUE);
+       update_default (self);
 }
 
 static void
@@ -1348,7 +1341,7 @@ gkd_secret_service_get_alias (GkdSecretService *self, const gchar *alias)
        identifier =  g_hash_table_lookup (self->aliases, alias);
        if (!identifier) {
                if (g_str_equal (alias, "default")) {
-                       update_default (self, TRUE);
+                       update_default (self);
                        identifier = g_hash_table_lookup (self->aliases, alias);
 
                        /* Default to to 'login' if no default keyring */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]