[gnome-applets] window-buttons: move out icons from pixmaps
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-applets] window-buttons: move out icons from pixmaps
- Date: Tue, 10 Mar 2020 16:11:48 +0000 (UTC)
commit f2b1cfc2b6e5c062c74f315edfa704cefe728eb5
Author: Balló György <ballogyor gmail com>
Date: Fri Dec 28 15:49:48 2018 +0100
window-buttons: move out icons from pixmaps
Use /usr/share/icons directory to store icons for these applets.
window-buttons/pixmaps/Makefile.am | 12 +++++-------
window-buttons/pixmaps/windowbuttons-applet.png | Bin 5109 -> 10381 bytes
window-buttons/windowbuttons.c | 4 +---
window-buttons/windowbuttons.h | 1 -
4 files changed, 6 insertions(+), 11 deletions(-)
---
diff --git a/window-buttons/pixmaps/Makefile.am b/window-buttons/pixmaps/Makefile.am
index d1873e8ab..c4e66988d 100644
--- a/window-buttons/pixmaps/Makefile.am
+++ b/window-buttons/pixmaps/Makefile.am
@@ -1,13 +1,11 @@
-EXTRA_DIST = \
- $(pixmaps_DATA)\
- $(other_files_DATA) \
- $(pixmaps_DATA)
-
pixmaps_DATA = \
- windowbuttons-applet.png
+ windowbuttons-applet.png
pixmapsdir = \
- $(datadir)/pixmaps
+ $(datadir)/icons/hicolor/96x96/apps
+
+EXTRA_DIST = \
+ $(pixmaps_DATA)
-include $(top_srcdir)/git.mk
diff --git a/window-buttons/pixmaps/windowbuttons-applet.png b/window-buttons/pixmaps/windowbuttons-applet.png
index 72b2d3545..852b0b462 100644
Binary files a/window-buttons/pixmaps/windowbuttons-applet.png and
b/window-buttons/pixmaps/windowbuttons-applet.png differ
diff --git a/window-buttons/windowbuttons.c b/window-buttons/windowbuttons.c
index ddcab9733..bf20acb78 100755
--- a/window-buttons/windowbuttons.c
+++ b/window-buttons/windowbuttons.c
@@ -172,8 +172,6 @@ static void about_cb (GSimpleAction *action, GVariant *parameter, gpointer user_
NULL
};
- GdkPixbuf *logo = gdk_pixbuf_new_from_file (PATH_LOGO, NULL);
-
gtk_show_about_dialog (NULL,
"version", VERSION,
"comments", N_("Window buttons for your GNOME Panel."),
@@ -182,7 +180,7 @@ static void about_cb (GSimpleAction *action, GVariant *parameter, gpointer user_
"artists", artists,
"documenters", documenters,
"translator-credits", ("translator-credits"),
- "logo", logo,
+ "logo-icon-name", "windowbuttons-applet",
"website", "http://www.gnome-look.org/content/show.php?content=103732",
"website-label", N_("Window Applets on Gnome-Look"),
NULL);
diff --git a/window-buttons/windowbuttons.h b/window-buttons/windowbuttons.h
index df89b3046..2b1e377b0 100755
--- a/window-buttons/windowbuttons.h
+++ b/window-buttons/windowbuttons.h
@@ -48,7 +48,6 @@
#define APPLET_OAFIID_FACTORY "WindowButtonsAppletFactory"
#define PATH_THEMES WB_DATA_DIR"/themes"
#define PATH_UI_PREFS GTK_BUILDERDIR"/windowbuttons.ui"
-#define PATH_LOGO DATA_DIR"/pixmaps/windowbuttons-applet.png"
#define METACITY_XML "metacity-theme-1.xml"
#define THEME_EXTENSION "png"
#define FILE_CONFIGFILE ".windowbuttons"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]