diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | rest/rest-proxy.h | 24 |
2 files changed, 2 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac index 9fd2615..344a932 100644 --- a/configure.ac +++ b/configure.ac @@ -40,7 +40,7 @@ AM_PROG_CC_C_O LT_PREREQ([2.2.6]) LT_INIT([disable-static]) -PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.38) +PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.44) PKG_CHECK_MODULES(SOUP, libsoup-2.4 >= 2.42) PKG_CHECK_MODULES(XML, libxml-2.0) PKG_CHECK_MODULES(GTHREAD, gthread-2.0) diff --git a/rest/rest-proxy.h b/rest/rest-proxy.h index d882dea..bb6d7b0 100644 --- a/rest/rest-proxy.h +++ b/rest/rest-proxy.h @@ -31,33 +31,13 @@ G_BEGIN_DECLS #define REST_TYPE_PROXY rest_proxy_get_type() - -#define REST_PROXY(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), REST_TYPE_PROXY, RestProxy)) - -#define REST_PROXY_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), REST_TYPE_PROXY, RestProxyClass)) - -#define REST_IS_PROXY(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), REST_TYPE_PROXY)) - -#define REST_IS_PROXY_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), REST_TYPE_PROXY)) - -#define REST_PROXY_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), REST_TYPE_PROXY, RestProxyClass)) - -typedef struct _RestProxy RestProxy; -typedef struct _RestProxyClass RestProxyClass; +G_DECLARE_DERIVABLE_TYPE (RestProxy, rest_proxy, REST, PROXY, GObject) /** * RestProxy: * * #RestProxy has no publicly available members. */ -struct _RestProxy { - GObject parent; -}; /** * RestProxyClass: @@ -180,8 +160,6 @@ typedef enum { GQuark rest_proxy_error_quark (void); -GType rest_proxy_get_type (void); - RestProxy *rest_proxy_new (const gchar *url_format, gboolean binding_required); |