[gtk+] widget-factory: use new icon instead of gtk logo
- From: William Jon McCann <mccann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] widget-factory: use new icon instead of gtk logo
- Date: Tue, 5 Nov 2013 21:40:44 +0000 (UTC)
commit 46cb6e8291f588d812f23caca9a678487fe0fab2
Author: William Jon McCann <william jon mccann gmail com>
Date: Tue Nov 5 16:39:50 2013 -0500
widget-factory: use new icon instead of gtk logo
demos/widget-factory/Makefile.am | 3 +--
demos/widget-factory/gtk-logo-256.png | Bin 10688 -> 0 bytes
demos/widget-factory/widget-factory.c | 7 +------
demos/widget-factory/widget-factory.gresource.xml | 3 ---
demos/widget-factory/widget-factory.ui | 2 +-
5 files changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am
index 742c177..9772204 100644
--- a/demos/widget-factory/Makefile.am
+++ b/demos/widget-factory/Makefile.am
@@ -60,7 +60,6 @@ uninstall-update-icon-cache:
EXTRA_DIST += \
widget-factory.ui \
- widget-factory.gresource.xml \
- gtk-logo-256.png
+ widget-factory.gresource.xml
-include $(top_srcdir)/git.mk
diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c
index ef3f1d4..df301e7 100644
--- a/demos/widget-factory/widget-factory.c
+++ b/demos/widget-factory/widget-factory.c
@@ -56,15 +56,12 @@ activate_about (GSimpleAction *action,
gpointer user_data)
{
GtkWidget *window = user_data;
- GdkPixbuf *pixbuf;
const gchar *authors[] = {
"Andrea Cimitan",
"Cosimo Cecchi",
NULL
};
- pixbuf = gdk_pixbuf_new_from_resource ("/logos/gtk-logo-256.png", NULL);
-
gtk_show_about_dialog (GTK_WINDOW (window),
"program-name", "GTK+ Widget Factory",
"version", g_strdup_printf ("%s,\nRunning against GTK+ %d.%d.%d",
@@ -77,11 +74,9 @@ activate_about (GSimpleAction *action,
"website", "http://www.gtk.org",
"comments", "Program to demonstrate GTK+ themes and widgets",
"authors", authors,
- "logo", pixbuf,
+ "logo-icon-name", "gtk3-widget-factory",
"title", "About GTK+ Widget Factory",
NULL);
-
- g_object_unref (pixbuf);
}
static void
diff --git a/demos/widget-factory/widget-factory.gresource.xml
b/demos/widget-factory/widget-factory.gresource.xml
index 79bad5b..ec660ff 100644
--- a/demos/widget-factory/widget-factory.gresource.xml
+++ b/demos/widget-factory/widget-factory.gresource.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
- <gresource prefix="/logos">
- <file>gtk-logo-256.png</file>
- </gresource>
<gresource prefix="/ui">
<file preprocess="xml-stripblanks">widget-factory.ui</file>
</gresource>
diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index d1242c0..b4b6d28 100644
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -1883,7 +1883,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
<child>
<object class="GtkImage" id="imageo">
<property name="visible">True</property>
- <property name="resource">/logos/gtk-logo-256.png</property>
+ <property name="icon-name">gtk3-widget-factory</property>
</object>
<packing>
<property name="name">page2</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]