From 9030b864e234179a4a2b8a583a958639dae2c938 Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Tue, 2 Sep 2014 18:11:13 +0200 Subject: flickr: Remove direct access to RestProxyCallPrivate Now that FlickrProxyCall no longer directly modifies RestProxyCall::url, it's trivial to remove all accesses to RestProxyCallPrivate. https://bugzilla.gnome.org/show_bug.cgi?id=735919 --- rest-extras/flickr-proxy-call.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/rest-extras/flickr-proxy-call.c b/rest-extras/flickr-proxy-call.c index d03f919..df8366f 100644 --- a/rest-extras/flickr-proxy-call.c +++ b/rest-extras/flickr-proxy-call.c @@ -25,7 +25,6 @@ #include #include "flickr-proxy-call.h" #include "flickr-proxy-private.h" -#include "rest/rest-proxy-call-private.h" #include "rest/sha1.h" G_DEFINE_TYPE (FlickrProxyCall, flickr_proxy_call, REST_TYPE_PROXY_CALL) @@ -62,14 +61,11 @@ _prepare (RestProxyCall *call, GError **error) { FlickrProxy *proxy = NULL; FlickrProxyPrivate *priv; - RestProxyCallPrivate *call_priv; GHashTable *params; char *s; g_object_get (call, "proxy", &proxy, NULL); priv = FLICKR_PROXY_GET_PRIVATE (proxy); - call_priv = call->priv; - if (GET_PRIVATE (call)->upload) { rest_proxy_bind (REST_PROXY(proxy), "upload"); @@ -89,7 +85,7 @@ _prepare (RestProxyCall *call, GError **error) rest_proxy_call_add_param (call, "auth_token", priv->token); /* Get the string params as a hash for signing */ - params = rest_params_as_string_hash_table (call_priv->params); + params = rest_params_as_string_hash_table (rest_proxy_call_get_params (call)); s = flickr_proxy_sign (proxy, params); g_hash_table_unref (params); -- cgit v1.2.3