[gnome-applets/wip/muktupavels/window-buttons] window-buttons: port to libgnome-panel
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-applets/wip/muktupavels/window-buttons] window-buttons: port to libgnome-panel
- Date: Tue, 31 Mar 2020 15:20:30 +0000 (UTC)
commit 70bc45babfcc8a27ab1711303104f6c917872811
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Tue Mar 31 18:19:04 2020 +0300
window-buttons: port to libgnome-panel
Makefile.am | 19 +---
configure.ac | 16 +--
gnome-applets/Makefile.am | 4 +
gnome-applets/ga-module.c | 11 ++
gnome-applets/mini-commander/Makefile.am | 2 +-
gnome-applets/window-buttons/Makefile.am | 41 +++++++
.../window-buttons}/external.c | 0
.../window-buttons}/external.h | 0
.../window-buttons}/preferences.c | 2 +-
.../window-buttons}/preferences.h | 2 +-
.../window-buttons}/theme.c | 0
.../window-buttons}/theme.h | 2 +-
.../window-buttons}/themes/Makefile.am | 0
.../window-buttons}/themes/WoW/close-clicked.png | Bin
.../window-buttons}/themes/WoW/close-focused.png | Bin
.../window-buttons}/themes/WoW/close-hover.png | Bin
.../window-buttons}/themes/WoW/close-unfocused.png | Bin
.../themes/WoW/maximize-clicked.png | Bin
.../themes/WoW/maximize-focused.png | Bin
.../window-buttons}/themes/WoW/maximize-hover.png | Bin
.../themes/WoW/maximize-unfocused.png | Bin
.../themes/WoW/minimize-clicked.png | Bin
.../themes/WoW/minimize-focused.png | Bin
.../window-buttons}/themes/WoW/minimize-hover.png | Bin
.../themes/WoW/minimize-unfocused.png | Bin
.../themes/WoW/unmaximize-clicked.png | Bin
.../themes/WoW/unmaximize-focused.png | Bin
.../themes/WoW/unmaximize-hover.png | Bin
.../themes/WoW/unmaximize-unfocused.png | Bin
.../themes/ambiance-maverick/bg.png | Bin
.../ambiance-maverick/close-focused-clicked.png | Bin
.../ambiance-maverick/close-focused-hover.png | Bin
.../ambiance-maverick/close-focused-normal.png | Bin
.../ambiance-maverick/close-unfocused-clicked.png | Bin
.../ambiance-maverick/close-unfocused-hover.png | Bin
.../ambiance-maverick/close-unfocused-normal.png | Bin
.../ambiance-maverick/maximize-focused-clicked.png | Bin
.../ambiance-maverick/maximize-focused-hover.png | Bin
.../ambiance-maverick/maximize-focused-normal.png | Bin
.../maximize-unfocused-clicked.png | Bin
.../ambiance-maverick/maximize-unfocused-hover.png | Bin
.../maximize-unfocused-normal.png | Bin
.../ambiance-maverick/minimize-focused-clicked.png | Bin
.../ambiance-maverick/minimize-focused-hover.png | Bin
.../ambiance-maverick/minimize-focused-normal.png | Bin
.../minimize-unfocused-clicked.png | Bin
.../ambiance-maverick/minimize-unfocused-hover.png | Bin
.../minimize-unfocused-normal.png | Bin
.../unmaximize-focused-clicked.png | Bin
.../ambiance-maverick/unmaximize-focused-hover.png | Bin
.../unmaximize-focused-normal.png | Bin
.../unmaximize-unfocused-clicked.png | Bin
.../unmaximize-unfocused-hover.png | Bin
.../unmaximize-unfocused-normal.png | Bin
.../themes/ambiance-x-studio/close-clicked.png | Bin
.../themes/ambiance-x-studio/close-focused.png | Bin
.../themes/ambiance-x-studio/close-hover.png | Bin
.../themes/ambiance-x-studio/close-unfocused.png | Bin
.../themes/ambiance-x-studio/maximize-clicked.png | Bin
.../themes/ambiance-x-studio/maximize-focused.png | Bin
.../themes/ambiance-x-studio/maximize-hover.png | Bin
.../ambiance-x-studio/maximize-unfocused.png | Bin
.../themes/ambiance-x-studio/minimize-clicked.png | Bin
.../themes/ambiance-x-studio/minimize-focused.png | Bin
.../themes/ambiance-x-studio/minimize-hover.png | Bin
.../ambiance-x-studio/minimize-unfocused.png | Bin
.../ambiance-x-studio/unmaximize-clicked.png | Bin
.../ambiance-x-studio/unmaximize-focused.png | Bin
.../themes/ambiance-x-studio/unmaximize-hover.png | Bin
.../ambiance-x-studio/unmaximize-unfocused.png | Bin
.../themes/ambiance/close-clicked.png | Bin
.../themes/ambiance/close-focused.png | Bin
.../themes/ambiance/close-hover.png | Bin
.../themes/ambiance/close-unfocused.png | Bin
.../themes/ambiance/maximize-clicked.png | Bin
.../themes/ambiance/maximize-focused.png | Bin
.../themes/ambiance/maximize-hover.png | Bin
.../themes/ambiance/maximize-unfocused.png | Bin
.../themes/ambiance/minimize-clicked.png | Bin
.../themes/ambiance/minimize-focused.png | Bin
.../themes/ambiance/minimize-hover.png | Bin
.../themes/ambiance/minimize-unfocused.png | Bin
.../themes/ambiance/unmaximize-clicked.png | Bin
.../themes/ambiance/unmaximize-focused.png | Bin
.../themes/ambiance/unmaximize-hover.png | Bin
.../themes/ambiance/unmaximize-unfocused.png | Bin
.../themes/antique/close-clicked.png | Bin
.../themes/antique/close-focused.png | Bin
.../window-buttons}/themes/antique/close-hover.png | Bin
.../themes/antique/close-unfocused.png | Bin
.../themes/antique/maximize-clicked.png | Bin
.../themes/antique/maximize-focused.png | Bin
.../themes/antique/maximize-hover.png | Bin
.../themes/antique/maximize-unfocused.png | Bin
.../themes/antique/minimize-clicked.png | Bin
.../themes/antique/minimize-focused.png | Bin
.../themes/antique/minimize-hover.png | Bin
.../themes/antique/minimize-unfocused.png | Bin
.../themes/antique/unmaximize-clicked.png | Bin
.../themes/antique/unmaximize-focused.png | Bin
.../themes/antique/unmaximize-hover.png | Bin
.../themes/antique/unmaximize-unfocused.png | Bin
.../themes/blaze-color/close-clicked.png | Bin
.../themes/blaze-color/close-focused.png | Bin
.../themes/blaze-color/close-hover.png | Bin
.../themes/blaze-color/close-unfocused.png | Bin
.../themes/blaze-color/maximize-clicked.png | Bin
.../themes/blaze-color/maximize-focused.png | Bin
.../themes/blaze-color/maximize-hover.png | Bin
.../themes/blaze-color/maximize-unfocused.png | Bin
.../themes/blaze-color/minimize-clicked.png | Bin
.../themes/blaze-color/minimize-focused.png | Bin
.../themes/blaze-color/minimize-hover.png | Bin
.../themes/blaze-color/minimize-unfocused.png | Bin
.../themes/blaze-color/unmaximize-clicked.png | Bin
.../themes/blaze-color/unmaximize-focused.png | Bin
.../themes/blaze-color/unmaximize-hover.png | Bin
.../themes/blaze-color/unmaximize-unfocused.png | Bin
.../window-buttons}/themes/blaze/close-clicked.png | Bin
.../window-buttons}/themes/blaze/close-focused.png | Bin
.../window-buttons}/themes/blaze/close-hover.png | Bin
.../themes/blaze/close-unfocused.png | Bin
.../themes/blaze/maximize-clicked.png | Bin
.../themes/blaze/maximize-focused.png | Bin
.../themes/blaze/maximize-hover.png | Bin
.../themes/blaze/maximize-unfocused.png | Bin
.../themes/blaze/minimize-clicked.png | Bin
.../themes/blaze/minimize-focused.png | Bin
.../themes/blaze/minimize-hover.png | Bin
.../themes/blaze/minimize-unfocused.png | Bin
.../themes/blaze/unmaximize-clicked.png | Bin
.../themes/blaze/unmaximize-focused.png | Bin
.../themes/blaze/unmaximize-hover.png | Bin
.../themes/blaze/unmaximize-unfocused.png | Bin
.../themes/blubuntu/close-clicked.png | Bin
.../themes/blubuntu/close-focused.png | Bin
.../themes/blubuntu/close-hover.png | Bin
.../themes/blubuntu/close-unfocused.png | Bin
.../themes/blubuntu/maximize-clicked.png | Bin
.../themes/blubuntu/maximize-focused.png | Bin
.../themes/blubuntu/maximize-hover.png | Bin
.../themes/blubuntu/maximize-unfocused.png | Bin
.../themes/blubuntu/minimize-clicked.png | Bin
.../themes/blubuntu/minimize-focused.png | Bin
.../themes/blubuntu/minimize-hover.png | Bin
.../themes/blubuntu/minimize-unfocused.png | Bin
.../themes/blubuntu/unmaximize-clicked.png | Bin
.../themes/blubuntu/unmaximize-focused.png | Bin
.../themes/blubuntu/unmaximize-hover.png | Bin
.../themes/blubuntu/unmaximize-unfocused.png | Bin
.../themes/default/close-focused-clicked.png | Bin
.../themes/default/close-focused-hover.png | Bin
.../themes/default/close-focused-normal.png | Bin
.../themes/default/close-unfocused-clicked.png | Bin
.../themes/default/close-unfocused-hover.png | Bin
.../themes/default/close-unfocused-normal.png | Bin
.../themes/default/maximize-focused-clicked.png | Bin
.../themes/default/maximize-focused-hover.png | Bin
.../themes/default/maximize-focused-normal.png | Bin
.../themes/default/maximize-unfocused-clicked.png | Bin
.../themes/default/maximize-unfocused-hover.png | Bin
.../themes/default/maximize-unfocused-normal.png | Bin
.../themes/default/minimize-focused-clicked.png | Bin
.../themes/default/minimize-focused-hover.png | Bin
.../themes/default/minimize-focused-normal.png | Bin
.../themes/default/minimize-unfocused-clicked.png | Bin
.../themes/default/minimize-unfocused-hover.png | Bin
.../themes/default/minimize-unfocused-normal.png | Bin
.../themes/default/unmaximize-focused-clicked.png | Bin
.../themes/default/unmaximize-focused-hover.png | Bin
.../themes/default/unmaximize-focused-normal.png | Bin
.../default/unmaximize-unfocused-clicked.png | Bin
.../themes/default/unmaximize-unfocused-hover.png | Bin
.../themes/default/unmaximize-unfocused-normal.png | Bin
.../themes/dust-invert/close-clicked.png | Bin
.../themes/dust-invert/close-focused.png | Bin
.../themes/dust-invert/close-hover.png | Bin
.../themes/dust-invert/close-unfocused.png | Bin
.../themes/dust-invert/maximize-clicked.png | Bin
.../themes/dust-invert/maximize-focused.png | Bin
.../themes/dust-invert/maximize-hover.png | Bin
.../themes/dust-invert/maximize-unfocused.png | Bin
.../themes/dust-invert/minimize-clicked.png | Bin
.../themes/dust-invert/minimize-focused.png | Bin
.../themes/dust-invert/minimize-hover.png | Bin
.../themes/dust-invert/minimize-unfocused.png | Bin
.../themes/dust-invert/unmaximize-clicked.png | Bin
.../themes/dust-invert/unmaximize-focused.png | Bin
.../themes/dust-invert/unmaximize-hover.png | Bin
.../themes/dust-invert/unmaximize-unfocused.png | Bin
.../themes/dust-sand/close-clicked.png | Bin
.../themes/dust-sand/close-focused.png | Bin
.../themes/dust-sand/close-hover.png | Bin
.../themes/dust-sand/close-unfocused.png | Bin
.../themes/dust-sand/maximize-clicked.png | Bin
.../themes/dust-sand/maximize-focused.png | Bin
.../themes/dust-sand/maximize-hover.png | Bin
.../themes/dust-sand/maximize-unfocused.png | Bin
.../themes/dust-sand/minimize-clicked.png | Bin
.../themes/dust-sand/minimize-focused.png | Bin
.../themes/dust-sand/minimize-hover.png | Bin
.../themes/dust-sand/minimize-unfocused.png | Bin
.../themes/dust-sand/unmaximize-clicked.png | Bin
.../themes/dust-sand/unmaximize-focused.png | Bin
.../themes/dust-sand/unmaximize-hover.png | Bin
.../themes/dust-sand/unmaximize-unfocused.png | Bin
.../window-buttons}/themes/dust/close-clicked.png | Bin
.../window-buttons}/themes/dust/close-focused.png | Bin
.../window-buttons}/themes/dust/close-hover.png | Bin
.../themes/dust/close-unfocused.png | Bin
.../themes/dust/maximize-clicked.png | Bin
.../themes/dust/maximize-focused.png | Bin
.../window-buttons}/themes/dust/maximize-hover.png | Bin
.../themes/dust/maximize-unfocused.png | Bin
.../themes/dust/minimize-clicked.png | Bin
.../themes/dust/minimize-focused.png | Bin
.../window-buttons}/themes/dust/minimize-hover.png | Bin
.../themes/dust/minimize-unfocused.png | Bin
.../themes/dust/unmaximize-clicked.png | Bin
.../themes/dust/unmaximize-focused.png | Bin
.../themes/dust/unmaximize-hover.png | Bin
.../themes/dust/unmaximize-unfocused.png | Bin
.../window-buttons}/themes/elementary/README | 0
.../themes/elementary/close-clicked.png | Bin
.../themes/elementary/close-focused.png | Bin
.../themes/elementary/close-hover.png | Bin
.../themes/elementary/close-unfocused.png | Bin
.../themes/elementary/maximize-clicked.png | Bin
.../themes/elementary/maximize-focused.png | Bin
.../themes/elementary/maximize-hover.png | Bin
.../themes/elementary/maximize-unfocused.png | Bin
.../themes/elementary/minimize-clicked.png | Bin
.../themes/elementary/minimize-focused.png | Bin
.../themes/elementary/minimize-hover.png | Bin
.../themes/elementary/minimize-unfocused.png | Bin
.../themes/elementary/unmaximize-clicked.png | Bin
.../themes/elementary/unmaximize-focused.png | Bin
.../themes/elementary/unmaximize-hover.png | Bin
.../themes/elementary/unmaximize-unfocused.png | Bin
.../window-buttons}/themes/equinox-glass/README | 0
.../themes/equinox-glass/close-clicked.png | Bin
.../themes/equinox-glass/close-focused.png | Bin
.../themes/equinox-glass/close-hover.png | Bin
.../themes/equinox-glass/close-unfocused.png | Bin
.../themes/equinox-glass/maximize-clicked.png | Bin
.../themes/equinox-glass/maximize-focused.png | Bin
.../themes/equinox-glass/maximize-hover.png | Bin
.../themes/equinox-glass/maximize-unfocused.png | Bin
.../themes/equinox-glass/minimize-clicked.png | Bin
.../themes/equinox-glass/minimize-focused.png | Bin
.../themes/equinox-glass/minimize-hover.png | Bin
.../themes/equinox-glass/minimize-unfocused.png | Bin
.../themes/equinox-glass/unmaximize-clicked.png | Bin
.../themes/equinox-glass/unmaximize-focused.png | Bin
.../themes/equinox-glass/unmaximize-hover.png | Bin
.../themes/equinox-glass/unmaximize-unfocused.png | Bin
.../themes/human-thin/close-clicked.png | Bin
.../themes/human-thin/close-focused.png | Bin
.../themes/human-thin/close-hover.png | Bin
.../themes/human-thin/close-unfocused.png | Bin
.../themes/human-thin/maximize-clicked.png | Bin
.../themes/human-thin/maximize-focused.png | Bin
.../themes/human-thin/maximize-hover.png | Bin
.../themes/human-thin/maximize-unfocused.png | Bin
.../themes/human-thin/minimize-clicked.png | Bin
.../themes/human-thin/minimize-focused.png | Bin
.../themes/human-thin/minimize-hover.png | Bin
.../themes/human-thin/minimize-unfocused.png | Bin
.../themes/human-thin/unmaximize-clicked.png | Bin
.../themes/human-thin/unmaximize-focused.png | Bin
.../themes/human-thin/unmaximize-hover.png | Bin
.../themes/human-thin/unmaximize-unfocused.png | Bin
.../window-buttons}/themes/human/close-clicked.png | Bin
.../window-buttons}/themes/human/close-focused.png | Bin
.../window-buttons}/themes/human/close-hover.png | Bin
.../themes/human/close-unfocused.png | Bin
.../themes/human/maximize-clicked.png | Bin
.../themes/human/maximize-focused.png | Bin
.../themes/human/maximize-hover.png | Bin
.../themes/human/maximize-unfocused.png | Bin
.../themes/human/minimize-clicked.png | Bin
.../themes/human/minimize-focused.png | Bin
.../themes/human/minimize-hover.png | Bin
.../themes/human/minimize-unfocused.png | Bin
.../themes/human/unmaximize-clicked.png | Bin
.../themes/human/unmaximize-focused.png | Bin
.../themes/human/unmaximize-hover.png | Bin
.../themes/human/unmaximize-unfocused.png | Bin
.../themes/new-hope/close-clicked.png | Bin
.../themes/new-hope/close-focused.png | Bin
.../themes/new-hope/close-hover.png | Bin
.../themes/new-hope/close-unfocused.png | Bin
.../themes/new-hope/maximize-clicked.png | Bin
.../themes/new-hope/maximize-focused.png | Bin
.../themes/new-hope/maximize-hover.png | Bin
.../themes/new-hope/maximize-unfocused.png | Bin
.../themes/new-hope/minimize-clicked.png | Bin
.../themes/new-hope/minimize-focused.png | Bin
.../themes/new-hope/minimize-hover.png | Bin
.../themes/new-hope/minimize-unfocused.png | Bin
.../themes/new-hope/unmaximize-clicked.png | Bin
.../themes/new-hope/unmaximize-focused.png | Bin
.../themes/new-hope/unmaximize-hover.png | Bin
.../themes/new-hope/unmaximize-unfocused.png | Bin
.../window-buttons}/themes/plano/close-clicked.png | Bin
.../window-buttons}/themes/plano/close-focused.png | Bin
.../window-buttons}/themes/plano/close-hover.png | Bin
.../themes/plano/close-unfocused.png | Bin
.../themes/plano/maximize-clicked.png | Bin
.../themes/plano/maximize-focused.png | Bin
.../themes/plano/maximize-hover.png | Bin
.../themes/plano/maximize-unfocused.png | Bin
.../themes/plano/minimize-clicked.png | Bin
.../themes/plano/minimize-focused.png | Bin
.../themes/plano/minimize-hover.png | Bin
.../themes/plano/minimize-unfocused.png | Bin
.../themes/plano/unmaximize-clicked.png | Bin
.../themes/plano/unmaximize-focused.png | Bin
.../themes/plano/unmaximize-hover.png | Bin
.../themes/plano/unmaximize-unfocused.png | Bin
.../radiance-maverick/close-focused-clicked.png | Bin
.../radiance-maverick/close-focused-hover.png | Bin
.../radiance-maverick/close-focused-normal.png | Bin
.../radiance-maverick/close-unfocused-clicked.png | Bin
.../radiance-maverick/close-unfocused-hover.png | Bin
.../radiance-maverick/close-unfocused-normal.png | Bin
.../radiance-maverick/maximize-focused-clicked.png | Bin
.../radiance-maverick/maximize-focused-hover.png | Bin
.../radiance-maverick/maximize-focused-normal.png | Bin
.../maximize-unfocused-clicked.png | Bin
.../radiance-maverick/maximize-unfocused-hover.png | Bin
.../maximize-unfocused-normal.png | Bin
.../radiance-maverick/minimize-focused-clicked.png | Bin
.../radiance-maverick/minimize-focused-hover.png | Bin
.../radiance-maverick/minimize-focused-normal.png | Bin
.../minimize-unfocused-clicked.png | Bin
.../radiance-maverick/minimize-unfocused-hover.png | Bin
.../minimize-unfocused-normal.png | Bin
.../unmaximize-focused-clicked.png | Bin
.../radiance-maverick/unmaximize-focused-hover.png | Bin
.../unmaximize-focused-normal.png | Bin
.../unmaximize-unfocused-clicked.png | Bin
.../unmaximize-unfocused-hover.png | Bin
.../unmaximize-unfocused-normal.png | Bin
.../themes/radiance/close-clicked.png | Bin
.../themes/radiance/close-focused.png | Bin
.../themes/radiance/close-hover.png | Bin
.../themes/radiance/close-unfocused.png | Bin
.../themes/radiance/maximize-clicked.png | Bin
.../themes/radiance/maximize-focused.png | Bin
.../themes/radiance/maximize-hover.png | Bin
.../themes/radiance/maximize-unfocused.png | Bin
.../themes/radiance/minimize-clicked.png | Bin
.../themes/radiance/minimize-focused.png | Bin
.../themes/radiance/minimize-hover.png | Bin
.../themes/radiance/minimize-unfocused.png | Bin
.../themes/radiance/unmaximize-clicked.png | Bin
.../themes/radiance/unmaximize-focused.png | Bin
.../themes/radiance/unmaximize-hover.png | Bin
.../themes/radiance/unmaximize-unfocused.png | Bin
.../themes/sorbet/close-clicked.png | Bin
.../themes/sorbet/close-focused.png | Bin
.../window-buttons}/themes/sorbet/close-hover.png | Bin
.../themes/sorbet/close-unfocused.png | Bin
.../themes/sorbet/maximize-clicked.png | Bin
.../themes/sorbet/maximize-focused.png | Bin
.../themes/sorbet/maximize-hover.png | Bin
.../themes/sorbet/maximize-unfocused.png | Bin
.../themes/sorbet/minimize-clicked.png | Bin
.../themes/sorbet/minimize-focused.png | Bin
.../themes/sorbet/minimize-hover.png | Bin
.../themes/sorbet/minimize-unfocused.png | Bin
.../themes/sorbet/unmaximize-clicked.png | Bin
.../themes/sorbet/unmaximize-focused.png | Bin
.../themes/sorbet/unmaximize-hover.png | Bin
.../themes/sorbet/unmaximize-unfocused.png | Bin
.../window-buttons/window-buttons-menu.xml | 14 +++
.../window-buttons/window-buttons-private.h | 57 ++--------
.../window-buttons/window-buttons.c | 119 ++++++++-------------
gnome-applets/window-buttons/window-buttons.h | 30 ++++++
.../window-buttons/window-buttons.ui | 0
po/POTFILES.in | 6 +-
po/POTFILES.skip | 1 -
window-buttons/Makefile.am | 71 ------------
...me.panel.WindowButtonsApplet.panel-applet.in.in | 16 ---
385 files changed, 166 insertions(+), 247 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 318f697a1..9db39c76d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,33 +1,16 @@
NULL =
-always_built_SUBDIRS = \
- window-buttons \
- $(NULL)
-
SUBDIRS = \
data \
gnome-applets \
help \
- po \
- $(always_built_SUBDIRS) \
- $(NULL)
-
-DIST_SUBDIRS = \
- data \
- gnome-applets \
- help \
- po \
- window-buttons \
+ po \
$(NULL)
EXTRA_DIST = \
COPYING-DOCS \
$(NULL)
-AM_DISTCHECK_CONFIGURE_FLAGS = \
- --with-libpanel-applet-dir='$${datadir}/gnome-panel/distcheck/applets' \
- $(NULL)
-
MAINTAINERCLEANFILES = \
$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
$(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
diff --git a/configure.ac b/configure.ac
index 98dd416f8..ba2049fe9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,17 +106,6 @@ PKG_CHECK_MODULES(GIO_UNIX, gio-unix-2.0 >= $GIO_REQUIRED)
dnl -- Check for GTK+ 3.0 (required) ------------------------------------------
PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED)
-dnl -- check for libpanelapplet (required) ------------------------------------
-PKG_CHECK_MODULES(GNOME_APPLETS, libpanel-applet >= $LIBPANEL_REQUIRED)
-
-AC_ARG_WITH([libpanel-applet-dir], [], [LIBPANEL_APPLET_DIR=$withval], [LIBPANEL_APPLET_DIR=""])
-if test "$LIBPANEL_APPLET_DIR" == ""; then
- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=libpanel_applet_dir libpanel-applet`
-fi
-
-AC_MSG_NOTICE([installing applets in $LIBPANEL_APPLET_DIR])
-AC_SUBST(LIBPANEL_APPLET_DIR)
-
dnl -- check for libgnome-panel (required) ------------------------------------
PKG_CHECK_MODULES([GNOME_PANEL], [libgnome-panel >= $LIBGNOME_PANEL_REQUIRED])
@@ -362,6 +351,8 @@ AC_CONFIG_FILES([
gnome-applets/timer/Makefile
gnome-applets/tracker-search-bar/Makefile
gnome-applets/trash/Makefile
+ gnome-applets/window-buttons/Makefile
+ gnome-applets/window-buttons/themes/Makefile
gnome-applets/window-picker/Makefile
gnome-applets/window-title/Makefile
@@ -380,9 +371,6 @@ AC_CONFIG_FILES([
help/trash/Makefile
po/Makefile.in
-
- window-buttons/Makefile
- window-buttons/themes/Makefile
])
AC_OUTPUT
diff --git a/gnome-applets/Makefile.am b/gnome-applets/Makefile.am
index c98e785f5..02ff683a7 100644
--- a/gnome-applets/Makefile.am
+++ b/gnome-applets/Makefile.am
@@ -18,6 +18,7 @@ SUBDIRS = \
timer \
tracker-search-bar \
trash \
+ window-buttons \
window-picker \
window-title \
$(NULL)
@@ -59,6 +60,7 @@ org_gnome_gnome_applets_la_LIBADD = \
$(top_builddir)/gnome-applets/sticky-notes/libsticky-notes-applet.la \
$(top_builddir)/gnome-applets/timer/libtimer-applet.la \
$(top_builddir)/gnome-applets/trash/libtrash-applet.la \
+ $(top_builddir)/gnome-applets/window-buttons/libwindow-buttons-applet.la \
$(top_builddir)/gnome-applets/window-picker/libwindow-picker-applet.la \
$(top_builddir)/gnome-applets/window-title/libwindow-title-applet.la \
$(GNOME_PANEL_LIBS) \
@@ -169,6 +171,8 @@ ui_files = \
timer/timer-applet-menu.xml \
trash/trash-empty.ui \
trash/trash-menu.xml \
+ window-buttons/window-buttons.ui \
+ window-buttons/window-buttons-menu.xml \
window-picker/wp-menu.xml \
window-picker/wp-preferences-dialog.ui \
window-title/window-title.ui \
diff --git a/gnome-applets/ga-module.c b/gnome-applets/ga-module.c
index 1a7061b1a..4cb08afd2 100644
--- a/gnome-applets/ga-module.c
+++ b/gnome-applets/ga-module.c
@@ -42,6 +42,7 @@
#include "tracker-search-bar/tracker-applet.h"
#endif
#include "trash/trash-applet.h"
+#include "window-buttons/window-buttons.h"
#include "window-picker/wp-applet.h"
#include "window-title/window-title.h"
@@ -177,6 +178,13 @@ ga_get_applet_info (const char *id)
description = _("Go to Trash");
icon_name = "user-trash-full";
}
+ else if (g_strcmp0 (id, "window-buttons") == 0)
+ {
+ type_func = wb_applet_get_type;
+ name = _("Window Buttons");
+ description = _("Window buttons for your GNOME Panel");
+ icon_name = "windowbuttons-applet";
+ }
else if (g_strcmp0 (id, "window-picker") == 0)
{
type_func = wp_applet_get_type;
@@ -243,6 +251,8 @@ ga_get_applet_id_from_iid (const char *iid)
#endif
else if (g_strcmp0 (iid, "TrashAppletFactory::TrashApplet") == 0)
return "trash";
+ else if (g_strcmp0 (iid, "WindowButtonsAppletFactory::WindowButtonsApplet") == 0)
+ return "window-buttons";
else if (g_strcmp0 (iid, "WindowPickerFactory::WindowPicker") == 0 ||
g_strcmp0 (iid, "org.gnome.gnome-applets.window-picker::window-picker") == 0)
return "window-picker";
@@ -286,6 +296,7 @@ gp_module_load (GpModule *module)
"tracker-search-bar",
#endif
"trash",
+ "window-buttons",
"window-picker",
"window-title",
NULL);
diff --git a/gnome-applets/mini-commander/Makefile.am b/gnome-applets/mini-commander/Makefile.am
index f12e1ec57..02ae02c83 100644
--- a/gnome-applets/mini-commander/Makefile.am
+++ b/gnome-applets/mini-commander/Makefile.am
@@ -42,7 +42,7 @@ libmini_commander_applet_la_LDFLAGS = \
$(NULL)
libmini_commander_applet_la_LIBADD = \
- $(GNOME_APPLETS_LIBS)
+ $(GNOME_PANEL_LIBS) \
$(NULL)
BITMAPS = \
diff --git a/gnome-applets/window-buttons/Makefile.am b/gnome-applets/window-buttons/Makefile.am
new file mode 100755
index 000000000..d87d94dc4
--- /dev/null
+++ b/gnome-applets/window-buttons/Makefile.am
@@ -0,0 +1,41 @@
+NULL =
+
+SUBDIRS = themes
+
+noinst_LTLIBRARIES = libwindow-buttons-applet.la
+
+libwindow_buttons_applet_la_CPPFLAGS = \
+ -DWB_DATA_DIR=\""$(pkgdatadir)/window-buttons-applet"\" \
+ $(NULL)
+
+libwindow_buttons_applet_la_CFLAGS = \
+ $(GNOME_PANEL_CFLAGS) \
+ $(LIBWNCK_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CFLAGS) \
+ $(NULL)
+
+libwindow_buttons_applet_la_SOURCES = \
+ window-buttons-private.h \
+ window-buttons.c \
+ window-buttons.h \
+ preferences.c \
+ preferences.h \
+ external.c \
+ external.h \
+ theme.c \
+ theme.h \
+ $(NULL)
+
+libwindow_buttons_applet_la_LDFLAGS = \
+ $(WARN_LDFLAGS) \
+ $(AM_LDFLAGS) \
+ $(NULL)
+
+libwindow_buttons_applet_la_LIBADD = \
+ $(GNOME_PANEL_LIBS) \
+ $(LIBWNCK_LIBS) \
+ $(LIBM) \
+ $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/window-buttons/external.c b/gnome-applets/window-buttons/external.c
similarity index 100%
rename from window-buttons/external.c
rename to gnome-applets/window-buttons/external.c
diff --git a/window-buttons/external.h b/gnome-applets/window-buttons/external.h
similarity index 100%
rename from window-buttons/external.h
rename to gnome-applets/window-buttons/external.h
diff --git a/window-buttons/preferences.c b/gnome-applets/window-buttons/preferences.c
similarity index 99%
rename from window-buttons/preferences.c
rename to gnome-applets/window-buttons/preferences.c
index 6b813d59d..aa1fb490f 100755
--- a/window-buttons/preferences.c
+++ b/gnome-applets/window-buttons/preferences.c
@@ -532,7 +532,7 @@ wb_applet_properties_cb (GSimpleAction *action,
gtk_window_present(GTK_WINDOW(wbapplet->window_prefs)); // CRASHES HERE BECAUSE window_prefs
IS NOT NULL WHEN IT SHOULD BE!!!
} else {
// Create window from builder
- gtk_builder_add_from_file (wbapplet->prefbuilder, PATH_UI_PREFS, NULL);
+ gtk_builder_add_from_resource (wbapplet->prefbuilder, GRESOURCE_PREFIX
"/ui/window-buttons.ui", NULL);
wbapplet->window_prefs = GTK_WIDGET (gtk_builder_get_object (wbapplet->prefbuilder,
"properties"));
}
diff --git a/window-buttons/preferences.h b/gnome-applets/window-buttons/preferences.h
similarity index 96%
rename from window-buttons/preferences.h
rename to gnome-applets/window-buttons/preferences.h
index 2dcd6a0d9..b9a4cd2fa 100644
--- a/window-buttons/preferences.h
+++ b/gnome-applets/window-buttons/preferences.h
@@ -18,7 +18,7 @@
* Andrej Belcijan <{andrejx} at {gmail.com}>
*/
-#include "windowbuttons.h"
+#include "window-buttons-private.h"
typedef struct {
WBApplet *wbapplet;
diff --git a/window-buttons/theme.c b/gnome-applets/window-buttons/theme.c
similarity index 100%
rename from window-buttons/theme.c
rename to gnome-applets/window-buttons/theme.c
diff --git a/window-buttons/theme.h b/gnome-applets/window-buttons/theme.h
similarity index 95%
rename from window-buttons/theme.h
rename to gnome-applets/window-buttons/theme.h
index dbf5f159c..c833024e7 100644
--- a/window-buttons/theme.h
+++ b/gnome-applets/window-buttons/theme.h
@@ -18,4 +18,4 @@
* Andrej Belcijan <{andrejx} at {gmail.com}>
*/
-#include "windowbuttons.h"
+#include "window-buttons-private.h"
diff --git a/window-buttons/themes/Makefile.am b/gnome-applets/window-buttons/themes/Makefile.am
similarity index 100%
rename from window-buttons/themes/Makefile.am
rename to gnome-applets/window-buttons/themes/Makefile.am
diff --git a/window-buttons/themes/WoW/close-clicked.png
b/gnome-applets/window-buttons/themes/WoW/close-clicked.png
similarity index 100%
rename from window-buttons/themes/WoW/close-clicked.png
rename to gnome-applets/window-buttons/themes/WoW/close-clicked.png
diff --git a/window-buttons/themes/WoW/close-focused.png
b/gnome-applets/window-buttons/themes/WoW/close-focused.png
similarity index 100%
rename from window-buttons/themes/WoW/close-focused.png
rename to gnome-applets/window-buttons/themes/WoW/close-focused.png
diff --git a/window-buttons/themes/WoW/close-hover.png
b/gnome-applets/window-buttons/themes/WoW/close-hover.png
similarity index 100%
rename from window-buttons/themes/WoW/close-hover.png
rename to gnome-applets/window-buttons/themes/WoW/close-hover.png
diff --git a/window-buttons/themes/WoW/close-unfocused.png
b/gnome-applets/window-buttons/themes/WoW/close-unfocused.png
similarity index 100%
rename from window-buttons/themes/WoW/close-unfocused.png
rename to gnome-applets/window-buttons/themes/WoW/close-unfocused.png
diff --git a/window-buttons/themes/WoW/maximize-clicked.png
b/gnome-applets/window-buttons/themes/WoW/maximize-clicked.png
similarity index 100%
rename from window-buttons/themes/WoW/maximize-clicked.png
rename to gnome-applets/window-buttons/themes/WoW/maximize-clicked.png
diff --git a/window-buttons/themes/WoW/maximize-focused.png
b/gnome-applets/window-buttons/themes/WoW/maximize-focused.png
similarity index 100%
rename from window-buttons/themes/WoW/maximize-focused.png
rename to gnome-applets/window-buttons/themes/WoW/maximize-focused.png
diff --git a/window-buttons/themes/WoW/maximize-hover.png
b/gnome-applets/window-buttons/themes/WoW/maximize-hover.png
similarity index 100%
rename from window-buttons/themes/WoW/maximize-hover.png
rename to gnome-applets/window-buttons/themes/WoW/maximize-hover.png
diff --git a/window-buttons/themes/WoW/maximize-unfocused.png
b/gnome-applets/window-buttons/themes/WoW/maximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/WoW/maximize-unfocused.png
rename to gnome-applets/window-buttons/themes/WoW/maximize-unfocused.png
diff --git a/window-buttons/themes/WoW/minimize-clicked.png
b/gnome-applets/window-buttons/themes/WoW/minimize-clicked.png
similarity index 100%
rename from window-buttons/themes/WoW/minimize-clicked.png
rename to gnome-applets/window-buttons/themes/WoW/minimize-clicked.png
diff --git a/window-buttons/themes/WoW/minimize-focused.png
b/gnome-applets/window-buttons/themes/WoW/minimize-focused.png
similarity index 100%
rename from window-buttons/themes/WoW/minimize-focused.png
rename to gnome-applets/window-buttons/themes/WoW/minimize-focused.png
diff --git a/window-buttons/themes/WoW/minimize-hover.png
b/gnome-applets/window-buttons/themes/WoW/minimize-hover.png
similarity index 100%
rename from window-buttons/themes/WoW/minimize-hover.png
rename to gnome-applets/window-buttons/themes/WoW/minimize-hover.png
diff --git a/window-buttons/themes/WoW/minimize-unfocused.png
b/gnome-applets/window-buttons/themes/WoW/minimize-unfocused.png
similarity index 100%
rename from window-buttons/themes/WoW/minimize-unfocused.png
rename to gnome-applets/window-buttons/themes/WoW/minimize-unfocused.png
diff --git a/window-buttons/themes/WoW/unmaximize-clicked.png
b/gnome-applets/window-buttons/themes/WoW/unmaximize-clicked.png
similarity index 100%
rename from window-buttons/themes/WoW/unmaximize-clicked.png
rename to gnome-applets/window-buttons/themes/WoW/unmaximize-clicked.png
diff --git a/window-buttons/themes/WoW/unmaximize-focused.png
b/gnome-applets/window-buttons/themes/WoW/unmaximize-focused.png
similarity index 100%
rename from window-buttons/themes/WoW/unmaximize-focused.png
rename to gnome-applets/window-buttons/themes/WoW/unmaximize-focused.png
diff --git a/window-buttons/themes/WoW/unmaximize-hover.png
b/gnome-applets/window-buttons/themes/WoW/unmaximize-hover.png
similarity index 100%
rename from window-buttons/themes/WoW/unmaximize-hover.png
rename to gnome-applets/window-buttons/themes/WoW/unmaximize-hover.png
diff --git a/window-buttons/themes/WoW/unmaximize-unfocused.png
b/gnome-applets/window-buttons/themes/WoW/unmaximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/WoW/unmaximize-unfocused.png
rename to gnome-applets/window-buttons/themes/WoW/unmaximize-unfocused.png
diff --git a/window-buttons/themes/ambiance-maverick/bg.png
b/gnome-applets/window-buttons/themes/ambiance-maverick/bg.png
similarity index 100%
rename from window-buttons/themes/ambiance-maverick/bg.png
rename to gnome-applets/window-buttons/themes/ambiance-maverick/bg.png
diff --git a/window-buttons/themes/ambiance-maverick/close-focused-clicked.png
b/gnome-applets/window-buttons/themes/ambiance-maverick/close-focused-clicked.png
similarity index 100%
rename from window-buttons/themes/ambiance-maverick/close-focused-clicked.png
rename to gnome-applets/window-buttons/themes/ambiance-maverick/close-focused-clicked.png
diff --git a/window-buttons/themes/ambiance-maverick/close-focused-hover.png
b/gnome-applets/window-buttons/themes/ambiance-maverick/close-focused-hover.png
similarity index 100%
rename from window-buttons/themes/ambiance-maverick/close-focused-hover.png
rename to gnome-applets/window-buttons/themes/ambiance-maverick/close-focused-hover.png
diff --git a/window-buttons/themes/ambiance-maverick/close-focused-normal.png
b/gnome-applets/window-buttons/themes/ambiance-maverick/close-focused-normal.png
similarity index 100%
rename from window-buttons/themes/ambiance-maverick/close-focused-normal.png
rename to gnome-applets/window-buttons/themes/ambiance-maverick/close-focused-normal.png
diff --git a/window-buttons/themes/ambiance-maverick/close-unfocused-clicked.png
b/gnome-applets/window-buttons/themes/ambiance-maverick/close-unfocused-clicked.png
similarity index 100%
rename from window-buttons/themes/ambiance-maverick/close-unfocused-clicked.png
rename to gnome-applets/window-buttons/themes/ambiance-maverick/close-unfocused-clicked.png
diff --git a/window-buttons/themes/ambiance-maverick/close-unfocused-hover.png
b/gnome-applets/window-buttons/themes/ambiance-maverick/close-unfocused-hover.png
similarity index 100%
rename from window-buttons/themes/ambiance-maverick/close-unfocused-hover.png
rename to gnome-applets/window-buttons/themes/ambiance-maverick/close-unfocused-hover.png
diff --git a/window-buttons/themes/ambiance-maverick/close-unfocused-normal.png
b/gnome-applets/window-buttons/themes/ambiance-maverick/close-unfocused-normal.png
similarity index 100%
rename from window-buttons/themes/ambiance-maverick/close-unfocused-normal.png
rename to gnome-applets/window-buttons/themes/ambiance-maverick/close-unfocused-normal.png
diff --git a/window-buttons/themes/ambiance-maverick/maximize-focused-clicked.png
b/gnome-applets/window-buttons/themes/ambiance-maverick/maximize-focused-clicked.png
similarity index 100%
rename from window-buttons/themes/ambiance-maverick/maximize-focused-clicked.png
rename to gnome-applets/window-buttons/themes/ambiance-maverick/maximize-focused-clicked.png
diff --git a/window-buttons/themes/ambiance-maverick/maximize-focused-hover.png
b/gnome-applets/window-buttons/themes/ambiance-maverick/maximize-focused-hover.png
similarity index 100%
rename from window-buttons/themes/ambiance-maverick/maximize-focused-hover.png
rename to gnome-applets/window-buttons/themes/ambiance-maverick/maximize-focused-hover.png
diff --git a/window-buttons/themes/ambiance-maverick/maximize-focused-normal.png
b/gnome-applets/window-buttons/themes/ambiance-maverick/maximize-focused-normal.png
similarity index 100%
rename from window-buttons/themes/ambiance-maverick/maximize-focused-normal.png
rename to gnome-applets/window-buttons/themes/ambiance-maverick/maximize-focused-normal.png
diff --git a/window-buttons/themes/ambiance-maverick/maximize-unfocused-clicked.png
b/gnome-applets/window-buttons/themes/ambiance-maverick/maximize-unfocused-clicked.png
similarity index 100%
rename from window-buttons/themes/ambiance-maverick/maximize-unfocused-clicked.png
rename to gnome-applets/window-buttons/themes/ambiance-maverick/maximize-unfocused-clicked.png
diff --git a/window-buttons/themes/ambiance-maverick/maximize-unfocused-hover.png
b/gnome-applets/window-buttons/themes/ambiance-maverick/maximize-unfocused-hover.png
similarity index 100%
rename from window-buttons/themes/ambiance-maverick/maximize-unfocused-hover.png
rename to gnome-applets/window-buttons/themes/ambiance-maverick/maximize-unfocused-hover.png
diff --git a/window-buttons/themes/ambiance-maverick/maximize-unfocused-normal.png
b/gnome-applets/window-buttons/themes/ambiance-maverick/maximize-unfocused-normal.png
similarity index 100%
rename from window-buttons/themes/ambiance-maverick/maximize-unfocused-normal.png
rename to gnome-applets/window-buttons/themes/ambiance-maverick/maximize-unfocused-normal.png
diff --git a/window-buttons/themes/ambiance-maverick/minimize-focused-clicked.png
b/gnome-applets/window-buttons/themes/ambiance-maverick/minimize-focused-clicked.png
similarity index 100%
rename from window-buttons/themes/ambiance-maverick/minimize-focused-clicked.png
rename to gnome-applets/window-buttons/themes/ambiance-maverick/minimize-focused-clicked.png
diff --git a/window-buttons/themes/ambiance-maverick/minimize-focused-hover.png
b/gnome-applets/window-buttons/themes/ambiance-maverick/minimize-focused-hover.png
similarity index 100%
rename from window-buttons/themes/ambiance-maverick/minimize-focused-hover.png
rename to gnome-applets/window-buttons/themes/ambiance-maverick/minimize-focused-hover.png
diff --git a/window-buttons/themes/ambiance-maverick/minimize-focused-normal.png
b/gnome-applets/window-buttons/themes/ambiance-maverick/minimize-focused-normal.png
similarity index 100%
rename from window-buttons/themes/ambiance-maverick/minimize-focused-normal.png
rename to gnome-applets/window-buttons/themes/ambiance-maverick/minimize-focused-normal.png
diff --git a/window-buttons/themes/ambiance-maverick/minimize-unfocused-clicked.png
b/gnome-applets/window-buttons/themes/ambiance-maverick/minimize-unfocused-clicked.png
similarity index 100%
rename from window-buttons/themes/ambiance-maverick/minimize-unfocused-clicked.png
rename to gnome-applets/window-buttons/themes/ambiance-maverick/minimize-unfocused-clicked.png
diff --git a/window-buttons/themes/ambiance-maverick/minimize-unfocused-hover.png
b/gnome-applets/window-buttons/themes/ambiance-maverick/minimize-unfocused-hover.png
similarity index 100%
rename from window-buttons/themes/ambiance-maverick/minimize-unfocused-hover.png
rename to gnome-applets/window-buttons/themes/ambiance-maverick/minimize-unfocused-hover.png
diff --git a/window-buttons/themes/ambiance-maverick/minimize-unfocused-normal.png
b/gnome-applets/window-buttons/themes/ambiance-maverick/minimize-unfocused-normal.png
similarity index 100%
rename from window-buttons/themes/ambiance-maverick/minimize-unfocused-normal.png
rename to gnome-applets/window-buttons/themes/ambiance-maverick/minimize-unfocused-normal.png
diff --git a/window-buttons/themes/ambiance-maverick/unmaximize-focused-clicked.png
b/gnome-applets/window-buttons/themes/ambiance-maverick/unmaximize-focused-clicked.png
similarity index 100%
rename from window-buttons/themes/ambiance-maverick/unmaximize-focused-clicked.png
rename to gnome-applets/window-buttons/themes/ambiance-maverick/unmaximize-focused-clicked.png
diff --git a/window-buttons/themes/ambiance-maverick/unmaximize-focused-hover.png
b/gnome-applets/window-buttons/themes/ambiance-maverick/unmaximize-focused-hover.png
similarity index 100%
rename from window-buttons/themes/ambiance-maverick/unmaximize-focused-hover.png
rename to gnome-applets/window-buttons/themes/ambiance-maverick/unmaximize-focused-hover.png
diff --git a/window-buttons/themes/ambiance-maverick/unmaximize-focused-normal.png
b/gnome-applets/window-buttons/themes/ambiance-maverick/unmaximize-focused-normal.png
similarity index 100%
rename from window-buttons/themes/ambiance-maverick/unmaximize-focused-normal.png
rename to gnome-applets/window-buttons/themes/ambiance-maverick/unmaximize-focused-normal.png
diff --git a/window-buttons/themes/ambiance-maverick/unmaximize-unfocused-clicked.png
b/gnome-applets/window-buttons/themes/ambiance-maverick/unmaximize-unfocused-clicked.png
similarity index 100%
rename from window-buttons/themes/ambiance-maverick/unmaximize-unfocused-clicked.png
rename to gnome-applets/window-buttons/themes/ambiance-maverick/unmaximize-unfocused-clicked.png
diff --git a/window-buttons/themes/ambiance-maverick/unmaximize-unfocused-hover.png
b/gnome-applets/window-buttons/themes/ambiance-maverick/unmaximize-unfocused-hover.png
similarity index 100%
rename from window-buttons/themes/ambiance-maverick/unmaximize-unfocused-hover.png
rename to gnome-applets/window-buttons/themes/ambiance-maverick/unmaximize-unfocused-hover.png
diff --git a/window-buttons/themes/ambiance-maverick/unmaximize-unfocused-normal.png
b/gnome-applets/window-buttons/themes/ambiance-maverick/unmaximize-unfocused-normal.png
similarity index 100%
rename from window-buttons/themes/ambiance-maverick/unmaximize-unfocused-normal.png
rename to gnome-applets/window-buttons/themes/ambiance-maverick/unmaximize-unfocused-normal.png
diff --git a/window-buttons/themes/ambiance-x-studio/close-clicked.png
b/gnome-applets/window-buttons/themes/ambiance-x-studio/close-clicked.png
similarity index 100%
rename from window-buttons/themes/ambiance-x-studio/close-clicked.png
rename to gnome-applets/window-buttons/themes/ambiance-x-studio/close-clicked.png
diff --git a/window-buttons/themes/ambiance-x-studio/close-focused.png
b/gnome-applets/window-buttons/themes/ambiance-x-studio/close-focused.png
similarity index 100%
rename from window-buttons/themes/ambiance-x-studio/close-focused.png
rename to gnome-applets/window-buttons/themes/ambiance-x-studio/close-focused.png
diff --git a/window-buttons/themes/ambiance-x-studio/close-hover.png
b/gnome-applets/window-buttons/themes/ambiance-x-studio/close-hover.png
similarity index 100%
rename from window-buttons/themes/ambiance-x-studio/close-hover.png
rename to gnome-applets/window-buttons/themes/ambiance-x-studio/close-hover.png
diff --git a/window-buttons/themes/ambiance-x-studio/close-unfocused.png
b/gnome-applets/window-buttons/themes/ambiance-x-studio/close-unfocused.png
similarity index 100%
rename from window-buttons/themes/ambiance-x-studio/close-unfocused.png
rename to gnome-applets/window-buttons/themes/ambiance-x-studio/close-unfocused.png
diff --git a/window-buttons/themes/ambiance-x-studio/maximize-clicked.png
b/gnome-applets/window-buttons/themes/ambiance-x-studio/maximize-clicked.png
similarity index 100%
rename from window-buttons/themes/ambiance-x-studio/maximize-clicked.png
rename to gnome-applets/window-buttons/themes/ambiance-x-studio/maximize-clicked.png
diff --git a/window-buttons/themes/ambiance-x-studio/maximize-focused.png
b/gnome-applets/window-buttons/themes/ambiance-x-studio/maximize-focused.png
similarity index 100%
rename from window-buttons/themes/ambiance-x-studio/maximize-focused.png
rename to gnome-applets/window-buttons/themes/ambiance-x-studio/maximize-focused.png
diff --git a/window-buttons/themes/ambiance-x-studio/maximize-hover.png
b/gnome-applets/window-buttons/themes/ambiance-x-studio/maximize-hover.png
similarity index 100%
rename from window-buttons/themes/ambiance-x-studio/maximize-hover.png
rename to gnome-applets/window-buttons/themes/ambiance-x-studio/maximize-hover.png
diff --git a/window-buttons/themes/ambiance-x-studio/maximize-unfocused.png
b/gnome-applets/window-buttons/themes/ambiance-x-studio/maximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/ambiance-x-studio/maximize-unfocused.png
rename to gnome-applets/window-buttons/themes/ambiance-x-studio/maximize-unfocused.png
diff --git a/window-buttons/themes/ambiance-x-studio/minimize-clicked.png
b/gnome-applets/window-buttons/themes/ambiance-x-studio/minimize-clicked.png
similarity index 100%
rename from window-buttons/themes/ambiance-x-studio/minimize-clicked.png
rename to gnome-applets/window-buttons/themes/ambiance-x-studio/minimize-clicked.png
diff --git a/window-buttons/themes/ambiance-x-studio/minimize-focused.png
b/gnome-applets/window-buttons/themes/ambiance-x-studio/minimize-focused.png
similarity index 100%
rename from window-buttons/themes/ambiance-x-studio/minimize-focused.png
rename to gnome-applets/window-buttons/themes/ambiance-x-studio/minimize-focused.png
diff --git a/window-buttons/themes/ambiance-x-studio/minimize-hover.png
b/gnome-applets/window-buttons/themes/ambiance-x-studio/minimize-hover.png
similarity index 100%
rename from window-buttons/themes/ambiance-x-studio/minimize-hover.png
rename to gnome-applets/window-buttons/themes/ambiance-x-studio/minimize-hover.png
diff --git a/window-buttons/themes/ambiance-x-studio/minimize-unfocused.png
b/gnome-applets/window-buttons/themes/ambiance-x-studio/minimize-unfocused.png
similarity index 100%
rename from window-buttons/themes/ambiance-x-studio/minimize-unfocused.png
rename to gnome-applets/window-buttons/themes/ambiance-x-studio/minimize-unfocused.png
diff --git a/window-buttons/themes/ambiance-x-studio/unmaximize-clicked.png
b/gnome-applets/window-buttons/themes/ambiance-x-studio/unmaximize-clicked.png
similarity index 100%
rename from window-buttons/themes/ambiance-x-studio/unmaximize-clicked.png
rename to gnome-applets/window-buttons/themes/ambiance-x-studio/unmaximize-clicked.png
diff --git a/window-buttons/themes/ambiance-x-studio/unmaximize-focused.png
b/gnome-applets/window-buttons/themes/ambiance-x-studio/unmaximize-focused.png
similarity index 100%
rename from window-buttons/themes/ambiance-x-studio/unmaximize-focused.png
rename to gnome-applets/window-buttons/themes/ambiance-x-studio/unmaximize-focused.png
diff --git a/window-buttons/themes/ambiance-x-studio/unmaximize-hover.png
b/gnome-applets/window-buttons/themes/ambiance-x-studio/unmaximize-hover.png
similarity index 100%
rename from window-buttons/themes/ambiance-x-studio/unmaximize-hover.png
rename to gnome-applets/window-buttons/themes/ambiance-x-studio/unmaximize-hover.png
diff --git a/window-buttons/themes/ambiance-x-studio/unmaximize-unfocused.png
b/gnome-applets/window-buttons/themes/ambiance-x-studio/unmaximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/ambiance-x-studio/unmaximize-unfocused.png
rename to gnome-applets/window-buttons/themes/ambiance-x-studio/unmaximize-unfocused.png
diff --git a/window-buttons/themes/ambiance/close-clicked.png
b/gnome-applets/window-buttons/themes/ambiance/close-clicked.png
similarity index 100%
rename from window-buttons/themes/ambiance/close-clicked.png
rename to gnome-applets/window-buttons/themes/ambiance/close-clicked.png
diff --git a/window-buttons/themes/ambiance/close-focused.png
b/gnome-applets/window-buttons/themes/ambiance/close-focused.png
similarity index 100%
rename from window-buttons/themes/ambiance/close-focused.png
rename to gnome-applets/window-buttons/themes/ambiance/close-focused.png
diff --git a/window-buttons/themes/ambiance/close-hover.png
b/gnome-applets/window-buttons/themes/ambiance/close-hover.png
similarity index 100%
rename from window-buttons/themes/ambiance/close-hover.png
rename to gnome-applets/window-buttons/themes/ambiance/close-hover.png
diff --git a/window-buttons/themes/ambiance/close-unfocused.png
b/gnome-applets/window-buttons/themes/ambiance/close-unfocused.png
similarity index 100%
rename from window-buttons/themes/ambiance/close-unfocused.png
rename to gnome-applets/window-buttons/themes/ambiance/close-unfocused.png
diff --git a/window-buttons/themes/ambiance/maximize-clicked.png
b/gnome-applets/window-buttons/themes/ambiance/maximize-clicked.png
similarity index 100%
rename from window-buttons/themes/ambiance/maximize-clicked.png
rename to gnome-applets/window-buttons/themes/ambiance/maximize-clicked.png
diff --git a/window-buttons/themes/ambiance/maximize-focused.png
b/gnome-applets/window-buttons/themes/ambiance/maximize-focused.png
similarity index 100%
rename from window-buttons/themes/ambiance/maximize-focused.png
rename to gnome-applets/window-buttons/themes/ambiance/maximize-focused.png
diff --git a/window-buttons/themes/ambiance/maximize-hover.png
b/gnome-applets/window-buttons/themes/ambiance/maximize-hover.png
similarity index 100%
rename from window-buttons/themes/ambiance/maximize-hover.png
rename to gnome-applets/window-buttons/themes/ambiance/maximize-hover.png
diff --git a/window-buttons/themes/ambiance/maximize-unfocused.png
b/gnome-applets/window-buttons/themes/ambiance/maximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/ambiance/maximize-unfocused.png
rename to gnome-applets/window-buttons/themes/ambiance/maximize-unfocused.png
diff --git a/window-buttons/themes/ambiance/minimize-clicked.png
b/gnome-applets/window-buttons/themes/ambiance/minimize-clicked.png
similarity index 100%
rename from window-buttons/themes/ambiance/minimize-clicked.png
rename to gnome-applets/window-buttons/themes/ambiance/minimize-clicked.png
diff --git a/window-buttons/themes/ambiance/minimize-focused.png
b/gnome-applets/window-buttons/themes/ambiance/minimize-focused.png
similarity index 100%
rename from window-buttons/themes/ambiance/minimize-focused.png
rename to gnome-applets/window-buttons/themes/ambiance/minimize-focused.png
diff --git a/window-buttons/themes/ambiance/minimize-hover.png
b/gnome-applets/window-buttons/themes/ambiance/minimize-hover.png
similarity index 100%
rename from window-buttons/themes/ambiance/minimize-hover.png
rename to gnome-applets/window-buttons/themes/ambiance/minimize-hover.png
diff --git a/window-buttons/themes/ambiance/minimize-unfocused.png
b/gnome-applets/window-buttons/themes/ambiance/minimize-unfocused.png
similarity index 100%
rename from window-buttons/themes/ambiance/minimize-unfocused.png
rename to gnome-applets/window-buttons/themes/ambiance/minimize-unfocused.png
diff --git a/window-buttons/themes/ambiance/unmaximize-clicked.png
b/gnome-applets/window-buttons/themes/ambiance/unmaximize-clicked.png
similarity index 100%
rename from window-buttons/themes/ambiance/unmaximize-clicked.png
rename to gnome-applets/window-buttons/themes/ambiance/unmaximize-clicked.png
diff --git a/window-buttons/themes/ambiance/unmaximize-focused.png
b/gnome-applets/window-buttons/themes/ambiance/unmaximize-focused.png
similarity index 100%
rename from window-buttons/themes/ambiance/unmaximize-focused.png
rename to gnome-applets/window-buttons/themes/ambiance/unmaximize-focused.png
diff --git a/window-buttons/themes/ambiance/unmaximize-hover.png
b/gnome-applets/window-buttons/themes/ambiance/unmaximize-hover.png
similarity index 100%
rename from window-buttons/themes/ambiance/unmaximize-hover.png
rename to gnome-applets/window-buttons/themes/ambiance/unmaximize-hover.png
diff --git a/window-buttons/themes/ambiance/unmaximize-unfocused.png
b/gnome-applets/window-buttons/themes/ambiance/unmaximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/ambiance/unmaximize-unfocused.png
rename to gnome-applets/window-buttons/themes/ambiance/unmaximize-unfocused.png
diff --git a/window-buttons/themes/antique/close-clicked.png
b/gnome-applets/window-buttons/themes/antique/close-clicked.png
similarity index 100%
rename from window-buttons/themes/antique/close-clicked.png
rename to gnome-applets/window-buttons/themes/antique/close-clicked.png
diff --git a/window-buttons/themes/antique/close-focused.png
b/gnome-applets/window-buttons/themes/antique/close-focused.png
similarity index 100%
rename from window-buttons/themes/antique/close-focused.png
rename to gnome-applets/window-buttons/themes/antique/close-focused.png
diff --git a/window-buttons/themes/antique/close-hover.png
b/gnome-applets/window-buttons/themes/antique/close-hover.png
similarity index 100%
rename from window-buttons/themes/antique/close-hover.png
rename to gnome-applets/window-buttons/themes/antique/close-hover.png
diff --git a/window-buttons/themes/antique/close-unfocused.png
b/gnome-applets/window-buttons/themes/antique/close-unfocused.png
similarity index 100%
rename from window-buttons/themes/antique/close-unfocused.png
rename to gnome-applets/window-buttons/themes/antique/close-unfocused.png
diff --git a/window-buttons/themes/antique/maximize-clicked.png
b/gnome-applets/window-buttons/themes/antique/maximize-clicked.png
similarity index 100%
rename from window-buttons/themes/antique/maximize-clicked.png
rename to gnome-applets/window-buttons/themes/antique/maximize-clicked.png
diff --git a/window-buttons/themes/antique/maximize-focused.png
b/gnome-applets/window-buttons/themes/antique/maximize-focused.png
similarity index 100%
rename from window-buttons/themes/antique/maximize-focused.png
rename to gnome-applets/window-buttons/themes/antique/maximize-focused.png
diff --git a/window-buttons/themes/antique/maximize-hover.png
b/gnome-applets/window-buttons/themes/antique/maximize-hover.png
similarity index 100%
rename from window-buttons/themes/antique/maximize-hover.png
rename to gnome-applets/window-buttons/themes/antique/maximize-hover.png
diff --git a/window-buttons/themes/antique/maximize-unfocused.png
b/gnome-applets/window-buttons/themes/antique/maximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/antique/maximize-unfocused.png
rename to gnome-applets/window-buttons/themes/antique/maximize-unfocused.png
diff --git a/window-buttons/themes/antique/minimize-clicked.png
b/gnome-applets/window-buttons/themes/antique/minimize-clicked.png
similarity index 100%
rename from window-buttons/themes/antique/minimize-clicked.png
rename to gnome-applets/window-buttons/themes/antique/minimize-clicked.png
diff --git a/window-buttons/themes/antique/minimize-focused.png
b/gnome-applets/window-buttons/themes/antique/minimize-focused.png
similarity index 100%
rename from window-buttons/themes/antique/minimize-focused.png
rename to gnome-applets/window-buttons/themes/antique/minimize-focused.png
diff --git a/window-buttons/themes/antique/minimize-hover.png
b/gnome-applets/window-buttons/themes/antique/minimize-hover.png
similarity index 100%
rename from window-buttons/themes/antique/minimize-hover.png
rename to gnome-applets/window-buttons/themes/antique/minimize-hover.png
diff --git a/window-buttons/themes/antique/minimize-unfocused.png
b/gnome-applets/window-buttons/themes/antique/minimize-unfocused.png
similarity index 100%
rename from window-buttons/themes/antique/minimize-unfocused.png
rename to gnome-applets/window-buttons/themes/antique/minimize-unfocused.png
diff --git a/window-buttons/themes/antique/unmaximize-clicked.png
b/gnome-applets/window-buttons/themes/antique/unmaximize-clicked.png
similarity index 100%
rename from window-buttons/themes/antique/unmaximize-clicked.png
rename to gnome-applets/window-buttons/themes/antique/unmaximize-clicked.png
diff --git a/window-buttons/themes/antique/unmaximize-focused.png
b/gnome-applets/window-buttons/themes/antique/unmaximize-focused.png
similarity index 100%
rename from window-buttons/themes/antique/unmaximize-focused.png
rename to gnome-applets/window-buttons/themes/antique/unmaximize-focused.png
diff --git a/window-buttons/themes/antique/unmaximize-hover.png
b/gnome-applets/window-buttons/themes/antique/unmaximize-hover.png
similarity index 100%
rename from window-buttons/themes/antique/unmaximize-hover.png
rename to gnome-applets/window-buttons/themes/antique/unmaximize-hover.png
diff --git a/window-buttons/themes/antique/unmaximize-unfocused.png
b/gnome-applets/window-buttons/themes/antique/unmaximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/antique/unmaximize-unfocused.png
rename to gnome-applets/window-buttons/themes/antique/unmaximize-unfocused.png
diff --git a/window-buttons/themes/blaze-color/close-clicked.png
b/gnome-applets/window-buttons/themes/blaze-color/close-clicked.png
similarity index 100%
rename from window-buttons/themes/blaze-color/close-clicked.png
rename to gnome-applets/window-buttons/themes/blaze-color/close-clicked.png
diff --git a/window-buttons/themes/blaze-color/close-focused.png
b/gnome-applets/window-buttons/themes/blaze-color/close-focused.png
similarity index 100%
rename from window-buttons/themes/blaze-color/close-focused.png
rename to gnome-applets/window-buttons/themes/blaze-color/close-focused.png
diff --git a/window-buttons/themes/blaze-color/close-hover.png
b/gnome-applets/window-buttons/themes/blaze-color/close-hover.png
similarity index 100%
rename from window-buttons/themes/blaze-color/close-hover.png
rename to gnome-applets/window-buttons/themes/blaze-color/close-hover.png
diff --git a/window-buttons/themes/blaze-color/close-unfocused.png
b/gnome-applets/window-buttons/themes/blaze-color/close-unfocused.png
similarity index 100%
rename from window-buttons/themes/blaze-color/close-unfocused.png
rename to gnome-applets/window-buttons/themes/blaze-color/close-unfocused.png
diff --git a/window-buttons/themes/blaze-color/maximize-clicked.png
b/gnome-applets/window-buttons/themes/blaze-color/maximize-clicked.png
similarity index 100%
rename from window-buttons/themes/blaze-color/maximize-clicked.png
rename to gnome-applets/window-buttons/themes/blaze-color/maximize-clicked.png
diff --git a/window-buttons/themes/blaze-color/maximize-focused.png
b/gnome-applets/window-buttons/themes/blaze-color/maximize-focused.png
similarity index 100%
rename from window-buttons/themes/blaze-color/maximize-focused.png
rename to gnome-applets/window-buttons/themes/blaze-color/maximize-focused.png
diff --git a/window-buttons/themes/blaze-color/maximize-hover.png
b/gnome-applets/window-buttons/themes/blaze-color/maximize-hover.png
similarity index 100%
rename from window-buttons/themes/blaze-color/maximize-hover.png
rename to gnome-applets/window-buttons/themes/blaze-color/maximize-hover.png
diff --git a/window-buttons/themes/blaze-color/maximize-unfocused.png
b/gnome-applets/window-buttons/themes/blaze-color/maximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/blaze-color/maximize-unfocused.png
rename to gnome-applets/window-buttons/themes/blaze-color/maximize-unfocused.png
diff --git a/window-buttons/themes/blaze-color/minimize-clicked.png
b/gnome-applets/window-buttons/themes/blaze-color/minimize-clicked.png
similarity index 100%
rename from window-buttons/themes/blaze-color/minimize-clicked.png
rename to gnome-applets/window-buttons/themes/blaze-color/minimize-clicked.png
diff --git a/window-buttons/themes/blaze-color/minimize-focused.png
b/gnome-applets/window-buttons/themes/blaze-color/minimize-focused.png
similarity index 100%
rename from window-buttons/themes/blaze-color/minimize-focused.png
rename to gnome-applets/window-buttons/themes/blaze-color/minimize-focused.png
diff --git a/window-buttons/themes/blaze-color/minimize-hover.png
b/gnome-applets/window-buttons/themes/blaze-color/minimize-hover.png
similarity index 100%
rename from window-buttons/themes/blaze-color/minimize-hover.png
rename to gnome-applets/window-buttons/themes/blaze-color/minimize-hover.png
diff --git a/window-buttons/themes/blaze-color/minimize-unfocused.png
b/gnome-applets/window-buttons/themes/blaze-color/minimize-unfocused.png
similarity index 100%
rename from window-buttons/themes/blaze-color/minimize-unfocused.png
rename to gnome-applets/window-buttons/themes/blaze-color/minimize-unfocused.png
diff --git a/window-buttons/themes/blaze-color/unmaximize-clicked.png
b/gnome-applets/window-buttons/themes/blaze-color/unmaximize-clicked.png
similarity index 100%
rename from window-buttons/themes/blaze-color/unmaximize-clicked.png
rename to gnome-applets/window-buttons/themes/blaze-color/unmaximize-clicked.png
diff --git a/window-buttons/themes/blaze-color/unmaximize-focused.png
b/gnome-applets/window-buttons/themes/blaze-color/unmaximize-focused.png
similarity index 100%
rename from window-buttons/themes/blaze-color/unmaximize-focused.png
rename to gnome-applets/window-buttons/themes/blaze-color/unmaximize-focused.png
diff --git a/window-buttons/themes/blaze-color/unmaximize-hover.png
b/gnome-applets/window-buttons/themes/blaze-color/unmaximize-hover.png
similarity index 100%
rename from window-buttons/themes/blaze-color/unmaximize-hover.png
rename to gnome-applets/window-buttons/themes/blaze-color/unmaximize-hover.png
diff --git a/window-buttons/themes/blaze-color/unmaximize-unfocused.png
b/gnome-applets/window-buttons/themes/blaze-color/unmaximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/blaze-color/unmaximize-unfocused.png
rename to gnome-applets/window-buttons/themes/blaze-color/unmaximize-unfocused.png
diff --git a/window-buttons/themes/blaze/close-clicked.png
b/gnome-applets/window-buttons/themes/blaze/close-clicked.png
similarity index 100%
rename from window-buttons/themes/blaze/close-clicked.png
rename to gnome-applets/window-buttons/themes/blaze/close-clicked.png
diff --git a/window-buttons/themes/blaze/close-focused.png
b/gnome-applets/window-buttons/themes/blaze/close-focused.png
similarity index 100%
rename from window-buttons/themes/blaze/close-focused.png
rename to gnome-applets/window-buttons/themes/blaze/close-focused.png
diff --git a/window-buttons/themes/blaze/close-hover.png
b/gnome-applets/window-buttons/themes/blaze/close-hover.png
similarity index 100%
rename from window-buttons/themes/blaze/close-hover.png
rename to gnome-applets/window-buttons/themes/blaze/close-hover.png
diff --git a/window-buttons/themes/blaze/close-unfocused.png
b/gnome-applets/window-buttons/themes/blaze/close-unfocused.png
similarity index 100%
rename from window-buttons/themes/blaze/close-unfocused.png
rename to gnome-applets/window-buttons/themes/blaze/close-unfocused.png
diff --git a/window-buttons/themes/blaze/maximize-clicked.png
b/gnome-applets/window-buttons/themes/blaze/maximize-clicked.png
similarity index 100%
rename from window-buttons/themes/blaze/maximize-clicked.png
rename to gnome-applets/window-buttons/themes/blaze/maximize-clicked.png
diff --git a/window-buttons/themes/blaze/maximize-focused.png
b/gnome-applets/window-buttons/themes/blaze/maximize-focused.png
similarity index 100%
rename from window-buttons/themes/blaze/maximize-focused.png
rename to gnome-applets/window-buttons/themes/blaze/maximize-focused.png
diff --git a/window-buttons/themes/blaze/maximize-hover.png
b/gnome-applets/window-buttons/themes/blaze/maximize-hover.png
similarity index 100%
rename from window-buttons/themes/blaze/maximize-hover.png
rename to gnome-applets/window-buttons/themes/blaze/maximize-hover.png
diff --git a/window-buttons/themes/blaze/maximize-unfocused.png
b/gnome-applets/window-buttons/themes/blaze/maximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/blaze/maximize-unfocused.png
rename to gnome-applets/window-buttons/themes/blaze/maximize-unfocused.png
diff --git a/window-buttons/themes/blaze/minimize-clicked.png
b/gnome-applets/window-buttons/themes/blaze/minimize-clicked.png
similarity index 100%
rename from window-buttons/themes/blaze/minimize-clicked.png
rename to gnome-applets/window-buttons/themes/blaze/minimize-clicked.png
diff --git a/window-buttons/themes/blaze/minimize-focused.png
b/gnome-applets/window-buttons/themes/blaze/minimize-focused.png
similarity index 100%
rename from window-buttons/themes/blaze/minimize-focused.png
rename to gnome-applets/window-buttons/themes/blaze/minimize-focused.png
diff --git a/window-buttons/themes/blaze/minimize-hover.png
b/gnome-applets/window-buttons/themes/blaze/minimize-hover.png
similarity index 100%
rename from window-buttons/themes/blaze/minimize-hover.png
rename to gnome-applets/window-buttons/themes/blaze/minimize-hover.png
diff --git a/window-buttons/themes/blaze/minimize-unfocused.png
b/gnome-applets/window-buttons/themes/blaze/minimize-unfocused.png
similarity index 100%
rename from window-buttons/themes/blaze/minimize-unfocused.png
rename to gnome-applets/window-buttons/themes/blaze/minimize-unfocused.png
diff --git a/window-buttons/themes/blaze/unmaximize-clicked.png
b/gnome-applets/window-buttons/themes/blaze/unmaximize-clicked.png
similarity index 100%
rename from window-buttons/themes/blaze/unmaximize-clicked.png
rename to gnome-applets/window-buttons/themes/blaze/unmaximize-clicked.png
diff --git a/window-buttons/themes/blaze/unmaximize-focused.png
b/gnome-applets/window-buttons/themes/blaze/unmaximize-focused.png
similarity index 100%
rename from window-buttons/themes/blaze/unmaximize-focused.png
rename to gnome-applets/window-buttons/themes/blaze/unmaximize-focused.png
diff --git a/window-buttons/themes/blaze/unmaximize-hover.png
b/gnome-applets/window-buttons/themes/blaze/unmaximize-hover.png
similarity index 100%
rename from window-buttons/themes/blaze/unmaximize-hover.png
rename to gnome-applets/window-buttons/themes/blaze/unmaximize-hover.png
diff --git a/window-buttons/themes/blaze/unmaximize-unfocused.png
b/gnome-applets/window-buttons/themes/blaze/unmaximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/blaze/unmaximize-unfocused.png
rename to gnome-applets/window-buttons/themes/blaze/unmaximize-unfocused.png
diff --git a/window-buttons/themes/blubuntu/close-clicked.png
b/gnome-applets/window-buttons/themes/blubuntu/close-clicked.png
similarity index 100%
rename from window-buttons/themes/blubuntu/close-clicked.png
rename to gnome-applets/window-buttons/themes/blubuntu/close-clicked.png
diff --git a/window-buttons/themes/blubuntu/close-focused.png
b/gnome-applets/window-buttons/themes/blubuntu/close-focused.png
similarity index 100%
rename from window-buttons/themes/blubuntu/close-focused.png
rename to gnome-applets/window-buttons/themes/blubuntu/close-focused.png
diff --git a/window-buttons/themes/blubuntu/close-hover.png
b/gnome-applets/window-buttons/themes/blubuntu/close-hover.png
similarity index 100%
rename from window-buttons/themes/blubuntu/close-hover.png
rename to gnome-applets/window-buttons/themes/blubuntu/close-hover.png
diff --git a/window-buttons/themes/blubuntu/close-unfocused.png
b/gnome-applets/window-buttons/themes/blubuntu/close-unfocused.png
similarity index 100%
rename from window-buttons/themes/blubuntu/close-unfocused.png
rename to gnome-applets/window-buttons/themes/blubuntu/close-unfocused.png
diff --git a/window-buttons/themes/blubuntu/maximize-clicked.png
b/gnome-applets/window-buttons/themes/blubuntu/maximize-clicked.png
similarity index 100%
rename from window-buttons/themes/blubuntu/maximize-clicked.png
rename to gnome-applets/window-buttons/themes/blubuntu/maximize-clicked.png
diff --git a/window-buttons/themes/blubuntu/maximize-focused.png
b/gnome-applets/window-buttons/themes/blubuntu/maximize-focused.png
similarity index 100%
rename from window-buttons/themes/blubuntu/maximize-focused.png
rename to gnome-applets/window-buttons/themes/blubuntu/maximize-focused.png
diff --git a/window-buttons/themes/blubuntu/maximize-hover.png
b/gnome-applets/window-buttons/themes/blubuntu/maximize-hover.png
similarity index 100%
rename from window-buttons/themes/blubuntu/maximize-hover.png
rename to gnome-applets/window-buttons/themes/blubuntu/maximize-hover.png
diff --git a/window-buttons/themes/blubuntu/maximize-unfocused.png
b/gnome-applets/window-buttons/themes/blubuntu/maximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/blubuntu/maximize-unfocused.png
rename to gnome-applets/window-buttons/themes/blubuntu/maximize-unfocused.png
diff --git a/window-buttons/themes/blubuntu/minimize-clicked.png
b/gnome-applets/window-buttons/themes/blubuntu/minimize-clicked.png
similarity index 100%
rename from window-buttons/themes/blubuntu/minimize-clicked.png
rename to gnome-applets/window-buttons/themes/blubuntu/minimize-clicked.png
diff --git a/window-buttons/themes/blubuntu/minimize-focused.png
b/gnome-applets/window-buttons/themes/blubuntu/minimize-focused.png
similarity index 100%
rename from window-buttons/themes/blubuntu/minimize-focused.png
rename to gnome-applets/window-buttons/themes/blubuntu/minimize-focused.png
diff --git a/window-buttons/themes/blubuntu/minimize-hover.png
b/gnome-applets/window-buttons/themes/blubuntu/minimize-hover.png
similarity index 100%
rename from window-buttons/themes/blubuntu/minimize-hover.png
rename to gnome-applets/window-buttons/themes/blubuntu/minimize-hover.png
diff --git a/window-buttons/themes/blubuntu/minimize-unfocused.png
b/gnome-applets/window-buttons/themes/blubuntu/minimize-unfocused.png
similarity index 100%
rename from window-buttons/themes/blubuntu/minimize-unfocused.png
rename to gnome-applets/window-buttons/themes/blubuntu/minimize-unfocused.png
diff --git a/window-buttons/themes/blubuntu/unmaximize-clicked.png
b/gnome-applets/window-buttons/themes/blubuntu/unmaximize-clicked.png
similarity index 100%
rename from window-buttons/themes/blubuntu/unmaximize-clicked.png
rename to gnome-applets/window-buttons/themes/blubuntu/unmaximize-clicked.png
diff --git a/window-buttons/themes/blubuntu/unmaximize-focused.png
b/gnome-applets/window-buttons/themes/blubuntu/unmaximize-focused.png
similarity index 100%
rename from window-buttons/themes/blubuntu/unmaximize-focused.png
rename to gnome-applets/window-buttons/themes/blubuntu/unmaximize-focused.png
diff --git a/window-buttons/themes/blubuntu/unmaximize-hover.png
b/gnome-applets/window-buttons/themes/blubuntu/unmaximize-hover.png
similarity index 100%
rename from window-buttons/themes/blubuntu/unmaximize-hover.png
rename to gnome-applets/window-buttons/themes/blubuntu/unmaximize-hover.png
diff --git a/window-buttons/themes/blubuntu/unmaximize-unfocused.png
b/gnome-applets/window-buttons/themes/blubuntu/unmaximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/blubuntu/unmaximize-unfocused.png
rename to gnome-applets/window-buttons/themes/blubuntu/unmaximize-unfocused.png
diff --git a/window-buttons/themes/default/close-focused-clicked.png
b/gnome-applets/window-buttons/themes/default/close-focused-clicked.png
similarity index 100%
rename from window-buttons/themes/default/close-focused-clicked.png
rename to gnome-applets/window-buttons/themes/default/close-focused-clicked.png
diff --git a/window-buttons/themes/default/close-focused-hover.png
b/gnome-applets/window-buttons/themes/default/close-focused-hover.png
similarity index 100%
rename from window-buttons/themes/default/close-focused-hover.png
rename to gnome-applets/window-buttons/themes/default/close-focused-hover.png
diff --git a/window-buttons/themes/default/close-focused-normal.png
b/gnome-applets/window-buttons/themes/default/close-focused-normal.png
similarity index 100%
rename from window-buttons/themes/default/close-focused-normal.png
rename to gnome-applets/window-buttons/themes/default/close-focused-normal.png
diff --git a/window-buttons/themes/default/close-unfocused-clicked.png
b/gnome-applets/window-buttons/themes/default/close-unfocused-clicked.png
similarity index 100%
rename from window-buttons/themes/default/close-unfocused-clicked.png
rename to gnome-applets/window-buttons/themes/default/close-unfocused-clicked.png
diff --git a/window-buttons/themes/default/close-unfocused-hover.png
b/gnome-applets/window-buttons/themes/default/close-unfocused-hover.png
similarity index 100%
rename from window-buttons/themes/default/close-unfocused-hover.png
rename to gnome-applets/window-buttons/themes/default/close-unfocused-hover.png
diff --git a/window-buttons/themes/default/close-unfocused-normal.png
b/gnome-applets/window-buttons/themes/default/close-unfocused-normal.png
similarity index 100%
rename from window-buttons/themes/default/close-unfocused-normal.png
rename to gnome-applets/window-buttons/themes/default/close-unfocused-normal.png
diff --git a/window-buttons/themes/default/maximize-focused-clicked.png
b/gnome-applets/window-buttons/themes/default/maximize-focused-clicked.png
similarity index 100%
rename from window-buttons/themes/default/maximize-focused-clicked.png
rename to gnome-applets/window-buttons/themes/default/maximize-focused-clicked.png
diff --git a/window-buttons/themes/default/maximize-focused-hover.png
b/gnome-applets/window-buttons/themes/default/maximize-focused-hover.png
similarity index 100%
rename from window-buttons/themes/default/maximize-focused-hover.png
rename to gnome-applets/window-buttons/themes/default/maximize-focused-hover.png
diff --git a/window-buttons/themes/default/maximize-focused-normal.png
b/gnome-applets/window-buttons/themes/default/maximize-focused-normal.png
similarity index 100%
rename from window-buttons/themes/default/maximize-focused-normal.png
rename to gnome-applets/window-buttons/themes/default/maximize-focused-normal.png
diff --git a/window-buttons/themes/default/maximize-unfocused-clicked.png
b/gnome-applets/window-buttons/themes/default/maximize-unfocused-clicked.png
similarity index 100%
rename from window-buttons/themes/default/maximize-unfocused-clicked.png
rename to gnome-applets/window-buttons/themes/default/maximize-unfocused-clicked.png
diff --git a/window-buttons/themes/default/maximize-unfocused-hover.png
b/gnome-applets/window-buttons/themes/default/maximize-unfocused-hover.png
similarity index 100%
rename from window-buttons/themes/default/maximize-unfocused-hover.png
rename to gnome-applets/window-buttons/themes/default/maximize-unfocused-hover.png
diff --git a/window-buttons/themes/default/maximize-unfocused-normal.png
b/gnome-applets/window-buttons/themes/default/maximize-unfocused-normal.png
similarity index 100%
rename from window-buttons/themes/default/maximize-unfocused-normal.png
rename to gnome-applets/window-buttons/themes/default/maximize-unfocused-normal.png
diff --git a/window-buttons/themes/default/minimize-focused-clicked.png
b/gnome-applets/window-buttons/themes/default/minimize-focused-clicked.png
similarity index 100%
rename from window-buttons/themes/default/minimize-focused-clicked.png
rename to gnome-applets/window-buttons/themes/default/minimize-focused-clicked.png
diff --git a/window-buttons/themes/default/minimize-focused-hover.png
b/gnome-applets/window-buttons/themes/default/minimize-focused-hover.png
similarity index 100%
rename from window-buttons/themes/default/minimize-focused-hover.png
rename to gnome-applets/window-buttons/themes/default/minimize-focused-hover.png
diff --git a/window-buttons/themes/default/minimize-focused-normal.png
b/gnome-applets/window-buttons/themes/default/minimize-focused-normal.png
similarity index 100%
rename from window-buttons/themes/default/minimize-focused-normal.png
rename to gnome-applets/window-buttons/themes/default/minimize-focused-normal.png
diff --git a/window-buttons/themes/default/minimize-unfocused-clicked.png
b/gnome-applets/window-buttons/themes/default/minimize-unfocused-clicked.png
similarity index 100%
rename from window-buttons/themes/default/minimize-unfocused-clicked.png
rename to gnome-applets/window-buttons/themes/default/minimize-unfocused-clicked.png
diff --git a/window-buttons/themes/default/minimize-unfocused-hover.png
b/gnome-applets/window-buttons/themes/default/minimize-unfocused-hover.png
similarity index 100%
rename from window-buttons/themes/default/minimize-unfocused-hover.png
rename to gnome-applets/window-buttons/themes/default/minimize-unfocused-hover.png
diff --git a/window-buttons/themes/default/minimize-unfocused-normal.png
b/gnome-applets/window-buttons/themes/default/minimize-unfocused-normal.png
similarity index 100%
rename from window-buttons/themes/default/minimize-unfocused-normal.png
rename to gnome-applets/window-buttons/themes/default/minimize-unfocused-normal.png
diff --git a/window-buttons/themes/default/unmaximize-focused-clicked.png
b/gnome-applets/window-buttons/themes/default/unmaximize-focused-clicked.png
similarity index 100%
rename from window-buttons/themes/default/unmaximize-focused-clicked.png
rename to gnome-applets/window-buttons/themes/default/unmaximize-focused-clicked.png
diff --git a/window-buttons/themes/default/unmaximize-focused-hover.png
b/gnome-applets/window-buttons/themes/default/unmaximize-focused-hover.png
similarity index 100%
rename from window-buttons/themes/default/unmaximize-focused-hover.png
rename to gnome-applets/window-buttons/themes/default/unmaximize-focused-hover.png
diff --git a/window-buttons/themes/default/unmaximize-focused-normal.png
b/gnome-applets/window-buttons/themes/default/unmaximize-focused-normal.png
similarity index 100%
rename from window-buttons/themes/default/unmaximize-focused-normal.png
rename to gnome-applets/window-buttons/themes/default/unmaximize-focused-normal.png
diff --git a/window-buttons/themes/default/unmaximize-unfocused-clicked.png
b/gnome-applets/window-buttons/themes/default/unmaximize-unfocused-clicked.png
similarity index 100%
rename from window-buttons/themes/default/unmaximize-unfocused-clicked.png
rename to gnome-applets/window-buttons/themes/default/unmaximize-unfocused-clicked.png
diff --git a/window-buttons/themes/default/unmaximize-unfocused-hover.png
b/gnome-applets/window-buttons/themes/default/unmaximize-unfocused-hover.png
similarity index 100%
rename from window-buttons/themes/default/unmaximize-unfocused-hover.png
rename to gnome-applets/window-buttons/themes/default/unmaximize-unfocused-hover.png
diff --git a/window-buttons/themes/default/unmaximize-unfocused-normal.png
b/gnome-applets/window-buttons/themes/default/unmaximize-unfocused-normal.png
similarity index 100%
rename from window-buttons/themes/default/unmaximize-unfocused-normal.png
rename to gnome-applets/window-buttons/themes/default/unmaximize-unfocused-normal.png
diff --git a/window-buttons/themes/dust-invert/close-clicked.png
b/gnome-applets/window-buttons/themes/dust-invert/close-clicked.png
similarity index 100%
rename from window-buttons/themes/dust-invert/close-clicked.png
rename to gnome-applets/window-buttons/themes/dust-invert/close-clicked.png
diff --git a/window-buttons/themes/dust-invert/close-focused.png
b/gnome-applets/window-buttons/themes/dust-invert/close-focused.png
similarity index 100%
rename from window-buttons/themes/dust-invert/close-focused.png
rename to gnome-applets/window-buttons/themes/dust-invert/close-focused.png
diff --git a/window-buttons/themes/dust-invert/close-hover.png
b/gnome-applets/window-buttons/themes/dust-invert/close-hover.png
similarity index 100%
rename from window-buttons/themes/dust-invert/close-hover.png
rename to gnome-applets/window-buttons/themes/dust-invert/close-hover.png
diff --git a/window-buttons/themes/dust-invert/close-unfocused.png
b/gnome-applets/window-buttons/themes/dust-invert/close-unfocused.png
similarity index 100%
rename from window-buttons/themes/dust-invert/close-unfocused.png
rename to gnome-applets/window-buttons/themes/dust-invert/close-unfocused.png
diff --git a/window-buttons/themes/dust-invert/maximize-clicked.png
b/gnome-applets/window-buttons/themes/dust-invert/maximize-clicked.png
similarity index 100%
rename from window-buttons/themes/dust-invert/maximize-clicked.png
rename to gnome-applets/window-buttons/themes/dust-invert/maximize-clicked.png
diff --git a/window-buttons/themes/dust-invert/maximize-focused.png
b/gnome-applets/window-buttons/themes/dust-invert/maximize-focused.png
similarity index 100%
rename from window-buttons/themes/dust-invert/maximize-focused.png
rename to gnome-applets/window-buttons/themes/dust-invert/maximize-focused.png
diff --git a/window-buttons/themes/dust-invert/maximize-hover.png
b/gnome-applets/window-buttons/themes/dust-invert/maximize-hover.png
similarity index 100%
rename from window-buttons/themes/dust-invert/maximize-hover.png
rename to gnome-applets/window-buttons/themes/dust-invert/maximize-hover.png
diff --git a/window-buttons/themes/dust-invert/maximize-unfocused.png
b/gnome-applets/window-buttons/themes/dust-invert/maximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/dust-invert/maximize-unfocused.png
rename to gnome-applets/window-buttons/themes/dust-invert/maximize-unfocused.png
diff --git a/window-buttons/themes/dust-invert/minimize-clicked.png
b/gnome-applets/window-buttons/themes/dust-invert/minimize-clicked.png
similarity index 100%
rename from window-buttons/themes/dust-invert/minimize-clicked.png
rename to gnome-applets/window-buttons/themes/dust-invert/minimize-clicked.png
diff --git a/window-buttons/themes/dust-invert/minimize-focused.png
b/gnome-applets/window-buttons/themes/dust-invert/minimize-focused.png
similarity index 100%
rename from window-buttons/themes/dust-invert/minimize-focused.png
rename to gnome-applets/window-buttons/themes/dust-invert/minimize-focused.png
diff --git a/window-buttons/themes/dust-invert/minimize-hover.png
b/gnome-applets/window-buttons/themes/dust-invert/minimize-hover.png
similarity index 100%
rename from window-buttons/themes/dust-invert/minimize-hover.png
rename to gnome-applets/window-buttons/themes/dust-invert/minimize-hover.png
diff --git a/window-buttons/themes/dust-invert/minimize-unfocused.png
b/gnome-applets/window-buttons/themes/dust-invert/minimize-unfocused.png
similarity index 100%
rename from window-buttons/themes/dust-invert/minimize-unfocused.png
rename to gnome-applets/window-buttons/themes/dust-invert/minimize-unfocused.png
diff --git a/window-buttons/themes/dust-invert/unmaximize-clicked.png
b/gnome-applets/window-buttons/themes/dust-invert/unmaximize-clicked.png
similarity index 100%
rename from window-buttons/themes/dust-invert/unmaximize-clicked.png
rename to gnome-applets/window-buttons/themes/dust-invert/unmaximize-clicked.png
diff --git a/window-buttons/themes/dust-invert/unmaximize-focused.png
b/gnome-applets/window-buttons/themes/dust-invert/unmaximize-focused.png
similarity index 100%
rename from window-buttons/themes/dust-invert/unmaximize-focused.png
rename to gnome-applets/window-buttons/themes/dust-invert/unmaximize-focused.png
diff --git a/window-buttons/themes/dust-invert/unmaximize-hover.png
b/gnome-applets/window-buttons/themes/dust-invert/unmaximize-hover.png
similarity index 100%
rename from window-buttons/themes/dust-invert/unmaximize-hover.png
rename to gnome-applets/window-buttons/themes/dust-invert/unmaximize-hover.png
diff --git a/window-buttons/themes/dust-invert/unmaximize-unfocused.png
b/gnome-applets/window-buttons/themes/dust-invert/unmaximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/dust-invert/unmaximize-unfocused.png
rename to gnome-applets/window-buttons/themes/dust-invert/unmaximize-unfocused.png
diff --git a/window-buttons/themes/dust-sand/close-clicked.png
b/gnome-applets/window-buttons/themes/dust-sand/close-clicked.png
similarity index 100%
rename from window-buttons/themes/dust-sand/close-clicked.png
rename to gnome-applets/window-buttons/themes/dust-sand/close-clicked.png
diff --git a/window-buttons/themes/dust-sand/close-focused.png
b/gnome-applets/window-buttons/themes/dust-sand/close-focused.png
similarity index 100%
rename from window-buttons/themes/dust-sand/close-focused.png
rename to gnome-applets/window-buttons/themes/dust-sand/close-focused.png
diff --git a/window-buttons/themes/dust-sand/close-hover.png
b/gnome-applets/window-buttons/themes/dust-sand/close-hover.png
similarity index 100%
rename from window-buttons/themes/dust-sand/close-hover.png
rename to gnome-applets/window-buttons/themes/dust-sand/close-hover.png
diff --git a/window-buttons/themes/dust-sand/close-unfocused.png
b/gnome-applets/window-buttons/themes/dust-sand/close-unfocused.png
similarity index 100%
rename from window-buttons/themes/dust-sand/close-unfocused.png
rename to gnome-applets/window-buttons/themes/dust-sand/close-unfocused.png
diff --git a/window-buttons/themes/dust-sand/maximize-clicked.png
b/gnome-applets/window-buttons/themes/dust-sand/maximize-clicked.png
similarity index 100%
rename from window-buttons/themes/dust-sand/maximize-clicked.png
rename to gnome-applets/window-buttons/themes/dust-sand/maximize-clicked.png
diff --git a/window-buttons/themes/dust-sand/maximize-focused.png
b/gnome-applets/window-buttons/themes/dust-sand/maximize-focused.png
similarity index 100%
rename from window-buttons/themes/dust-sand/maximize-focused.png
rename to gnome-applets/window-buttons/themes/dust-sand/maximize-focused.png
diff --git a/window-buttons/themes/dust-sand/maximize-hover.png
b/gnome-applets/window-buttons/themes/dust-sand/maximize-hover.png
similarity index 100%
rename from window-buttons/themes/dust-sand/maximize-hover.png
rename to gnome-applets/window-buttons/themes/dust-sand/maximize-hover.png
diff --git a/window-buttons/themes/dust-sand/maximize-unfocused.png
b/gnome-applets/window-buttons/themes/dust-sand/maximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/dust-sand/maximize-unfocused.png
rename to gnome-applets/window-buttons/themes/dust-sand/maximize-unfocused.png
diff --git a/window-buttons/themes/dust-sand/minimize-clicked.png
b/gnome-applets/window-buttons/themes/dust-sand/minimize-clicked.png
similarity index 100%
rename from window-buttons/themes/dust-sand/minimize-clicked.png
rename to gnome-applets/window-buttons/themes/dust-sand/minimize-clicked.png
diff --git a/window-buttons/themes/dust-sand/minimize-focused.png
b/gnome-applets/window-buttons/themes/dust-sand/minimize-focused.png
similarity index 100%
rename from window-buttons/themes/dust-sand/minimize-focused.png
rename to gnome-applets/window-buttons/themes/dust-sand/minimize-focused.png
diff --git a/window-buttons/themes/dust-sand/minimize-hover.png
b/gnome-applets/window-buttons/themes/dust-sand/minimize-hover.png
similarity index 100%
rename from window-buttons/themes/dust-sand/minimize-hover.png
rename to gnome-applets/window-buttons/themes/dust-sand/minimize-hover.png
diff --git a/window-buttons/themes/dust-sand/minimize-unfocused.png
b/gnome-applets/window-buttons/themes/dust-sand/minimize-unfocused.png
similarity index 100%
rename from window-buttons/themes/dust-sand/minimize-unfocused.png
rename to gnome-applets/window-buttons/themes/dust-sand/minimize-unfocused.png
diff --git a/window-buttons/themes/dust-sand/unmaximize-clicked.png
b/gnome-applets/window-buttons/themes/dust-sand/unmaximize-clicked.png
similarity index 100%
rename from window-buttons/themes/dust-sand/unmaximize-clicked.png
rename to gnome-applets/window-buttons/themes/dust-sand/unmaximize-clicked.png
diff --git a/window-buttons/themes/dust-sand/unmaximize-focused.png
b/gnome-applets/window-buttons/themes/dust-sand/unmaximize-focused.png
similarity index 100%
rename from window-buttons/themes/dust-sand/unmaximize-focused.png
rename to gnome-applets/window-buttons/themes/dust-sand/unmaximize-focused.png
diff --git a/window-buttons/themes/dust-sand/unmaximize-hover.png
b/gnome-applets/window-buttons/themes/dust-sand/unmaximize-hover.png
similarity index 100%
rename from window-buttons/themes/dust-sand/unmaximize-hover.png
rename to gnome-applets/window-buttons/themes/dust-sand/unmaximize-hover.png
diff --git a/window-buttons/themes/dust-sand/unmaximize-unfocused.png
b/gnome-applets/window-buttons/themes/dust-sand/unmaximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/dust-sand/unmaximize-unfocused.png
rename to gnome-applets/window-buttons/themes/dust-sand/unmaximize-unfocused.png
diff --git a/window-buttons/themes/dust/close-clicked.png
b/gnome-applets/window-buttons/themes/dust/close-clicked.png
similarity index 100%
rename from window-buttons/themes/dust/close-clicked.png
rename to gnome-applets/window-buttons/themes/dust/close-clicked.png
diff --git a/window-buttons/themes/dust/close-focused.png
b/gnome-applets/window-buttons/themes/dust/close-focused.png
similarity index 100%
rename from window-buttons/themes/dust/close-focused.png
rename to gnome-applets/window-buttons/themes/dust/close-focused.png
diff --git a/window-buttons/themes/dust/close-hover.png
b/gnome-applets/window-buttons/themes/dust/close-hover.png
similarity index 100%
rename from window-buttons/themes/dust/close-hover.png
rename to gnome-applets/window-buttons/themes/dust/close-hover.png
diff --git a/window-buttons/themes/dust/close-unfocused.png
b/gnome-applets/window-buttons/themes/dust/close-unfocused.png
similarity index 100%
rename from window-buttons/themes/dust/close-unfocused.png
rename to gnome-applets/window-buttons/themes/dust/close-unfocused.png
diff --git a/window-buttons/themes/dust/maximize-clicked.png
b/gnome-applets/window-buttons/themes/dust/maximize-clicked.png
similarity index 100%
rename from window-buttons/themes/dust/maximize-clicked.png
rename to gnome-applets/window-buttons/themes/dust/maximize-clicked.png
diff --git a/window-buttons/themes/dust/maximize-focused.png
b/gnome-applets/window-buttons/themes/dust/maximize-focused.png
similarity index 100%
rename from window-buttons/themes/dust/maximize-focused.png
rename to gnome-applets/window-buttons/themes/dust/maximize-focused.png
diff --git a/window-buttons/themes/dust/maximize-hover.png
b/gnome-applets/window-buttons/themes/dust/maximize-hover.png
similarity index 100%
rename from window-buttons/themes/dust/maximize-hover.png
rename to gnome-applets/window-buttons/themes/dust/maximize-hover.png
diff --git a/window-buttons/themes/dust/maximize-unfocused.png
b/gnome-applets/window-buttons/themes/dust/maximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/dust/maximize-unfocused.png
rename to gnome-applets/window-buttons/themes/dust/maximize-unfocused.png
diff --git a/window-buttons/themes/dust/minimize-clicked.png
b/gnome-applets/window-buttons/themes/dust/minimize-clicked.png
similarity index 100%
rename from window-buttons/themes/dust/minimize-clicked.png
rename to gnome-applets/window-buttons/themes/dust/minimize-clicked.png
diff --git a/window-buttons/themes/dust/minimize-focused.png
b/gnome-applets/window-buttons/themes/dust/minimize-focused.png
similarity index 100%
rename from window-buttons/themes/dust/minimize-focused.png
rename to gnome-applets/window-buttons/themes/dust/minimize-focused.png
diff --git a/window-buttons/themes/dust/minimize-hover.png
b/gnome-applets/window-buttons/themes/dust/minimize-hover.png
similarity index 100%
rename from window-buttons/themes/dust/minimize-hover.png
rename to gnome-applets/window-buttons/themes/dust/minimize-hover.png
diff --git a/window-buttons/themes/dust/minimize-unfocused.png
b/gnome-applets/window-buttons/themes/dust/minimize-unfocused.png
similarity index 100%
rename from window-buttons/themes/dust/minimize-unfocused.png
rename to gnome-applets/window-buttons/themes/dust/minimize-unfocused.png
diff --git a/window-buttons/themes/dust/unmaximize-clicked.png
b/gnome-applets/window-buttons/themes/dust/unmaximize-clicked.png
similarity index 100%
rename from window-buttons/themes/dust/unmaximize-clicked.png
rename to gnome-applets/window-buttons/themes/dust/unmaximize-clicked.png
diff --git a/window-buttons/themes/dust/unmaximize-focused.png
b/gnome-applets/window-buttons/themes/dust/unmaximize-focused.png
similarity index 100%
rename from window-buttons/themes/dust/unmaximize-focused.png
rename to gnome-applets/window-buttons/themes/dust/unmaximize-focused.png
diff --git a/window-buttons/themes/dust/unmaximize-hover.png
b/gnome-applets/window-buttons/themes/dust/unmaximize-hover.png
similarity index 100%
rename from window-buttons/themes/dust/unmaximize-hover.png
rename to gnome-applets/window-buttons/themes/dust/unmaximize-hover.png
diff --git a/window-buttons/themes/dust/unmaximize-unfocused.png
b/gnome-applets/window-buttons/themes/dust/unmaximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/dust/unmaximize-unfocused.png
rename to gnome-applets/window-buttons/themes/dust/unmaximize-unfocused.png
diff --git a/window-buttons/themes/elementary/README b/gnome-applets/window-buttons/themes/elementary/README
similarity index 100%
rename from window-buttons/themes/elementary/README
rename to gnome-applets/window-buttons/themes/elementary/README
diff --git a/window-buttons/themes/elementary/close-clicked.png
b/gnome-applets/window-buttons/themes/elementary/close-clicked.png
similarity index 100%
rename from window-buttons/themes/elementary/close-clicked.png
rename to gnome-applets/window-buttons/themes/elementary/close-clicked.png
diff --git a/window-buttons/themes/elementary/close-focused.png
b/gnome-applets/window-buttons/themes/elementary/close-focused.png
similarity index 100%
rename from window-buttons/themes/elementary/close-focused.png
rename to gnome-applets/window-buttons/themes/elementary/close-focused.png
diff --git a/window-buttons/themes/elementary/close-hover.png
b/gnome-applets/window-buttons/themes/elementary/close-hover.png
similarity index 100%
rename from window-buttons/themes/elementary/close-hover.png
rename to gnome-applets/window-buttons/themes/elementary/close-hover.png
diff --git a/window-buttons/themes/elementary/close-unfocused.png
b/gnome-applets/window-buttons/themes/elementary/close-unfocused.png
similarity index 100%
rename from window-buttons/themes/elementary/close-unfocused.png
rename to gnome-applets/window-buttons/themes/elementary/close-unfocused.png
diff --git a/window-buttons/themes/elementary/maximize-clicked.png
b/gnome-applets/window-buttons/themes/elementary/maximize-clicked.png
similarity index 100%
rename from window-buttons/themes/elementary/maximize-clicked.png
rename to gnome-applets/window-buttons/themes/elementary/maximize-clicked.png
diff --git a/window-buttons/themes/elementary/maximize-focused.png
b/gnome-applets/window-buttons/themes/elementary/maximize-focused.png
similarity index 100%
rename from window-buttons/themes/elementary/maximize-focused.png
rename to gnome-applets/window-buttons/themes/elementary/maximize-focused.png
diff --git a/window-buttons/themes/elementary/maximize-hover.png
b/gnome-applets/window-buttons/themes/elementary/maximize-hover.png
similarity index 100%
rename from window-buttons/themes/elementary/maximize-hover.png
rename to gnome-applets/window-buttons/themes/elementary/maximize-hover.png
diff --git a/window-buttons/themes/elementary/maximize-unfocused.png
b/gnome-applets/window-buttons/themes/elementary/maximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/elementary/maximize-unfocused.png
rename to gnome-applets/window-buttons/themes/elementary/maximize-unfocused.png
diff --git a/window-buttons/themes/elementary/minimize-clicked.png
b/gnome-applets/window-buttons/themes/elementary/minimize-clicked.png
similarity index 100%
rename from window-buttons/themes/elementary/minimize-clicked.png
rename to gnome-applets/window-buttons/themes/elementary/minimize-clicked.png
diff --git a/window-buttons/themes/elementary/minimize-focused.png
b/gnome-applets/window-buttons/themes/elementary/minimize-focused.png
similarity index 100%
rename from window-buttons/themes/elementary/minimize-focused.png
rename to gnome-applets/window-buttons/themes/elementary/minimize-focused.png
diff --git a/window-buttons/themes/elementary/minimize-hover.png
b/gnome-applets/window-buttons/themes/elementary/minimize-hover.png
similarity index 100%
rename from window-buttons/themes/elementary/minimize-hover.png
rename to gnome-applets/window-buttons/themes/elementary/minimize-hover.png
diff --git a/window-buttons/themes/elementary/minimize-unfocused.png
b/gnome-applets/window-buttons/themes/elementary/minimize-unfocused.png
similarity index 100%
rename from window-buttons/themes/elementary/minimize-unfocused.png
rename to gnome-applets/window-buttons/themes/elementary/minimize-unfocused.png
diff --git a/window-buttons/themes/elementary/unmaximize-clicked.png
b/gnome-applets/window-buttons/themes/elementary/unmaximize-clicked.png
similarity index 100%
rename from window-buttons/themes/elementary/unmaximize-clicked.png
rename to gnome-applets/window-buttons/themes/elementary/unmaximize-clicked.png
diff --git a/window-buttons/themes/elementary/unmaximize-focused.png
b/gnome-applets/window-buttons/themes/elementary/unmaximize-focused.png
similarity index 100%
rename from window-buttons/themes/elementary/unmaximize-focused.png
rename to gnome-applets/window-buttons/themes/elementary/unmaximize-focused.png
diff --git a/window-buttons/themes/elementary/unmaximize-hover.png
b/gnome-applets/window-buttons/themes/elementary/unmaximize-hover.png
similarity index 100%
rename from window-buttons/themes/elementary/unmaximize-hover.png
rename to gnome-applets/window-buttons/themes/elementary/unmaximize-hover.png
diff --git a/window-buttons/themes/elementary/unmaximize-unfocused.png
b/gnome-applets/window-buttons/themes/elementary/unmaximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/elementary/unmaximize-unfocused.png
rename to gnome-applets/window-buttons/themes/elementary/unmaximize-unfocused.png
diff --git a/window-buttons/themes/equinox-glass/README
b/gnome-applets/window-buttons/themes/equinox-glass/README
similarity index 100%
rename from window-buttons/themes/equinox-glass/README
rename to gnome-applets/window-buttons/themes/equinox-glass/README
diff --git a/window-buttons/themes/equinox-glass/close-clicked.png
b/gnome-applets/window-buttons/themes/equinox-glass/close-clicked.png
similarity index 100%
rename from window-buttons/themes/equinox-glass/close-clicked.png
rename to gnome-applets/window-buttons/themes/equinox-glass/close-clicked.png
diff --git a/window-buttons/themes/equinox-glass/close-focused.png
b/gnome-applets/window-buttons/themes/equinox-glass/close-focused.png
similarity index 100%
rename from window-buttons/themes/equinox-glass/close-focused.png
rename to gnome-applets/window-buttons/themes/equinox-glass/close-focused.png
diff --git a/window-buttons/themes/equinox-glass/close-hover.png
b/gnome-applets/window-buttons/themes/equinox-glass/close-hover.png
similarity index 100%
rename from window-buttons/themes/equinox-glass/close-hover.png
rename to gnome-applets/window-buttons/themes/equinox-glass/close-hover.png
diff --git a/window-buttons/themes/equinox-glass/close-unfocused.png
b/gnome-applets/window-buttons/themes/equinox-glass/close-unfocused.png
similarity index 100%
rename from window-buttons/themes/equinox-glass/close-unfocused.png
rename to gnome-applets/window-buttons/themes/equinox-glass/close-unfocused.png
diff --git a/window-buttons/themes/equinox-glass/maximize-clicked.png
b/gnome-applets/window-buttons/themes/equinox-glass/maximize-clicked.png
similarity index 100%
rename from window-buttons/themes/equinox-glass/maximize-clicked.png
rename to gnome-applets/window-buttons/themes/equinox-glass/maximize-clicked.png
diff --git a/window-buttons/themes/equinox-glass/maximize-focused.png
b/gnome-applets/window-buttons/themes/equinox-glass/maximize-focused.png
similarity index 100%
rename from window-buttons/themes/equinox-glass/maximize-focused.png
rename to gnome-applets/window-buttons/themes/equinox-glass/maximize-focused.png
diff --git a/window-buttons/themes/equinox-glass/maximize-hover.png
b/gnome-applets/window-buttons/themes/equinox-glass/maximize-hover.png
similarity index 100%
rename from window-buttons/themes/equinox-glass/maximize-hover.png
rename to gnome-applets/window-buttons/themes/equinox-glass/maximize-hover.png
diff --git a/window-buttons/themes/equinox-glass/maximize-unfocused.png
b/gnome-applets/window-buttons/themes/equinox-glass/maximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/equinox-glass/maximize-unfocused.png
rename to gnome-applets/window-buttons/themes/equinox-glass/maximize-unfocused.png
diff --git a/window-buttons/themes/equinox-glass/minimize-clicked.png
b/gnome-applets/window-buttons/themes/equinox-glass/minimize-clicked.png
similarity index 100%
rename from window-buttons/themes/equinox-glass/minimize-clicked.png
rename to gnome-applets/window-buttons/themes/equinox-glass/minimize-clicked.png
diff --git a/window-buttons/themes/equinox-glass/minimize-focused.png
b/gnome-applets/window-buttons/themes/equinox-glass/minimize-focused.png
similarity index 100%
rename from window-buttons/themes/equinox-glass/minimize-focused.png
rename to gnome-applets/window-buttons/themes/equinox-glass/minimize-focused.png
diff --git a/window-buttons/themes/equinox-glass/minimize-hover.png
b/gnome-applets/window-buttons/themes/equinox-glass/minimize-hover.png
similarity index 100%
rename from window-buttons/themes/equinox-glass/minimize-hover.png
rename to gnome-applets/window-buttons/themes/equinox-glass/minimize-hover.png
diff --git a/window-buttons/themes/equinox-glass/minimize-unfocused.png
b/gnome-applets/window-buttons/themes/equinox-glass/minimize-unfocused.png
similarity index 100%
rename from window-buttons/themes/equinox-glass/minimize-unfocused.png
rename to gnome-applets/window-buttons/themes/equinox-glass/minimize-unfocused.png
diff --git a/window-buttons/themes/equinox-glass/unmaximize-clicked.png
b/gnome-applets/window-buttons/themes/equinox-glass/unmaximize-clicked.png
similarity index 100%
rename from window-buttons/themes/equinox-glass/unmaximize-clicked.png
rename to gnome-applets/window-buttons/themes/equinox-glass/unmaximize-clicked.png
diff --git a/window-buttons/themes/equinox-glass/unmaximize-focused.png
b/gnome-applets/window-buttons/themes/equinox-glass/unmaximize-focused.png
similarity index 100%
rename from window-buttons/themes/equinox-glass/unmaximize-focused.png
rename to gnome-applets/window-buttons/themes/equinox-glass/unmaximize-focused.png
diff --git a/window-buttons/themes/equinox-glass/unmaximize-hover.png
b/gnome-applets/window-buttons/themes/equinox-glass/unmaximize-hover.png
similarity index 100%
rename from window-buttons/themes/equinox-glass/unmaximize-hover.png
rename to gnome-applets/window-buttons/themes/equinox-glass/unmaximize-hover.png
diff --git a/window-buttons/themes/equinox-glass/unmaximize-unfocused.png
b/gnome-applets/window-buttons/themes/equinox-glass/unmaximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/equinox-glass/unmaximize-unfocused.png
rename to gnome-applets/window-buttons/themes/equinox-glass/unmaximize-unfocused.png
diff --git a/window-buttons/themes/human-thin/close-clicked.png
b/gnome-applets/window-buttons/themes/human-thin/close-clicked.png
similarity index 100%
rename from window-buttons/themes/human-thin/close-clicked.png
rename to gnome-applets/window-buttons/themes/human-thin/close-clicked.png
diff --git a/window-buttons/themes/human-thin/close-focused.png
b/gnome-applets/window-buttons/themes/human-thin/close-focused.png
similarity index 100%
rename from window-buttons/themes/human-thin/close-focused.png
rename to gnome-applets/window-buttons/themes/human-thin/close-focused.png
diff --git a/window-buttons/themes/human-thin/close-hover.png
b/gnome-applets/window-buttons/themes/human-thin/close-hover.png
similarity index 100%
rename from window-buttons/themes/human-thin/close-hover.png
rename to gnome-applets/window-buttons/themes/human-thin/close-hover.png
diff --git a/window-buttons/themes/human-thin/close-unfocused.png
b/gnome-applets/window-buttons/themes/human-thin/close-unfocused.png
similarity index 100%
rename from window-buttons/themes/human-thin/close-unfocused.png
rename to gnome-applets/window-buttons/themes/human-thin/close-unfocused.png
diff --git a/window-buttons/themes/human-thin/maximize-clicked.png
b/gnome-applets/window-buttons/themes/human-thin/maximize-clicked.png
similarity index 100%
rename from window-buttons/themes/human-thin/maximize-clicked.png
rename to gnome-applets/window-buttons/themes/human-thin/maximize-clicked.png
diff --git a/window-buttons/themes/human-thin/maximize-focused.png
b/gnome-applets/window-buttons/themes/human-thin/maximize-focused.png
similarity index 100%
rename from window-buttons/themes/human-thin/maximize-focused.png
rename to gnome-applets/window-buttons/themes/human-thin/maximize-focused.png
diff --git a/window-buttons/themes/human-thin/maximize-hover.png
b/gnome-applets/window-buttons/themes/human-thin/maximize-hover.png
similarity index 100%
rename from window-buttons/themes/human-thin/maximize-hover.png
rename to gnome-applets/window-buttons/themes/human-thin/maximize-hover.png
diff --git a/window-buttons/themes/human-thin/maximize-unfocused.png
b/gnome-applets/window-buttons/themes/human-thin/maximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/human-thin/maximize-unfocused.png
rename to gnome-applets/window-buttons/themes/human-thin/maximize-unfocused.png
diff --git a/window-buttons/themes/human-thin/minimize-clicked.png
b/gnome-applets/window-buttons/themes/human-thin/minimize-clicked.png
similarity index 100%
rename from window-buttons/themes/human-thin/minimize-clicked.png
rename to gnome-applets/window-buttons/themes/human-thin/minimize-clicked.png
diff --git a/window-buttons/themes/human-thin/minimize-focused.png
b/gnome-applets/window-buttons/themes/human-thin/minimize-focused.png
similarity index 100%
rename from window-buttons/themes/human-thin/minimize-focused.png
rename to gnome-applets/window-buttons/themes/human-thin/minimize-focused.png
diff --git a/window-buttons/themes/human-thin/minimize-hover.png
b/gnome-applets/window-buttons/themes/human-thin/minimize-hover.png
similarity index 100%
rename from window-buttons/themes/human-thin/minimize-hover.png
rename to gnome-applets/window-buttons/themes/human-thin/minimize-hover.png
diff --git a/window-buttons/themes/human-thin/minimize-unfocused.png
b/gnome-applets/window-buttons/themes/human-thin/minimize-unfocused.png
similarity index 100%
rename from window-buttons/themes/human-thin/minimize-unfocused.png
rename to gnome-applets/window-buttons/themes/human-thin/minimize-unfocused.png
diff --git a/window-buttons/themes/human-thin/unmaximize-clicked.png
b/gnome-applets/window-buttons/themes/human-thin/unmaximize-clicked.png
similarity index 100%
rename from window-buttons/themes/human-thin/unmaximize-clicked.png
rename to gnome-applets/window-buttons/themes/human-thin/unmaximize-clicked.png
diff --git a/window-buttons/themes/human-thin/unmaximize-focused.png
b/gnome-applets/window-buttons/themes/human-thin/unmaximize-focused.png
similarity index 100%
rename from window-buttons/themes/human-thin/unmaximize-focused.png
rename to gnome-applets/window-buttons/themes/human-thin/unmaximize-focused.png
diff --git a/window-buttons/themes/human-thin/unmaximize-hover.png
b/gnome-applets/window-buttons/themes/human-thin/unmaximize-hover.png
similarity index 100%
rename from window-buttons/themes/human-thin/unmaximize-hover.png
rename to gnome-applets/window-buttons/themes/human-thin/unmaximize-hover.png
diff --git a/window-buttons/themes/human-thin/unmaximize-unfocused.png
b/gnome-applets/window-buttons/themes/human-thin/unmaximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/human-thin/unmaximize-unfocused.png
rename to gnome-applets/window-buttons/themes/human-thin/unmaximize-unfocused.png
diff --git a/window-buttons/themes/human/close-clicked.png
b/gnome-applets/window-buttons/themes/human/close-clicked.png
similarity index 100%
rename from window-buttons/themes/human/close-clicked.png
rename to gnome-applets/window-buttons/themes/human/close-clicked.png
diff --git a/window-buttons/themes/human/close-focused.png
b/gnome-applets/window-buttons/themes/human/close-focused.png
similarity index 100%
rename from window-buttons/themes/human/close-focused.png
rename to gnome-applets/window-buttons/themes/human/close-focused.png
diff --git a/window-buttons/themes/human/close-hover.png
b/gnome-applets/window-buttons/themes/human/close-hover.png
similarity index 100%
rename from window-buttons/themes/human/close-hover.png
rename to gnome-applets/window-buttons/themes/human/close-hover.png
diff --git a/window-buttons/themes/human/close-unfocused.png
b/gnome-applets/window-buttons/themes/human/close-unfocused.png
similarity index 100%
rename from window-buttons/themes/human/close-unfocused.png
rename to gnome-applets/window-buttons/themes/human/close-unfocused.png
diff --git a/window-buttons/themes/human/maximize-clicked.png
b/gnome-applets/window-buttons/themes/human/maximize-clicked.png
similarity index 100%
rename from window-buttons/themes/human/maximize-clicked.png
rename to gnome-applets/window-buttons/themes/human/maximize-clicked.png
diff --git a/window-buttons/themes/human/maximize-focused.png
b/gnome-applets/window-buttons/themes/human/maximize-focused.png
similarity index 100%
rename from window-buttons/themes/human/maximize-focused.png
rename to gnome-applets/window-buttons/themes/human/maximize-focused.png
diff --git a/window-buttons/themes/human/maximize-hover.png
b/gnome-applets/window-buttons/themes/human/maximize-hover.png
similarity index 100%
rename from window-buttons/themes/human/maximize-hover.png
rename to gnome-applets/window-buttons/themes/human/maximize-hover.png
diff --git a/window-buttons/themes/human/maximize-unfocused.png
b/gnome-applets/window-buttons/themes/human/maximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/human/maximize-unfocused.png
rename to gnome-applets/window-buttons/themes/human/maximize-unfocused.png
diff --git a/window-buttons/themes/human/minimize-clicked.png
b/gnome-applets/window-buttons/themes/human/minimize-clicked.png
similarity index 100%
rename from window-buttons/themes/human/minimize-clicked.png
rename to gnome-applets/window-buttons/themes/human/minimize-clicked.png
diff --git a/window-buttons/themes/human/minimize-focused.png
b/gnome-applets/window-buttons/themes/human/minimize-focused.png
similarity index 100%
rename from window-buttons/themes/human/minimize-focused.png
rename to gnome-applets/window-buttons/themes/human/minimize-focused.png
diff --git a/window-buttons/themes/human/minimize-hover.png
b/gnome-applets/window-buttons/themes/human/minimize-hover.png
similarity index 100%
rename from window-buttons/themes/human/minimize-hover.png
rename to gnome-applets/window-buttons/themes/human/minimize-hover.png
diff --git a/window-buttons/themes/human/minimize-unfocused.png
b/gnome-applets/window-buttons/themes/human/minimize-unfocused.png
similarity index 100%
rename from window-buttons/themes/human/minimize-unfocused.png
rename to gnome-applets/window-buttons/themes/human/minimize-unfocused.png
diff --git a/window-buttons/themes/human/unmaximize-clicked.png
b/gnome-applets/window-buttons/themes/human/unmaximize-clicked.png
similarity index 100%
rename from window-buttons/themes/human/unmaximize-clicked.png
rename to gnome-applets/window-buttons/themes/human/unmaximize-clicked.png
diff --git a/window-buttons/themes/human/unmaximize-focused.png
b/gnome-applets/window-buttons/themes/human/unmaximize-focused.png
similarity index 100%
rename from window-buttons/themes/human/unmaximize-focused.png
rename to gnome-applets/window-buttons/themes/human/unmaximize-focused.png
diff --git a/window-buttons/themes/human/unmaximize-hover.png
b/gnome-applets/window-buttons/themes/human/unmaximize-hover.png
similarity index 100%
rename from window-buttons/themes/human/unmaximize-hover.png
rename to gnome-applets/window-buttons/themes/human/unmaximize-hover.png
diff --git a/window-buttons/themes/human/unmaximize-unfocused.png
b/gnome-applets/window-buttons/themes/human/unmaximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/human/unmaximize-unfocused.png
rename to gnome-applets/window-buttons/themes/human/unmaximize-unfocused.png
diff --git a/window-buttons/themes/new-hope/close-clicked.png
b/gnome-applets/window-buttons/themes/new-hope/close-clicked.png
similarity index 100%
rename from window-buttons/themes/new-hope/close-clicked.png
rename to gnome-applets/window-buttons/themes/new-hope/close-clicked.png
diff --git a/window-buttons/themes/new-hope/close-focused.png
b/gnome-applets/window-buttons/themes/new-hope/close-focused.png
similarity index 100%
rename from window-buttons/themes/new-hope/close-focused.png
rename to gnome-applets/window-buttons/themes/new-hope/close-focused.png
diff --git a/window-buttons/themes/new-hope/close-hover.png
b/gnome-applets/window-buttons/themes/new-hope/close-hover.png
similarity index 100%
rename from window-buttons/themes/new-hope/close-hover.png
rename to gnome-applets/window-buttons/themes/new-hope/close-hover.png
diff --git a/window-buttons/themes/new-hope/close-unfocused.png
b/gnome-applets/window-buttons/themes/new-hope/close-unfocused.png
similarity index 100%
rename from window-buttons/themes/new-hope/close-unfocused.png
rename to gnome-applets/window-buttons/themes/new-hope/close-unfocused.png
diff --git a/window-buttons/themes/new-hope/maximize-clicked.png
b/gnome-applets/window-buttons/themes/new-hope/maximize-clicked.png
similarity index 100%
rename from window-buttons/themes/new-hope/maximize-clicked.png
rename to gnome-applets/window-buttons/themes/new-hope/maximize-clicked.png
diff --git a/window-buttons/themes/new-hope/maximize-focused.png
b/gnome-applets/window-buttons/themes/new-hope/maximize-focused.png
similarity index 100%
rename from window-buttons/themes/new-hope/maximize-focused.png
rename to gnome-applets/window-buttons/themes/new-hope/maximize-focused.png
diff --git a/window-buttons/themes/new-hope/maximize-hover.png
b/gnome-applets/window-buttons/themes/new-hope/maximize-hover.png
similarity index 100%
rename from window-buttons/themes/new-hope/maximize-hover.png
rename to gnome-applets/window-buttons/themes/new-hope/maximize-hover.png
diff --git a/window-buttons/themes/new-hope/maximize-unfocused.png
b/gnome-applets/window-buttons/themes/new-hope/maximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/new-hope/maximize-unfocused.png
rename to gnome-applets/window-buttons/themes/new-hope/maximize-unfocused.png
diff --git a/window-buttons/themes/new-hope/minimize-clicked.png
b/gnome-applets/window-buttons/themes/new-hope/minimize-clicked.png
similarity index 100%
rename from window-buttons/themes/new-hope/minimize-clicked.png
rename to gnome-applets/window-buttons/themes/new-hope/minimize-clicked.png
diff --git a/window-buttons/themes/new-hope/minimize-focused.png
b/gnome-applets/window-buttons/themes/new-hope/minimize-focused.png
similarity index 100%
rename from window-buttons/themes/new-hope/minimize-focused.png
rename to gnome-applets/window-buttons/themes/new-hope/minimize-focused.png
diff --git a/window-buttons/themes/new-hope/minimize-hover.png
b/gnome-applets/window-buttons/themes/new-hope/minimize-hover.png
similarity index 100%
rename from window-buttons/themes/new-hope/minimize-hover.png
rename to gnome-applets/window-buttons/themes/new-hope/minimize-hover.png
diff --git a/window-buttons/themes/new-hope/minimize-unfocused.png
b/gnome-applets/window-buttons/themes/new-hope/minimize-unfocused.png
similarity index 100%
rename from window-buttons/themes/new-hope/minimize-unfocused.png
rename to gnome-applets/window-buttons/themes/new-hope/minimize-unfocused.png
diff --git a/window-buttons/themes/new-hope/unmaximize-clicked.png
b/gnome-applets/window-buttons/themes/new-hope/unmaximize-clicked.png
similarity index 100%
rename from window-buttons/themes/new-hope/unmaximize-clicked.png
rename to gnome-applets/window-buttons/themes/new-hope/unmaximize-clicked.png
diff --git a/window-buttons/themes/new-hope/unmaximize-focused.png
b/gnome-applets/window-buttons/themes/new-hope/unmaximize-focused.png
similarity index 100%
rename from window-buttons/themes/new-hope/unmaximize-focused.png
rename to gnome-applets/window-buttons/themes/new-hope/unmaximize-focused.png
diff --git a/window-buttons/themes/new-hope/unmaximize-hover.png
b/gnome-applets/window-buttons/themes/new-hope/unmaximize-hover.png
similarity index 100%
rename from window-buttons/themes/new-hope/unmaximize-hover.png
rename to gnome-applets/window-buttons/themes/new-hope/unmaximize-hover.png
diff --git a/window-buttons/themes/new-hope/unmaximize-unfocused.png
b/gnome-applets/window-buttons/themes/new-hope/unmaximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/new-hope/unmaximize-unfocused.png
rename to gnome-applets/window-buttons/themes/new-hope/unmaximize-unfocused.png
diff --git a/window-buttons/themes/plano/close-clicked.png
b/gnome-applets/window-buttons/themes/plano/close-clicked.png
similarity index 100%
rename from window-buttons/themes/plano/close-clicked.png
rename to gnome-applets/window-buttons/themes/plano/close-clicked.png
diff --git a/window-buttons/themes/plano/close-focused.png
b/gnome-applets/window-buttons/themes/plano/close-focused.png
similarity index 100%
rename from window-buttons/themes/plano/close-focused.png
rename to gnome-applets/window-buttons/themes/plano/close-focused.png
diff --git a/window-buttons/themes/plano/close-hover.png
b/gnome-applets/window-buttons/themes/plano/close-hover.png
similarity index 100%
rename from window-buttons/themes/plano/close-hover.png
rename to gnome-applets/window-buttons/themes/plano/close-hover.png
diff --git a/window-buttons/themes/plano/close-unfocused.png
b/gnome-applets/window-buttons/themes/plano/close-unfocused.png
similarity index 100%
rename from window-buttons/themes/plano/close-unfocused.png
rename to gnome-applets/window-buttons/themes/plano/close-unfocused.png
diff --git a/window-buttons/themes/plano/maximize-clicked.png
b/gnome-applets/window-buttons/themes/plano/maximize-clicked.png
similarity index 100%
rename from window-buttons/themes/plano/maximize-clicked.png
rename to gnome-applets/window-buttons/themes/plano/maximize-clicked.png
diff --git a/window-buttons/themes/plano/maximize-focused.png
b/gnome-applets/window-buttons/themes/plano/maximize-focused.png
similarity index 100%
rename from window-buttons/themes/plano/maximize-focused.png
rename to gnome-applets/window-buttons/themes/plano/maximize-focused.png
diff --git a/window-buttons/themes/plano/maximize-hover.png
b/gnome-applets/window-buttons/themes/plano/maximize-hover.png
similarity index 100%
rename from window-buttons/themes/plano/maximize-hover.png
rename to gnome-applets/window-buttons/themes/plano/maximize-hover.png
diff --git a/window-buttons/themes/plano/maximize-unfocused.png
b/gnome-applets/window-buttons/themes/plano/maximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/plano/maximize-unfocused.png
rename to gnome-applets/window-buttons/themes/plano/maximize-unfocused.png
diff --git a/window-buttons/themes/plano/minimize-clicked.png
b/gnome-applets/window-buttons/themes/plano/minimize-clicked.png
similarity index 100%
rename from window-buttons/themes/plano/minimize-clicked.png
rename to gnome-applets/window-buttons/themes/plano/minimize-clicked.png
diff --git a/window-buttons/themes/plano/minimize-focused.png
b/gnome-applets/window-buttons/themes/plano/minimize-focused.png
similarity index 100%
rename from window-buttons/themes/plano/minimize-focused.png
rename to gnome-applets/window-buttons/themes/plano/minimize-focused.png
diff --git a/window-buttons/themes/plano/minimize-hover.png
b/gnome-applets/window-buttons/themes/plano/minimize-hover.png
similarity index 100%
rename from window-buttons/themes/plano/minimize-hover.png
rename to gnome-applets/window-buttons/themes/plano/minimize-hover.png
diff --git a/window-buttons/themes/plano/minimize-unfocused.png
b/gnome-applets/window-buttons/themes/plano/minimize-unfocused.png
similarity index 100%
rename from window-buttons/themes/plano/minimize-unfocused.png
rename to gnome-applets/window-buttons/themes/plano/minimize-unfocused.png
diff --git a/window-buttons/themes/plano/unmaximize-clicked.png
b/gnome-applets/window-buttons/themes/plano/unmaximize-clicked.png
similarity index 100%
rename from window-buttons/themes/plano/unmaximize-clicked.png
rename to gnome-applets/window-buttons/themes/plano/unmaximize-clicked.png
diff --git a/window-buttons/themes/plano/unmaximize-focused.png
b/gnome-applets/window-buttons/themes/plano/unmaximize-focused.png
similarity index 100%
rename from window-buttons/themes/plano/unmaximize-focused.png
rename to gnome-applets/window-buttons/themes/plano/unmaximize-focused.png
diff --git a/window-buttons/themes/plano/unmaximize-hover.png
b/gnome-applets/window-buttons/themes/plano/unmaximize-hover.png
similarity index 100%
rename from window-buttons/themes/plano/unmaximize-hover.png
rename to gnome-applets/window-buttons/themes/plano/unmaximize-hover.png
diff --git a/window-buttons/themes/plano/unmaximize-unfocused.png
b/gnome-applets/window-buttons/themes/plano/unmaximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/plano/unmaximize-unfocused.png
rename to gnome-applets/window-buttons/themes/plano/unmaximize-unfocused.png
diff --git a/window-buttons/themes/radiance-maverick/close-focused-clicked.png
b/gnome-applets/window-buttons/themes/radiance-maverick/close-focused-clicked.png
similarity index 100%
rename from window-buttons/themes/radiance-maverick/close-focused-clicked.png
rename to gnome-applets/window-buttons/themes/radiance-maverick/close-focused-clicked.png
diff --git a/window-buttons/themes/radiance-maverick/close-focused-hover.png
b/gnome-applets/window-buttons/themes/radiance-maverick/close-focused-hover.png
similarity index 100%
rename from window-buttons/themes/radiance-maverick/close-focused-hover.png
rename to gnome-applets/window-buttons/themes/radiance-maverick/close-focused-hover.png
diff --git a/window-buttons/themes/radiance-maverick/close-focused-normal.png
b/gnome-applets/window-buttons/themes/radiance-maverick/close-focused-normal.png
similarity index 100%
rename from window-buttons/themes/radiance-maverick/close-focused-normal.png
rename to gnome-applets/window-buttons/themes/radiance-maverick/close-focused-normal.png
diff --git a/window-buttons/themes/radiance-maverick/close-unfocused-clicked.png
b/gnome-applets/window-buttons/themes/radiance-maverick/close-unfocused-clicked.png
similarity index 100%
rename from window-buttons/themes/radiance-maverick/close-unfocused-clicked.png
rename to gnome-applets/window-buttons/themes/radiance-maverick/close-unfocused-clicked.png
diff --git a/window-buttons/themes/radiance-maverick/close-unfocused-hover.png
b/gnome-applets/window-buttons/themes/radiance-maverick/close-unfocused-hover.png
similarity index 100%
rename from window-buttons/themes/radiance-maverick/close-unfocused-hover.png
rename to gnome-applets/window-buttons/themes/radiance-maverick/close-unfocused-hover.png
diff --git a/window-buttons/themes/radiance-maverick/close-unfocused-normal.png
b/gnome-applets/window-buttons/themes/radiance-maverick/close-unfocused-normal.png
similarity index 100%
rename from window-buttons/themes/radiance-maverick/close-unfocused-normal.png
rename to gnome-applets/window-buttons/themes/radiance-maverick/close-unfocused-normal.png
diff --git a/window-buttons/themes/radiance-maverick/maximize-focused-clicked.png
b/gnome-applets/window-buttons/themes/radiance-maverick/maximize-focused-clicked.png
similarity index 100%
rename from window-buttons/themes/radiance-maverick/maximize-focused-clicked.png
rename to gnome-applets/window-buttons/themes/radiance-maverick/maximize-focused-clicked.png
diff --git a/window-buttons/themes/radiance-maverick/maximize-focused-hover.png
b/gnome-applets/window-buttons/themes/radiance-maverick/maximize-focused-hover.png
similarity index 100%
rename from window-buttons/themes/radiance-maverick/maximize-focused-hover.png
rename to gnome-applets/window-buttons/themes/radiance-maverick/maximize-focused-hover.png
diff --git a/window-buttons/themes/radiance-maverick/maximize-focused-normal.png
b/gnome-applets/window-buttons/themes/radiance-maverick/maximize-focused-normal.png
similarity index 100%
rename from window-buttons/themes/radiance-maverick/maximize-focused-normal.png
rename to gnome-applets/window-buttons/themes/radiance-maverick/maximize-focused-normal.png
diff --git a/window-buttons/themes/radiance-maverick/maximize-unfocused-clicked.png
b/gnome-applets/window-buttons/themes/radiance-maverick/maximize-unfocused-clicked.png
similarity index 100%
rename from window-buttons/themes/radiance-maverick/maximize-unfocused-clicked.png
rename to gnome-applets/window-buttons/themes/radiance-maverick/maximize-unfocused-clicked.png
diff --git a/window-buttons/themes/radiance-maverick/maximize-unfocused-hover.png
b/gnome-applets/window-buttons/themes/radiance-maverick/maximize-unfocused-hover.png
similarity index 100%
rename from window-buttons/themes/radiance-maverick/maximize-unfocused-hover.png
rename to gnome-applets/window-buttons/themes/radiance-maverick/maximize-unfocused-hover.png
diff --git a/window-buttons/themes/radiance-maverick/maximize-unfocused-normal.png
b/gnome-applets/window-buttons/themes/radiance-maverick/maximize-unfocused-normal.png
similarity index 100%
rename from window-buttons/themes/radiance-maverick/maximize-unfocused-normal.png
rename to gnome-applets/window-buttons/themes/radiance-maverick/maximize-unfocused-normal.png
diff --git a/window-buttons/themes/radiance-maverick/minimize-focused-clicked.png
b/gnome-applets/window-buttons/themes/radiance-maverick/minimize-focused-clicked.png
similarity index 100%
rename from window-buttons/themes/radiance-maverick/minimize-focused-clicked.png
rename to gnome-applets/window-buttons/themes/radiance-maverick/minimize-focused-clicked.png
diff --git a/window-buttons/themes/radiance-maverick/minimize-focused-hover.png
b/gnome-applets/window-buttons/themes/radiance-maverick/minimize-focused-hover.png
similarity index 100%
rename from window-buttons/themes/radiance-maverick/minimize-focused-hover.png
rename to gnome-applets/window-buttons/themes/radiance-maverick/minimize-focused-hover.png
diff --git a/window-buttons/themes/radiance-maverick/minimize-focused-normal.png
b/gnome-applets/window-buttons/themes/radiance-maverick/minimize-focused-normal.png
similarity index 100%
rename from window-buttons/themes/radiance-maverick/minimize-focused-normal.png
rename to gnome-applets/window-buttons/themes/radiance-maverick/minimize-focused-normal.png
diff --git a/window-buttons/themes/radiance-maverick/minimize-unfocused-clicked.png
b/gnome-applets/window-buttons/themes/radiance-maverick/minimize-unfocused-clicked.png
similarity index 100%
rename from window-buttons/themes/radiance-maverick/minimize-unfocused-clicked.png
rename to gnome-applets/window-buttons/themes/radiance-maverick/minimize-unfocused-clicked.png
diff --git a/window-buttons/themes/radiance-maverick/minimize-unfocused-hover.png
b/gnome-applets/window-buttons/themes/radiance-maverick/minimize-unfocused-hover.png
similarity index 100%
rename from window-buttons/themes/radiance-maverick/minimize-unfocused-hover.png
rename to gnome-applets/window-buttons/themes/radiance-maverick/minimize-unfocused-hover.png
diff --git a/window-buttons/themes/radiance-maverick/minimize-unfocused-normal.png
b/gnome-applets/window-buttons/themes/radiance-maverick/minimize-unfocused-normal.png
similarity index 100%
rename from window-buttons/themes/radiance-maverick/minimize-unfocused-normal.png
rename to gnome-applets/window-buttons/themes/radiance-maverick/minimize-unfocused-normal.png
diff --git a/window-buttons/themes/radiance-maverick/unmaximize-focused-clicked.png
b/gnome-applets/window-buttons/themes/radiance-maverick/unmaximize-focused-clicked.png
similarity index 100%
rename from window-buttons/themes/radiance-maverick/unmaximize-focused-clicked.png
rename to gnome-applets/window-buttons/themes/radiance-maverick/unmaximize-focused-clicked.png
diff --git a/window-buttons/themes/radiance-maverick/unmaximize-focused-hover.png
b/gnome-applets/window-buttons/themes/radiance-maverick/unmaximize-focused-hover.png
similarity index 100%
rename from window-buttons/themes/radiance-maverick/unmaximize-focused-hover.png
rename to gnome-applets/window-buttons/themes/radiance-maverick/unmaximize-focused-hover.png
diff --git a/window-buttons/themes/radiance-maverick/unmaximize-focused-normal.png
b/gnome-applets/window-buttons/themes/radiance-maverick/unmaximize-focused-normal.png
similarity index 100%
rename from window-buttons/themes/radiance-maverick/unmaximize-focused-normal.png
rename to gnome-applets/window-buttons/themes/radiance-maverick/unmaximize-focused-normal.png
diff --git a/window-buttons/themes/radiance-maverick/unmaximize-unfocused-clicked.png
b/gnome-applets/window-buttons/themes/radiance-maverick/unmaximize-unfocused-clicked.png
similarity index 100%
rename from window-buttons/themes/radiance-maverick/unmaximize-unfocused-clicked.png
rename to gnome-applets/window-buttons/themes/radiance-maverick/unmaximize-unfocused-clicked.png
diff --git a/window-buttons/themes/radiance-maverick/unmaximize-unfocused-hover.png
b/gnome-applets/window-buttons/themes/radiance-maverick/unmaximize-unfocused-hover.png
similarity index 100%
rename from window-buttons/themes/radiance-maverick/unmaximize-unfocused-hover.png
rename to gnome-applets/window-buttons/themes/radiance-maverick/unmaximize-unfocused-hover.png
diff --git a/window-buttons/themes/radiance-maverick/unmaximize-unfocused-normal.png
b/gnome-applets/window-buttons/themes/radiance-maverick/unmaximize-unfocused-normal.png
similarity index 100%
rename from window-buttons/themes/radiance-maverick/unmaximize-unfocused-normal.png
rename to gnome-applets/window-buttons/themes/radiance-maverick/unmaximize-unfocused-normal.png
diff --git a/window-buttons/themes/radiance/close-clicked.png
b/gnome-applets/window-buttons/themes/radiance/close-clicked.png
similarity index 100%
rename from window-buttons/themes/radiance/close-clicked.png
rename to gnome-applets/window-buttons/themes/radiance/close-clicked.png
diff --git a/window-buttons/themes/radiance/close-focused.png
b/gnome-applets/window-buttons/themes/radiance/close-focused.png
similarity index 100%
rename from window-buttons/themes/radiance/close-focused.png
rename to gnome-applets/window-buttons/themes/radiance/close-focused.png
diff --git a/window-buttons/themes/radiance/close-hover.png
b/gnome-applets/window-buttons/themes/radiance/close-hover.png
similarity index 100%
rename from window-buttons/themes/radiance/close-hover.png
rename to gnome-applets/window-buttons/themes/radiance/close-hover.png
diff --git a/window-buttons/themes/radiance/close-unfocused.png
b/gnome-applets/window-buttons/themes/radiance/close-unfocused.png
similarity index 100%
rename from window-buttons/themes/radiance/close-unfocused.png
rename to gnome-applets/window-buttons/themes/radiance/close-unfocused.png
diff --git a/window-buttons/themes/radiance/maximize-clicked.png
b/gnome-applets/window-buttons/themes/radiance/maximize-clicked.png
similarity index 100%
rename from window-buttons/themes/radiance/maximize-clicked.png
rename to gnome-applets/window-buttons/themes/radiance/maximize-clicked.png
diff --git a/window-buttons/themes/radiance/maximize-focused.png
b/gnome-applets/window-buttons/themes/radiance/maximize-focused.png
similarity index 100%
rename from window-buttons/themes/radiance/maximize-focused.png
rename to gnome-applets/window-buttons/themes/radiance/maximize-focused.png
diff --git a/window-buttons/themes/radiance/maximize-hover.png
b/gnome-applets/window-buttons/themes/radiance/maximize-hover.png
similarity index 100%
rename from window-buttons/themes/radiance/maximize-hover.png
rename to gnome-applets/window-buttons/themes/radiance/maximize-hover.png
diff --git a/window-buttons/themes/radiance/maximize-unfocused.png
b/gnome-applets/window-buttons/themes/radiance/maximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/radiance/maximize-unfocused.png
rename to gnome-applets/window-buttons/themes/radiance/maximize-unfocused.png
diff --git a/window-buttons/themes/radiance/minimize-clicked.png
b/gnome-applets/window-buttons/themes/radiance/minimize-clicked.png
similarity index 100%
rename from window-buttons/themes/radiance/minimize-clicked.png
rename to gnome-applets/window-buttons/themes/radiance/minimize-clicked.png
diff --git a/window-buttons/themes/radiance/minimize-focused.png
b/gnome-applets/window-buttons/themes/radiance/minimize-focused.png
similarity index 100%
rename from window-buttons/themes/radiance/minimize-focused.png
rename to gnome-applets/window-buttons/themes/radiance/minimize-focused.png
diff --git a/window-buttons/themes/radiance/minimize-hover.png
b/gnome-applets/window-buttons/themes/radiance/minimize-hover.png
similarity index 100%
rename from window-buttons/themes/radiance/minimize-hover.png
rename to gnome-applets/window-buttons/themes/radiance/minimize-hover.png
diff --git a/window-buttons/themes/radiance/minimize-unfocused.png
b/gnome-applets/window-buttons/themes/radiance/minimize-unfocused.png
similarity index 100%
rename from window-buttons/themes/radiance/minimize-unfocused.png
rename to gnome-applets/window-buttons/themes/radiance/minimize-unfocused.png
diff --git a/window-buttons/themes/radiance/unmaximize-clicked.png
b/gnome-applets/window-buttons/themes/radiance/unmaximize-clicked.png
similarity index 100%
rename from window-buttons/themes/radiance/unmaximize-clicked.png
rename to gnome-applets/window-buttons/themes/radiance/unmaximize-clicked.png
diff --git a/window-buttons/themes/radiance/unmaximize-focused.png
b/gnome-applets/window-buttons/themes/radiance/unmaximize-focused.png
similarity index 100%
rename from window-buttons/themes/radiance/unmaximize-focused.png
rename to gnome-applets/window-buttons/themes/radiance/unmaximize-focused.png
diff --git a/window-buttons/themes/radiance/unmaximize-hover.png
b/gnome-applets/window-buttons/themes/radiance/unmaximize-hover.png
similarity index 100%
rename from window-buttons/themes/radiance/unmaximize-hover.png
rename to gnome-applets/window-buttons/themes/radiance/unmaximize-hover.png
diff --git a/window-buttons/themes/radiance/unmaximize-unfocused.png
b/gnome-applets/window-buttons/themes/radiance/unmaximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/radiance/unmaximize-unfocused.png
rename to gnome-applets/window-buttons/themes/radiance/unmaximize-unfocused.png
diff --git a/window-buttons/themes/sorbet/close-clicked.png
b/gnome-applets/window-buttons/themes/sorbet/close-clicked.png
similarity index 100%
rename from window-buttons/themes/sorbet/close-clicked.png
rename to gnome-applets/window-buttons/themes/sorbet/close-clicked.png
diff --git a/window-buttons/themes/sorbet/close-focused.png
b/gnome-applets/window-buttons/themes/sorbet/close-focused.png
similarity index 100%
rename from window-buttons/themes/sorbet/close-focused.png
rename to gnome-applets/window-buttons/themes/sorbet/close-focused.png
diff --git a/window-buttons/themes/sorbet/close-hover.png
b/gnome-applets/window-buttons/themes/sorbet/close-hover.png
similarity index 100%
rename from window-buttons/themes/sorbet/close-hover.png
rename to gnome-applets/window-buttons/themes/sorbet/close-hover.png
diff --git a/window-buttons/themes/sorbet/close-unfocused.png
b/gnome-applets/window-buttons/themes/sorbet/close-unfocused.png
similarity index 100%
rename from window-buttons/themes/sorbet/close-unfocused.png
rename to gnome-applets/window-buttons/themes/sorbet/close-unfocused.png
diff --git a/window-buttons/themes/sorbet/maximize-clicked.png
b/gnome-applets/window-buttons/themes/sorbet/maximize-clicked.png
similarity index 100%
rename from window-buttons/themes/sorbet/maximize-clicked.png
rename to gnome-applets/window-buttons/themes/sorbet/maximize-clicked.png
diff --git a/window-buttons/themes/sorbet/maximize-focused.png
b/gnome-applets/window-buttons/themes/sorbet/maximize-focused.png
similarity index 100%
rename from window-buttons/themes/sorbet/maximize-focused.png
rename to gnome-applets/window-buttons/themes/sorbet/maximize-focused.png
diff --git a/window-buttons/themes/sorbet/maximize-hover.png
b/gnome-applets/window-buttons/themes/sorbet/maximize-hover.png
similarity index 100%
rename from window-buttons/themes/sorbet/maximize-hover.png
rename to gnome-applets/window-buttons/themes/sorbet/maximize-hover.png
diff --git a/window-buttons/themes/sorbet/maximize-unfocused.png
b/gnome-applets/window-buttons/themes/sorbet/maximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/sorbet/maximize-unfocused.png
rename to gnome-applets/window-buttons/themes/sorbet/maximize-unfocused.png
diff --git a/window-buttons/themes/sorbet/minimize-clicked.png
b/gnome-applets/window-buttons/themes/sorbet/minimize-clicked.png
similarity index 100%
rename from window-buttons/themes/sorbet/minimize-clicked.png
rename to gnome-applets/window-buttons/themes/sorbet/minimize-clicked.png
diff --git a/window-buttons/themes/sorbet/minimize-focused.png
b/gnome-applets/window-buttons/themes/sorbet/minimize-focused.png
similarity index 100%
rename from window-buttons/themes/sorbet/minimize-focused.png
rename to gnome-applets/window-buttons/themes/sorbet/minimize-focused.png
diff --git a/window-buttons/themes/sorbet/minimize-hover.png
b/gnome-applets/window-buttons/themes/sorbet/minimize-hover.png
similarity index 100%
rename from window-buttons/themes/sorbet/minimize-hover.png
rename to gnome-applets/window-buttons/themes/sorbet/minimize-hover.png
diff --git a/window-buttons/themes/sorbet/minimize-unfocused.png
b/gnome-applets/window-buttons/themes/sorbet/minimize-unfocused.png
similarity index 100%
rename from window-buttons/themes/sorbet/minimize-unfocused.png
rename to gnome-applets/window-buttons/themes/sorbet/minimize-unfocused.png
diff --git a/window-buttons/themes/sorbet/unmaximize-clicked.png
b/gnome-applets/window-buttons/themes/sorbet/unmaximize-clicked.png
similarity index 100%
rename from window-buttons/themes/sorbet/unmaximize-clicked.png
rename to gnome-applets/window-buttons/themes/sorbet/unmaximize-clicked.png
diff --git a/window-buttons/themes/sorbet/unmaximize-focused.png
b/gnome-applets/window-buttons/themes/sorbet/unmaximize-focused.png
similarity index 100%
rename from window-buttons/themes/sorbet/unmaximize-focused.png
rename to gnome-applets/window-buttons/themes/sorbet/unmaximize-focused.png
diff --git a/window-buttons/themes/sorbet/unmaximize-hover.png
b/gnome-applets/window-buttons/themes/sorbet/unmaximize-hover.png
similarity index 100%
rename from window-buttons/themes/sorbet/unmaximize-hover.png
rename to gnome-applets/window-buttons/themes/sorbet/unmaximize-hover.png
diff --git a/window-buttons/themes/sorbet/unmaximize-unfocused.png
b/gnome-applets/window-buttons/themes/sorbet/unmaximize-unfocused.png
similarity index 100%
rename from window-buttons/themes/sorbet/unmaximize-unfocused.png
rename to gnome-applets/window-buttons/themes/sorbet/unmaximize-unfocused.png
diff --git a/gnome-applets/window-buttons/window-buttons-menu.xml
b/gnome-applets/window-buttons/window-buttons-menu.xml
new file mode 100644
index 000000000..20d4db65a
--- /dev/null
+++ b/gnome-applets/window-buttons/window-buttons-menu.xml
@@ -0,0 +1,14 @@
+<interface>
+ <menu id="window-buttons-menu">
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Preferences</attribute>
+ <attribute name="action">window-buttons.preferences</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_About</attribute>
+ <attribute name="action">window-buttons.about</attribute>
+ </item>
+ </section>
+ </menu>
+</interface>
diff --git a/window-buttons/windowbuttons.h b/gnome-applets/window-buttons/window-buttons-private.h
similarity index 77%
rename from window-buttons/windowbuttons.h
rename to gnome-applets/window-buttons/window-buttons-private.h
index 3e3242b8f..672799a06 100755
--- a/window-buttons/windowbuttons.h
+++ b/gnome-applets/window-buttons/window-buttons-private.h
@@ -27,10 +27,11 @@
#include <config.h>
#endif
+#include "window-buttons.h"
+
#include <glib.h>
#include <glib-object.h>
-#include <glib/gi18n.h>
-#include <panel-applet.h>
+#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
#if PLAINTEXT_CONFIG == 1
@@ -43,11 +44,7 @@
#include <libwnck/libwnck.h>
/* static paths and stuff */
-#define APPLET_NAME "Window Buttons"
-#define APPLET_OAFIID "WindowButtonsApplet"
-#define APPLET_OAFIID_FACTORY "WindowButtonsAppletFactory"
#define PATH_THEMES WB_DATA_DIR"/themes"
-#define PATH_UI_PREFS GTK_BUILDERDIR"/windowbuttons.ui"
#define METACITY_XML "metacity-theme-1.xml"
#define THEME_EXTENSION "png"
#define FILE_CONFIGFILE ".windowbuttons"
@@ -83,13 +80,6 @@
G_BEGIN_DECLS
-#define WB_TYPE_APPLET wb_applet_get_type()
-#define WB_APPLET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), WB_TYPE_APPLET, WBApplet))
-#define WB_APPLET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), WB_TYPE_APPLET, WBAppletClass))
-#define WB_IS_APPLET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), WB_TYPE_APPLET))
-#define WB_IS_APPLET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), WB_TYPE_APPLET))
-#define WB_APPLET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), WB_TYPE_APPLET, WBAppletClass))
-
/* we will index images for convenience */
typedef enum {
WB_IMAGE_MINIMIZE = 0,
@@ -155,9 +145,10 @@ typedef struct {
show_tooltips;
} WBPreferences;
-/* WBApplet definition (inherits from PanelApplet) */
-typedef struct {
- PanelApplet parent;
+struct _WBApplet
+{
+ GpApplet parent;
+
GSettings *settings;
/* Widgets */
@@ -182,7 +173,8 @@ typedef struct {
gulong active_handler, // activewindow's event handler ID
umaxed_handler; // umaxedwindow's event handler ID
- PanelAppletOrient orient; // Panel orientation
+ GtkOrientation orient; // Panel orientation
+ GtkPositionType position;
GdkPixbufRotation angle; // Applet angle
GtkPackType packtype; // Packaging direction of buttons
@@ -190,37 +182,10 @@ typedef struct {
/* GtkBuilder */
GtkBuilder *prefbuilder;
-} WBApplet;
-
-typedef struct {
- PanelAppletClass applet_class;
-} WBAppletClass;
-
-GType wb_applet_get_type (void);
-WBApplet* wb_applet_new (void);
+};
void wb_applet_update_images (WBApplet *wbapplet);
G_END_DECLS
-#endif
-/*
-Applet structure:
-
- Panel
- |
- |
- Applet
- |
- |
- _________ Box _________
- | | |
- | | |
-EventBox[0] EventBox[1] EventBox[2]
- | | |
- | | |
- Image[0] Image[1] Image[2]
-
-* note that EventBox/Image pairs (buttons) may be positioned in a different order
-
-*/
+#endif
diff --git a/window-buttons/windowbuttons.c b/gnome-applets/window-buttons/window-buttons.c
similarity index 87%
rename from window-buttons/windowbuttons.c
rename to gnome-applets/window-buttons/window-buttons.c
index 1fae6552f..0d6a1868d 100755
--- a/window-buttons/windowbuttons.c
+++ b/gnome-applets/window-buttons/window-buttons.c
@@ -18,23 +18,15 @@
* Andrej Belcijan <{andrejx} at {gmail.com}>
*/
-#include "windowbuttons.h"
+#include "config.h"
+#include "window-buttons-private.h"
#include "preferences.h"
/* Prototypes */
-//static void applet_change_background (PanelApplet *, PanelAppletBackgroundType, GdkColor *, GdkPixmap *);
-static void active_workspace_changed (WnckScreen *, WnckWorkspace *, WBApplet *);
-static void active_window_changed (WnckScreen *, WnckWindow *, WBApplet *);
+static void init_wbapplet (WBApplet *);
static void active_window_state_changed (WnckWindow *, WnckWindowState, WnckWindowState, WBApplet *);
static void umaxed_window_state_changed (WnckWindow *, WnckWindowState, WnckWindowState, WBApplet *);
-static void viewports_changed (WnckScreen *, WBApplet *);
-static void window_closed (WnckScreen *, WnckWindow *, WBApplet *);
-static void window_opened (WnckScreen *, WnckWindow *, WBApplet *);
static void about_cb ( GSimpleAction *, GVariant *, gpointer );
-static gboolean hover_enter (GtkWidget *, GdkEventCrossing *, WBApplet *);
-static gboolean hover_leave (GtkWidget *, GdkEventCrossing *, WBApplet *);
-static gboolean button_press (GtkWidget *, GdkEventButton *, WBApplet *);
-static gboolean button_release (GtkWidget *, GdkEventButton *, WBApplet *);
static WnckWindow *getRootWindow (WnckScreen *screen);
static WnckWindow *getUpperMaximized (WBApplet *);
void setCustomLayout (WBPreferences *, gchar *);
@@ -44,33 +36,22 @@ void reloadButtons(WBApplet *);
void toggleHidden(WBApplet *);
void loadThemes(GtkComboBox *, gchar *);
WBPreferences *loadPreferences(WBApplet *);
-//gchar *getButtonLayoutGConf(WBApplet *, gboolean);
gchar *getMetacityLayout(void);
GdkPixbuf ***getPixbufs(gchar ***);
-//G_DEFINE_TYPE(TN, t_n, T_P) G_DEFINE_TYPE_EXTENDED (TN, t_n, T_P, 0, {})
-//This line is very important! It defines how the requested functions will be called
-G_DEFINE_TYPE (WBApplet, wb_applet, PANEL_TYPE_APPLET);
-
-static const gchar windowbuttons_menu_items [] =
- "<section>"
- "<item>"
- "<attribute name=\"label\">Preferences</attribute>"
- "<attribute name=\"action\">windowbuttons.preferences</attribute>"
- "</item>"
- "<item>"
- "<attribute name=\"label\">About</attribute>"
- "<attribute name=\"action\">windowbuttons.about</attribute>"
- "</item>"
- "</section>";
+G_DEFINE_TYPE (WBApplet, wb_applet, GP_TYPE_APPLET)
static const GActionEntry windowbuttons_menu_actions [] = {
{ "preferences", wb_applet_properties_cb, NULL, NULL, NULL },
- { "about", about_cb, NULL, NULL, NULL }
+ { "about", about_cb, NULL, NULL, NULL },
+ { NULL }
};
-WBApplet* wb_applet_new (void) {
- return g_object_new (WB_TYPE_APPLET, NULL);
+static void
+wb_applet_constructed (GObject *object)
+{
+ G_OBJECT_CLASS (wb_applet_parent_class)->constructed (object);
+ init_wbapplet (WB_APPLET (object));
}
static void
@@ -135,11 +116,14 @@ wb_applet_class_init (WBAppletClass *self_class)
object_class = G_OBJECT_CLASS (self_class);
+ object_class->constructed = wb_applet_constructed;
object_class->dispose = wb_applet_dispose;
}
-static void wb_applet_init(WBApplet *wbapplet) {
- // Called before windowbuttons_applet_fill(), after wb_applet_class_init()
+static void
+wb_applet_init (WBApplet *self)
+{
+ gp_applet_set_flags (GP_APPLET (self), GP_APPLET_FLAGS_EXPAND_MINOR);
}
/* The About dialog */
@@ -619,7 +603,7 @@ void placeButtons(WBApplet *wbapplet) {
gtk_orientable_set_orientation(GTK_ORIENTABLE(wbapplet->box), GTK_ORIENTATION_HORIZONTAL);
} else if (wbapplet->prefs->orientation == 2) {
// Vertical position: The pixmaps need to be rotated to: Left/Down=270°, Right/Up=90°
- if (wbapplet->orient == PANEL_APPLET_ORIENT_LEFT || wbapplet->orient ==
PANEL_APPLET_ORIENT_DOWN) {
+ if (wbapplet->orient == GTK_ORIENTATION_VERTICAL) {
wbapplet->angle = GDK_PIXBUF_ROTATE_CLOCKWISE; // = 270°
wbapplet->packtype = GTK_PACK_START;
} else {
@@ -629,11 +613,11 @@ void placeButtons(WBApplet *wbapplet) {
gtk_orientable_set_orientation(GTK_ORIENTABLE(wbapplet->box), GTK_ORIENTATION_VERTICAL);
} else {
// Automatic position (default setting)
- if (wbapplet->orient == PANEL_APPLET_ORIENT_RIGHT) {
+ if (wbapplet->position == GTK_POS_LEFT) {
wbapplet->angle = GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE;
wbapplet->packtype = GTK_PACK_END;
gtk_orientable_set_orientation(GTK_ORIENTABLE(wbapplet->box),
GTK_ORIENTATION_VERTICAL);
- } else if (wbapplet->orient == PANEL_APPLET_ORIENT_LEFT) {
+ } else if (wbapplet->position == GTK_POS_RIGHT) {
wbapplet->angle = GDK_PIXBUF_ROTATE_CLOCKWISE;
wbapplet->packtype = GTK_PACK_START;
gtk_orientable_set_orientation(GTK_ORIENTABLE(wbapplet->box),
GTK_ORIENTATION_VERTICAL);
@@ -687,26 +671,29 @@ void reloadButtons(WBApplet *wbapplet) {
}
static void
-applet_change_orient (PanelApplet *panelapplet,
- PanelAppletOrient orient,
- WBApplet *wbapplet)
+placement_changed_cb (GpApplet *applet,
+ GtkOrientation orientation,
+ GtkPositionType position,
+ WBApplet *self)
{
- if (orient != wbapplet->orient) {
- wbapplet->orient = orient;
- wbapplet->pixbufs = getPixbufs(wbapplet->prefs->images);
- reloadButtons(wbapplet);
- wb_applet_update_images(wbapplet);
- }
-}
+ if (self->orient == orientation && self->position == position)
+ return;
-/* Do the actual applet initialization */
-static void init_wbapplet(PanelApplet *applet) {
- WBApplet *wbapplet;
- GSimpleActionGroup *action_group;
+ self->orient = orientation;
+ self->position = position;
- wbapplet = WB_APPLET (applet);
+ self->pixbufs = getPixbufs (self->prefs->images);
+ reloadButtons (self);
- wbapplet->settings = panel_applet_settings_new (applet, WINDOWBUTTONS_GSCHEMA);
+ wb_applet_update_images (self);
+}
+
+static void
+init_wbapplet (WBApplet *wbapplet)
+{
+ const char *menu_resource;
+
+ wbapplet->settings = gp_applet_settings_new (GP_APPLET (wbapplet), WINDOWBUTTONS_GSCHEMA);
wbapplet->prefs = loadPreferences(wbapplet);
wbapplet->activescreen = wnck_screen_get_default();
wnck_screen_force_update(wbapplet->activescreen);
@@ -717,7 +704,8 @@ static void init_wbapplet(PanelApplet *applet) {
wbapplet->prefbuilder = gtk_builder_new();
wbapplet->box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0));
wbapplet->button = createButtons(wbapplet);
- wbapplet->orient = panel_applet_get_orient(applet);
+ wbapplet->orient = gp_applet_get_orientation(GP_APPLET (wbapplet));
+ wbapplet->position = gp_applet_get_position(GP_APPLET (wbapplet));
wbapplet->pixbufs = getPixbufs(wbapplet->prefs->images);
// Rotate & place buttons
@@ -749,18 +737,17 @@ static void init_wbapplet(PanelApplet *applet) {
G_CALLBACK (window_opened),
wbapplet);
-// g_signal_connect(G_OBJECT (wbapplet), "change-background", G_CALLBACK (applet_change_background),
wbapplet);
- g_signal_connect(G_OBJECT (wbapplet), "change-orient", G_CALLBACK (applet_change_orient), wbapplet);
+ g_signal_connect (wbapplet, "placement-changed", G_CALLBACK (placement_changed_cb), wbapplet);
// ???: Is this still necessary?
wbapplet->active_handler =
g_signal_connect(G_OBJECT (wbapplet->activewindow), "state-changed", G_CALLBACK
(active_window_state_changed), wbapplet);
// Setup applet right-click menu
- action_group = g_simple_action_group_new ();
- g_action_map_add_action_entries (G_ACTION_MAP (action_group), windowbuttons_menu_actions,
G_N_ELEMENTS (windowbuttons_menu_actions), wbapplet);
- panel_applet_setup_menu (applet, windowbuttons_menu_items, action_group, GETTEXT_PACKAGE);
- gtk_widget_insert_action_group (GTK_WIDGET (wbapplet), "windowbuttons", G_ACTION_GROUP
(action_group));
+ menu_resource = GRESOURCE_PREFIX "/ui/window-buttons-menu.xml";
+ gp_applet_setup_menu_from_resource (GP_APPLET (wbapplet),
+ menu_resource,
+ windowbuttons_menu_actions);
toggleHidden (wbapplet); // Properly hide or show stuff
wb_applet_update_images (wbapplet);
@@ -782,19 +769,3 @@ void toggleHidden (WBApplet *wbapplet) {
if (!gtk_widget_get_visible(GTK_WIDGET(wbapplet)))
gtk_widget_show_all(GTK_WIDGET(wbapplet));
}
-
-// Initial function that creates the applet
-static gboolean windowbuttons_applet_factory (PanelApplet *applet, const gchar *iid, gpointer data) {
- if (g_strcmp0(iid, APPLET_OAFIID) != 0) return FALSE;
-
- panel_applet_set_flags (applet, PANEL_APPLET_EXPAND_MINOR);
-
- init_wbapplet(applet);
-
- return TRUE;
-}
-
-PANEL_APPLET_IN_PROCESS_FACTORY (APPLET_OAFIID_FACTORY,
- WB_TYPE_APPLET,
- windowbuttons_applet_factory,
- NULL)
diff --git a/gnome-applets/window-buttons/window-buttons.h b/gnome-applets/window-buttons/window-buttons.h
new file mode 100644
index 000000000..f4cb5e1f7
--- /dev/null
+++ b/gnome-applets/window-buttons/window-buttons.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2020 Alberts Muktupāvels
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef WINDOW_BUTTONS_H
+#define WINDOW_BUTTONS_H
+
+#include <libgnome-panel/gp-applet.h>
+
+G_BEGIN_DECLS
+
+#define WB_TYPE_APPLET (wb_applet_get_type ())
+G_DECLARE_FINAL_TYPE (WBApplet, wb_applet, WB, APPLET, GpApplet)
+
+G_END_DECLS
+
+#endif
diff --git a/window-buttons/windowbuttons.ui b/gnome-applets/window-buttons/window-buttons.ui
similarity index 100%
rename from window-buttons/windowbuttons.ui
rename to gnome-applets/window-buttons/window-buttons.ui
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e5d9c5ad4..fbbfb2501 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -83,6 +83,9 @@ gnome-applets/trash/trash-applet.c
gnome-applets/trash/trash-empty.c
[type: gettext/glade]gnome-applets/trash/trash-empty.ui
[type: gettext/glade]gnome-applets/trash/trash-menu.xml
+gnome-applets/window-buttons/window-buttons.c
+[type: gettext/glade]gnome-applets/window-buttons/window-buttons.ui
+[type: gettext/glade]gnome-applets/window-buttons/window-buttons-menu.xml
gnome-applets/window-picker/task-item.c
gnome-applets/window-picker/wp-about-dialog.c
gnome-applets/window-picker/wp-applet.c
@@ -92,6 +95,3 @@ gnome-applets/window-picker/wp-task-title.c
[type: gettext/glade]gnome-applets/window-title/window-title.ui
[type: gettext/glade]gnome-applets/window-title/window-title-menu.xml
gnome-applets/window-title/window-title.c
-[type: gettext/ini]window-buttons/org.gnome.panel.WindowButtonsApplet.panel-applet.in.in
-window-buttons/windowbuttons.c
-[type: gettext/glade]window-buttons/windowbuttons.ui
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index e8c08ce83..303519707 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -17,4 +17,3 @@ data/schemas/org.gnome.gnome-applets.timer.gschema.xml.in
data/schemas/org.gnome.gnome-applets.window-buttons.gschema.xml.in
data/schemas/org.gnome.gnome-applets.window-picker-applet.gschema.xml.in
data/schemas/org.gnome.gnome-applets.window-title.gschema.xml.in
-window-buttons/org.gnome.panel.WindowButtonsApplet.panel-applet.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
