[gtk+] gtk-demo: Port builder example to resources
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] gtk-demo: Port builder example to resources
- Date: Fri, 1 Feb 2013 16:47:09 +0000 (UTC)
commit 4f93194039a16d7ef0352a13224781182db76371
Author: Benjamin Otte <otte redhat com>
Date: Tue Jan 29 17:10:30 2013 +0100
gtk-demo: Port builder example to resources
demos/gtk-demo/Makefile.am | 2 +-
demos/gtk-demo/builder.c | 5 +----
demos/gtk-demo/demo.gresource.xml | 3 +++
3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index afdda22..7e23da6 100644
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -79,7 +79,6 @@ BUILT_SOURCES = demos.h demo_resources.c
EXTRA_DIST += \
$(IMAGEFILES) \
- demo.ui \
demo.gresource.xml \
$(RESOURCES) \
org.gtk.Demo.gschema.xml
@@ -113,6 +112,7 @@ demo_resources.c: demo.gresource.xml $(RESOURCES)
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/demo.gresource.xml
RESOURCES= application.ui \
+ demo.ui \
menus.ui \
theming.ui \
gtk-logo-24.png \
diff --git a/demos/gtk-demo/builder.c b/demos/gtk-demo/builder.c
index f0691af..663fffd 100644
--- a/demos/gtk-demo/builder.c
+++ b/demos/gtk-demo/builder.c
@@ -38,14 +38,11 @@ do_builder (GtkWidget *do_widget)
{
static GtkWidget *window = NULL;
GError *err = NULL;
- gchar *filename;
if (!window)
{
builder = gtk_builder_new ();
- filename = demo_find_file ("demo.ui", NULL);
- gtk_builder_add_from_file (builder, filename, &err);
- g_free (filename);
+ gtk_builder_add_from_resource (builder, "/builder/demo.ui", &err);
if (err)
{
g_error ("ERROR: %s\n", err->message);
diff --git a/demos/gtk-demo/demo.gresource.xml b/demos/gtk-demo/demo.gresource.xml
index ad24bb8..33c0962 100644
--- a/demos/gtk-demo/demo.gresource.xml
+++ b/demos/gtk-demo/demo.gresource.xml
@@ -12,6 +12,9 @@
<file>cssview.css</file>
<file>reset.css</file>
</gresource>
+ <gresource prefix="/builder">
+ <file>demo.ui</file>
+ </gresource>
<gresource prefix="/css_accordion">
<file alias="gtk.css">css_accordion.css</file>
</gresource>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]