From 19cd3b8678cbee003fdfec2da202891e151dd6c6 Mon Sep 17 00:00:00 2001
From: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Thu, 2 Jul 2020 14:00:03 +0200
Subject: [PATCH] Rename statusnotifier to systray

This will make the transition more seamless for users.
---
 configure.ac.in                               |  4 +--
 plugins/Makefile.am                           |  2 +-
 .../{statusnotifier => systray}/Makefile.am   | 25 ++++++++++---------
 .../{statusnotifier => systray}/sn-backend.c  |  0
 .../{statusnotifier => systray}/sn-backend.h  |  0
 plugins/{statusnotifier => systray}/sn-box.c  |  0
 plugins/{statusnotifier => systray}/sn-box.h  |  0
 .../{statusnotifier => systray}/sn-button.c   |  0
 .../{statusnotifier => systray}/sn-button.h   |  0
 .../{statusnotifier => systray}/sn-config.c   |  0
 .../{statusnotifier => systray}/sn-config.h   |  0
 .../{statusnotifier => systray}/sn-dialog.c   |  0
 .../sn-dialog.glade                           |  0
 .../{statusnotifier => systray}/sn-dialog.h   |  0
 .../{statusnotifier => systray}/sn-icon-box.c |  0
 .../{statusnotifier => systray}/sn-icon-box.h |  0
 plugins/{statusnotifier => systray}/sn-item.c |  0
 plugins/{statusnotifier => systray}/sn-item.h |  0
 .../{statusnotifier => systray}/sn-plugin.c   | 11 +++-----
 .../{statusnotifier => systray}/sn-plugin.h   |  1 -
 plugins/{statusnotifier => systray}/sn-util.c |  0
 plugins/{statusnotifier => systray}/sn-util.h |  0
 .../{statusnotifier => systray}/sn-watcher.c  |  0
 .../{statusnotifier => systray}/sn-watcher.h  |  0
 .../sn-watcher.xml                            |  0
 .../statusnotifier.py                         |  0
 .../{statusnotifier => systray}/systray-box.c |  0
 .../{statusnotifier => systray}/systray-box.h |  0
 .../systray-dialog.glade                      |  0
 .../systray-manager.c                         |  0
 .../systray-manager.h                         |  0
 .../systray-marshal.list                      |  0
 .../systray-socket.c                          |  0
 .../systray-socket.h                          |  0
 plugins/{statusnotifier => systray}/systray.c |  0
 .../systray.desktop.in.in}                    |  2 +-
 plugins/{statusnotifier => systray}/systray.h |  0
 po/POTFILES.in                                | 24 +++++++++---------
 po/POTFILES.skip                              |  4 +--
 39 files changed, 34 insertions(+), 39 deletions(-)
 rename plugins/{statusnotifier => systray}/Makefile.am (86%)
 rename plugins/{statusnotifier => systray}/sn-backend.c (100%)
 rename plugins/{statusnotifier => systray}/sn-backend.h (100%)
 rename plugins/{statusnotifier => systray}/sn-box.c (100%)
 rename plugins/{statusnotifier => systray}/sn-box.h (100%)
 rename plugins/{statusnotifier => systray}/sn-button.c (100%)
 rename plugins/{statusnotifier => systray}/sn-button.h (100%)
 rename plugins/{statusnotifier => systray}/sn-config.c (100%)
 rename plugins/{statusnotifier => systray}/sn-config.h (100%)
 rename plugins/{statusnotifier => systray}/sn-dialog.c (100%)
 rename plugins/{statusnotifier => systray}/sn-dialog.glade (100%)
 rename plugins/{statusnotifier => systray}/sn-dialog.h (100%)
 rename plugins/{statusnotifier => systray}/sn-icon-box.c (100%)
 rename plugins/{statusnotifier => systray}/sn-icon-box.h (100%)
 rename plugins/{statusnotifier => systray}/sn-item.c (100%)
 rename plugins/{statusnotifier => systray}/sn-item.h (100%)
 rename plugins/{statusnotifier => systray}/sn-plugin.c (98%)
 rename plugins/{statusnotifier => systray}/sn-plugin.h (98%)
 rename plugins/{statusnotifier => systray}/sn-util.c (100%)
 rename plugins/{statusnotifier => systray}/sn-util.h (100%)
 rename plugins/{statusnotifier => systray}/sn-watcher.c (100%)
 rename plugins/{statusnotifier => systray}/sn-watcher.h (100%)
 rename plugins/{statusnotifier => systray}/sn-watcher.xml (100%)
 rename plugins/{statusnotifier => systray}/statusnotifier.py (100%)
 rename plugins/{statusnotifier => systray}/systray-box.c (100%)
 rename plugins/{statusnotifier => systray}/systray-box.h (100%)
 rename plugins/{statusnotifier => systray}/systray-dialog.glade (100%)
 rename plugins/{statusnotifier => systray}/systray-manager.c (100%)
 rename plugins/{statusnotifier => systray}/systray-manager.h (100%)
 rename plugins/{statusnotifier => systray}/systray-marshal.list (100%)
 rename plugins/{statusnotifier => systray}/systray-socket.c (100%)
 rename plugins/{statusnotifier => systray}/systray-socket.h (100%)
 rename plugins/{statusnotifier => systray}/systray.c (100%)
 rename plugins/{statusnotifier/statusnotifier.desktop.in.in => systray/systray.desktop.in.in} (89%)
 rename plugins/{statusnotifier => systray}/systray.h (100%)

diff --git a/configure.ac.in b/configure.ac.in
index 4f744517c..a8b2fdcce 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -277,8 +277,8 @@ plugins/separator/Makefile
 plugins/separator/separator.desktop.in
 plugins/showdesktop/Makefile
 plugins/showdesktop/showdesktop.desktop.in
-plugins/statusnotifier/Makefile
-plugins/statusnotifier/statusnotifier.desktop.in
+plugins/systray/Makefile
+plugins/systray/systray.desktop.in
 plugins/tasklist/Makefile
 plugins/tasklist/tasklist.desktop.in
 plugins/windowmenu/Makefile
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index a833765ae..6a3844247 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -8,7 +8,7 @@ SUBDIRS = \
 	pager \
 	separator \
 	showdesktop \
-	statusnotifier \
+	systray \
 	tasklist \
 	windowmenu
 
diff --git a/plugins/statusnotifier/Makefile.am b/plugins/systray/Makefile.am
similarity index 86%
rename from plugins/statusnotifier/Makefile.am
rename to plugins/systray/Makefile.am
index ac6fb23b4..613555a8c 100644
--- a/plugins/statusnotifier/Makefile.am
+++ b/plugins/systray/Makefile.am
@@ -1,16 +1,17 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
-	-DG_LOG_DOMAIN=\"libstatusnotifier\" \
+	-DG_LOG_DOMAIN=\"libsystray\" \
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
 	$(PLATFORM_CPPFLAGS)
 
 plugindir = \
 	$(libdir)/xfce4/panel/plugins
 
+# Keep the legacy "systray" name to ease the migration for users
 plugin_LTLIBRARIES = \
-	libstatusnotifier.la
+	libsystray.la
 
-libstatusnotifier_built_sources = \
+libsystray_built_sources = \
 	sn-watcher.h \
 	sn-watcher.c \
 	sn-dialog-ui.h \
@@ -18,8 +19,8 @@ libstatusnotifier_built_sources = \
 	systray-marshal.c \
 	systray-marshal.h
 
-libstatusnotifier_la_SOURCES = \
-	$(libstatusnotifier_built_sources) \
+libsystray_la_SOURCES = \
+	$(libsystray_built_sources) \
 	sn-config.c \
 	sn-config.h \
 	sn-backend.c \
@@ -47,7 +48,7 @@ libstatusnotifier_la_SOURCES = \
 	systray-socket.c \
 	systray-socket.h
 
-libstatusnotifier_la_CFLAGS = \
+libsystray_la_CFLAGS = \
 	$(LIBX11_CFLAGS) \
 	$(GTK_CFLAGS) \
 	$(LIBXFCE4UTIL_CFLAGS) \
@@ -58,14 +59,14 @@ libstatusnotifier_la_CFLAGS = \
 	$(PLATFORM_CFLAGS) \
 	-DDATADIR=\""$(datadir)"\"
 
-libstatusnotifier_la_LDFLAGS = \
+libsystray_la_LDFLAGS = \
 	-avoid-version \
 	-module \
 	-no-undefined \
 	-export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' \
 	$(PLATFORM_LDFLAGS)
 
-libstatusnotifier_la_LIBADD = \
+libsystray_la_LIBADD = \
 	$(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
 	$(top_builddir)/common/libpanel-common.la \
 	$(LIBX11_LIBS) \
@@ -76,7 +77,7 @@ libstatusnotifier_la_LIBADD = \
 	$(XFCONF_LIBS) \
 	$(DBUSMENU_LIBS)
 
-libstatusnotifier_la_DEPENDENCIES = \
+libsystray_la_DEPENDENCIES = \
 	$(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
 	$(top_builddir)/common/libpanel-common.la
 
@@ -84,7 +85,7 @@ desktopdir = \
 	$(datadir)/xfce4/panel/plugins
 
 desktop_in_files = \
-	statusnotifier.desktop.in.in
+	systray.desktop.in.in
 
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 
@@ -121,10 +122,10 @@ systray-dialog_ui.h: systray-dialog.glade
 	$(AM_V_GEN) xdt-csource --static --strip-comments --strip-content --name=systray_dialog_ui $< >$@
 
 BUILT_SOURCES = \
-	$(libstatusnotifier_built_sources)
+	$(libsystray_built_sources)
 
 DISTCLEANFILES += \
-	$(libstatusnotifier_built_sources)
+	$(libsystray_built_sources)
 
 endif
 
diff --git a/plugins/statusnotifier/sn-backend.c b/plugins/systray/sn-backend.c
similarity index 100%
rename from plugins/statusnotifier/sn-backend.c
rename to plugins/systray/sn-backend.c
diff --git a/plugins/statusnotifier/sn-backend.h b/plugins/systray/sn-backend.h
similarity index 100%
rename from plugins/statusnotifier/sn-backend.h
rename to plugins/systray/sn-backend.h
diff --git a/plugins/statusnotifier/sn-box.c b/plugins/systray/sn-box.c
similarity index 100%
rename from plugins/statusnotifier/sn-box.c
rename to plugins/systray/sn-box.c
diff --git a/plugins/statusnotifier/sn-box.h b/plugins/systray/sn-box.h
similarity index 100%
rename from plugins/statusnotifier/sn-box.h
rename to plugins/systray/sn-box.h
diff --git a/plugins/statusnotifier/sn-button.c b/plugins/systray/sn-button.c
similarity index 100%
rename from plugins/statusnotifier/sn-button.c
rename to plugins/systray/sn-button.c
diff --git a/plugins/statusnotifier/sn-button.h b/plugins/systray/sn-button.h
similarity index 100%
rename from plugins/statusnotifier/sn-button.h
rename to plugins/systray/sn-button.h
diff --git a/plugins/statusnotifier/sn-config.c b/plugins/systray/sn-config.c
similarity index 100%
rename from plugins/statusnotifier/sn-config.c
rename to plugins/systray/sn-config.c
diff --git a/plugins/statusnotifier/sn-config.h b/plugins/systray/sn-config.h
similarity index 100%
rename from plugins/statusnotifier/sn-config.h
rename to plugins/systray/sn-config.h
diff --git a/plugins/statusnotifier/sn-dialog.c b/plugins/systray/sn-dialog.c
similarity index 100%
rename from plugins/statusnotifier/sn-dialog.c
rename to plugins/systray/sn-dialog.c
diff --git a/plugins/statusnotifier/sn-dialog.glade b/plugins/systray/sn-dialog.glade
similarity index 100%
rename from plugins/statusnotifier/sn-dialog.glade
rename to plugins/systray/sn-dialog.glade
diff --git a/plugins/statusnotifier/sn-dialog.h b/plugins/systray/sn-dialog.h
similarity index 100%
rename from plugins/statusnotifier/sn-dialog.h
rename to plugins/systray/sn-dialog.h
diff --git a/plugins/statusnotifier/sn-icon-box.c b/plugins/systray/sn-icon-box.c
similarity index 100%
rename from plugins/statusnotifier/sn-icon-box.c
rename to plugins/systray/sn-icon-box.c
diff --git a/plugins/statusnotifier/sn-icon-box.h b/plugins/systray/sn-icon-box.h
similarity index 100%
rename from plugins/statusnotifier/sn-icon-box.h
rename to plugins/systray/sn-icon-box.h
diff --git a/plugins/statusnotifier/sn-item.c b/plugins/systray/sn-item.c
similarity index 100%
rename from plugins/statusnotifier/sn-item.c
rename to plugins/systray/sn-item.c
diff --git a/plugins/statusnotifier/sn-item.h b/plugins/systray/sn-item.h
similarity index 100%
rename from plugins/statusnotifier/sn-item.h
rename to plugins/systray/sn-item.h
diff --git a/plugins/statusnotifier/sn-plugin.c b/plugins/systray/sn-plugin.c
similarity index 98%
rename from plugins/statusnotifier/sn-plugin.c
rename to plugins/systray/sn-plugin.c
index dc65e6889..9c72d0fda 100644
--- a/plugins/statusnotifier/sn-plugin.c
+++ b/plugins/systray/sn-plugin.c
@@ -200,19 +200,17 @@ sn_plugin_configure_plugin (XfcePanelPlugin *panel_plugin)
 static void
 sn_plugin_show_about (XfcePanelPlugin *panel_plugin)
 {
-  GdkPixbuf *icon;
-
   const gchar *auth[] =
     {
       "Viktor Odintsev <ninetls@xfce.org>",
       "Andrzej Radecki <andrzejr@xfce.org>",
+      "Simon Steinbeiß <simon@xfce.org>",
+      "Sean Davis <bluesabre@xfce.org>",
       NULL
     };
 
-  icon = xfce_panel_pixbuf_from_source ("xfce4-statusnotifier-plugin", NULL, 32);
-
   gtk_show_about_dialog (NULL,
-                         "logo", icon,
+                         "logo-icon-name", "org.xfce.panel.statustray",
                          "license", xfce_get_license_text (XFCE_LICENSE_TEXT_GPL),
                          "version", PACKAGE_VERSION,
                          "program-name", PACKAGE_NAME,
@@ -220,9 +218,6 @@ sn_plugin_show_about (XfcePanelPlugin *panel_plugin)
                          "website", "https://docs.xfce.org/panel-plugins/xfce4-statusnotifier-plugin",
                          "authors", auth,
                          NULL);
-
-  if (icon)
-    g_object_unref (icon);
 }
 
 
diff --git a/plugins/statusnotifier/sn-plugin.h b/plugins/systray/sn-plugin.h
similarity index 98%
rename from plugins/statusnotifier/sn-plugin.h
rename to plugins/systray/sn-plugin.h
index 2335d2b49..1fef21e63 100644
--- a/plugins/statusnotifier/sn-plugin.h
+++ b/plugins/systray/sn-plugin.h
@@ -24,7 +24,6 @@
 
 #include "systray.h"
 #include "systray-manager.h"
-#include "systray-dialog_ui.h"
 
 #include "sn-backend.h"
 #include "sn-config.h"
diff --git a/plugins/statusnotifier/sn-util.c b/plugins/systray/sn-util.c
similarity index 100%
rename from plugins/statusnotifier/sn-util.c
rename to plugins/systray/sn-util.c
diff --git a/plugins/statusnotifier/sn-util.h b/plugins/systray/sn-util.h
similarity index 100%
rename from plugins/statusnotifier/sn-util.h
rename to plugins/systray/sn-util.h
diff --git a/plugins/statusnotifier/sn-watcher.c b/plugins/systray/sn-watcher.c
similarity index 100%
rename from plugins/statusnotifier/sn-watcher.c
rename to plugins/systray/sn-watcher.c
diff --git a/plugins/statusnotifier/sn-watcher.h b/plugins/systray/sn-watcher.h
similarity index 100%
rename from plugins/statusnotifier/sn-watcher.h
rename to plugins/systray/sn-watcher.h
diff --git a/plugins/statusnotifier/sn-watcher.xml b/plugins/systray/sn-watcher.xml
similarity index 100%
rename from plugins/statusnotifier/sn-watcher.xml
rename to plugins/systray/sn-watcher.xml
diff --git a/plugins/statusnotifier/statusnotifier.py b/plugins/systray/statusnotifier.py
similarity index 100%
rename from plugins/statusnotifier/statusnotifier.py
rename to plugins/systray/statusnotifier.py
diff --git a/plugins/statusnotifier/systray-box.c b/plugins/systray/systray-box.c
similarity index 100%
rename from plugins/statusnotifier/systray-box.c
rename to plugins/systray/systray-box.c
diff --git a/plugins/statusnotifier/systray-box.h b/plugins/systray/systray-box.h
similarity index 100%
rename from plugins/statusnotifier/systray-box.h
rename to plugins/systray/systray-box.h
diff --git a/plugins/statusnotifier/systray-dialog.glade b/plugins/systray/systray-dialog.glade
similarity index 100%
rename from plugins/statusnotifier/systray-dialog.glade
rename to plugins/systray/systray-dialog.glade
diff --git a/plugins/statusnotifier/systray-manager.c b/plugins/systray/systray-manager.c
similarity index 100%
rename from plugins/statusnotifier/systray-manager.c
rename to plugins/systray/systray-manager.c
diff --git a/plugins/statusnotifier/systray-manager.h b/plugins/systray/systray-manager.h
similarity index 100%
rename from plugins/statusnotifier/systray-manager.h
rename to plugins/systray/systray-manager.h
diff --git a/plugins/statusnotifier/systray-marshal.list b/plugins/systray/systray-marshal.list
similarity index 100%
rename from plugins/statusnotifier/systray-marshal.list
rename to plugins/systray/systray-marshal.list
diff --git a/plugins/statusnotifier/systray-socket.c b/plugins/systray/systray-socket.c
similarity index 100%
rename from plugins/statusnotifier/systray-socket.c
rename to plugins/systray/systray-socket.c
diff --git a/plugins/statusnotifier/systray-socket.h b/plugins/systray/systray-socket.h
similarity index 100%
rename from plugins/statusnotifier/systray-socket.h
rename to plugins/systray/systray-socket.h
diff --git a/plugins/statusnotifier/systray.c b/plugins/systray/systray.c
similarity index 100%
rename from plugins/statusnotifier/systray.c
rename to plugins/systray/systray.c
diff --git a/plugins/statusnotifier/statusnotifier.desktop.in.in b/plugins/systray/systray.desktop.in.in
similarity index 89%
rename from plugins/statusnotifier/statusnotifier.desktop.in.in
rename to plugins/systray/systray.desktop.in.in
index fc9236a4e..c3bfd8baf 100644
--- a/plugins/statusnotifier/statusnotifier.desktop.in.in
+++ b/plugins/systray/systray.desktop.in.in
@@ -4,7 +4,7 @@ Encoding=UTF-8
 _Name=Status Tray Plugin
 _Comment=Provides status notifier items (application indicators) and legacy systray items
 Icon=org.xfce.panel.statustray
-X-XFCE-Module=statusnotifier
+X-XFCE-Module=systray
 X-XFCE-Unique=FALSE
 X-XFCE-Internal=FALSE
 X-XFCE-API=2.0
diff --git a/plugins/statusnotifier/systray.h b/plugins/systray/systray.h
similarity index 100%
rename from plugins/statusnotifier/systray.h
rename to plugins/systray/systray.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 474256929..2a5aab719 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -73,18 +73,18 @@ plugins/separator/separator.desktop.in.in
 plugins/showdesktop/showdesktop.c
 plugins/showdesktop/showdesktop.desktop.in.in
 
-plugins/statusnotifier/sn-box.c
-plugins/statusnotifier/sn-button.c
-plugins/statusnotifier/sn-config.c
-plugins/statusnotifier/sn-dialog.c
-plugins/statusnotifier/sn-dialog.glade
-plugins/statusnotifier/sn-plugin.c
-plugins/statusnotifier/statusnotifier.desktop.in.in
-plugins/statusnotifier/systray.c
-plugins/statusnotifier/systray-box.c
-plugins/statusnotifier/systray-manager.c
-plugins/statusnotifier/systray-marshal.list
-plugins/statusnotifier/systray-socket.c
+plugins/systray/sn-box.c
+plugins/systray/sn-button.c
+plugins/systray/sn-config.c
+plugins/systray/sn-dialog.c
+plugins/systray/sn-dialog.glade
+plugins/systray/sn-plugin.c
+plugins/systray/systray.desktop.in.in
+plugins/systray/systray.c
+plugins/systray/systray-box.c
+plugins/systray/systray-manager.c
+plugins/systray/systray-marshal.list
+plugins/systray/systray-socket.c
 
 plugins/tasklist/tasklist.c
 plugins/tasklist/tasklist-dialog.glade
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 72ff5f868..07e812e46 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -17,7 +17,7 @@ plugins/launcher/launcher.desktop.in
 plugins/pager/pager.desktop.in
 plugins/separator/separator.desktop.in
 plugins/showdesktop/showdesktop.desktop.in
-plugins/statusnotifier/statusnotifier.desktop.in
+plugins/systray/systray.desktop.in
 plugins/tasklist/tasklist.desktop.in
 plugins/windowmenu/windowmenu.desktop.in
 
@@ -40,7 +40,7 @@ sub/plugins/launcher/launcher.desktop.in
 sub/plugins/pager/pager.desktop.in
 sub/plugins/separator/separator.desktop.in
 sub/plugins/showdesktop/showdesktop.desktop.in
-sub/plugins/statusnotifier/statusnotifier.desktop.in
+sub/plugins/systray/systray.desktop.in
 sub/plugins/systray/systray.desktop.in
 sub/plugins/tasklist/tasklist.desktop.in
 sub/plugins/windowmenu/windowmenu.desktop.in
-- 
GitLab