Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/1c5a5207fb2056b58be7a... ...commit http://git.netsurf-browser.org/netsurf.git/commit/1c5a5207fb2056b58be7a27... ...tree http://git.netsurf-browser.org/netsurf.git/tree/1c5a5207fb2056b58be7a27a5... The branch, master has been updated via 1c5a5207fb2056b58be7a27a5135f39228702260 (commit) from 796ac470b5e86e185ebfcd9b5d3f1a8686b7662f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=1c5a5207fb2056b58be... commit 1c5a5207fb2056b58be7a27a5135f39228702260 Author: Vincent Sanders <vince(a)kyllikki.org&gt; Commit: Vincent Sanders <vince(a)kyllikki.org&gt; fix glib resource API usage even when gresource was disabled diff --git a/gtk/resources.c b/gtk/resources.c index b90fdd4..e2ca72e 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 */ ----------------------------------------------------------------------- Summary of changes: gtk/resources.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gtk/resources.c b/gtk/resources.c index b90fdd4..e2ca72e 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 */ -- NetSurf Browser