summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortest-tools <test-tools>2006-11-11 14:34:49 +0000
committertest-tools <test-tools>2006-11-11 14:34:49 +0000
commit59347d86ba048665f51b0ee2d5e0e24bf9dde609 (patch)
treee7dae380c570296222d6e68e5e06dc45413d11a3 /src
parent4e8caf30007bc68b70d03f142830c081c5278c9f (diff)
downloadberyl-manager-59347d86ba048665f51b0ee2d5e0e24bf9dde609.tar.gz
beryl-manager-59347d86ba048665f51b0ee2d5e0e24bf9dde609.tar.bz2
beryl-manager: Icon stuff, starts following http://live.gnome.org/GnomeGoals/AppIcon
The 22x22 icon is taken #675, the .svg icon from Artwork on Wiki. Todo: figure out, what icon size the systray wants...
Diffstat (limited to 'src')
-rw-r--r--src/main.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c
index a15352e..fea6438 100644
--- a/src/main.c
+++ b/src/main.c
@@ -985,11 +985,17 @@ void init_widgets()
evbox = gtk_event_box_new();
gtk_event_box_set_visible_window(GTK_EVENT_BOX(evbox),FALSE);
gtk_tooltips_set_tip(tips,evbox,_("Beryl Manager"),_("Manage various things related to Beryl"));
- pbuf = gdk_pixbuf_new_from_file(PIXMAPS_DIR "/beryl-manager.png",NULL);
+ pbuf = gdk_pixbuf_new_from_file_at_size(DATADIR "/icons/hicolor/scalable/apps/beryl-manager.svg",24,24,NULL);
+ if (!pbuf)
+ pbuf = gdk_pixbuf_new_from_file(DATADIR "/icons/hicolor/24x24/apps/beryl-manager.png",NULL);
+ if (!pbuf)
+ pbuf = gdk_pixbuf_new_from_file(PIXMAPS_DIR "/beryl-manager.png",NULL);
if (!pbuf)
icon = gtk_image_new_from_stock(GTK_STOCK_MISSING_IMAGE,GTK_ICON_SIZE_SMALL_TOOLBAR);
- else
+ else {
+ g_object_ref(G_OBJECT(pbuf));
icon = gtk_image_new_from_pixbuf(pbuf);
+ }
gtk_container_add(GTK_CONTAINER(mainIcon),evbox);
gtk_container_add(GTK_CONTAINER(evbox),icon);
g_signal_connect(evbox,"button-release-event",G_CALLBACK(buttonUp),NULL);