icon fixes

21 files changed, 3 insertions, 16 deletions

diff --git a/icons/128x128/deadbeef.png b/icons/128x128/deadbeef.png
index 5ba1e0bf..64272881 100644
--- a/icons/128x128/deadbeef.png
+++ b/icons/128x128/deadbeef.png
diff --git a/icons/16x16/deadbeef.png b/icons/16x16/deadbeef.png
index d6958cdf..ffbbc5ef 100644
--- a/icons/16x16/deadbeef.png
+++ b/icons/16x16/deadbeef.png
diff --git a/icons/192x192/deadbeef.png b/icons/192x192/deadbeef.png
index a1559a51..68ea86a7 100644
--- a/icons/192x192/deadbeef.png
+++ b/icons/192x192/deadbeef.png
diff --git a/icons/22x22/deadbeef.png b/icons/22x22/deadbeef.png
index 38a92e82..6219ec6c 100644
--- a/icons/22x22/deadbeef.png
+++ b/icons/22x22/deadbeef.png
diff --git a/icons/24x24/deadbeef.png b/icons/24x24/deadbeef.png
index 6384ff3a..b72664bd 100644
--- a/icons/24x24/deadbeef.png
+++ b/icons/24x24/deadbeef.png
diff --git a/icons/256x256/deadbeef.png b/icons/256x256/deadbeef.png
index 133284a5..b4e14443 100644
--- a/icons/256x256/deadbeef.png
+++ b/icons/256x256/deadbeef.png
diff --git a/icons/32x32/deadbeef.png b/icons/32x32/deadbeef.png
index 7220a48f..79ded73f 100644
--- a/icons/32x32/deadbeef.png
+++ b/icons/32x32/deadbeef.png
diff --git a/icons/36x36/deadbeef.png b/icons/36x36/deadbeef.png
index 5a8a1312..39ee3dfe 100644
--- a/icons/36x36/deadbeef.png
+++ b/icons/36x36/deadbeef.png
diff --git a/icons/48x48/deadbeef.png b/icons/48x48/deadbeef.png
index 166745f1..eda47c9c 100644
--- a/icons/48x48/deadbeef.png
+++ b/icons/48x48/deadbeef.png
diff --git a/icons/64x64/deadbeef.png b/icons/64x64/deadbeef.png
index d24f1ccb..d95c98d1 100644
--- a/icons/64x64/deadbeef.png
+++ b/icons/64x64/deadbeef.png
diff --git a/icons/72x72/deadbeef.png b/icons/72x72/deadbeef.png
index c5fc3d84..14efad6b 100644
--- a/icons/72x72/deadbeef.png
+++ b/icons/72x72/deadbeef.png
diff --git a/icons/96x96/deadbeef.png b/icons/96x96/deadbeef.png
index 10a5a4ae..d4be19fa 100644
--- a/icons/96x96/deadbeef.png
+++ b/icons/96x96/deadbeef.png
diff --git a/icons/make_png_icons.pl b/icons/make_png_icons.pl
index 7b7d419f..4b7637a7 100755
--- a/icons/make_png_icons.pl
+++ b/icons/make_png_icons.pl
@@ -2,9 +2,7 @@
 
 @lst = qw(16 22 24 32 36 48 64 72 96 128 192 256);
 foreach $i (@lst) {
-    $size = $i-2;
-    $size = $size.'x'.$size;
     $dir = $i.'x'.$i;
     `mkdir $dir`;
-    `convert -density 100 -background None scalable/deadbeef.svg -bordercolor None -support 0.1 -resize $size -border 1x1 $dir/deadbeef.png`;
+    `convert -density 100 -background None scalable/deadbeef.svg -support 0.1 -resize $dir  $dir/deadbeef.png`;
 }
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index 23d91f51..9eaf9d55 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -4,12 +4,6 @@ pixmaps_DATA =\
 pause_16.png\
 play_16.png\
 buffering_16.png\
-next_24.png\
-pause_24.png\
-play_24.png\
-prev_24.png\
-random_24.png\
-stop_24.png\
 noartwork.jpg
 
 EXTRA_DIST = $(pixmaps_DATA)
diff --git a/pixmaps/next_24.png b/pixmaps/next_24.png
deleted file mode 100644
index 35514e5b..00000000
--- a/pixmaps/next_24.png
+++ /dev/null
diff --git a/pixmaps/pause_24.png b/pixmaps/pause_24.png
deleted file mode 100644
index 6d4bf993..00000000
--- a/pixmaps/pause_24.png
+++ /dev/null
diff --git a/pixmaps/play_24.png b/pixmaps/play_24.png
deleted file mode 100644
index 263347e4..00000000
--- a/pixmaps/play_24.png
+++ /dev/null
diff --git a/pixmaps/prev_24.png b/pixmaps/prev_24.png
deleted file mode 100644
index f2a02a4e..00000000
--- a/pixmaps/prev_24.png
+++ /dev/null
diff --git a/pixmaps/random_24.png b/pixmaps/random_24.png
deleted file mode 100644
index b43d969a..00000000
--- a/pixmaps/random_24.png
+++ /dev/null
diff --git a/pixmaps/stop_24.png b/pixmaps/stop_24.png
deleted file mode 100644
index a9585c74..00000000
--- a/pixmaps/stop_24.png
+++ /dev/null
diff --git a/plugins/gtkui/gtkui.c b/plugins/gtkui/gtkui.c
index c743983d..ac993b57 100644
--- a/plugins/gtkui/gtkui.c
+++ b/plugins/gtkui/gtkui.c
@@ -838,13 +838,8 @@ gtkui_thread (void *ctx) {
     mainwin = create_mainwin ();
     gtkpl_init ();
 
-    GdkPixbuf *mainwin_icon_pixbuf;
-    mainwin_icon_pixbuf = create_pixbuf ("play_24.png");
-    if (mainwin_icon_pixbuf)
-    {
-        gtk_window_set_icon (GTK_WINDOW (mainwin), mainwin_icon_pixbuf);
-        g_object_unref (G_OBJECT (mainwin_icon_pixbuf));
-    }
+    gtk_window_set_icon_name (GTK_WINDOW (mainwin), "deadbeef");
+
     {
         int x = deadbeef->conf_get_int ("mainwin.geometry.x", 40);
         int y = deadbeef->conf_get_int ("mainwin.geometry.y", 40);