summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am2
-rw-r--r--README2
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.ac14
-rw-r--r--src/Makefile.am6
-rw-r--r--src/mcd-master.c30
-rw-r--r--test/twisted/Makefile.am4
7 files changed, 30 insertions, 30 deletions
diff --git a/Makefile.am b/Makefile.am
index 24684cb5..a7cbd981 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@ endif
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libmcclient.pc mission-control-plugins.pc
-if ENABLE_PLUGINS
+if ENABLE_MCD_PLUGINS
pkgconfig_DATA += mission-control.pc
endif
diff --git a/README b/README
index 7df10bba..d6d25471 100644
--- a/README
+++ b/README
@@ -78,7 +78,7 @@ libmissioncontrol-server contains most of the implementation of MC, and can
be used to produce a derivative of MC containing desktop- or device-specific
behaviour, like Maemo's proprietary osso-mission-control package. It is only
built and installed as a library if Mission Control is configured with
-the --enable-plugins option; this is not recommended on mainstream Linux
+the --enable-mcd-plugins option; this is not recommended on mainstream Linux
distributions.
At this stage in development, neither library is considered stable; only
diff --git a/autogen.sh b/autogen.sh
index cfe340b4..5a0229a7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -30,7 +30,7 @@ for arg in $*; do
esac
done
-default_args="--enable-gtk-doc --enable-plugins --enable-gnome-keyring=auto"
+default_args="--enable-gtk-doc --enable-mcd-plugins --enable-gnome-keyring=auto"
if test $run_configure = true; then
echo "Running ./configure $default_args $*"
diff --git a/configure.ac b/configure.ac
index c68518d3..0a4a1caf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -256,21 +256,21 @@ AM_CONDITIONAL(ENABLE_MC_SERVER_SO6, [test "x$ENABLE_MC_SERVER_SO6" = xyes])
plugins_enabled="no"
AC_MSG_CHECKING(whether to support plugins)
-AC_ARG_ENABLE(plugins,
- [ --enable-plugins support plugins. default=no],
+AC_ARG_ENABLE(mcd-plugins,
+ [ --enable-mcd-plugins support plugins that use internal APIs. default=no],
[
AC_MSG_RESULT(${enableval})
- plugins_enabled="${enableval}"
+ mcd_plugins_enabled="${enableval}"
],
[
AC_MSG_RESULT(no)
- plugins_enabled="no"
+ mcd_plugins_enabled="no"
]
)
-AM_CONDITIONAL(ENABLE_PLUGINS, [test x$plugins_enabled = xyes])
-if test "x$plugins_enabled" = xyes
+AM_CONDITIONAL(ENABLE_MCD_PLUGINS, [test x$mcd_plugins_enabled = xyes])
+if test "x$mcd_plugins_enabled" = xyes
then
- AC_DEFINE([ENABLE_PLUGINS], [1], [Define if plugins should be enabled])
+ AC_DEFINE([ENABLE_MCD_PLUGINS], [1], [Define if MCD plugins should be enabled])
fi
keyring_enabled="no"
diff --git a/src/Makefile.am b/src/Makefile.am
index 91a80362..d1eecd94 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -80,7 +80,7 @@ endif
noinst_LTLIBRARIES = libmcd-convenience.la
-if ENABLE_PLUGINS
+if ENABLE_MCD_PLUGINS
# When plugins are enabled, libmissioncontrol-server.la is a shared library
# that wraps the convenience library
lib_LTLIBRARIES = libmissioncontrol-server.la
@@ -109,13 +109,13 @@ libmcd_convenience_la_LIBADD += $(GMODULE_LIBS)
INCLUDES += \
$(GMODULE_CFLAGS) \
-DMCD_DEFAULT_FILTER_PLUGIN_DIR=\"@pluginlibdir@\"
-else # ! ENABLE_PLUGINS
+else # ! ENABLE_MCD_PLUGINS
# When plugins are not enabled, libmissioncontrol-server.la is just a copy of
# the convenience library
noinst_LTLIBRARIES += libmissioncontrol-server.la
libmissioncontrol_server_la_SOURCES =
libmissioncontrol_server_la_LIBADD = libmcd-convenience.la
-endif # ! ENABLE_PLUGINS
+endif # ! ENABLE_MCD_PLUGINS
libmcd_convenience_la_SOURCES = \
mcd-account.c \
diff --git a/src/mcd-master.c b/src/mcd-master.c
index b273d59f..302ba627 100644
--- a/src/mcd-master.c
+++ b/src/mcd-master.c
@@ -96,7 +96,7 @@ typedef struct _McdMasterPrivate
GHashTable *extra_parameters;
- GPtrArray *plugins;
+ GPtrArray *mcd_plugins;
GPtrArray *transport_plugins;
GList *account_connections;
@@ -242,21 +242,21 @@ on_transport_status_changed (McdTransportPlugin *plugin,
}
}
-#ifdef ENABLE_PLUGINS
+#ifdef ENABLE_MCD_PLUGINS
static void
-mcd_master_unload_plugins (McdMaster *master)
+mcd_master_unload_mcd_plugins (McdMaster *master)
{
McdMasterPrivate *priv = MCD_MASTER_PRIV (master);
GModule *module;
guint i;
- for (i = 0; i < priv->plugins->len; i++)
+ for (i = 0; i < priv->mcd_plugins->len; i++)
{
- module = g_ptr_array_index (priv->plugins, i);
+ module = g_ptr_array_index (priv->mcd_plugins, i);
g_module_close (module);
}
- g_ptr_array_free (priv->plugins, TRUE);
- priv->plugins = NULL;
+ g_ptr_array_free (priv->mcd_plugins, TRUE);
+ priv->mcd_plugins = NULL;
}
static const gchar *
@@ -271,7 +271,7 @@ mcd_master_get_plugin_dir (void)
}
static void
-mcd_master_load_plugins (McdMaster *master)
+mcd_master_load_mcd_plugins (McdMaster *master)
{
McdMasterPrivate *priv = MCD_MASTER_PRIV (master);
const gchar *plugin_dir;
@@ -292,7 +292,7 @@ mcd_master_load_plugins (McdMaster *master)
DEBUG ("Looking for plugins in %s", plugin_dir);
- priv->plugins = g_ptr_array_new ();
+ priv->mcd_plugins = g_ptr_array_new ();
while ((name = g_dir_read_name (dir)))
{
GModule *module;
@@ -311,7 +311,7 @@ mcd_master_load_plugins (McdMaster *master)
{
DEBUG ("Initializing plugin %s", name);
init_func ((McdPlugin *)master);
- g_ptr_array_add (priv->plugins, module);
+ g_ptr_array_add (priv->mcd_plugins, module);
}
else
DEBUG ("Error looking up symbol " MCD_PLUGIN_INIT_FUNC
@@ -416,10 +416,10 @@ _mcd_master_dispose (GObject * object)
priv->transport_plugins = NULL;
}
-#ifdef ENABLE_PLUGINS
- if (priv->plugins)
+#ifdef ENABLE_MCD_PLUGINS
+ if (priv->mcd_plugins)
{
- mcd_master_unload_plugins (MCD_MASTER (object));
+ mcd_master_unload_mcd_plugins (MCD_MASTER (object));
}
#endif
@@ -478,8 +478,8 @@ mcd_master_constructor (GType type, guint n_params,
mcd_operation_take_mission (MCD_OPERATION (priv->proxy),
MCD_MISSION (priv->dispatcher));
-#ifdef ENABLE_PLUGINS
- mcd_master_load_plugins (master);
+#ifdef ENABLE_MCD_PLUGINS
+ mcd_master_load_mcd_plugins (master);
#endif
/* we assume that at this point all transport plugins have been registered.
diff --git a/test/twisted/Makefile.am b/test/twisted/Makefile.am
index 1364fa0f..25b34831 100644
--- a/test/twisted/Makefile.am
+++ b/test/twisted/Makefile.am
@@ -47,7 +47,7 @@ TWISTED_BASIC_TESTS = \
dispatcher/undispatchable.py \
dispatcher/vanishing-client.py
-if ENABLE_PLUGINS
+if ENABLE_MCD_PLUGINS
TWISTED_BASIC_TESTS += \
dispatcher/create-delayed-by-plugin.py \
dispatcher/dispatch-delayed-by-plugin.py \
@@ -73,7 +73,7 @@ TWISTED_SEPARATE_TESTS = \
crash-recovery/crash-recovery.py \
dispatcher/create-at-startup.py
-if ENABLE_PLUGINS
+if ENABLE_MCD_PLUGINS
# A demo dispatcher plugin
noinst_LTLIBRARIES = test-plugin.la
test_plugin_la_SOURCES = test-plugin.c
View Lorry Controller Status