Index: subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
===================================================================
--- subversion/libsvn_auth_gnome_keyring/gnome_keyring.c	(revision 37484)
+++ subversion/libsvn_auth_gnome_keyring/gnome_keyring.c	(working copy)
@@ -250,6 +250,7 @@
                            apr_pool_t *pool)
 {
   char *default_keyring = NULL;
+  char *pass;
 
   if (non_interactive)
     return FALSE;
@@ -270,9 +271,9 @@
                      "gnome-keyring-opening-failed",
                      APR_HASH_KEY_STRING))
     {
-      result = gnome_keyring_find_network_password_sync(username, realmstring,
-                                                        NULL, NULL, NULL, NULL,
-                                                        0, &items);
+      result = gnome_keyring_find_password_sync(GNOME_KEYRING_NETWORK_PASSWORD,
+                                                &pass, "user", username,
+                                                "domain", realmstring, NULL);
     }
   else
     {
@@ -281,21 +282,7 @@
 
   if (result == GNOME_KEYRING_RESULT_OK)
     {
-      if (items && items->data)
-        {
-          GnomeKeyringNetworkPasswordData *item;
-          item = (GnomeKeyringNetworkPasswordData *)items->data;
-          if (item->password)
-            {
-              size_t len = strlen(item->password);
-              if (len > 0)
-                {
-                  *password = apr_pstrmemdup(pool, item->password, len);
-                  ret = TRUE;
-                }
-            }
-          gnome_keyring_network_password_list_free(items);
-        }
+      *password = pass;
     }
   else
     {
@@ -342,11 +329,10 @@
                      "gnome-keyring-opening-failed",
                      APR_HASH_KEY_STRING))
     {
-      result = gnome_keyring_set_network_password_sync(NULL, /* default keyring */
-                                                       username, realmstring,
-                                                       NULL, NULL, NULL, NULL,
-                                                       0, password,
-                                                       &item_id);
+      result = gnome_keyring_store_password_sync(GNOME_KEYRING_NETWORK_PASSWORD,
+                                                 NULL, "Subversion", password,
+                                                 "user", username,
+                                                 "domain", realmstring, NULL);
     }
   else
     {