diff options
author | Ross Burton <ross@linux.intel.com> | 2010-08-04 15:20:26 +0100 |
---|---|---|
committer | Ross Burton <ross@linux.intel.com> | 2010-08-04 15:20:26 +0100 |
commit | c210c19c05d901fdb083905d4ebef8fcf609f821 (patch) | |
tree | 10e974a27627fd7e095f085db5d9b98635391ec3 | |
parent | b85c2ec5b9fd7778f1cffded4f95a0eeb6a02c52 (diff) | |
download | librest-c210c19c05d901fdb083905d4ebef8fcf609f821.tar.gz |
Rename duplicate PROXY_GET_PRIVATE macros, to silence the introspection generation
-rw-r--r-- | rest-extras/flickr-proxy-call.c | 2 | ||||
-rw-r--r-- | rest-extras/flickr-proxy-private.h | 2 | ||||
-rw-r--r-- | rest-extras/flickr-proxy.c | 18 | ||||
-rw-r--r-- | rest-extras/lastfm-proxy-call.c | 2 | ||||
-rw-r--r-- | rest-extras/lastfm-proxy-private.h | 2 | ||||
-rw-r--r-- | rest-extras/lastfm-proxy.c | 18 |
6 files changed, 22 insertions, 22 deletions
diff --git a/rest-extras/flickr-proxy-call.c b/rest-extras/flickr-proxy-call.c index 77bd6bf..d923536 100644 --- a/rest-extras/flickr-proxy-call.c +++ b/rest-extras/flickr-proxy-call.c @@ -40,7 +40,7 @@ _prepare (RestProxyCall *call, GError **error) char *s; g_object_get (call, "proxy", &proxy, NULL); - priv = PROXY_GET_PRIVATE (proxy); + priv = FLICKR_PROXY_GET_PRIVATE (proxy); call_priv = call->priv; /* First reset the URL because Flickr puts the function in the parameters */ diff --git a/rest-extras/flickr-proxy-private.h b/rest-extras/flickr-proxy-private.h index cbf8533..5932946 100644 --- a/rest-extras/flickr-proxy-private.h +++ b/rest-extras/flickr-proxy-private.h @@ -22,7 +22,7 @@ #include "flickr-proxy.h" -#define PROXY_GET_PRIVATE(o) \ +#define FLICKR_PROXY_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), FLICKR_TYPE_PROXY, FlickrProxyPrivate)) struct _FlickrProxyPrivate { diff --git a/rest-extras/flickr-proxy.c b/rest-extras/flickr-proxy.c index 7371d71..9900242 100644 --- a/rest-extras/flickr-proxy.c +++ b/rest-extras/flickr-proxy.c @@ -67,7 +67,7 @@ static void flickr_proxy_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { - FlickrProxyPrivate *priv = PROXY_GET_PRIVATE (object); + FlickrProxyPrivate *priv = FLICKR_PROXY_GET_PRIVATE (object); switch (property_id) { case PROP_API_KEY: @@ -88,7 +88,7 @@ static void flickr_proxy_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { - FlickrProxyPrivate *priv = PROXY_GET_PRIVATE (object); + FlickrProxyPrivate *priv = FLICKR_PROXY_GET_PRIVATE (object); switch (property_id) { case PROP_API_KEY: @@ -114,7 +114,7 @@ flickr_proxy_set_property (GObject *object, guint property_id, static void flickr_proxy_finalize (GObject *object) { - FlickrProxyPrivate *priv = PROXY_GET_PRIVATE (object); + FlickrProxyPrivate *priv = FLICKR_PROXY_GET_PRIVATE (object); g_free (priv->api_key); g_free (priv->shared_secret); @@ -167,7 +167,7 @@ flickr_proxy_class_init (FlickrProxyClass *klass) static void flickr_proxy_init (FlickrProxy *self) { - self->priv = PROXY_GET_PRIVATE (self); + self->priv = FLICKR_PROXY_GET_PRIVATE (self); } RestProxy * @@ -205,7 +205,7 @@ flickr_proxy_new_with_token (const char *api_key, const char * flickr_proxy_get_api_key (FlickrProxy *proxy) { - FlickrProxyPrivate *priv = PROXY_GET_PRIVATE (proxy); + FlickrProxyPrivate *priv = FLICKR_PROXY_GET_PRIVATE (proxy); return priv->api_key; } @@ -221,7 +221,7 @@ flickr_proxy_get_api_key (FlickrProxy *proxy) const char * flickr_proxy_get_shared_secret (FlickrProxy *proxy) { - FlickrProxyPrivate *priv = PROXY_GET_PRIVATE (proxy); + FlickrProxyPrivate *priv = FLICKR_PROXY_GET_PRIVATE (proxy); return priv->shared_secret; } @@ -237,7 +237,7 @@ flickr_proxy_get_shared_secret (FlickrProxy *proxy) const char * flickr_proxy_get_token (FlickrProxy *proxy) { - FlickrProxyPrivate *priv = PROXY_GET_PRIVATE (proxy); + FlickrProxyPrivate *priv = FLICKR_PROXY_GET_PRIVATE (proxy); return priv->token; } @@ -254,7 +254,7 @@ flickr_proxy_set_token (FlickrProxy *proxy, const char *token) FlickrProxyPrivate *priv; g_return_if_fail (FLICKR_IS_PROXY (proxy)); - priv = PROXY_GET_PRIVATE (proxy); + priv = FLICKR_PROXY_GET_PRIVATE (proxy); if (priv->token) g_free (priv->token); @@ -273,7 +273,7 @@ flickr_proxy_sign (FlickrProxy *proxy, GHashTable *params) g_return_val_if_fail (FLICKR_IS_PROXY (proxy), NULL); g_return_val_if_fail (params, NULL); - priv = PROXY_GET_PRIVATE (proxy); + priv = FLICKR_PROXY_GET_PRIVATE (proxy); checksum = g_checksum_new (G_CHECKSUM_MD5); g_checksum_update (checksum, (guchar *)priv->shared_secret, -1); diff --git a/rest-extras/lastfm-proxy-call.c b/rest-extras/lastfm-proxy-call.c index c5aed2f..5e04038 100644 --- a/rest-extras/lastfm-proxy-call.c +++ b/rest-extras/lastfm-proxy-call.c @@ -41,7 +41,7 @@ _prepare (RestProxyCall *call, GError **error) char *s; g_object_get (call, "proxy", &proxy, NULL); - priv = PROXY_GET_PRIVATE (proxy); + priv = LASTFM_PROXY_GET_PRIVATE (proxy); call_priv = call->priv; /* First reset the URL because Lastfm puts the function in the parameters */ diff --git a/rest-extras/lastfm-proxy-private.h b/rest-extras/lastfm-proxy-private.h index 1002f39..128f7a9 100644 --- a/rest-extras/lastfm-proxy-private.h +++ b/rest-extras/lastfm-proxy-private.h @@ -22,7 +22,7 @@ #include "lastfm-proxy.h" -#define PROXY_GET_PRIVATE(o) \ +#define LASTFM_PROXY_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), LASTFM_TYPE_PROXY, LastfmProxyPrivate)) struct _LastfmProxyPrivate { diff --git a/rest-extras/lastfm-proxy.c b/rest-extras/lastfm-proxy.c index c6fe054..b9fc713 100644 --- a/rest-extras/lastfm-proxy.c +++ b/rest-extras/lastfm-proxy.c @@ -60,7 +60,7 @@ static void lastfm_proxy_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { - LastfmProxyPrivate *priv = PROXY_GET_PRIVATE (object); + LastfmProxyPrivate *priv = LASTFM_PROXY_GET_PRIVATE (object); switch (property_id) { case PROP_API_KEY: @@ -81,7 +81,7 @@ static void lastfm_proxy_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { - LastfmProxyPrivate *priv = PROXY_GET_PRIVATE (object); + LastfmProxyPrivate *priv = LASTFM_PROXY_GET_PRIVATE (object); switch (property_id) { case PROP_API_KEY: @@ -107,7 +107,7 @@ lastfm_proxy_set_property (GObject *object, guint property_id, static void lastfm_proxy_finalize (GObject *object) { - LastfmProxyPrivate *priv = PROXY_GET_PRIVATE (object); + LastfmProxyPrivate *priv = LASTFM_PROXY_GET_PRIVATE (object); g_free (priv->api_key); g_free (priv->secret); @@ -160,7 +160,7 @@ lastfm_proxy_class_init (LastfmProxyClass *klass) static void lastfm_proxy_init (LastfmProxy *self) { - self->priv = PROXY_GET_PRIVATE (self); + self->priv = LASTFM_PROXY_GET_PRIVATE (self); } RestProxy * @@ -198,7 +198,7 @@ lastfm_proxy_new_with_session (const char *api_key, const char * lastfm_proxy_get_api_key (LastfmProxy *proxy) { - LastfmProxyPrivate *priv = PROXY_GET_PRIVATE (proxy); + LastfmProxyPrivate *priv = LASTFM_PROXY_GET_PRIVATE (proxy); return priv->api_key; } @@ -214,7 +214,7 @@ lastfm_proxy_get_api_key (LastfmProxy *proxy) const char * lastfm_proxy_get_secret (LastfmProxy *proxy) { - LastfmProxyPrivate *priv = PROXY_GET_PRIVATE (proxy); + LastfmProxyPrivate *priv = LASTFM_PROXY_GET_PRIVATE (proxy); return priv->secret; } @@ -230,7 +230,7 @@ lastfm_proxy_get_secret (LastfmProxy *proxy) const char * lastfm_proxy_get_session_key (LastfmProxy *proxy) { - LastfmProxyPrivate *priv = PROXY_GET_PRIVATE (proxy); + LastfmProxyPrivate *priv = LASTFM_PROXY_GET_PRIVATE (proxy); return priv->session_key; } @@ -247,7 +247,7 @@ lastfm_proxy_set_session_key (LastfmProxy *proxy, const char *session_key) LastfmProxyPrivate *priv; g_return_if_fail (LASTFM_IS_PROXY (proxy)); - priv = PROXY_GET_PRIVATE (proxy); + priv = LASTFM_PROXY_GET_PRIVATE (proxy); if (priv->session_key) g_free (priv->session_key); @@ -266,7 +266,7 @@ lastfm_proxy_sign (LastfmProxy *proxy, GHashTable *params) g_return_val_if_fail (LASTFM_IS_PROXY (proxy), NULL); g_return_val_if_fail (params, NULL); - priv = PROXY_GET_PRIVATE (proxy); + priv = LASTFM_PROXY_GET_PRIVATE (proxy); s = g_string_new (NULL); |