[gnome-settings-daemon] Remove useless custom eject icon
- From: Bastien Nocera <hadess src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] Remove useless custom eject icon
- Date: Wed, 9 Sep 2009 16:29:57 +0000 (UTC)
commit af471ed4b5afef15225bbed1e6f8231ebd7a29cf
Author: Bastien Nocera <hadess hadess net>
Date: Wed Sep 9 16:52:28 2009 +0100
Remove useless custom eject icon
And use the theme's eject icon instead.
plugins/media-keys/Makefile.am | 5 -----
plugins/media-keys/acme-eject.png | Bin 1624 -> 0 bytes
plugins/media-keys/gsd-media-keys-window.c | 12 +-----------
3 files changed, 1 insertions(+), 16 deletions(-)
---
diff --git a/plugins/media-keys/Makefile.am b/plugins/media-keys/Makefile.am
index fae8a5e..6be5a86 100644
--- a/plugins/media-keys/Makefile.am
+++ b/plugins/media-keys/Makefile.am
@@ -133,11 +133,6 @@ gtkbuilder_DATA = \
acme.ui \
$(NULL)
-pixmapsdir = $(pkgdatadir)
-pixmaps_DATA = \
- acme-eject.png \
- $(NULL)
-
DIST_SUBDIRS = cut-n-paste
EXTRA_DIST = \
diff --git a/plugins/media-keys/gsd-media-keys-window.c b/plugins/media-keys/gsd-media-keys-window.c
index 3eca69b..9306b92 100644
--- a/plugins/media-keys/gsd-media-keys-window.c
+++ b/plugins/media-keys/gsd-media-keys-window.c
@@ -168,16 +168,6 @@ window_set_icon_name (GsdMediaKeysWindow *window,
}
static void
-window_set_icon_file (GsdMediaKeysWindow *window,
- const char *path)
-{
- if (window->priv->image == NULL)
- return;
-
- gtk_image_set_from_file (window->priv->image, path);
-}
-
-static void
action_changed (GsdMediaKeysWindow *window)
{
if (! window->priv->is_composited) {
@@ -194,7 +184,7 @@ action_changed (GsdMediaKeysWindow *window)
break;
case GSD_MEDIA_KEYS_WINDOW_ACTION_EJECT:
volume_controls_set_visible (window, FALSE);
- window_set_icon_file (window, PIXMAPDIR "/acme-eject.png");
+ window_set_icon_name (window, "media-eject");
break;
default:
break;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]