Merge lp:~muktupavels/indicator-applet/port-to-libgnome-panel into lp:indicator-applet

[Alberts Muktupāvels]

Port applet to libgnome-panel library.

[lp:~muktupavels/indicator-applet/port-to-libgnome-panel]

443. By Alberts Muktupāvels on 2020-03-22

Port applet to libgnome-panel library.

=== modified file 'configure.ac'
--- configure.ac	2020-03-21 22:10:27 +0000
+++ configure.ac	2020-03-22 12:39:21 +0000
@@ -3,7 +3,7 @@
 AC_INIT([indicator-applet], [12.10.1])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_SRCDIR([src/applet-main.c])
+AC_CONFIG_SRCDIR([src/indicator-applet.c])
 
 AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE
@@ -24,13 +24,14 @@
 
 GTK_REQUIRED_VERSION=3.1
 INDICATOR_REQUIRED_VERSION=0.3.92
-APPLET_PKG=libpanel-applet
+LIBGNOME_PANEL_REQUIRED=3.36.0
+APPLET_PKG=libgnome-panel
 INDICATOR_PKG=indicator3-0.4
 
 PKG_CHECK_MODULES(APPLET, gtk+-3.0 >= $GTK_REQUIRED_VERSION
                           x11
                           libido3-0.1
-                          $APPLET_PKG
+                          $APPLET_PKG >= $LIBGNOME_PANEL_REQUIRED
                           $INDICATOR_PKG >= $INDICATOR_REQUIRED_VERSION)
 AC_SUBST(APPLET_CFLAGS)
 AC_SUBST(APPLET_LIBS)
@@ -47,16 +48,16 @@
 ###########################
 
 if test "x$with_localinstall" = "xyes"; then
-	APPLETDIR="${datadir}/gnome-panel/applets/"
+	MODULESDIR="${libdir}/gnome-panel/modules/"
 	INDICATORDIR="${libdir}/indicators/2/"
 	INDICATORICONSDIR="${datadir}/indicator-applet/icons/"
 else
-	APPLETDIR=`$PKG_CONFIG --variable=libpanel_applet_dir $APPLET_PKG`
+	MODULESDIR=`$PKG_CONFIG --variable=modulesdir $APPLET_PKG`
 	INDICATORDIR=`$PKG_CONFIG --variable=indicatordir $INDICATOR_PKG`
 	INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir $INDICATOR_PKG`
 fi
 
-AC_SUBST(APPLETDIR)
+AC_SUBST(MODULESDIR)
 AC_SUBST(INDICATORDIR)
 AC_SUBST(INDICATORICONSDIR)
 

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2016-11-13 21:35:44 +0000
+++ data/Makefile.am	2020-03-22 12:39:21 +0000
@@ -1,26 +1,6 @@
 # This file will be processed with automake to create Makefile.in
 
 ##############################
-# Applets
-##############################
-
-appletdir       = $(APPLETDIR)
-applet_in_files = \
-	org.ayatana.panel.IndicatorApplet.panel-applet.in \
-	org.ayatana.panel.IndicatorAppletComplete.panel-applet.in \
-	org.ayatana.panel.IndicatorAppletAppmenu.panel-applet.in \
-	org.ayatana.panel.FastUserSwitchApplet.panel-applet.in
-applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
-
-%.panel-applet.in: %.panel-applet.in.in Makefile
-	$(AM_V_GEN)sed \
-	    -e "s|\@PKGLIBDIR\@|$(pkglibdir)|" \
-	    $< > $@
-
-%.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-
-##############################
 # Icons
 ##############################
 
@@ -46,16 +26,8 @@
 # Autojunk
 ##############################
 
-CLEANFILES =					\
-	$(applet_in_files)			\
-	$(applet_DATA)				\
-	*.bak
-
 EXTRA_DIST =					\
-	$(icons_DATA)				\
-	$(applet_in_files:.in=.in.in)
+	$(icons_DATA)
 
 MAINTAINERCLEANFILES =				\
 	Makefile.in
-
-

=== removed file 'data/org.ayatana.panel.FastUserSwitchApplet.panel-applet.in.in'
=== removed file 'data/org.ayatana.panel.IndicatorApplet.panel-applet.in.in'
=== removed file 'data/org.ayatana.panel.IndicatorAppletAppmenu.panel-applet.in.in'
=== removed file 'data/org.ayatana.panel.IndicatorAppletComplete.panel-applet.in.in'
=== modified file 'debian/control'
--- debian/control	2020-03-21 23:50:41 +0000
+++ debian/control	2020-03-22 12:39:21 +0000
@@ -7,8 +7,8 @@
                dh-autoreconf,
                libtool,
                intltool,
+               libgnome-panel-dev,
                libgtk-3-dev,
-               libpanel-applet-dev,
                libxml2-dev,
                libindicator3-dev,
                libido3-0.1-dev (>= 13.10.0),
@@ -26,9 +26,16 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          python3-xdg,
-Recommends: indicator-messages,
+Recommends: indicator-application,
+            indicator-appmenu,
+            indicator-bluetooth,
+            indicator-datetime,
+            indicator-keyboard,
+            indicator-messages,
+            indicator-power,
+            indicator-printers,
+            indicator-session,
             indicator-sound,
-            indicator-application,
 Provides: indicator-renderer,
 Description: GNOME panel indicator applet
  indicator-applet is an applet to display information from
@@ -39,47 +46,24 @@
 
 Package: indicator-applet-session
 Architecture: any
-Depends: ${shlibs:Depends},
+Depends: indicator-applet,
          ${misc:Depends},
-         indicator-applet (= ${binary:Version}),
-Recommends: indicator-session,
-Description: Clone of the GNOME panel indicator applet
- Indicator-applet is an applet to display information from
- various applications consistently in the GNOME panel.
- .
- This instance will only load the session menu which provides
- status changing, user choosing and session management.
+Section: oldlibs
+Description: transitional package
+ This is a transitional package. It can safely be removed.
 
 Package: indicator-applet-complete
 Architecture: any
-Depends: ${shlibs:Depends},
+Depends: indicator-applet,
          ${misc:Depends},
-Recommends: indicator-application,
-         indicator-bluetooth,
-         indicator-datetime,
-         indicator-keyboard,
-         indicator-messages,
-         indicator-power,
-         indicator-printers,
-         indicator-session,
-         indicator-sound,
-Provides: indicator-renderer,
-Description: Clone of the GNOME panel indicator applet
- Indicator-applet is an applet to display information from
- various applications consistently in the GNOME panel.
- .
- This instance will load all indicators in a single panel
- applet.
+Section: oldlibs
+Description: transitional package
+ This is a transitional package. It can safely be removed.
 
 Package: indicator-applet-appmenu
 Architecture: any
-Depends: ${shlibs:Depends},
+Depends: indicator-applet,
          ${misc:Depends},
-Recommends: indicator-appmenu,
-Provides: indicator-renderer,
-Description: Clone of the GNOME panel indicator applet
- Indicator-applet is an applet to display information from
- various applications consistently in the GNOME panel.
- .
- This instance will load the appmenu indicator.
-
+Section: oldlibs
+Description: transitional package
+ This is a transitional package. It can safely be removed.

=== removed file 'debian/indicator-applet-appmenu.install'
=== removed file 'debian/indicator-applet-complete.install'
=== removed file 'debian/indicator-applet-session.install'
=== modified file 'debian/indicator-applet.install'
--- debian/indicator-applet.install	2016-12-02 11:33:34 +0000
+++ debian/indicator-applet.install	2020-03-22 12:39:21 +0000
@@ -1,5 +1,4 @@
-usr/lib/*/indicator-applet/libindicator-applet.so
-usr/share/gnome-panel/applets/org.ayatana.panel.IndicatorApplet.panel-applet
+usr/lib/gnome-panel/modules/org.ayatana.indicator-applet.so
 usr/share/icons
 usr/share/locale
 debian/indicator-applet-crashdb.conf /etc/apport/crashdb.conf.d/

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2010-11-10 18:28:18 +0000
+++ po/POTFILES.in	2020-03-22 12:39:21 +0000
@@ -1,6 +1,6 @@
 [encoding: UTF-8]
-[type: gettext/keys]data/org.ayatana.panel.IndicatorApplet.panel-applet.in.in
-[type: gettext/keys]data/org.ayatana.panel.IndicatorAppletComplete.panel-applet.in.in
-[type: gettext/keys]data/org.ayatana.panel.IndicatorAppletAppmenu.panel-applet.in.in
-[type: gettext/keys]data/org.ayatana.panel.FastUserSwitchApplet.panel-applet.in.in
-src/applet-main.c
+src/indicator-applet.c
+src/indicator-applet-appmenu.c
+src/indicator-applet-complete.c
+src/indicator-applet-session.c
+src/indicator-module.c

=== modified file 'po/POTFILES.skip'
--- po/POTFILES.skip	2010-11-10 18:28:18 +0000
+++ po/POTFILES.skip	2020-03-22 12:39:21 +0000
@@ -1,4 +0,0 @@
-data/org.ayatana.panel.IndicatorApplet.panel-applet.in
-data/org.ayatana.panel.IndicatorAppletComplete.panel-applet.in
-data/org.ayatana.panel.IndicatorAppletAppmenu.panel-applet.in
-data/org.ayatana.panel.FastUserSwitchApplet.panel-applet.in

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2020-03-21 22:10:27 +0000
+++ src/Makefile.am	2020-03-22 12:39:21 +0000
@@ -1,47 +1,44 @@
-indicator_applet_libdir = ${pkglibdir}
-indicator_applet_lib_LTLIBRARIES = \
-	libindicator-applet.la \
-	libindicator-applet-appmenu.la \
-	libindicator-applet-session.la \
-	libindicator-applet-complete.la
-
-APPLET_SOURCES = \
-	applet-main.c \
+NULL =
+
+org_ayatana_indicator_applet_libdir = $(MODULESDIR)
+org_ayatana_indicator_applet_lib_LTLIBRARIES = org.ayatana.indicator-applet.la
+
+org_ayatana_indicator_applet_la_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\""indicator-applet"\" \
+	-DG_LOG_USE_STRUCTURED=1 \
+	-DGDK_DISABLE_DEPRECATED \
+	-DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
+	-DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
+	-DLOCALE_DIR=\"$(localedir)\" \
+	$(AM_CPPFLAGS) \
+	$(NULL)
+
+org_ayatana_indicator_applet_la_CFLAGS = \
+	$(APPLET_CFLAGS) \
+	$(AM_CFLAGS) \
+	$(NULL)
+
+org_ayatana_indicator_applet_la_SOURCES = \
 	eggaccelerators.c \
 	eggaccelerators.h \
+	indicator-applet.c \
+	indicator-applet.h \
+	indicator-applet-appmenu.c \
+	indicator-applet-appmenu.h \
+	indicator-applet-complete.c \
+	indicator-applet-complete.h \
+	indicator-applet-session.c \
+	indicator-applet-session.h \
+	indicator-module.c \
 	tomboykeybinder.c \
-	tomboykeybinder.h
-
-APPLET_CPPFLAGS = \
-	-DGNOMELOCALEDIR=\""$(localedir)"\" \
-	-DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
-	-DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
-	-DGDK_DISABLE_DEPRECATED \
-	-I$(srcdir)/..
-
-AM_CFLAGS = $(APPLET_CFLAGS)
-AM_LDFLAGS = -module -avoid-version
-
-libindicator_applet_la_SOURCES = $(APPLET_SOURCES)
-libindicator_applet_la_CPPFLAGS = $(APPLET_CPPFLAGS) \
-	-DG_LOG_DOMAIN=\""Indicator-Applet"\" \
-	-DINDICATOR_APPLET
-libindicator_applet_la_LIBADD = $(APPLET_LIBS)
-
-libindicator_applet_appmenu_la_SOURCES = $(APPLET_SOURCES)
-libindicator_applet_appmenu_la_CPPFLAGS = $(APPLET_CPPFLAGS) \
-	-DG_LOG_DOMAIN=\""Indicator-Applet-Appmenu"\" \
-	-DINDICATOR_APPLET_APPMENU
-libindicator_applet_appmenu_la_LIBADD = $(APPLET_LIBS)
-
-libindicator_applet_session_la_SOURCES = $(APPLET_SOURCES)
-libindicator_applet_session_la_CPPFLAGS = $(APPLET_CPPFLAGS) \
-	-DG_LOG_DOMAIN=\""Indicator-Applet-Session"\" \
-	-DINDICATOR_APPLET_SESSION
-libindicator_applet_session_la_LIBADD = $(APPLET_LIBS)
-
-libindicator_applet_complete_la_SOURCES = $(APPLET_SOURCES)
-libindicator_applet_complete_la_CPPFLAGS = $(APPLET_CPPFLAGS) \
-	-DG_LOG_DOMAIN=\""Indicator-Applet-Complete"\" \
-	-DINDICATOR_APPLET_COMPLETE
-libindicator_applet_complete_la_LIBADD = $(APPLET_LIBS)
+	tomboykeybinder.h \
+	$(NULL)
+
+org_ayatana_indicator_applet_la_LIBADD = \
+	$(APPLET_LIBS) \
+	$(NULL)
+
+org_ayatana_indicator_applet_la_LDFLAGS = \
+	-module -avoid-version \
+	$(AM_LDFLAGS) \
+	$(NULL)

=== added file 'src/indicator-applet-appmenu.c'
--- src/indicator-applet-appmenu.c	1970-01-01 00:00:00 +0000
+++ src/indicator-applet-appmenu.c	2020-03-22 12:39:21 +0000
@@ -0,0 +1,90 @@
+/*
+ * 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 3 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/>.
+ */
+
+#include "config.h"
+#include "indicator-applet-appmenu.h"
+
+#include <glib/gi18n-lib.h>
+
+struct _IndicatorAppletAppmenu
+{
+  IndicatorApplet parent;
+};
+
+G_DEFINE_TYPE (IndicatorAppletAppmenu,
+               indicator_applet_appmenu,
+               INDICATOR_TYPE_APPLET)
+
+static const char *
+indicator_applet_appmenu_get_name (void)
+{
+  return _("Indicator Applet Application Menu");
+}
+
+static const char *
+indicator_applet_appmenu_get_description (void)
+{
+  return _("An applet to hold your application menus.");
+}
+
+static const char *
+indicator_applet_appmenu_get_indicator_env (void)
+{
+  return "indicator-applet-appmenu";
+}
+
+static gboolean
+indicator_applet_appmenu_load_module (const char *name)
+{
+  return g_strcmp0 (name, "libappmenu.so") == 0;
+}
+
+static gboolean
+indicator_applet_appmenu_load_indicator (const char *name)
+{
+  return g_strcmp0 (name, "com.canonical.indicator.appmenu") == 0;
+}
+
+static const char *
+indicator_applet_appmenu_get_hotkey_keycode (void)
+{
+  return "<Super>F1";
+}
+
+static void
+indicator_applet_appmenu_class_init (IndicatorAppletAppmenuClass *self_class)
+{
+  IndicatorAppletClass *applet_class;
+
+  applet_class = INDICATOR_APPLET_CLASS (self_class);
+
+  applet_class->get_name = indicator_applet_appmenu_get_name;
+  applet_class->get_description = indicator_applet_appmenu_get_description;
+  applet_class->get_indicator_env = indicator_applet_appmenu_get_indicator_env;
+  applet_class->load_module = indicator_applet_appmenu_load_module;
+  applet_class->load_indicator = indicator_applet_appmenu_load_indicator;
+  applet_class->get_hotkey_keycode = indicator_applet_appmenu_get_hotkey_keycode;
+}
+
+static void
+indicator_applet_appmenu_init (IndicatorAppletAppmenu *self)
+{
+  AtkObject *atk_object;
+
+  atk_object = gtk_widget_get_accessible (GTK_WIDGET (self));
+  atk_object_set_name (atk_object, "indicator-applet-appmenu");
+}

=== added file 'src/indicator-applet-appmenu.h'
--- src/indicator-applet-appmenu.h	1970-01-01 00:00:00 +0000
+++ src/indicator-applet-appmenu.h	2020-03-22 12:39:21 +0000
@@ -0,0 +1,31 @@
+/*
+ * 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 3 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 INDICATOR_APPLET_APPMENU_H
+#define INDICATOR_APPLET_APPMENU_H
+
+#include "indicator-applet.h"
+
+G_BEGIN_DECLS
+
+#define INDICATOR_TYPE_APPLET_APPMENU (indicator_applet_appmenu_get_type ())
+G_DECLARE_FINAL_TYPE (IndicatorAppletAppmenu, indicator_applet_appmenu,
+                      INDICATOR, APPLET_APPMENU, IndicatorApplet)
+
+G_END_DECLS
+
+#endif

=== added file 'src/indicator-applet-complete.c'
--- src/indicator-applet-complete.c	1970-01-01 00:00:00 +0000
+++ src/indicator-applet-complete.c	2020-03-22 12:39:21 +0000
@@ -0,0 +1,96 @@
+/*
+ * 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 3 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/>.
+ */
+
+#include "config.h"
+#include "indicator-applet-complete.h"
+
+#include <glib/gi18n-lib.h>
+
+struct _IndicatorAppletComplete
+{
+  IndicatorApplet parent;
+};
+
+G_DEFINE_TYPE (IndicatorAppletComplete,
+               indicator_applet_complete,
+               INDICATOR_TYPE_APPLET)
+
+static const char *
+indicator_applet_complete_get_name (void)
+{
+  return _("Indicator Applet Complete");
+}
+
+static const char *
+indicator_applet_complete_get_description (void)
+{
+  return _("An applet to hold all of the system indicators.");
+}
+
+static const char *
+indicator_applet_complete_get_indicator_env (void)
+{
+  return "indicator-applet-complete";
+}
+
+static gboolean
+indicator_applet_complete_load_module (const char *name)
+{
+  if (g_strcmp0 (name, "libappmenu.so") == 0)
+    return FALSE;
+
+  return TRUE;
+}
+
+static gboolean
+indicator_applet_complete_load_indicator (const char *name)
+{
+  if (g_strcmp0 (name, "com.canonical.indicator.appmenu") == 0)
+    return FALSE;
+
+  return TRUE;
+}
+
+static const char *
+indicator_applet_complete_get_hotkey_keycode (void)
+{
+  return "<Super>S";
+}
+
+static void
+indicator_applet_complete_class_init (IndicatorAppletCompleteClass *self_class)
+{
+  IndicatorAppletClass *applet_class;
+
+  applet_class = INDICATOR_APPLET_CLASS (self_class);
+
+  applet_class->get_name = indicator_applet_complete_get_name;
+  applet_class->get_description = indicator_applet_complete_get_description;
+  applet_class->get_indicator_env = indicator_applet_complete_get_indicator_env;
+  applet_class->load_module = indicator_applet_complete_load_module;
+  applet_class->load_indicator = indicator_applet_complete_load_indicator;
+  applet_class->get_hotkey_keycode = indicator_applet_complete_get_hotkey_keycode;
+}
+
+static void
+indicator_applet_complete_init (IndicatorAppletComplete *self)
+{
+  AtkObject *atk_object;
+
+  atk_object = gtk_widget_get_accessible (GTK_WIDGET (self));
+  atk_object_set_name (atk_object, "indicator-applet-complete");
+}

=== added file 'src/indicator-applet-complete.h'
--- src/indicator-applet-complete.h	1970-01-01 00:00:00 +0000
+++ src/indicator-applet-complete.h	2020-03-22 12:39:21 +0000
@@ -0,0 +1,31 @@
+/*
+ * 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 3 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 INDICATOR_APPLET_COMPLETE_H
+#define INDICATOR_APPLET_COMPLETE_H
+
+#include "indicator-applet.h"
+
+G_BEGIN_DECLS
+
+#define INDICATOR_TYPE_APPLET_COMPLETE (indicator_applet_complete_get_type ())
+G_DECLARE_FINAL_TYPE (IndicatorAppletComplete, indicator_applet_complete,
+                      INDICATOR, APPLET_COMPLETE, IndicatorApplet)
+
+G_END_DECLS
+
+#endif

=== added file 'src/indicator-applet-session.c'
--- src/indicator-applet-session.c	1970-01-01 00:00:00 +0000
+++ src/indicator-applet-session.c	2020-03-22 12:39:21 +0000
@@ -0,0 +1,93 @@
+/*
+ * 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 3 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/>.
+ */
+
+#include "config.h"
+#include "indicator-applet-session.h"
+
+#include <glib/gi18n-lib.h>
+
+struct _IndicatorAppletSession
+{
+  IndicatorApplet parent;
+};
+
+G_DEFINE_TYPE (IndicatorAppletSession,
+               indicator_applet_session,
+               INDICATOR_TYPE_APPLET)
+
+static const char *
+indicator_applet_session_get_name (void)
+{
+  return _("Indicator Applet Session");
+}
+
+static const char *
+indicator_applet_session_get_description (void)
+{
+  return _("A place to adjust your status, change users or exit your session.");
+}
+
+static const char *
+indicator_applet_session_get_indicator_env (void)
+{
+  return "indicator-applet-session";
+}
+
+static gboolean
+indicator_applet_session_load_module (const char *name)
+{
+  return g_strcmp0 (name, "libsession.so") == 0 ||
+         g_strcmp0 (name, "libme.so") == 0;
+}
+
+static gboolean
+indicator_applet_session_load_indicator (const char *name)
+{
+  return g_strcmp0 (name, "com.canonical.indicator.session") == 0 ||
+         g_strcmp0 (name, "com.canonical.indicator.me") == 0;
+}
+
+static const char *
+indicator_applet_session_get_hotkey_keycode (void)
+{
+  return "<Super>S";
+}
+
+static void
+indicator_applet_session_class_init (IndicatorAppletSessionClass *self_class)
+{
+  IndicatorAppletClass *applet_class;
+
+  applet_class = INDICATOR_APPLET_CLASS (self_class);
+
+  applet_class->get_name = indicator_applet_session_get_name;
+  applet_class->get_description = indicator_applet_session_get_description;
+  applet_class->get_indicator_env = indicator_applet_session_get_indicator_env;
+  applet_class->load_module = indicator_applet_session_load_module;
+  applet_class->load_indicator = indicator_applet_session_load_indicator;
+
+  applet_class->get_hotkey_keycode = indicator_applet_session_get_hotkey_keycode;
+}
+
+static void
+indicator_applet_session_init (IndicatorAppletSession *self)
+{
+  AtkObject *atk_object;
+
+  atk_object = gtk_widget_get_accessible (GTK_WIDGET (self));
+  atk_object_set_name (atk_object, "indicator-applet-session");
+}

=== added file 'src/indicator-applet-session.h'
--- src/indicator-applet-session.h	1970-01-01 00:00:00 +0000
+++ src/indicator-applet-session.h	2020-03-22 12:39:21 +0000
@@ -0,0 +1,31 @@
+/*
+ * 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 3 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 INDICATOR_APPLET_SESSION_H
+#define INDICATOR_APPLET_SESSION_H
+
+#include "indicator-applet.h"
+
+G_BEGIN_DECLS
+
+#define INDICATOR_TYPE_APPLET_SESSION (indicator_applet_session_get_type ())
+G_DECLARE_FINAL_TYPE (IndicatorAppletSession, indicator_applet_session,
+                      INDICATOR, APPLET_SESSION, IndicatorApplet)
+
+G_END_DECLS
+
+#endif

=== renamed file 'src/applet-main.c' => 'src/indicator-applet.c'
--- src/applet-main.c	2020-03-21 13:45:56 +0000
+++ src/indicator-applet.c	2020-03-22 12:39:21 +0000
@@ -20,11 +20,13 @@
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "config.h"
+#include "indicator-applet.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <config.h>
 #include <glib/gi18n.h>
-#include <panel-applet.h>
 #include <gdk/gdkkeysyms.h>
 
 #include <libido/libido.h>
@@ -46,9 +48,6 @@
   {NULL, NULL}
 };
 
-static GtkPackDirection packdirection;
-static PanelAppletOrient orient;
-
 #define  MENU_DATA_BOX               "box"
 #define  MENU_DATA_INDICATOR_OBJECT  "indicator-object"
 #define  MENU_DATA_INDICATOR_ENTRY   "indicator-entry"
@@ -59,89 +58,14 @@
 #define  IO_DATA_ORDER_NUMBER        "indicator-order-number"
 #define  IO_DATA_MENUITEM_LOOKUP     "indicator-menuitem-lookup"
 
-static gboolean applet_fill_cb (PanelApplet * applet, const gchar * iid, gpointer data);
-
 static void update_accessible_desc (IndicatorObjectEntry * entry, GtkWidget * menuitem);
 
-/*************
- * main
- * ***********/
-
-#ifdef INDICATOR_APPLET
-PANEL_APPLET_IN_PROCESS_FACTORY ("IndicatorAppletFactory",
-               PANEL_TYPE_APPLET,
-               applet_fill_cb, NULL);
-#endif
-#ifdef INDICATOR_APPLET_SESSION
-PANEL_APPLET_IN_PROCESS_FACTORY ("FastUserSwitchAppletFactory",
-               PANEL_TYPE_APPLET,
-               applet_fill_cb, NULL);
-#endif
-#ifdef INDICATOR_APPLET_COMPLETE
-PANEL_APPLET_IN_PROCESS_FACTORY ("IndicatorAppletCompleteFactory",
-               PANEL_TYPE_APPLET,
-               applet_fill_cb, NULL);
-#endif
-#ifdef INDICATOR_APPLET_APPMENU
-PANEL_APPLET_IN_PROCESS_FACTORY ("IndicatorAppletAppmenuFactory",
-               PANEL_TYPE_APPLET,
-               applet_fill_cb, NULL);
-#endif
-
-/*************
- * log files
- * ***********/
-#ifdef INDICATOR_APPLET
-#define LOG_FILE_NAME  "indicator-applet.log"
-#endif
-#ifdef INDICATOR_APPLET_SESSION
-#define LOG_FILE_NAME  "indicator-applet-session.log"
-#endif
-#ifdef INDICATOR_APPLET_COMPLETE
-#define LOG_FILE_NAME  "indicator-applet-complete.log"
-#endif
-#ifdef INDICATOR_APPLET_APPMENU
-#define LOG_FILE_NAME  "indicator-applet-appmenu.log"
-#endif
-static FILE *log_file = NULL;
-
-/*****************
- * Hotkey support 
- * **************/
-#ifdef INDICATOR_APPLET
-gchar * hotkey_keycode = "<Super>M";
-#endif
-#ifdef INDICATOR_APPLET_SESSION
-gchar * hotkey_keycode = "<Super>S";
-#endif
-#ifdef INDICATOR_APPLET_COMPLETE
-gchar * hotkey_keycode = "<Super>S";
-#endif
-#ifdef INDICATOR_APPLET_APPMENU
-gchar * hotkey_keycode = "<Super>F1";
-#endif
-
-/********************
- * Environment Names
- * *******************/
-#ifdef INDICATOR_APPLET
-#define INDICATOR_SPECIFIC_ENV  "indicator-applet-original"
-#endif
-#ifdef INDICATOR_APPLET_SESSION
-#define INDICATOR_SPECIFIC_ENV  "indicator-applet-session"
-#endif
-#ifdef INDICATOR_APPLET_COMPLETE
-#define INDICATOR_SPECIFIC_ENV  "indicator-applet-complete"
-#endif
-#ifdef INDICATOR_APPLET_APPMENU
-#define INDICATOR_SPECIFIC_ENV  "indicator-applet-appmenu"
-#endif
-
-static const gchar * indicator_env[] = {
-  "indicator-applet",
-  INDICATOR_SPECIFIC_ENV,
-  NULL
-};
+typedef struct
+{
+  GtkWidget *menubar;
+} IndicatorAppletPrivate;
+
+G_DEFINE_TYPE_WITH_PRIVATE (IndicatorApplet, indicator_applet, GP_TYPE_APPLET)
 
 static gint
 name2order (const gchar * name, const gchar * hint) {
@@ -364,16 +288,34 @@
   return;
 }
 
+static float
+get_label_angle (IndicatorApplet *self)
+{
+  GtkPositionType position;
+
+  position = gp_applet_get_position (GP_APPLET (self));
+
+  if (position == GTK_POS_RIGHT)
+    return 270.0;
+  else if (position == GTK_POS_LEFT)
+    return 90.0;
+
+  return 0.0;
+}
+
 static GtkWidget*
-create_menuitem (IndicatorObject * io, IndicatorObjectEntry * entry, GtkWidget * menubar)
+create_menuitem (IndicatorObject      *io,
+                 IndicatorObjectEntry *entry,
+                 IndicatorApplet      *self)
 {
+  IndicatorAppletPrivate *priv;
   GtkWidget * box;
   GtkWidget * menuitem;
 
+  priv = indicator_applet_get_instance_private (self);
+
   menuitem = gtk_menu_item_new();
-  box = (packdirection == GTK_PACK_DIRECTION_LTR)
-      ? gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3)
-      : gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
+  box = gtk_box_new (gp_applet_get_orientation (GP_APPLET (self)), 3);
 
   gtk_widget_add_events(GTK_WIDGET(menuitem), GDK_SCROLL_MASK);
 
@@ -392,18 +334,8 @@
     gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(entry->image), FALSE, FALSE, 1);
   }
   if (entry->label != NULL) {
-    switch(packdirection) {
-      case GTK_PACK_DIRECTION_LTR:
-        gtk_label_set_angle(GTK_LABEL(entry->label), 0.0);
-        break;
-      case GTK_PACK_DIRECTION_TTB:
-        gtk_label_set_angle(GTK_LABEL(entry->label),
-            (orient == PANEL_APPLET_ORIENT_LEFT) ? 
-            270.0 : 90.0);
-        break;
-      default:
-        break;
-    }
+    gtk_label_set_angle (GTK_LABEL (entry->label), get_label_angle (self));
+
     /* gtk_box_pack requires that the widget has no parent */
     gtk_widget_unparent(GTK_WIDGET(entry->label));
     gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(entry->label), FALSE, FALSE, 1);
@@ -415,13 +347,15 @@
     gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), GTK_WIDGET(entry->menu));
   }
 
-  place_in_menu(menubar, menuitem, io, entry);
+  place_in_menu (priv->menubar, menuitem, io, entry);
 
   return menuitem;
 }
 
 static void
-entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, GtkWidget * menubar)
+entry_added (IndicatorObject      *io,
+             IndicatorObjectEntry *entry,
+             IndicatorApplet      *self)
 {
   const gchar * name;
   GtkWidget * menuitem;
@@ -437,7 +371,7 @@
   g_return_if_fail (menuitem_lookup != NULL);
   menuitem = g_hash_table_lookup (menuitem_lookup, entry);
   if (menuitem == NULL) {
-    menuitem = create_menuitem (io, entry, menubar);
+    menuitem = create_menuitem (io, entry, self);
     g_hash_table_insert (menuitem_lookup, entry, menuitem);
   }
 
@@ -606,12 +540,23 @@
   return;
 }
 
-static void load_indicator(GtkWidget * menubar, IndicatorObject *object, const gchar *name) {
+static void
+load_indicator (IndicatorApplet *self,
+                IndicatorObject *object,
+                const char      *name)
+{
+	IndicatorAppletPrivate *priv;
 	GObject * o;
 	GList *entries, *entry;
 
+	priv = indicator_applet_get_instance_private (self);
+
 	/* Set the environment it's in */
-	indicator_object_set_environment(object, (GStrv)indicator_env);
+	indicator_object_set_environment (object, (GStrv) (const char * const[]) {
+	                                    "indicator-applet",
+	                                    INDICATOR_APPLET_GET_CLASS (self)->get_indicator_env (),
+	                                    NULL
+	                                  });
 
 	/* Attach the 'name' to the object */
 	o = G_OBJECT (object);
@@ -626,25 +571,26 @@
 	g_object_set_data(o, IO_DATA_ORDER_NUMBER, GINT_TO_POINTER(pos));
 
 	/* Connect to its signals */
-	g_signal_connect(o, INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED,   G_CALLBACK(entry_added),    menubar);
-	g_signal_connect(o, INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, G_CALLBACK(entry_removed),  menubar);
-	g_signal_connect(o, INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED,   G_CALLBACK(entry_moved),    menubar);
-	g_signal_connect(o, INDICATOR_OBJECT_SIGNAL_MENU_SHOW,     G_CALLBACK(menu_show),      menubar);
-	g_signal_connect(o, INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE, G_CALLBACK(accessible_desc_update), menubar);
+	g_signal_connect (o, INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED, G_CALLBACK (entry_added), self);
+	g_signal_connect (o, INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, G_CALLBACK (entry_removed), priv->menubar);
+	g_signal_connect (o, INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED, G_CALLBACK (entry_moved), priv->menubar);
+	g_signal_connect (o, INDICATOR_OBJECT_SIGNAL_MENU_SHOW, G_CALLBACK (menu_show), priv->menubar);
+	g_signal_connect (o, INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE, G_CALLBACK (accessible_desc_update), priv->menubar);
 
 	/* Work on the entries */
 	entries = indicator_object_get_entries(object);
 
 	for (entry = entries; entry != NULL; entry = g_list_next(entry)) {
 		IndicatorObjectEntry * entrydata = (IndicatorObjectEntry *) entry->data;
-		entry_added(object, entrydata, menubar);
+		entry_added (object, entrydata, self);
 	}
 
 	g_list_free(entries);
 }
 
 static gboolean
-load_module (const gchar * name, GtkWidget * menubar)
+load_module (const char      *name,
+             IndicatorApplet *self)
 {
   
   g_debug("Looking at Module: %s", name);
@@ -661,48 +607,25 @@
   IndicatorObject * io = indicator_object_new_from_file(fullpath);
   g_free(fullpath);
 
-  load_indicator(menubar, io, name);
+  load_indicator (self, io, name);
 
   return TRUE;
 }
 
-static void load_modules(GtkWidget *menubar, gint *indicators_loaded) {
+static void
+load_modules (IndicatorApplet *self,
+              int             *indicators_loaded)
+{
 	if  (g_file_test(INDICATOR_DIR, (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) {
 		GDir * dir = g_dir_open(INDICATOR_DIR, 0, NULL);
 
 		const gchar * name;
 		gint count = 0;
 		while ((name = g_dir_read_name(dir)) != NULL) {
-			
-			#ifdef INDICATOR_APPLET_APPMENU
-				if (g_strcmp0(name, "libappmenu.so")) {
-					continue;
-				}
-			#else
-				if (!g_strcmp0(name, "libappmenu.so")) {
-					continue;
-				}
-			#endif
-			
-			#ifdef INDICATOR_APPLET
-				if (!g_strcmp0(name, "libsession.so")) {
-					continue;
-				}
-				if (!g_strcmp0(name, "libme.so")) {
-					continue;
-				}
-				if (!g_strcmp0(name, "libdatetime.so")) {
-					continue;
-				}
-			#endif
-			
-			#ifdef INDICATOR_APPLET_SESSION
-				if (g_strcmp0(name, "libsession.so") && g_strcmp0(name, "libme.so")) {
-					continue;
-				}
-			#endif
+			if (!INDICATOR_APPLET_GET_CLASS (self)->load_module (name))
+			  continue;
 
-			if (load_module(name, menubar)) {
+			if (load_module (name, self)) {
 				count++;
 			}
 		}
@@ -715,7 +638,10 @@
 
 #define INDICATOR_SERVICE_DIR "/usr/share/unity/indicators"
 
-static void load_indicators_from_indicator_files(GtkWidget *menubar, gint *indicators_loaded) {
+static void
+load_indicators_from_indicator_files (IndicatorApplet *self,
+                                      int             *indicators_loaded)
+{
 	GDir *dir;
 	const gchar *name;
 	GError *error = NULL;
@@ -738,37 +664,12 @@
 		indicator = indicator_ng_new_for_profile (filename, "desktop", &error);
 		g_free (filename);
 
-		#ifdef INDICATOR_APPLET_APPMENU
-			if (g_strcmp0(name, "com.canonical.indicator.appmenu")) {
-				continue;
-			}
-		#else
-			if (!g_strcmp0(name, "com.canonical.indicator.appmenu")) {
-				continue;
-			}
-		#endif
-		
-		#ifdef INDICATOR_APPLET
-			if (!g_strcmp0(name, "com.canonical.indicator.session")) {
-				continue;
-			}
-			if (!g_strcmp0(name, "com.canonical.indicator.me")) {
-				continue;
-			}
-			if (!g_strcmp0(name, "com.canonical.indicator.datetime")) {
-				continue;
-			}
-		#endif
-		
-		#ifdef INDICATOR_APPLET_SESSION
-			if (g_strcmp0(name, "com.canonical.indicator.session") && g_strcmp0(name, "com.canonical.indicator.me")) {
-				continue;
-			}
-		#endif
+		if (!INDICATOR_APPLET_GET_CLASS (self)->load_indicator (name))
+			  continue;
 
 		if (indicator) {
 			g_debug ("loading indicator: %s", name);
-			load_indicator(menubar,INDICATOR_OBJECT (indicator), name);
+			load_indicator (self, INDICATOR_OBJECT (indicator), name);
 			count++;
 		}else{
 			g_warning ("unable to load '%s': %s", name, error->message);
@@ -815,8 +716,9 @@
 static void
 about_cb (GSimpleAction *action G_GNUC_UNUSED,
           GVariant      *parameter G_GNUC_UNUSED,
-          gpointer       data G_GNUC_UNUSED)
+          gpointer       data)
 {
+  IndicatorApplet *self;
   static const gchar *authors[] = {
     "Ted Gould <[e-mail]>",
     NULL
@@ -836,31 +738,15 @@
   };
   gchar *license_i18n;
 
+  self = INDICATOR_APPLET (data);
+
   license_i18n = g_strconcat (_(license[0]), "\n\n", _(license[1]), "\n\n", _(license[2]), NULL);
 
   gtk_show_about_dialog(NULL,
-#ifdef INDICATOR_APPLET
-    "program-name", _("Indicator Applet"),
-#endif
-#ifdef INDICATOR_APPLET_SESSION
-    "program-name", _("Indicator Applet Session"),
-#endif
-#ifdef INDICATOR_APPLET_COMPLETE
-    "program-name", _("Indicator Applet Complete"),
-#endif
-#ifdef INDICATOR_APPLET_APPMENU
-    "program-name", _("Indicator Applet Application Menu"),
-#endif
+    "program-name", INDICATOR_APPLET_GET_CLASS (self)->get_name (),
     "version", VERSION,
     "copyright", "Copyright \xc2\xa9 2009-2010 Canonical, Ltd.",
-#ifdef INDICATOR_APPLET_SESSION
-    "comments", _("A place to adjust your status, change users or exit your session."),
-#else
-#ifdef INDICATOR_APPLET_APPMENU
-    "comments", _("An applet to hold your application menus."),
-#endif
-    "comments", _("An applet to hold all of the system indicators."),
-#endif
+    "comments", INDICATOR_APPLET_GET_CLASS (self)->get_description (),
     "authors", authors,
     "license", license_i18n,
     "wrap-license", TRUE,
@@ -877,70 +763,62 @@
   return;
 }
 
-static gboolean
+typedef struct
+{
+  GtkWidget       *from;
+  IndicatorApplet *self;
+} SwapData;
+
+static void
 swap_orient_cb (GtkWidget *item, gpointer data)
 {
-  GtkWidget *from = (GtkWidget *) data;
+  SwapData *swap_data = data;
+  GtkWidget *from = swap_data->from;
   GtkWidget *to = (GtkWidget *) g_object_get_data(G_OBJECT(from), "to");
   g_object_ref(G_OBJECT(item));
   gtk_container_remove(GTK_CONTAINER(from), item);
   if (GTK_IS_LABEL(item)) {
-      switch(packdirection) {
-      case GTK_PACK_DIRECTION_LTR:
-        gtk_label_set_angle(GTK_LABEL(item), 0.0);
-        break;
-      case GTK_PACK_DIRECTION_TTB:
-        gtk_label_set_angle(GTK_LABEL(item),
-            (orient == PANEL_APPLET_ORIENT_LEFT) ? 
-            270.0 : 90.0);
-        break;
-      default:
-        break;
-    }    
+      gtk_label_set_angle(GTK_LABEL(item), get_label_angle (swap_data->self));
   }
   gtk_box_pack_start(GTK_BOX(to), item, FALSE, FALSE, 0);
-  return TRUE;
 }
 
-static gboolean
+static void
 reorient_box_cb (GtkWidget *menuitem, gpointer data)
 {
+  SwapData swap_data;
   GtkWidget *from = g_object_get_data(G_OBJECT(menuitem), MENU_DATA_BOX);
-  GtkWidget *to = (packdirection == GTK_PACK_DIRECTION_LTR) ?
-      gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0) : gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+  GtkWidget *to = gtk_box_new (gp_applet_get_orientation (GP_APPLET (data)), 0);
   g_object_set_data(G_OBJECT(from), "to", to);
+
+  swap_data.from = from;
+  swap_data.self = data;
+
   gtk_container_foreach(GTK_CONTAINER(from), (GtkCallback)swap_orient_cb,
-      from);
+      &swap_data);
+
   gtk_container_remove(GTK_CONTAINER(menuitem), from);
   gtk_container_add(GTK_CONTAINER(menuitem), to);
   g_object_set_data(G_OBJECT(menuitem), MENU_DATA_BOX, to);
   gtk_widget_show_all(menuitem);
-  return TRUE;
 }
 
-static gboolean
-panelapplet_reorient_cb (GtkWidget *applet, PanelAppletOrient neworient,
-    gpointer data)
+static void
+placement_changed_cb (GpApplet        *applet,
+                      GtkOrientation   orientation,
+                      GtkPositionType  position,
+                      IndicatorApplet *self)
 {
-  GtkWidget *menubar = (GtkWidget *)data;
-  if ((((neworient == PANEL_APPLET_ORIENT_UP) || 
-      (neworient == PANEL_APPLET_ORIENT_DOWN)) && 
-      ((orient == PANEL_APPLET_ORIENT_LEFT) || 
-      (orient == PANEL_APPLET_ORIENT_RIGHT))) || 
-      (((neworient == PANEL_APPLET_ORIENT_LEFT) || 
-      (neworient == PANEL_APPLET_ORIENT_RIGHT)) && 
-      ((orient == PANEL_APPLET_ORIENT_UP) ||
-      (orient == PANEL_APPLET_ORIENT_DOWN)))) {
-    packdirection = (packdirection == GTK_PACK_DIRECTION_LTR) ?
-        GTK_PACK_DIRECTION_TTB : GTK_PACK_DIRECTION_LTR;
-    gtk_menu_bar_set_pack_direction(GTK_MENU_BAR(menubar),
-        packdirection);
-    orient = neworient;
-    gtk_container_foreach(GTK_CONTAINER(menubar),
-        (GtkCallback)reorient_box_cb, NULL);
-  }
-  orient = neworient;
-  return FALSE;
+  IndicatorAppletPrivate *priv;
+  GtkPackDirection packdirection;
+
+  priv = indicator_applet_get_instance_private (self);
+
+  packdirection = (orientation == GTK_ORIENTATION_VERTICAL) ?
+                  GTK_PACK_DIRECTION_TTB : GTK_PACK_DIRECTION_LTR;
+
+  gtk_menu_bar_set_pack_direction (GTK_MENU_BAR (priv->menubar), packdirection);
+  gtk_container_foreach (GTK_CONTAINER (priv->menubar), reorient_box_cb, self);
 }
 
 #ifdef N_
@@ -948,35 +826,37 @@
 #endif
 #define N_(x) x
 
-static gboolean
-applet_fill_cb (PanelApplet * applet, const gchar * iid G_GNUC_UNUSED,
-                gpointer data G_GNUC_UNUSED)
+static void
+indicator_applet_setup (IndicatorApplet *self)
 {
   ido_init();
 
   static const GActionEntry menu_actions[] = {
-    {"about", about_cb }
+    {"about", about_cb },
+    { NULL }
   };
   static const gchar *menu_xml = ""
+    "<interface>"
+    "<menu id=\"indicator-applet-menu\">"
     "<section>"
     "<item>"
     "<attribute name=\"label\" translatable=\"yes\">_About</attribute>"
     "<attribute name=\"action\">indicator-applet.about</attribute>"
     "</item>"
-    "</section>";
+    "</section>"
+    "</menu>"
+    "</interface>";
 
   static gboolean first_time = FALSE;
-  GtkWidget *menubar;
   gint indicators_loaded = 0;
-  GSimpleActionGroup *action_group;
+  IndicatorAppletPrivate *priv;
+  GpApplet *applet;
+  GtkOrientation orientation;
+  GtkPackDirection packdirection;
+  const char *hotkey_keycode;
 
-#ifdef INDICATOR_APPLET_SESSION
-  /* check if we are running stracciatella session */
-  if (g_strcmp0(g_getenv("GDMSESSION"), "gnome-stracciatella") == 0) {
-    g_debug("Running stracciatella GNOME session, disabling myself");
-    return TRUE;
-  }
-#endif
+  priv = indicator_applet_get_instance_private (self);
+  applet = GP_APPLET (self);
 
   if (!first_time)
   {
@@ -987,60 +867,31 @@
 
   /* Set panel options */
   gtk_container_set_border_width(GTK_CONTAINER (applet), 0);
-  panel_applet_set_flags(applet, PANEL_APPLET_EXPAND_MINOR);
-  menubar = gtk_menu_bar_new();
-
-  action_group = g_simple_action_group_new ();
-  g_action_map_add_action_entries (G_ACTION_MAP (action_group), menu_actions,
-                                   G_N_ELEMENTS (menu_actions), menubar);
-  panel_applet_setup_menu(applet, menu_xml, action_group, GETTEXT_PACKAGE);
-  gtk_widget_insert_action_group (GTK_WIDGET (applet), "indicator-applet", G_ACTION_GROUP (action_group));
-  g_object_unref(action_group);
-
-#ifdef INDICATOR_APPLET
-  atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (applet)),
-                       "indicator-applet");
-#endif
-#ifdef INDICATOR_APPLET_SESSION
-  atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (applet)),
-                       "indicator-applet-session");
-#endif
-#ifdef INDICATOR_APPLET_COMPLETE
-  atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (applet)),
-                       "indicator-applet-complete");
-#endif
-#ifdef INDICATOR_APPLET_APPMENU
-  atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (applet)),
-                       "indicator-applet-appmenu");
-#endif
-
-  /* Init some theme/icon stuff */
-  gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(),
-                                    INDICATOR_ICONS_DIR);
-  g_debug("Icons directory: %s", INDICATOR_ICONS_DIR);
+  gp_applet_set_flags (applet, GP_APPLET_FLAGS_EXPAND_MINOR);
+  priv->menubar = gtk_menu_bar_new ();
+
+  gp_applet_setup_menu (applet, menu_xml, menu_actions);
 
   gtk_widget_set_name(GTK_WIDGET (applet), "fast-user-switch-applet");
 
   /* Build menubar */
-  orient = (panel_applet_get_orient(applet));
-  packdirection = ((orient == PANEL_APPLET_ORIENT_UP) ||
-      (orient == PANEL_APPLET_ORIENT_DOWN)) ? 
+  orientation = gp_applet_get_orientation (applet);
+  packdirection = (orientation == GTK_ORIENTATION_HORIZONTAL) ? 
       GTK_PACK_DIRECTION_LTR : GTK_PACK_DIRECTION_TTB;
-  gtk_menu_bar_set_pack_direction(GTK_MENU_BAR(menubar),
-      packdirection);
-  gtk_widget_set_can_focus (GTK_WIDGET (menubar), TRUE);
-  gtk_widget_set_name(GTK_WIDGET (menubar), "fast-user-switch-menubar");
-  g_signal_connect(menubar, "button-press-event", G_CALLBACK(menubar_press), NULL);
-  g_signal_connect(applet, "change-orient", 
-      G_CALLBACK(panelapplet_reorient_cb), menubar);
-  gtk_container_set_border_width(GTK_CONTAINER(menubar), 0);
+  gtk_menu_bar_set_pack_direction (GTK_MENU_BAR (priv->menubar), packdirection);
+  gtk_widget_set_can_focus (GTK_WIDGET (priv->menubar), TRUE);
+  gtk_widget_set_name (GTK_WIDGET (priv->menubar), "fast-user-switch-menubar");
+  g_signal_connect (priv->menubar, "button-press-event", G_CALLBACK (menubar_press), NULL);
+  g_signal_connect (applet, "placement-changed", G_CALLBACK (placement_changed_cb), self);
+  gtk_container_set_border_width (GTK_CONTAINER (priv->menubar), 0);
 
   /* Add in filter func */
-  tomboy_keybinder_bind(hotkey_keycode, hotkey_filter, menubar);
+  hotkey_keycode = INDICATOR_APPLET_GET_CLASS (self)->get_hotkey_keycode ();
+  tomboy_keybinder_bind (hotkey_keycode, hotkey_filter, priv->menubar);
 
 	/* load indicators */
-	load_modules(menubar, &indicators_loaded);
-	load_indicators_from_indicator_files(menubar, &indicators_loaded);
+	load_modules (self, &indicators_loaded);
+	load_indicators_from_indicator_files (self, &indicators_loaded);
 
   if (indicators_loaded == 0) {
     /* A label to allow for click through */
@@ -1048,11 +899,102 @@
     gtk_container_add(GTK_CONTAINER(applet), item);
     gtk_widget_show(item);
   } else {
-    gtk_container_add(GTK_CONTAINER(applet), menubar);
-    gtk_widget_show(menubar);
+    gtk_container_add (GTK_CONTAINER (applet), priv->menubar);
+    gtk_widget_show (priv->menubar);
   }
 
   gtk_widget_show(GTK_WIDGET(applet));
-
-  return TRUE;
+}
+
+static void
+indicator_applet_constructed (GObject *object)
+{
+  G_OBJECT_CLASS (indicator_applet_parent_class)->constructed (object);
+  indicator_applet_setup (INDICATOR_APPLET (object));
+}
+
+static const char *
+indicator_applet_get_name (void)
+{
+  return _("Indicator Applet");
+}
+
+static const char *
+indicator_applet_get_description (void)
+{
+  return _("An applet to hold all of the system indicators.");
+}
+
+static const char *
+indicator_applet_get_indicator_env (void)
+{
+  return "indicator-applet-original";
+}
+
+static gboolean
+indicator_applet_load_module (const char *name)
+{
+  if (g_strcmp0 (name, "libappmenu.so") == 0)
+    return FALSE;
+  else if (g_strcmp0 (name, "libdatetime.so") == 0)
+    return FALSE;
+  else if (g_strcmp0 (name, "libme.so") == 0)
+    return FALSE;
+  else if (g_strcmp0 (name, "libsession.so") == 0)
+    return FALSE;
+
+  return TRUE;
+}
+
+static gboolean
+indicator_applet_load_indicator (const char *name)
+{
+  if (g_strcmp0 (name, "com.canonical.indicator.appmenu") == 0)
+    return FALSE;
+  else if (g_strcmp0 (name, "com.canonical.indicator.datetime") == 0)
+    return FALSE;
+  else if (g_strcmp0 (name, "com.canonical.indicator.me") == 0)
+    return FALSE;
+  else if (g_strcmp0 (name, "com.canonical.indicator.session") == 0)
+    return FALSE;
+
+  return TRUE;
+}
+
+static const char *
+indicator_applet_get_hotkey_keycode (void)
+{
+  return "<Super>M";
+}
+
+static void
+indicator_applet_class_init (IndicatorAppletClass *self_class)
+{
+  GObjectClass *object_class;
+
+  object_class = G_OBJECT_CLASS (self_class);
+
+  object_class->constructed = indicator_applet_constructed;
+
+  self_class->get_name = indicator_applet_get_name;
+  self_class->get_description = indicator_applet_get_description;
+  self_class->get_indicator_env = indicator_applet_get_indicator_env;
+  self_class->load_module = indicator_applet_load_module;
+  self_class->load_indicator = indicator_applet_load_indicator;
+  self_class->get_hotkey_keycode = indicator_applet_get_hotkey_keycode;
+}
+
+static void
+indicator_applet_init (IndicatorApplet *self)
+{
+  GtkIconTheme *icon_theme;
+  AtkObject *atk_object;
+
+  /* Init some theme/icon stuff */
+  icon_theme = gtk_icon_theme_get_default ();
+  gtk_icon_theme_append_search_path (icon_theme, INDICATOR_ICONS_DIR);
+  g_debug ("Icons directory: %s", INDICATOR_ICONS_DIR);
+
+  atk_object = gtk_widget_get_accessible (GTK_WIDGET (self));
+  atk_object_set_name (atk_object, "indicator-applet");
 }

=== added file 'src/indicator-applet.h'
--- src/indicator-applet.h	1970-01-01 00:00:00 +0000
+++ src/indicator-applet.h	2020-03-22 12:39:21 +0000
@@ -0,0 +1,46 @@
+/*
+ * 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 3 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 INDICATOR_APPLET_H
+#define INDICATOR_APPLET_H
+
+#include <libgnome-panel/gp-applet.h>
+
+G_BEGIN_DECLS
+
+#define INDICATOR_TYPE_APPLET (indicator_applet_get_type ())
+G_DECLARE_DERIVABLE_TYPE (IndicatorApplet, indicator_applet,
+                          INDICATOR, APPLET, GpApplet)
+
+struct _IndicatorAppletClass
+{
+  GpAppletClass parent_class;
+
+  const char * (* get_name)           (void);
+  const char * (* get_description)    (void);
+
+  const char * (* get_indicator_env)  (void);
+
+  gboolean     (* load_module)        (const char *name);
+  gboolean     (* load_indicator)     (const char *name);
+
+  const char * (* get_hotkey_keycode) (void);
+};
+
+G_END_DECLS
+
+#endif

=== added file 'src/indicator-module.c'
--- src/indicator-module.c	1970-01-01 00:00:00 +0000
+++ src/indicator-module.c	2020-03-22 12:39:21 +0000
@@ -0,0 +1,106 @@
+/*
+ * 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 3 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/>.
+ */
+
+#include "config.h"
+
+#include <glib/gi18n-lib.h>
+#include <libgnome-panel/gp-module.h>
+
+#include "indicator-applet.h"
+#include "indicator-applet-appmenu.h"
+#include "indicator-applet-complete.h"
+#include "indicator-applet-session.h"
+
+static GpAppletInfo *
+indicator_get_applet_info (const char *id)
+{
+  GpGetAppletTypeFunc type_func;
+  const gchar *name;
+  const gchar *description;
+  GpAppletInfo *info;
+
+  if (g_strcmp0 (id, "indicator") == 0)
+    {
+      type_func = indicator_applet_get_type;
+      name = _("Indicator Applet");
+      description = _("An indicator of something that needs your attention on the desktop");
+    }
+  else if (g_strcmp0 (id, "indicator-appmenu") == 0)
+    {
+      type_func = indicator_applet_appmenu_get_type;
+      name = _("Indicator Applet Appmenu");
+      description = _("A applet containing the application menus.");
+    }
+  else if (g_strcmp0 (id, "indicator-complete") == 0)
+    {
+      type_func = indicator_applet_complete_get_type;
+      name = _("Indicator Applet Complete");
+      description = _("A unified applet containing all of the indicators.");
+    }
+  else if (g_strcmp0 (id, "indicator-session") == 0)
+    {
+      type_func = indicator_applet_session_get_type;
+      name = _("Indicator Applet Session");
+      description = _("A place to adjust your status, change users or exit your session.");
+    }
+  else
+    {
+      g_assert_not_reached ();
+      return NULL;
+    }
+
+  info = gp_applet_info_new (type_func, name, description, "indicator-applet");
+
+  return info;
+}
+
+static const gchar *
+indicator_get_applet_id_from_iid (const gchar *iid)
+{
+  if (g_strcmp0 (iid, "IndicatorAppletFactory::IndicatorApplet") == 0)
+    return "indicator";
+  else if (g_strcmp0 (iid, "IndicatorAppletAppmenuFactory::IndicatorAppletAppmenu") == 0)
+    return "indicator-appmenu";
+  else if (g_strcmp0 (iid, "IndicatorAppletCompleteFactory::IndicatorAppletComplete") == 0)
+    return "indicator-complete";
+  else if (g_strcmp0 (iid, "FastUserSwitchAppletFactory::FastUserSwitchApplet") == 0)
+    return "indicator-session";
+
+  return NULL;
+}
+
+void
+gp_module_load (GpModule *module)
+{
+  bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+  gp_module_set_gettext_domain (module, GETTEXT_PACKAGE);
+
+  gp_module_set_abi_version (module, GP_MODULE_ABI_VERSION);
+
+  gp_module_set_id (module, "org.ayatana.indicator-applet");
+  gp_module_set_version (module, PACKAGE_VERSION);
+
+  gp_module_set_applet_ids (module,
+                            "indicator",
+                            "indicator-appmenu",
+                            "indicator-complete",
+                            "indicator-session", NULL);
+
+  gp_module_set_get_applet_info (module, indicator_get_applet_info);
+  gp_module_set_compatibility (module, indicator_get_applet_id_from_iid);
+}