From da543e4ce64c0751869b344081e9dc32f2750d39 Mon Sep 17 00:00:00 2001
From: Hakan Erduman <smultimeter@gmail.com>
Date: Sat, 16 Jan 2021 20:09:15 +0100
Subject: [PATCH] Drop variable icon resource

---
 autogen.sh               | 1 -
 configure.ac             | 4 ----
 panel-plugin/Makefile.am | 1 -
 panel-plugin/settings.c  | 2 +-
 po/POTFILES.in           | 2 --
 5 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 79e8f15..5e08a67 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -16,7 +16,6 @@
 # License along with this library; If not, see <http://www.gnu.org/licenses/>.
 mkdir -p m4
 autoreconf -sif
-intltool-prepare
 ./configure --enable-silent-rules --silent $*
 ./config.status -V
 echo "Preparation done"
diff --git a/configure.ac b/configure.ac
index 7c65125..e431721 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,10 +18,6 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define to the Gettext p
 AC_DEFINE_UNQUOTED(PLUGIN_NAME, "$PACKAGE", [Define plugin name])
 
 
-AC_ARG_WITH(icon_name,[  --with-icon-name        icon name (default: org.gnome.Hamster.GUI)],[with_icon_name=$withval],[with_icon_name=org.gnome.Hamster.GUI])
-AC_DEFINE_UNQUOTED(ICON_NAME, "$with_icon_name", [Hamster Icon name])
-AC_SUBST(with_icon_name)
-
 AC_ARG_ENABLE(debug,[  --enable-debug          disable debug support (default: disable)],[enable_debug=$enableval],[enable_debug=no])
 if test x$enable_debug = xyes; then
     AC_DEFINE([DEBUG], [1], [Set this to 1 to enable debug output.])
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 90c3b53..74fe28e 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -77,7 +77,6 @@ desktopdir = $(datadir)/xfce4/panel/plugins
 desktop_in_files = hamster.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
-	sed -i 's:@ICON_NAME@:$(with_icon_name):g' hamster.desktop
 
 EXTRA_DIST = hamster.desktop.in xfce4-popup-hamstermenu.sh org.gnome.Hamster.xml org.gnome.Hamster.WindowServer.xml
 
diff --git a/panel-plugin/settings.c b/panel-plugin/settings.c
index 24103d8..41e5263 100644
--- a/panel-plugin/settings.c
+++ b/panel-plugin/settings.c
@@ -31,7 +31,7 @@ config_show(XfcePanelPlugin *plugin, XfconfChannel *channel)
    GtkWidget *cnt, *lbl, *chk;
    g_object_set(G_OBJECT(dlg),
          "title", _("Hamster"),
-         "icon_name", ICON_NAME,
+         "icon_name", "org.gnome.Hamster.GUI",
          "subtitle", _("Time bookkeeping plugin"),
          NULL);
    g_signal_connect_swapped (dlg,
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6354897..a376297 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,5 +5,3 @@ panel-plugin/view.c
 panel-plugin/settings.c
 
 panel-plugin/hamster.desktop.in
-# files added by intltool-prepare
-build/panel-plugin/hamster.desktop.in