Commit a3f69309 authored by Alberts Muktupāvels's avatar Alberts Muktupāvels

separator: convert into a module

parent b0f531de
......@@ -284,7 +284,6 @@ AC_CONFIG_FILES([
modules/Makefile
modules/builtin/Makefile
modules/builtin/separator/Makefile
modules/external/Makefile
modules/external/clock/Makefile
modules/external/clock/pixmaps/Makefile
......@@ -292,6 +291,7 @@ AC_CONFIG_FILES([
modules/external/notification-area/Makefile
modules/external/status-notifier/Makefile
modules/external/wncklet/Makefile
modules/separator/Makefile
po/Makefile.in
])
......
......@@ -3,6 +3,7 @@ NULL =
SUBDIRS = \
builtin \
external \
separator \
$(NULL)
-include $(top_srcdir)/git.mk
NULL =
SUBDIRS = \
separator \
$(NULL)
noinst_LTLIBRARIES = libbuiltin.la
......@@ -31,7 +30,6 @@ libbuiltin_la_LDFLAGS = \
libbuiltin_la_LIBADD = \
$(top_builddir)/libgnome-panel/libgnome-panel.la \
$(top_builddir)/modules/builtin/separator/libseparator.la \
$(LIBGNOME_PANEL_LIBS) \
$(BUILTIN_LIBS) \
$(NULL)
......
......@@ -18,10 +18,8 @@
#include "config.h"
#include "gp-builtin.h"
#include "separator/separator-module.h"
const GpModuleVTable *builtin[] =
{
&separator_vtable,
NULL
};
/*
* 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
* (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 SEPARATOR_MODULE_H
#define SEPARATOR_MODULE_H
#include <libgnome-panel/gp-module.h>
G_BEGIN_DECLS
extern const GpModuleVTable separator_vtable;
G_END_DECLS
#endif
NULL =
noinst_LTLIBRARIES = libseparator.la
separator_libdir = $(libdir)/gnome-panel/modules
separator_lib_LTLIBRARIES = separator.la
libseparator_la_CPPFLAGS = \
separator_la_CPPFLAGS = \
-DLOCALEDIR=\""$(localedir)"\" \
-DG_LOG_DOMAIN=\""separator"\" \
-DG_LOG_USE_STRUCTURED=1 \
......@@ -10,27 +11,27 @@ libseparator_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(NULL)
libseparator_la_CFLAGS = \
separator_la_CFLAGS = \
$(LIBGNOME_PANEL_CFLAGS) \
$(SEPARATOR_CFLAGS) \
$(WARN_CFLAGS) \
$(AM_CFLAGS) \
$(NULL)
libseparator_la_SOURCES = \
separator_la_SOURCES = \
separator-applet.c \
separator-applet.h \
separator-module.c \
separator-module.h \
$(NULL)
libseparator_la_LIBADD = \
separator_la_LIBADD = \
$(top_builddir)/libgnome-panel/libgnome-panel.la \
$(LIBGNOME_PANEL_LIBS) \
$(SEPARATOR_LIBS) \
$(NULL)
libseparator_la_LDFLAGS = \
separator_la_LDFLAGS = \
-module -avoid-version \
$(WARN_LDFLAGS) \
$(AM_LDFLAGS) \
$(NULL)
......
......@@ -21,7 +21,6 @@
#include <libgnome-panel/gp-module.h>
#include "separator-applet.h"
#include "separator-module.h"
static GpModuleInfo *
separator_get_module_info (void)
......@@ -62,11 +61,20 @@ separator_get_applet_from_iid (const gchar *iid)
return NULL;
}
const GpModuleVTable separator_vtable =
guint32
gp_module_get_abi_version (void)
{
separator_get_module_info,
separator_get_applet_info,
separator_get_applet_type,
separator_get_applet_from_iid,
NULL
};
return GP_MODULE_ABI_VERSION;
}
void
gp_module_get_vtable (GpModuleVTable *vtable)
{
*vtable = (GpModuleVTable) {
separator_get_module_info,
separator_get_applet_info,
separator_get_applet_type,
separator_get_applet_from_iid,
NULL
};
}
......@@ -45,7 +45,6 @@ gnome-panel/panel-stock-icons.c
gnome-panel/panel-toplevel.c
gnome-panel/panel-util.c
libpanel-applet/panel-applet.c
modules/builtin/separator/separator-module.c
modules/external/clock/calendar-client.c
modules/external/clock/calendar-window.c
modules/external/clock/clock-applet.c
......@@ -73,3 +72,4 @@ modules/external/wncklet/wncklet-module.c
modules/external/wncklet/workspace-switcher.c
modules/external/wncklet/workspace-switcher-menu.ui
modules/external/wncklet/workspace-switcher.ui
modules/separator/separator-module.c
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment