diff options
| author | Ross Burton <ross@linux.intel.com> | 2010-07-06 11:24:52 +0100 |
|---|---|---|
| committer | Ross Burton <ross@linux.intel.com> | 2010-07-08 21:17:06 +0100 |
| commit | 77903df0256907073e0d8cadd9bd6acf4ff3d2d4 (patch) | |
| tree | 824a0efa1885b538c374cdb31c0e0b5d3a63b7f5 /rest-extras | |
| parent | 23de181bdb4eae9fe769a8f20d5359cbf443e52a (diff) | |
Port the proxies to use RestParam
Diffstat (limited to 'rest-extras')
| -rw-r--r-- | rest-extras/flickr-proxy-call.c | 7 | ||||
| -rw-r--r-- | rest-extras/flickr-proxy.c | 3 | ||||
| -rw-r--r-- | rest-extras/lastfm-proxy-call.c | 5 |
3 files changed, 11 insertions, 4 deletions
diff --git a/rest-extras/flickr-proxy-call.c b/rest-extras/flickr-proxy-call.c index a408925..77bd6bf 100644 --- a/rest-extras/flickr-proxy-call.c +++ b/rest-extras/flickr-proxy-call.c @@ -36,6 +36,7 @@ _prepare (RestProxyCall *call, GError **error) FlickrProxy *proxy = NULL; FlickrProxyPrivate *priv; RestProxyCallPrivate *call_priv; + GHashTable *params; char *s; g_object_get (call, "proxy", &proxy, NULL); @@ -53,7 +54,11 @@ _prepare (RestProxyCall *call, GError **error) if (priv->token) rest_proxy_call_add_param (call, "auth_token", priv->token); - s = flickr_proxy_sign (proxy, call_priv->params); + /* Get the string params as a hash for signing */ + params = rest_params_as_string_hash_table (call_priv->params); + s = flickr_proxy_sign (proxy, params); + g_hash_table_unref (params); + rest_proxy_call_add_param (call, "api_sig", s); g_free (s); diff --git a/rest-extras/flickr-proxy.c b/rest-extras/flickr-proxy.c index d8b43e5..b8f6bbe 100644 --- a/rest-extras/flickr-proxy.c +++ b/rest-extras/flickr-proxy.c @@ -281,8 +281,7 @@ flickr_proxy_sign (FlickrProxy *proxy, GHashTable *params) keys = g_list_sort (keys, (GCompareFunc)strcmp); while (keys) { - const char *key; - const char *value; + const char *key, *value; key = keys->data; value = g_hash_table_lookup (params, key); diff --git a/rest-extras/lastfm-proxy-call.c b/rest-extras/lastfm-proxy-call.c index 00d28d9..c5aed2f 100644 --- a/rest-extras/lastfm-proxy-call.c +++ b/rest-extras/lastfm-proxy-call.c @@ -37,6 +37,7 @@ _prepare (RestProxyCall *call, GError **error) LastfmProxy *proxy = NULL; LastfmProxyPrivate *priv; RestProxyCallPrivate *call_priv; + GHashTable *params; char *s; g_object_get (call, "proxy", &proxy, NULL); @@ -54,7 +55,9 @@ _prepare (RestProxyCall *call, GError **error) if (priv->session_key) rest_proxy_call_add_param (call, "sk", priv->session_key); - s = lastfm_proxy_sign (proxy, call_priv->params); + params = rest_params_as_string_hash_table (call_priv->params); + s = lastfm_proxy_sign (proxy, params); + g_hash_table_unref (params); rest_proxy_call_add_param (call, "api_sig", s); g_free (s); |