diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2015-06-29 15:48:08 +0100 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2015-06-29 15:48:08 +0100 |
| commit | 1c5a5207fb2056b58be7a27a5135f39228702260 (patch) | |
| tree | f475f8dc534c2b13601557e4a211a20579622cef | |
| parent | 796ac470b5e86e185ebfcd9b5d3f1a8686b7662f (diff) | |
| download | netsurf-1c5a5207fb2056b58be7a27a5135f39228702260.tar.gz netsurf-1c5a5207fb2056b58be7a27a5135f39228702260.tar.bz2 | |
fix glib resource API usage even when gresource was disabled
| -rw-r--r-- | gtk/resources.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/gtk/resources.c b/gtk/resources.c index b90fdd49b..e2ca72eb5 100644 --- a/gtk/resources.c +++ b/gtk/resources.c @@ -468,7 +468,9 @@ nsgdk_pixbuf_new_from_resname(const char *resname, GdkPixbuf **pixbuf_out) break; case NSGTK_RESOURCE_GLIB: +#ifdef WITH_GRESOURCE new_pixbuf = gdk_pixbuf_new_from_resource(resource->path, &error); +#endif break; case NSGTK_RESOURCE_INLINE: @@ -540,6 +542,7 @@ nsgtk_data_from_resname(const char *resname, const uint8_t ** data_out, size_t *data_size_out) { +#ifdef WITH_GRESOURCE struct nsgtk_resource_s *resource; GBytes *data; const gchar *buffer; @@ -564,6 +567,12 @@ nsgtk_data_from_resname(const char *resname, *data_size_out = (size_t)buffer_length; return NSERROR_OK; +#else + /** \todo consider adding compiled inline resources for things + * other than pixbufs. + */ + return NSERROR_NOT_FOUND; +#endif } /* exported interface documented in gtk/resources.h */ |