diff options
| -rw-r--r-- | rest-extras/Makefile.am | 7 | ||||
| -rw-r--r-- | rest-extras/flickr-proxy.c | 4 | ||||
| -rw-r--r-- | rest-extras/youtube-proxy.c | 19 | ||||
| -rw-r--r-- | rest-extras/youtube-proxy.h | 4 |
4 files changed, 28 insertions, 6 deletions
diff --git a/rest-extras/Makefile.am b/rest-extras/Makefile.am index c354867..fd0858e 100644 --- a/rest-extras/Makefile.am +++ b/rest-extras/Makefile.am @@ -57,11 +57,14 @@ RestExtras-@API_VERSION@.gir: librest-extras-@API_VERSION@.la Makefile RestExtras_@API_VERSION_AM@_gir_NAMESPACE = RestExtras RestExtras_@API_VERSION_AM@_gir_VERSION = @API_VERSION@ RestExtras_@API_VERSION_AM@_gir_LIBS = librest-extras-@API_VERSION@.la -RestExtras_@API_VERSION_AM@_gir_FILES = $(addprefix $(top_srcdir)/rest-extras/, $(lib_headers)) +RestExtras_@API_VERSION_AM@_gir_FILES = \ + $(lib_headers) \ + $(filter-out %private.h, $(lib_sources)) RestExtras_@API_VERSION_AM@_gir_CFLAGS = -I$(top_srcdir) RestExtras_@API_VERSION_AM@_gir_INCLUDES = GObject-2.0 libxml2-2.0 RestExtras_@API_VERSION_AM@_gir_PACKAGES = gobject-2.0 libsoup-2.4 libxml-2.0 -RestExtras_@API_VERSION_AM@_gir_SCANNERFLAGS = --include-uninstalled=$(top_builddir)/rest/Rest-@API_VERSION@.gir +RestExtras_@API_VERSION_AM@_gir_SCANNERFLAGS = --include-uninstalled=$(top_builddir)/rest/Rest-@API_VERSION@.gir --accept-unprefixed +RestExtras_@API_VERSION_AM@_gir_EXPORT_PACKAGES = rest-extras-@API_VERSION@ girdir = $(datadir)/gir-1.0 dist_gir_DATA = $(INTROSPECTION_GIRS) diff --git a/rest-extras/flickr-proxy.c b/rest-extras/flickr-proxy.c index 2cae090..5b7d960 100644 --- a/rest-extras/flickr-proxy.c +++ b/rest-extras/flickr-proxy.c @@ -376,6 +376,8 @@ flickr_proxy_is_successful (RestXmlNode *root, GError **error) * * See http://www.flickr.com/services/api/upload.api.html for details on * uploading to Flickr. + * + * Returns: (type FlickrProxyCall) (transfer full): a new #FlickrProxyCall */ RestProxyCall * flickr_proxy_new_upload (FlickrProxy *proxy) @@ -402,6 +404,8 @@ flickr_proxy_new_upload (FlickrProxy *proxy) * * See http://www.flickr.com/services/api/upload.api.html for details on * uploading to Flickr. + * + * Returns: (type FlickrProxyCall) (transfer full): a new #FlickrProxyCall */ RestProxyCall * flickr_proxy_new_upload_for_file (FlickrProxy *proxy, const char *filename, GError **error) diff --git a/rest-extras/youtube-proxy.c b/rest-extras/youtube-proxy.c index 39a1ac1..28698e2 100644 --- a/rest-extras/youtube-proxy.c +++ b/rest-extras/youtube-proxy.c @@ -336,6 +336,21 @@ _message_wrote_data_cb (SoupMessage *msg, closure->user_data); } +/** + * youtube_proxy_upload_async: + * @self: a #YoutubeProxy + * @filename: filename + * @fields: fields + * @incomplete: incomplete + * @callback: (scope async): callback to invoke upon completion + * @weak_object: + * @user_data: user data to pass to the callback + * @error: a #GError pointer, or %NULL + * + * Upload a file. + * + * Returns: %TRUE, or %FALSE if the file could not be opened + */ gboolean youtube_proxy_upload_async (YoutubeProxy *self, const gchar *filename, @@ -343,7 +358,7 @@ youtube_proxy_upload_async (YoutubeProxy *self, gboolean incomplete, YoutubeProxyUploadCallback callback, GObject *weak_object, - gpointer userdata, + gpointer user_data, GError **error) { SoupMultipart *mp; @@ -406,7 +421,7 @@ youtube_proxy_upload_async (YoutubeProxy *self, _set_upload_headers (self, message->request_headers, filename); closure = _upload_async_closure_new (self, callback, message, weak_object, - userdata); + user_data); g_signal_connect (message, "wrote-body-data", diff --git a/rest-extras/youtube-proxy.h b/rest-extras/youtube-proxy.h index 943f9f0..1fe6c20 100644 --- a/rest-extras/youtube-proxy.h +++ b/rest-extras/youtube-proxy.h @@ -81,7 +81,7 @@ typedef void (*YoutubeProxyUploadCallback)(YoutubeProxy *proxy, gsize uploaded, const GError *error, GObject *weak_object, - gpointer userdata); + gpointer user_data); gboolean youtube_proxy_upload_async (YoutubeProxy *self, const gchar *filename, @@ -89,7 +89,7 @@ gboolean youtube_proxy_upload_async (YoutubeProxy *self, gboolean incomplete, YoutubeProxyUploadCallback callback, GObject *weak_object, - gpointer userdata, + gpointer user_data, GError **error); G_END_DECLS |