[gnome-panel] libpanel-applet-private: move GpModule to libgnome-panel

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

commit cd05c2f6d3d21ee25aebaa1701458588b73dd76b
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sat Dec 30 15:33:44 2017 +0200

    libpanel-applet-private: move GpModule to libgnome-panel

 gnome-panel/Makefile.am                            |    1 +
 gnome-panel/libpanel-applet-private/Makefile.am    |    2 -
 .../libpanel-applet-private/gp-applet-manager.c    |    2 +-
 libgnome-panel/Makefile.am                         |    2 +
 libgnome-panel/gp-applet-info-private.h            |    2 +-
 libgnome-panel/gp-applet-info.h                    |    2 +-
 libgnome-panel/gp-applet-private.h                 |    2 +-
 libgnome-panel/gp-module-info-private.h            |    2 +-
 .../gp-module-private.h                            |   22 ++++++++++----------
 .../gp-module.c                                    |   22 ++++++++++----------
 10 files changed, 30 insertions(+), 29 deletions(-)
---
diff --git a/gnome-panel/Makefile.am b/gnome-panel/Makefile.am
index 29ab315..5747305 100644
--- a/gnome-panel/Makefile.am
+++ b/gnome-panel/Makefile.am
@@ -110,6 +110,7 @@ gnome_panel_CFLAGS = \
        -I$(srcdir) \
        -I$(top_builddir)/gnome-panel \
        -I$(top_builddir)/gnome-panel/libpanel-util \
+       -I$(top_srcdir) \
        $(XRANDR_CFLAGS) \
        $(PANEL_CFLAGS) \
        $(WARN_CFLAGS) \
diff --git a/gnome-panel/libpanel-applet-private/Makefile.am b/gnome-panel/libpanel-applet-private/Makefile.am
index af39f36..72ca1fe 100644
--- a/gnome-panel/libpanel-applet-private/Makefile.am
+++ b/gnome-panel/libpanel-applet-private/Makefile.am
@@ -24,8 +24,6 @@ libpanel_applet_private_la_SOURCES =  \
        gp-applet-frame.h \
        gp-applet-manager.c \
        gp-applet-manager.h \
-       gp-module.c \
-       gp-module-private.h \
        panel-applets-manager-dbus.c    \
        panel-applets-manager-dbus.h    \
        panel-applet-container.c        \
diff --git a/gnome-panel/libpanel-applet-private/gp-applet-manager.c 
b/gnome-panel/libpanel-applet-private/gp-applet-manager.c
index 8afbddc..2dba09e 100644
--- a/gnome-panel/libpanel-applet-private/gp-applet-manager.c
+++ b/gnome-panel/libpanel-applet-private/gp-applet-manager.c
@@ -21,8 +21,8 @@
 
 #include "gp-applet-frame.h"
 #include "gp-applet-manager.h"
-#include "gp-module-private.h"
 #include "libgnome-panel/gp-applet-info-private.h"
+#include "libgnome-panel/gp-module-private.h"
 
 struct _GpAppletManager
 {
diff --git a/libgnome-panel/Makefile.am b/libgnome-panel/Makefile.am
index fe1457e..760db5e 100644
--- a/libgnome-panel/Makefile.am
+++ b/libgnome-panel/Makefile.am
@@ -9,10 +9,12 @@ libgnome_panel_la_SOURCES = \
        gp-applet-info.h \
        gp-applet-info-private.h \
        gp-applet-private.h \
+       gp-module.c \
        gp-module.h \
        gp-module-info.c \
        gp-module-info.h \
        gp-module-info-private.h \
+       gp-module-private.h \
        $(BUILT_SOURCES) \
        $(NULL)
 
diff --git a/libgnome-panel/gp-applet-info-private.h b/libgnome-panel/gp-applet-info-private.h
index 5b7d95d..082de12 100644
--- a/libgnome-panel/gp-applet-info-private.h
+++ b/libgnome-panel/gp-applet-info-private.h
@@ -18,7 +18,7 @@
 #ifndef GP_APPLET_INFO_PRIVATE_H
 #define GP_APPLET_INFO_PRIVATE_H
 
-#include "libgnome-panel/gp-applet-info.h"
+#include <libgnome-panel/gp-applet-info.h>
 
 G_BEGIN_DECLS
 
diff --git a/libgnome-panel/gp-applet-info.h b/libgnome-panel/gp-applet-info.h
index 2a954ca..9227258 100644
--- a/libgnome-panel/gp-applet-info.h
+++ b/libgnome-panel/gp-applet-info.h
@@ -18,7 +18,7 @@
 #ifndef GP_APPLET_INFO_H
 #define GP_APPLET_INFO_H
 
-#include <glib-object.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/libgnome-panel/gp-applet-private.h b/libgnome-panel/gp-applet-private.h
index 61a2e5f..b2fb032 100644
--- a/libgnome-panel/gp-applet-private.h
+++ b/libgnome-panel/gp-applet-private.h
@@ -23,7 +23,7 @@
 #ifndef GP_APPLET_PRIVATE_H
 #define GP_APPLET_PRIVATE_H
 
-#include "libgnome-panel/gp-applet.h"
+#include <libgnome-panel/gp-applet.h>
 
 G_BEGIN_DECLS
 
diff --git a/libgnome-panel/gp-module-info-private.h b/libgnome-panel/gp-module-info-private.h
index 91a5a1b..601611f 100644
--- a/libgnome-panel/gp-module-info-private.h
+++ b/libgnome-panel/gp-module-info-private.h
@@ -18,7 +18,7 @@
 #ifndef GP_MODULE_INFO_PRIVATE_H
 #define GP_MODULE_INFO_PRIVATE_H
 
-#include "libgnome-panel/gp-module-info.h"
+#include <libgnome-panel/gp-module-info.h>
 
 G_BEGIN_DECLS
 
diff --git a/gnome-panel/libpanel-applet-private/gp-module-private.h b/libgnome-panel/gp-module-private.h
similarity index 72%
rename from gnome-panel/libpanel-applet-private/gp-module-private.h
rename to libgnome-panel/gp-module-private.h
index 77370e4..61360aa 100644
--- a/gnome-panel/libpanel-applet-private/gp-module-private.h
+++ b/libgnome-panel/gp-module-private.h
@@ -1,25 +1,25 @@
 /*
  * Copyright (C) 2016 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
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 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.
+ * This library 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 Lesser 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/>.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, see <https://www.gnu.org/licenses/>.
  */
 
 #ifndef GP_MODULE_PRIVATE_H
 #define GP_MODULE_PRIVATE_H
 
-#include "libgnome-panel/gp-applet.h"
-#include "libgnome-panel/gp-module.h"
+#include <libgnome-panel/gp-applet.h>
+#include <libgnome-panel/gp-module.h>
 
 G_BEGIN_DECLS
 
diff --git a/gnome-panel/libpanel-applet-private/gp-module.c b/libgnome-panel/gp-module.c
similarity index 93%
rename from gnome-panel/libpanel-applet-private/gp-module.c
rename to libgnome-panel/gp-module.c
index 054eb8f..e95c902 100644
--- a/gnome-panel/libpanel-applet-private/gp-module.c
+++ b/libgnome-panel/gp-module.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2016 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
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 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.
+ * This library 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 Lesser 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/>.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
@@ -27,9 +27,9 @@
 #include <gdk/gdkx.h>
 #endif
 
+#include "gp-applet-info-private.h"
 #include "gp-module-private.h"
-#include "libgnome-panel/gp-applet-info-private.h"
-#include "libgnome-panel/gp-module-info-private.h"
+#include "gp-module-info-private.h"
 
 typedef guint32        (* GetAbiVersionFunc)   (void);
 typedef GpModuleInfo * (* GetModuleInfoFunc)   (void);