[Xfce4-commits] [apps/xfdashboard] 02/02: Rename XfdashboardPluginManager to XfdashboardPluginsManager
noreply at xfce.org
noreply at xfce.org
Thu Nov 12 21:52:59 CET 2015
This is an automated email from the git hooks/post-receive script.
nomad pushed a commit to branch master
in repository apps/xfdashboard.
commit e8454d9bc2483cba98fc510f6ef11dfe6d931a22
Author: Stephan Haller <nomad at froevel.de>
Date: Thu Nov 12 21:52:47 2015 +0100
Rename XfdashboardPluginManager to XfdashboardPluginsManager
---
xfdashboard/Makefile.am | 4 +-
xfdashboard/application.c | 8 +-
xfdashboard/plugin-manager.h | 67 -----------------
.../{plugin-manager.c => plugins-manager.c} | 78 ++++++++++----------
xfdashboard/plugins-manager.h | 67 +++++++++++++++++
5 files changed, 112 insertions(+), 112 deletions(-)
diff --git a/xfdashboard/Makefile.am b/xfdashboard/Makefile.am
index e2054a6..abfaf91 100644
--- a/xfdashboard/Makefile.am
+++ b/xfdashboard/Makefile.am
@@ -50,7 +50,7 @@ xfdashboard_headers = \
live-workspace.h \
outline-effect.h \
plugin.h \
- plugin-manager.h \
+ plugins-manager.h \
quicklaunch.h \
scaled-table-layout.h \
scrollbar.h \
@@ -115,7 +115,7 @@ libxfdashboard_la_SOURCES = \
live-workspace.c \
outline-effect.c \
plugin.c \
- plugin-manager.c \
+ plugins-manager.c \
quicklaunch.c \
scaled-table-layout.c \
scrollbar.c \
diff --git a/xfdashboard/application.c b/xfdashboard/application.c
index c60592d..63beb0f 100644
--- a/xfdashboard/application.c
+++ b/xfdashboard/application.c
@@ -48,7 +48,7 @@
#include "bindings-pool.h"
#include "application-database.h"
#include "application-tracker.h"
-#include "plugin-manager.h"
+#include "plugins-manager.h"
/* Define this class in GObject system */
G_DEFINE_TYPE(XfdashboardApplication,
@@ -85,7 +85,7 @@ struct _XfdashboardApplicationPrivate
XfceSMClient *sessionManagementClient;
- XfdashboardPluginManager *pluginManager;
+ XfdashboardPluginsManager *pluginManager;
};
/* Properties */
@@ -425,14 +425,14 @@ static gboolean _xfdashboard_application_initialize_full(XfdashboardApplication
/* Create single-instance of plugin manager to keep it alive while
* application is running.
*/
- priv->pluginManager=xfdashboard_plugin_manager_get_default();
+ priv->pluginManager=xfdashboard_plugins_manager_get_default();
if(!priv->pluginManager)
{
g_critical(_("Could not initialize plugin manager"));
return(FALSE);
}
- if(!xfdashboard_plugin_manager_setup(priv->pluginManager))
+ if(!xfdashboard_plugins_manager_setup(priv->pluginManager))
{
g_critical(_("Could not setup plugin manager"));
return(FALSE);
diff --git a/xfdashboard/plugin-manager.h b/xfdashboard/plugin-manager.h
deleted file mode 100644
index 9894f1b..0000000
--- a/xfdashboard/plugin-manager.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * plugin-manager: Single-instance managing plugins
- *
- * Copyright 2012-2015 Stephan Haller <nomad at froevel.de>
- *
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- *
- */
-
-#ifndef __XFDASHBOARD_PLUGIN_MANAGER__
-#define __XFDASHBOARD_PLUGIN_MANAGER__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define XFDASHBOARD_TYPE_PLUGIN_MANAGER (xfdashboard_plugin_manager_get_type())
-#define XFDASHBOARD_PLUGIN_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), XFDASHBOARD_TYPE_PLUGIN_MANAGER, XfdashboardPluginManager))
-#define XFDASHBOARD_IS_PLUGIN_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), XFDASHBOARD_TYPE_PLUGIN_MANAGER))
-#define XFDASHBOARD_PLUGIN_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), XFDASHBOARD_TYPE_PLUGIN_MANAGER, XfdashboardPluginManagerClass))
-#define XFDASHBOARD_IS_PLUGIN_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), XFDASHBOARD_TYPE_PLUGIN_MANAGER))
-#define XFDASHBOARD_PLUGIN_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), XFDASHBOARD_TYPE_PLUGIN_MANAGER, XfdashboardPluginManagerClass))
-
-typedef struct _XfdashboardPluginManager XfdashboardPluginManager;
-typedef struct _XfdashboardPluginManagerClass XfdashboardPluginManagerClass;
-typedef struct _XfdashboardPluginManagerPrivate XfdashboardPluginManagerPrivate;
-
-struct _XfdashboardPluginManager
-{
- /* Parent instance */
- GObject parent_instance;
-
- /* Private structure */
- XfdashboardPluginManagerPrivate *priv;
-};
-
-struct _XfdashboardPluginManagerClass
-{
- /*< private >*/
- /* Parent class */
- GObjectClass parent_class;
-};
-
-/* Public API */
-GType xfdashboard_plugin_manager_get_type(void) G_GNUC_CONST;
-
-XfdashboardPluginManager* xfdashboard_plugin_manager_get_default(void);
-
-gboolean xfdashboard_plugin_manager_setup(XfdashboardPluginManager *self);
-
-G_END_DECLS
-
-#endif /* __XFDASHBOARD_PLUGIN_MANAGER__ */
diff --git a/xfdashboard/plugin-manager.c b/xfdashboard/plugins-manager.c
similarity index 74%
rename from xfdashboard/plugin-manager.c
rename to xfdashboard/plugins-manager.c
index 8148205..fdc156f 100644
--- a/xfdashboard/plugin-manager.c
+++ b/xfdashboard/plugins-manager.c
@@ -1,5 +1,5 @@
/*
- * plugin-manager: Single-instance managing plugins
+ * plugins-manager: Single-instance managing plugins
*
* Copyright 2012-2015 Stephan Haller <nomad at froevel.de>
*
@@ -25,7 +25,7 @@
#include "config.h"
#endif
-#include "plugin-manager.h"
+#include "plugins-manager.h"
#include <glib/gi18n-lib.h>
@@ -34,15 +34,15 @@
/* Define this class in GObject system */
-G_DEFINE_TYPE(XfdashboardPluginManager,
- xfdashboard_plugin_manager,
+G_DEFINE_TYPE(XfdashboardPluginsManager,
+ xfdashboard_plugins_manager,
G_TYPE_OBJECT)
/* Private structure - access only by public API if needed */
-#define XFDASHBOARD_PLUGIN_MANAGER_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE((obj), XFDASHBOARD_TYPE_PLUGIN_MANAGER, XfdashboardPluginManagerPrivate))
+#define XFDASHBOARD_PLUGINS_MANAGER_GET_PRIVATE(obj) \
+ (G_TYPE_INSTANCE_GET_PRIVATE((obj), XFDASHBOARD_TYPE_PLUGINS_MANAGER, XfdashboardPluginsManagerPrivate))
-struct _XfdashboardPluginManagerPrivate
+struct _XfdashboardPluginsManagerPrivate
{
/* Instance related */
gboolean isInited;
@@ -55,18 +55,18 @@ struct _XfdashboardPluginManagerPrivate
#define ENABLED_PLUGINS_XFCONF_PROP "/enabled-plugins"
/* Single instance of plugin manager */
-static XfdashboardPluginManager* _xfdashboard_plugin_manager=NULL;
+static XfdashboardPluginsManager* _xfdashboard_plugins_manager=NULL;
/* Add path to search path but avoid duplicates */
-static gboolean _xfdashboard_plugin_manager_add_search_path(XfdashboardPluginManager *self,
+static gboolean _xfdashboard_plugins_manager_add_search_path(XfdashboardPluginsManager *self,
const gchar *inPath)
{
- XfdashboardPluginManagerPrivate *priv;
+ XfdashboardPluginsManagerPrivate *priv;
gchar *normalizedPath;
GList *iter;
gchar *iterPath;
- g_return_val_if_fail(XFDASHBOARD_IS_PLUGIN_MANAGER(self), FALSE);
+ g_return_val_if_fail(XFDASHBOARD_IS_PLUGINS_MANAGER(self), FALSE);
g_return_val_if_fail(inPath && *inPath, FALSE);
priv=self->priv;
@@ -115,15 +115,15 @@ static gboolean _xfdashboard_plugin_manager_add_search_path(XfdashboardPluginMan
}
/* Find path to plugin */
-static gchar* _xfdashboard_plugin_manager_find_plugin_path(XfdashboardPluginManager *self,
+static gchar* _xfdashboard_plugins_manager_find_plugin_path(XfdashboardPluginsManager *self,
const gchar *inPluginName)
{
- XfdashboardPluginManagerPrivate *priv;
+ XfdashboardPluginsManagerPrivate *priv;
gchar *path;
GList *iter;
gchar *iterPath;
- g_return_val_if_fail(XFDASHBOARD_IS_PLUGIN_MANAGER(self), NULL);
+ g_return_val_if_fail(XFDASHBOARD_IS_PLUGINS_MANAGER(self), NULL);
g_return_val_if_fail(inPluginName && *inPluginName, NULL);
priv=self->priv;
@@ -160,7 +160,7 @@ static gchar* _xfdashboard_plugin_manager_find_plugin_path(XfdashboardPluginMana
/* IMPLEMENTATION: GObject */
/* Dispose this object */
-static void _xfdashboard_plugin_manager_dispose_remove_plugin(gpointer inData)
+static void _xfdashboard_plugins_manager_dispose_remove_plugin(gpointer inData)
{
XfdashboardPlugin *plugin;
@@ -175,15 +175,15 @@ static void _xfdashboard_plugin_manager_dispose_remove_plugin(gpointer inData)
g_type_module_unuse(G_TYPE_MODULE(plugin));
}
-static void _xfdashboard_plugin_manager_dispose(GObject *inObject)
+static void _xfdashboard_plugins_manager_dispose(GObject *inObject)
{
- XfdashboardPluginManager *self=XFDASHBOARD_PLUGIN_MANAGER(inObject);
- XfdashboardPluginManagerPrivate *priv=self->priv;
+ XfdashboardPluginsManager *self=XFDASHBOARD_PLUGINS_MANAGER(inObject);
+ XfdashboardPluginsManagerPrivate *priv=self->priv;
/* Release allocated resources */
if(priv->plugins)
{
- g_list_free_full(priv->plugins, (GDestroyNotify)_xfdashboard_plugin_manager_dispose_remove_plugin);
+ g_list_free_full(priv->plugins, (GDestroyNotify)_xfdashboard_plugins_manager_dispose_remove_plugin);
priv->plugins=NULL;
}
@@ -194,35 +194,35 @@ static void _xfdashboard_plugin_manager_dispose(GObject *inObject)
}
/* Unset singleton */
- if(G_LIKELY(G_OBJECT(_xfdashboard_plugin_manager)==inObject)) _xfdashboard_plugin_manager=NULL;
+ if(G_LIKELY(G_OBJECT(_xfdashboard_plugins_manager)==inObject)) _xfdashboard_plugins_manager=NULL;
/* Call parent's class dispose method */
- G_OBJECT_CLASS(xfdashboard_plugin_manager_parent_class)->dispose(inObject);
+ G_OBJECT_CLASS(xfdashboard_plugins_manager_parent_class)->dispose(inObject);
}
/* Class initialization
* Override functions in parent classes and define properties
* and signals
*/
-static void xfdashboard_plugin_manager_class_init(XfdashboardPluginManagerClass *klass)
+static void xfdashboard_plugins_manager_class_init(XfdashboardPluginsManagerClass *klass)
{
GObjectClass *gobjectClass=G_OBJECT_CLASS(klass);
/* Override functions */
- gobjectClass->dispose=_xfdashboard_plugin_manager_dispose;
+ gobjectClass->dispose=_xfdashboard_plugins_manager_dispose;
/* Set up private structure */
- g_type_class_add_private(klass, sizeof(XfdashboardPluginManagerPrivate));
+ g_type_class_add_private(klass, sizeof(XfdashboardPluginsManagerPrivate));
}
/* Object initialization
* Create private structure and set up default values
*/
-static void xfdashboard_plugin_manager_init(XfdashboardPluginManager *self)
+static void xfdashboard_plugins_manager_init(XfdashboardPluginsManager *self)
{
- XfdashboardPluginManagerPrivate *priv;
+ XfdashboardPluginsManagerPrivate *priv;
- priv=self->priv=XFDASHBOARD_PLUGIN_MANAGER_GET_PRIVATE(self);
+ priv=self->priv=XFDASHBOARD_PLUGINS_MANAGER_GET_PRIVATE(self);
/* Set default values */
priv->isInited=FALSE;
@@ -233,28 +233,28 @@ static void xfdashboard_plugin_manager_init(XfdashboardPluginManager *self)
/* IMPLEMENTATION: Public API */
/* Get single instance of manager */
-XfdashboardPluginManager* xfdashboard_plugin_manager_get_default(void)
+XfdashboardPluginsManager* xfdashboard_plugins_manager_get_default(void)
{
- if(G_UNLIKELY(_xfdashboard_plugin_manager==NULL))
+ if(G_UNLIKELY(_xfdashboard_plugins_manager==NULL))
{
- _xfdashboard_plugin_manager=g_object_new(XFDASHBOARD_TYPE_PLUGIN_MANAGER, NULL);
+ _xfdashboard_plugins_manager=g_object_new(XFDASHBOARD_TYPE_PLUGINS_MANAGER, NULL);
}
- else g_object_ref(_xfdashboard_plugin_manager);
+ else g_object_ref(_xfdashboard_plugins_manager);
- return(_xfdashboard_plugin_manager);
+ return(_xfdashboard_plugins_manager);
}
/* Initialize plugin manager */
-gboolean xfdashboard_plugin_manager_setup(XfdashboardPluginManager *self)
+gboolean xfdashboard_plugins_manager_setup(XfdashboardPluginsManager *self)
{
- XfdashboardPluginManagerPrivate *priv;
+ XfdashboardPluginsManagerPrivate *priv;
gchar *path;
const gchar *envPath;
gchar **enabledPlugins;
gchar **iter;
GError *error;
- g_return_val_if_fail(XFDASHBOARD_IS_PLUGIN_MANAGER(self), FALSE);
+ g_return_val_if_fail(XFDASHBOARD_IS_PLUGINS_MANAGER(self), FALSE);
priv=self->priv;
error=NULL;
@@ -268,15 +268,15 @@ gboolean xfdashboard_plugin_manager_setup(XfdashboardPluginManager *self)
envPath=g_getenv("XFDASHBOARD_PLUGINS_PATH");
if(envPath)
{
- _xfdashboard_plugin_manager_add_search_path(self, envPath);
+ _xfdashboard_plugins_manager_add_search_path(self, envPath);
}
path=g_build_filename(g_get_user_data_dir(), "xfdashboard", "plugins", NULL);
- _xfdashboard_plugin_manager_add_search_path(self, path);
+ _xfdashboard_plugins_manager_add_search_path(self, path);
g_free(path);
path=g_build_filename(PACKAGE_LIBDIR, "xfdashboard", "plugins", NULL);
- _xfdashboard_plugin_manager_add_search_path(self, path);
+ _xfdashboard_plugins_manager_add_search_path(self, path);
g_free(path);
/* Get list of enabled plugins and try to load them */
@@ -294,7 +294,7 @@ gboolean xfdashboard_plugin_manager_setup(XfdashboardPluginManager *self)
g_debug("Try to load plugin '%s'", pluginName);
/* Find path to plugin */
- path=_xfdashboard_plugin_manager_find_plugin_path(self, pluginName);
+ path=_xfdashboard_plugins_manager_find_plugin_path(self, pluginName);
if(!path)
{
/* Show error message */
diff --git a/xfdashboard/plugins-manager.h b/xfdashboard/plugins-manager.h
new file mode 100644
index 0000000..b37cebb
--- /dev/null
+++ b/xfdashboard/plugins-manager.h
@@ -0,0 +1,67 @@
+/*
+ * plugins-manager: Single-instance managing plugins
+ *
+ * Copyright 2012-2015 Stephan Haller <nomad at froevel.de>
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ *
+ */
+
+#ifndef __XFDASHBOARD_PLUGINS_MANAGER__
+#define __XFDASHBOARD_PLUGINS_MANAGER__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define XFDASHBOARD_TYPE_PLUGINS_MANAGER (xfdashboard_plugins_manager_get_type())
+#define XFDASHBOARD_PLUGINS_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), XFDASHBOARD_TYPE_PLUGINS_MANAGER, XfdashboardPluginsManager))
+#define XFDASHBOARD_IS_PLUGINS_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), XFDASHBOARD_TYPE_PLUGINS_MANAGER))
+#define XFDASHBOARD_PLUGINS_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), XFDASHBOARD_TYPE_PLUGINS_MANAGER, XfdashboardPluginsManagerClass))
+#define XFDASHBOARD_IS_PLUGINS_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), XFDASHBOARD_TYPE_PLUGINS_MANAGER))
+#define XFDASHBOARD_PLUGINS_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), XFDASHBOARD_TYPE_PLUGINS_MANAGER, XfdashboardPluginsManagerClass))
+
+typedef struct _XfdashboardPluginsManager XfdashboardPluginsManager;
+typedef struct _XfdashboardPluginsManagerClass XfdashboardPluginsManagerClass;
+typedef struct _XfdashboardPluginsManagerPrivate XfdashboardPluginsManagerPrivate;
+
+struct _XfdashboardPluginsManager
+{
+ /* Parent instance */
+ GObject parent_instance;
+
+ /* Private structure */
+ XfdashboardPluginsManagerPrivate *priv;
+};
+
+struct _XfdashboardPluginsManagerClass
+{
+ /*< private >*/
+ /* Parent class */
+ GObjectClass parent_class;
+};
+
+/* Public API */
+GType xfdashboard_plugins_manager_get_type(void) G_GNUC_CONST;
+
+XfdashboardPluginsManager* xfdashboard_plugins_manager_get_default(void);
+
+gboolean xfdashboard_plugins_manager_setup(XfdashboardPluginsManager *self);
+
+G_END_DECLS
+
+#endif /* __XFDASHBOARD_PLUGINS_MANAGER__ */
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list