[gnome-alsamixer] Rename the icon

[Bastien Nocera <hadess src gnome org>]

commit f37f9b32d14cb712aa0f197b2a3ea818be2e6280
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Jun 26 14:37:04 2012 +0100

    Rename the icon

 Makefile.am                                        |    2 +-
 gnome-alsamixer.desktop                            |    2 +-
 ...nome-alsamixer-icon.png => gnome-alsamixer.png} |  Bin 2699 -> 2699 bytes
 src/Makefile.am                                    |    2 +-
 src/gam-app.c                                      |    2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 0b719f5..4935521 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ schemadir   = @GCONF_SCHEMA_FILE_DIR@
 schema_DATA = gnome-alsamixer.schemas
 
 pixmapdir = $(datadir)/pixmaps/
-pixmap_DATA = pixmaps/gnome-alsamixer-icon.png
+pixmap_DATA = pixmaps/gnome-alsamixer.png
 
 desktopdir = $(datadir)/applications/
 desktop_DATA = gnome-alsamixer.desktop
diff --git a/gnome-alsamixer.desktop b/gnome-alsamixer.desktop
index 8ac617d..4ff7172 100644
--- a/gnome-alsamixer.desktop
+++ b/gnome-alsamixer.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Name=ALSA Volume Control
 Comment=Adjust the volume level
 Exec=gnome-alsamixer
-Icon=gnome-alsamixer-icon
+Icon=gnome-alsamixer
 Terminal=false
 Type=Application
 Categories=GNOME;Application;AudioVideo;
diff --git a/pixmaps/gnome-alsamixer-icon.png b/pixmaps/gnome-alsamixer.png
similarity index 100%
rename from pixmaps/gnome-alsamixer-icon.png
rename to pixmaps/gnome-alsamixer.png
diff --git a/src/Makefile.am b/src/Makefile.am
index 93dcc0b..1f2abca 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@
 
 INCLUDES = \
 	-DPACKAGE_DATA_DIR=\""$(datadir)/gnome-alsamixer"\"        \
-	-DPIXMAP_ICONDIR=\""$(datadir)/pixmaps/gnome-alsamixer"\"  \
+	-DPIXMAP_ICONDIR=\""$(datadir)/pixmaps"\"  \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	@PACKAGE_CFLAGS@
 
diff --git a/src/gam-app.c b/src/gam-app.c
index ad32887..bb29915 100644
--- a/src/gam-app.c
+++ b/src/gam-app.c
@@ -261,7 +261,7 @@ gam_app_constructor (GType                  type,
     g_signal_connect (G_OBJECT (gam_app), "delete_event",
                       G_CALLBACK (gam_app_delete), NULL);
 
-    gnome_window_icon_set_default_from_file (PIXMAP_ICONDIR"/gnome-alsamixer-icon.png");
+    gnome_window_icon_set_default_from_file (PIXMAP_ICONDIR"/gnome-alsamixer.png");
 
     // Build the main menu and toolbar
     gtk_action_group_add_actions (priv->main_action_group, action_entries,