[SCM] calf/master: + AutoHell: add icons by Thorsten Wilms, use them in the JACK host

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d7fe47557d1f4e197ebe26fe3db1cb961e05b27b
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Wed Dec 24 00:29:39 2008 +0000

    + AutoHell: add icons by Thorsten Wilms, use them in the JACK host

diff --git a/AUTHORS b/AUTHORS
index 621bcea..e93f248 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,4 @@
 Krzysztof Foltman <wdev at foltman.com>
 Hermann Meyer <brummer- at web.de>
 Thor Harald Johansen <thj at thj.no>
+Thorsten Wilms <t_w_ at freenet.de>
diff --git a/Makefile.am b/Makefile.am
index 024cdb8..b5fef60 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SRCDIRS = src gui
+SRCDIRS = src gui icons
 
 SUBDIRS = $(SRCDIRS)
 
diff --git a/calf.desktop.in b/calf.desktop.in
index 4303713..ca9f99e 100644
--- a/calf.desktop.in
+++ b/calf.desktop.in
@@ -8,3 +8,4 @@ Exec=calfjackhost
 Terminal=false
 Type=Application
 Categories=Application;AudioVideo;Audio
+Icon=calf
diff --git a/configure.ac b/configure.ac
index 6340c41..74d70f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -214,6 +214,7 @@ AC_CHECK_FUNCS([floor memset pow])
 AC_CONFIG_FILES([Makefile
                  calf.desktop
                  gui/Makefile
+                 icons/Makefile
                  src/Makefile
                  src/calf/Makefile])
 AC_MSG_RESULT([
diff --git a/icons/Makefile.am b/icons/Makefile.am
new file mode 100644
index 0000000..f8d6208
--- /dev/null
+++ b/icons/Makefile.am
@@ -0,0 +1,15 @@
+EXTRA_DIST = calf_16x16.png calf_24x24.png calf_32x32.png calf_48x48.png
+SIZES = 16x16 24x24 32x32 48x48
+
+install-data-hook:
+	-for fn in $(SIZES); do \
+		cp "calf_$${fn}.png" "$(datadir)/icons/hicolor/$${fn}/apps/calf.png"; \
+	done
+	@-gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+	
+uninstall-hook:
+	@-for fn in $(SIZES); do \
+		rm -f "$(datadir)/icons/hicolor/$${fn}/apps/calf.png"; \
+	done
+	@-gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+	
diff --git a/icons/calf_16x16.png b/icons/calf_16x16.png
new file mode 100644
index 0000000..66d795a
Binary files /dev/null and b/icons/calf_16x16.png differ
diff --git a/icons/calf_24x24.png b/icons/calf_24x24.png
new file mode 100644
index 0000000..1a7ded1
Binary files /dev/null and b/icons/calf_24x24.png differ
diff --git a/icons/calf_32x32.png b/icons/calf_32x32.png
new file mode 100644
index 0000000..5171747
Binary files /dev/null and b/icons/calf_32x32.png differ
diff --git a/icons/calf_44x41.png b/icons/calf_44x41.png
new file mode 100644
index 0000000..65f9602
Binary files /dev/null and b/icons/calf_44x41.png differ
diff --git a/icons/calf_48x48.png b/icons/calf_48x48.png
new file mode 100644
index 0000000..bc5214a
Binary files /dev/null and b/icons/calf_48x48.png differ
diff --git a/src/gui.cpp b/src/gui.cpp
index c421773..296c373 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -1050,6 +1050,7 @@ gboolean plugin_gui_window::on_idle(void *data)
 void plugin_gui_window::create(plugin_ctl_iface *_jh, const char *title, const char *effect)
 {
     toplevel = GTK_WINDOW(gtk_window_new (GTK_WINDOW_TOPLEVEL));
+    gtk_window_set_default_icon_name("calf");
     gtk_window_set_type_hint(toplevel, GDK_WINDOW_TYPE_HINT_DIALOG);
     GtkVBox *vbox = GTK_VBOX(gtk_vbox_new(false, 5));
     
diff --git a/src/main_win.cpp b/src/main_win.cpp
index 10713a9..715caf9 100644
--- a/src/main_win.cpp
+++ b/src/main_win.cpp
@@ -307,6 +307,7 @@ std::string main_window::make_plugin_list(GtkActionGroup *actions)
 void main_window::create()
 {
     toplevel = GTK_WINDOW(gtk_window_new (GTK_WINDOW_TOPLEVEL));
+    gtk_window_set_default_icon_name("calf");
     is_closed = false;
     gtk_window_set_resizable(toplevel, false);
     

-- 
calf audio plugins packaging