[gnome-panel/wip/muktupavels/remove-panel-applet-private: 1/5] merge panel-applet-private into panel code

[Alberts Muktupāvels <muktupavels src gnome org>]

commit f068c22b96b7736cbb070aed2be279706c295b05
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Mon Apr 13 21:20:27 2020 +0300

    merge panel-applet-private into panel code

 configure.ac                                                  | 1 -
 gnome-panel/Makefile.am                                       | 7 +++++--
 gnome-panel/{libpanel-applet-private => }/gp-applet-frame.c   | 0
 gnome-panel/{libpanel-applet-private => }/gp-applet-frame.h   | 0
 gnome-panel/{libpanel-applet-private => }/gp-applet-manager.c | 0
 gnome-panel/{libpanel-applet-private => }/gp-applet-manager.h | 0
 gnome-panel/panel-applets-manager.c                           | 2 +-
 po/POTFILES.in                                                | 2 +-
 8 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3d0588aa7..52901f507 100644
--- a/configure.ac
+++ b/configure.ac
@@ -260,7 +260,6 @@ AC_CONFIG_FILES([
   data/theme/Yaru/Makefile
 
   gnome-panel/Makefile
-  gnome-panel/libpanel-applet-private/Makefile
   gnome-panel/libpanel-util/Makefile
 
   libgnome-panel/Makefile
diff --git a/gnome-panel/Makefile.am b/gnome-panel/Makefile.am
index 583c0c998..59dd4d4b6 100644
--- a/gnome-panel/Makefile.am
+++ b/gnome-panel/Makefile.am
@@ -1,7 +1,6 @@
 NULL =
 
 SUBDIRS = \
-       libpanel-applet-private \
        libpanel-util \
        $(NULL)
 
@@ -12,6 +11,10 @@ bin_PROGRAMS = \
 panel_sources =                        \
        gp-add-applet-window.c \
        gp-add-applet-window.h \
+       gp-applet-frame.c \
+       gp-applet-frame.h \
+       gp-applet-manager.c \
+       gp-applet-manager.h \
        gp-application.c \
        gp-application.h \
        gp-arrow-button.c \
@@ -110,7 +113,7 @@ gnome_panel_CFLAGS = \
        $(NULL)
 
 gnome_panel_LDADD =            \
-       $(top_builddir)/gnome-panel/libpanel-applet-private/libpanel-applet-private.la  \
+       $(top_builddir)/libgnome-panel/libgnome-panel.la \
        $(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la                      \
        $(PANEL_LIBS)                                                                   \
        $(NULL)
diff --git a/gnome-panel/libpanel-applet-private/gp-applet-frame.c b/gnome-panel/gp-applet-frame.c
similarity index 100%
rename from gnome-panel/libpanel-applet-private/gp-applet-frame.c
rename to gnome-panel/gp-applet-frame.c
diff --git a/gnome-panel/libpanel-applet-private/gp-applet-frame.h b/gnome-panel/gp-applet-frame.h
similarity index 100%
rename from gnome-panel/libpanel-applet-private/gp-applet-frame.h
rename to gnome-panel/gp-applet-frame.h
diff --git a/gnome-panel/libpanel-applet-private/gp-applet-manager.c b/gnome-panel/gp-applet-manager.c
similarity index 100%
rename from gnome-panel/libpanel-applet-private/gp-applet-manager.c
rename to gnome-panel/gp-applet-manager.c
diff --git a/gnome-panel/libpanel-applet-private/gp-applet-manager.h b/gnome-panel/gp-applet-manager.h
similarity index 100%
rename from gnome-panel/libpanel-applet-private/gp-applet-manager.h
rename to gnome-panel/gp-applet-manager.h
diff --git a/gnome-panel/panel-applets-manager.c b/gnome-panel/panel-applets-manager.c
index 17a058299..12723be10 100644
--- a/gnome-panel/panel-applets-manager.c
+++ b/gnome-panel/panel-applets-manager.c
@@ -22,9 +22,9 @@
 
 #include <gio/gio.h>
 
-#include <libpanel-applet-private/gp-applet-manager.h>
 #include <libpanel-util/panel-cleanup.h>
 
+#include "gp-applet-manager.h"
 #include "panel-applets-manager.h"
 
 G_DEFINE_ABSTRACT_TYPE (PanelAppletsManager, panel_applets_manager, G_TYPE_OBJECT)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 20f72e907..b21d2110c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -12,12 +12,12 @@ gnome-panel/applet.c
 gnome-panel/button-widget.c
 gnome-panel/gnome-panel.desktop.in
 gnome-panel/gp-add-applet-window.c
+gnome-panel/gp-applet-frame.c
 gnome-panel/gp-arrow-button.c
 gnome-panel/gp-main.c
 gnome-panel/gp-properties-dialog.c
 gnome-panel/gp-properties-dialog.ui
 gnome-panel/launcher.c
-gnome-panel/libpanel-applet-private/gp-applet-frame.c
 gnome-panel/libpanel-util/panel-error.c
 gnome-panel/libpanel-util/panel-icon-chooser.c
 gnome-panel/libpanel-util/panel-launch.c