Skip to content

Commit

Permalink
Drop variable icon resource
Browse files Browse the repository at this point in the history
  • Loading branch information
Hakan Erduman committed Jan 16, 2021
1 parent 1ee06c7 commit da543e4
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 9 deletions.
1 change: 0 additions & 1 deletion autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 0 additions & 4 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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.])
Expand Down
1 change: 0 additions & 1 deletion panel-plugin/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion panel-plugin/settings.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 0 additions & 2 deletions po/POTFILES.in
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit da543e4

Please sign in to comment.