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

modules: remove builtin library

parent a3f69309
......@@ -151,10 +151,6 @@ PKG_CHECK_MODULES([LIBPANEL_APPLET], [
x11
])
PKG_CHECK_MODULES([BUILTIN], [
gio-2.0 >= $GLIB_REQUIRED
])
PKG_CHECK_MODULES(FISH, gtk+-3.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED)
AC_SUBST(FISH_CFLAGS)
AC_SUBST(FISH_LIBS)
......@@ -283,7 +279,6 @@ AC_CONFIG_FILES([
man/Makefile
modules/Makefile
modules/builtin/Makefile
modules/external/Makefile
modules/external/clock/Makefile
modules/external/clock/pixmaps/Makefile
......
......@@ -36,7 +36,6 @@ libpanel_applet_private_la_SOURCES = \
libpanel_applet_private_la_LIBADD = \
$(top_builddir)/libgnome-panel/libgnome-panel.la \
$(top_builddir)/modules/builtin/libbuiltin.la \
$(NULL)
libpanel_applet_private_la_LDFLAGS = \
......
......@@ -23,7 +23,6 @@
#include "gp-applet-manager.h"
#include "gp-module-private.h"
#include "libgnome-panel/gp-applet-info-private.h"
#include "modules/builtin/gp-builtin.h"
struct _GpAppletManager
{
......@@ -73,28 +72,6 @@ get_applet_infos (GpAppletManager *manager,
}
}
static void
load_builtin_modules (GpAppletManager *manager)
{
guint i;
for (i = 0; builtin[i] != NULL; i++)
{
GpModule *module;
const gchar *id;
module = gp_module_new_from_vtable (builtin[i]);
if (module == NULL)
continue;
id = gp_module_get_id (module);
g_hash_table_insert (manager->modules, g_strdup (id), module);
get_applet_infos (manager, id, module);
}
}
static void
load_external_modules (GpAppletManager *manager)
{
......@@ -362,6 +339,5 @@ gp_applet_manager_init (GpAppletManager *manager)
manager->infos = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free, applet_info_free);
load_builtin_modules (manager);
load_external_modules (manager);
}
......@@ -38,8 +38,6 @@ GQuark gp_module_error_quark (void);
GpModule *gp_module_new_from_path (const gchar *path);
GpModule *gp_module_new_from_vtable (const GpModuleVTable *vtable);
const gchar *gp_module_get_id (GpModule *module);
const gchar * const *gp_module_get_applets (GpModule *module);
......
......@@ -38,8 +38,6 @@ struct _GpModule
{
GObject parent;
gboolean builtin;
gchar *path;
GModule *library;
......@@ -255,7 +253,6 @@ gp_module_new_from_path (const gchar *path)
g_return_val_if_fail (path != NULL && *path != '\0', NULL);
module = g_object_new (GP_TYPE_MODULE, NULL);
module->builtin = FALSE;
flags = G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL;
......@@ -325,25 +322,6 @@ gp_module_new_from_path (const gchar *path)
return module;
}
GpModule *
gp_module_new_from_vtable (const GpModuleVTable *vtable)
{
GpModule *module;
module = g_object_new (GP_TYPE_MODULE, NULL);
module->builtin = TRUE;
module->vtable = *vtable;
if (!load_module_info (module))
{
g_object_unref (module);
return NULL;
}
return module;
}
const gchar *
gp_module_get_id (GpModule *module)
{
......
NULL =
SUBDIRS = \
builtin \
external \
separator \
$(NULL)
......
NULL =
SUBDIRS = \
$(NULL)
noinst_LTLIBRARIES = libbuiltin.la
libbuiltin_la_SOURCES = \
gp-builtin.c \
gp-builtin.h \
$(NULL)
libbuiltin_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"libbuiltin\" \
-DG_LOG_USE_STRUCTURED=1 \
-I$(top_srcdir) \
$(AM_CPPFLAGS) \
$(NULL)
libbuiltin_la_CFLAGS = \
$(LIBGNOME_PANEL_CFLAGS) \
$(BUILTIN_CFLAGS) \
$(AM_CFLAGS) \
$(NULL)
libbuiltin_la_LDFLAGS = \
$(WARN_LDFLAGS) \
$(AM_LDFLAGS) \
$(NULL)
libbuiltin_la_LIBADD = \
$(top_builddir)/libgnome-panel/libgnome-panel.la \
$(LIBGNOME_PANEL_LIBS) \
$(BUILTIN_LIBS) \
$(NULL)
-include $(top_srcdir)/git.mk
/*
* 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/>.
*/
#include "config.h"
#include "gp-builtin.h"
const GpModuleVTable *builtin[] =
{
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 GP_BUILTIN_H
#define GP_BUILTIN_H
#include <libgnome-panel/gp-module.h>
G_BEGIN_DECLS
extern const GpModuleVTable *builtin[];
G_END_DECLS
#endif
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