aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Escalante Urrelo <descalante@igalia.com>2010-03-10 00:09:29 +0800
committerDiego Escalante Urrelo <descalante@igalia.com>2010-03-10 00:10:29 +0800
commit3423f0766d8b935e0c35b6d379bd345f14dc0bcb (patch)
tree507041c677a3cc5af4621bcab896dbdbd4096581
parent2a1a987ae0deea9fcc86c7adaa33eb514e6873d1 (diff)
downloadgsoc2013-epiphany-3423f0766d8b935e0c35b6d379bd345f14dc0bcb.tar
gsoc2013-epiphany-3423f0766d8b935e0c35b6d379bd345f14dc0bcb.tar.gz
gsoc2013-epiphany-3423f0766d8b935e0c35b6d379bd345f14dc0bcb.tar.bz2
gsoc2013-epiphany-3423f0766d8b935e0c35b6d379bd345f14dc0bcb.tar.lz
gsoc2013-epiphany-3423f0766d8b935e0c35b6d379bd345f14dc0bcb.tar.xz
gsoc2013-epiphany-3423f0766d8b935e0c35b6d379bd345f14dc0bcb.tar.zst
gsoc2013-epiphany-3423f0766d8b935e0c35b6d379bd345f14dc0bcb.zip
ephy-profile-migration: remove useless return value
_ephy_profile_query_form_auth_data is async, doesn't return anything.
-rw-r--r--lib/ephy-profile-migration.c16
-rw-r--r--lib/ephy-profile-migration.h2
2 files changed, 8 insertions, 10 deletions
diff --git a/lib/ephy-profile-migration.c b/lib/ephy-profile-migration.c
index 857d4a491..eee329afb 100644
--- a/lib/ephy-profile-migration.c
+++ b/lib/ephy-profile-migration.c
@@ -1,4 +1,5 @@
/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
+/* vim: set sw=2 ts=2 sts=2 et: */
/*
* Copyright © 2009 Xan López
*
@@ -488,7 +489,7 @@ _ephy_profile_store_form_auth_data (const char *uri,
g_free (fake_uri_str);
}
-GList*
+void
_ephy_profile_query_form_auth_data (const char *uri,
const char *form_username,
const char *form_password,
@@ -498,17 +499,16 @@ _ephy_profile_query_form_auth_data (const char *uri,
{
SoupURI *key;
char *key_str;
- GList *results = NULL;
- g_return_val_if_fail (uri, NULL);
- g_return_val_if_fail (form_username, NULL);
- g_return_val_if_fail (form_password, NULL);
+ g_return_if_fail (uri);
+ g_return_if_fail (form_username);
+ g_return_if_fail (form_password);
key = soup_uri_new (uri);
- if (key == NULL)
- return NULL;
+ g_return_if_fail (key);
normalize_and_prepare_uri (key, form_username, form_password);
+
key_str = soup_uri_to_string (key, FALSE);
LOG ("Querying Keyring: %s", key_str);
@@ -524,8 +524,6 @@ _ephy_profile_query_form_auth_data (const char *uri,
destroy_data);
soup_uri_free (key);
g_free (key_str);
-
- return results;
}
#define PROFILE_MIGRATION_FILE ".migrated"
diff --git a/lib/ephy-profile-migration.h b/lib/ephy-profile-migration.h
index 33d14bf81..3716f24f0 100644
--- a/lib/ephy-profile-migration.h
+++ b/lib/ephy-profile-migration.h
@@ -34,7 +34,7 @@ void _ephy_profile_store_form_auth_data (const char *uri,
const char *username,
const char *password);
-GList*
+void
_ephy_profile_query_form_auth_data (const char *uri,
const char *form_username,
const char *form_password,