summaryrefslogtreecommitdiff
path: root/demos
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2012-05-13 19:53:43 +0200
committerCosimo Cecchi <cosimoc@gnome.org>2012-05-30 13:17:22 -0400
commit04e8a8a5ed61afe2c98e174acc3a2861b3702299 (patch)
tree66fe9a34e302a622f9731ebdec6370738d930632 /demos
parent3d98275961e072839dbe5e021509d730e22339ce (diff)
downloadgtk+-04e8a8a5ed61afe2c98e174acc3a2861b3702299.tar.gz
gtk-demo move application demo resources into a namespace
Diffstat (limited to 'demos')
-rw-r--r--demos/gtk-demo/application.c8
-rw-r--r--demos/gtk-demo/application.gresource.xml4
2 files changed, 6 insertions, 6 deletions
diff --git a/demos/gtk-demo/application.c b/demos/gtk-demo/application.c
index 6f6c054ca0..6889e61280 100644
--- a/demos/gtk-demo/application.c
+++ b/demos/gtk-demo/application.c
@@ -113,7 +113,7 @@ activate_about (GSimpleAction *action,
NULL
};
- pixbuf = gdk_pixbuf_new_from_resource ("/logos/gtk-logo-48.png", NULL);
+ pixbuf = gdk_pixbuf_new_from_resource ("/application/logos/gtk-logo-48.png", NULL);
gtk_show_about_dialog (GTK_WINDOW (window),
"program-name", "GTK+ Code Demos",
@@ -177,7 +177,7 @@ register_stock_icons (void)
factory = gtk_icon_factory_new ();
gtk_icon_factory_add_default (factory);
- pixbuf = gdk_pixbuf_new_from_resource ("/logos/gtk-logo-24.png", NULL);
+ pixbuf = gdk_pixbuf_new_from_resource ("/application/logos/gtk-logo-24.png", NULL);
icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
gtk_icon_factory_add (factory, "demo-gtk-logo", icon_set);
@@ -295,7 +295,7 @@ startup (GApplication *app)
GMenuModel *menubar;
builder = gtk_builder_new ();
- gtk_builder_add_from_resource (builder, "/ui/menus.ui", NULL);
+ gtk_builder_add_from_resource (builder, "/application/ui/menus.ui", NULL);
appmenu = (GMenuModel *)gtk_builder_get_object (builder, "appmenu");
menubar = (GMenuModel *)gtk_builder_get_object (builder, "menubar");
@@ -331,7 +331,7 @@ activate (GApplication *app)
window);
builder = gtk_builder_new ();
- gtk_builder_add_from_resource (builder, "/ui/application.ui", NULL);
+ gtk_builder_add_from_resource (builder, "/application/ui/application.ui", NULL);
grid = (GtkWidget *)gtk_builder_get_object (builder, "grid");
contents = (GtkWidget *)gtk_builder_get_object (builder, "contents");
diff --git a/demos/gtk-demo/application.gresource.xml b/demos/gtk-demo/application.gresource.xml
index 485053532e..d4a5aeca16 100644
--- a/demos/gtk-demo/application.gresource.xml
+++ b/demos/gtk-demo/application.gresource.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
- <gresource prefix="/logos">
+ <gresource prefix="/application/logos">
<file preprocess="to-pixdata">gtk-logo-24.png</file>
<file preprocess="to-pixdata">gtk-logo-48.png</file>
</gresource>
- <gresource prefix="/ui">
+ <gresource prefix="/application/ui">
<file preprocess="xml-stripblanks">application.ui</file>
<file preprocess="xml-stripblanks">menus.ui</file>
</gresource>