[Xfce4-commits] [apps/xfdashboard] 01/01: We check already that the signal handlers 'enable' and 'disable' are connected we do not need default handlers and we do not need the boolean return value to check if it was handled so change it to void.
noreply at xfce.org
noreply at xfce.org
Fri Feb 19 21:44:45 CET 2016
This is an automated email from the git hooks/post-receive script.
nomad pushed a commit to branch master
in repository apps/xfdashboard.
commit f1db0eeeda071748e6f212685f30117ca9196c3e
Author: Stephan Haller <nomad at froevel.de>
Date: Fri Feb 19 20:58:37 2016 +0100
We check already that the signal handlers 'enable' and 'disable' are connected we do not need default handlers and we do not need the boolean return value to check if it was handled so change it to void.
---
libxfdashboard/plugin.c | 64 ++++------------------------
libxfdashboard/plugin.h | 10 ++---
plugins/clock-view/plugin.c | 8 +---
plugins/gnome-shell-search-provider/plugin.c | 18 +++-----
plugins/hot-corner/plugin.c | 8 +---
5 files changed, 22 insertions(+), 86 deletions(-)
diff --git a/libxfdashboard/plugin.c b/libxfdashboard/plugin.c
index df9cf03..29268c6 100644
--- a/libxfdashboard/plugin.c
+++ b/libxfdashboard/plugin.c
@@ -112,12 +112,6 @@ static guint XfdashboardPluginSignals[SIGNAL_LAST]={ 0, };
/* IMPLEMENTATION: Private variables and methods */
-#define XFDASHBOARD_PLUGIN_CRITICAL_NOT_IMPLEMENTED(self, action) \
- g_critical(_("Plugin at path '%s' does not implement required signal handler %s::%s"), \
- self->priv->filename ? self->priv->filename : _("unknown filename"), \
- G_OBJECT_TYPE_NAME(self), \
- action);
-
#define XFDASHBOARD_PLUGIN_FUNCTION_NAME_INITIALIZE "plugin_init"
/* Get display name for XFDASHBOARD_PLUGIN_STATE_* enum values */
@@ -397,42 +391,6 @@ static void _xfdashboard_plugin_set_license(XfdashboardPlugin *self, const gchar
}
}
-/* Default implementation of signal handler "enable" */
-static gboolean _xfdashboard_plugin_enable(XfdashboardPlugin *self)
-{
- g_return_val_if_fail(XFDASHBOARD_IS_PLUGIN(self), XFDASHBOARD_PLUGIN_ACTION_HANDLED);
-
- /* We should never reach this code because each plugin must connect a signal handler
- * for this action and return TRUE to indicate that this action was handled.
- */
- XFDASHBOARD_PLUGIN_CRITICAL_NOT_IMPLEMENTED(self, "enable");
- return(XFDASHBOARD_PLUGIN_ACTION_HANDLED);
-}
-
-/* Default implementation of signal handler "disable" */
-static gboolean _xfdashboard_plugin_disable(XfdashboardPlugin *self)
-{
- g_return_val_if_fail(XFDASHBOARD_IS_PLUGIN(self), XFDASHBOARD_PLUGIN_ACTION_HANDLED);
-
- /* We should never reach this code because each plugin must connect a signal handler
- * for this action and return TRUE to indicate that this action was handled.
- */
- XFDASHBOARD_PLUGIN_CRITICAL_NOT_IMPLEMENTED(self, "disable");
- return(XFDASHBOARD_PLUGIN_ACTION_HANDLED);
-}
-
-/* Default implementation of signal handler "configure" */
-static gboolean _xfdashboard_plugin_configure(XfdashboardPlugin *self)
-{
- g_return_val_if_fail(XFDASHBOARD_IS_PLUGIN(self), XFDASHBOARD_PLUGIN_ACTION_HANDLED);
-
- /* We should never reach this code because each plugin must connect a signal handler
- * for this action and return TRUE to indicate that this action was handled.
- */
- XFDASHBOARD_PLUGIN_CRITICAL_NOT_IMPLEMENTED(self, "configure");
- return(XFDASHBOARD_PLUGIN_ACTION_HANDLED);
-}
-
/* IMPLEMENTATION: GTypeModule */
/* Load and initialize plugin */
@@ -801,10 +759,6 @@ static void xfdashboard_plugin_class_init(XfdashboardPluginClass *klass)
GObjectClass *gobjectClass=G_OBJECT_CLASS(klass);
/* Override functions */
- klass->enable=_xfdashboard_plugin_enable;
- klass->disable=_xfdashboard_plugin_disable;
- klass->configure=_xfdashboard_plugin_configure;
-
moduleClass->load=_xfdashboard_plugin_load;
moduleClass->unload=_xfdashboard_plugin_unload;
@@ -894,10 +848,10 @@ static void xfdashboard_plugin_class_init(XfdashboardPluginClass *klass)
G_TYPE_FROM_CLASS(klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET(XfdashboardPluginClass, enable),
- g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__VOID,
- G_TYPE_BOOLEAN,
+ NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE,
0);
XfdashboardPluginSignals[ACTION_DISABLE]=
@@ -905,10 +859,10 @@ static void xfdashboard_plugin_class_init(XfdashboardPluginClass *klass)
G_TYPE_FROM_CLASS(klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET(XfdashboardPluginClass, disable),
- g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__VOID,
- G_TYPE_BOOLEAN,
+ NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE,
0);
XfdashboardPluginSignals[ACTION_CONFIGURE]=
@@ -916,10 +870,10 @@ static void xfdashboard_plugin_class_init(XfdashboardPluginClass *klass)
G_TYPE_FROM_CLASS(klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET(XfdashboardPluginClass, configure),
- g_signal_accumulator_true_handled,
NULL,
- _xfdashboard_marshal_BOOLEAN__VOID,
- G_TYPE_BOOLEAN,
+ NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE,
0);
}
diff --git a/libxfdashboard/plugin.h b/libxfdashboard/plugin.h
index ff21238..ad99651 100644
--- a/libxfdashboard/plugin.h
+++ b/libxfdashboard/plugin.h
@@ -44,10 +44,6 @@ G_BEGIN_DECLS
inFunctionNamePrefix##_register_plugin_type(XFDASHBOARD_PLUGIN(self));
-/* Definitions */
-#define XFDASHBOARD_PLUGIN_ACTION_HANDLED (TRUE)
-
-
/* Object declaration */
#define XFDASHBOARD_TYPE_PLUGIN (xfdashboard_plugin_get_type())
#define XFDASHBOARD_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), XFDASHBOARD_TYPE_PLUGIN, XfdashboardPlugin))
@@ -77,10 +73,10 @@ struct _XfdashboardPluginClass
/*< public >*/
/* Virtual functions */
- gboolean (*enable)(XfdashboardPlugin *self);
- gboolean (*disable)(XfdashboardPlugin *self);
+ void (*enable)(XfdashboardPlugin *self);
+ void (*disable)(XfdashboardPlugin *self);
- gboolean (*configure)(XfdashboardPlugin *self);
+ void (*configure)(XfdashboardPlugin *self);
};
/* Error */
diff --git a/plugins/clock-view/plugin.c b/plugins/clock-view/plugin.c
index c8a0243..144ee42 100644
--- a/plugins/clock-view/plugin.c
+++ b/plugins/clock-view/plugin.c
@@ -39,7 +39,7 @@
G_MODULE_EXPORT void plugin_init(XfdashboardPlugin *self);
/* Plugin enable function */
-static gboolean plugin_enable(XfdashboardPlugin *self, gpointer inUserData)
+static void plugin_enable(XfdashboardPlugin *self, gpointer inUserData)
{
XfdashboardViewManager *viewManager;
@@ -49,12 +49,10 @@ static gboolean plugin_enable(XfdashboardPlugin *self, gpointer inUserData)
xfdashboard_view_manager_register(viewManager, PLUGIN_ID, XFDASHBOARD_TYPE_CLOCK_VIEW);
g_object_unref(viewManager);
-
- return(XFDASHBOARD_PLUGIN_ACTION_HANDLED);
}
/* Plugin disable function */
-static gboolean plugin_disable(XfdashboardPlugin *self, gpointer inUserData)
+static void plugin_disable(XfdashboardPlugin *self, gpointer inUserData)
{
XfdashboardViewManager *viewManager;
@@ -64,8 +62,6 @@ static gboolean plugin_disable(XfdashboardPlugin *self, gpointer inUserData)
xfdashboard_view_manager_unregister(viewManager, PLUGIN_ID);
g_object_unref(viewManager);
-
- return(XFDASHBOARD_PLUGIN_ACTION_HANDLED);
}
/* Plugin initialization function */
diff --git a/plugins/gnome-shell-search-provider/plugin.c b/plugins/gnome-shell-search-provider/plugin.c
index 1b6e217..4062af7 100644
--- a/plugins/gnome-shell-search-provider/plugin.c
+++ b/plugins/gnome-shell-search-provider/plugin.c
@@ -190,7 +190,7 @@ static void _xfdashboard_gnome_shell_search_provider_plugin_on_file_monitor_chan
}
/* Plugin enable function */
-static gboolean plugin_enable(XfdashboardPlugin *self, gpointer inUserData)
+static void plugin_enable(XfdashboardPlugin *self, gpointer inUserData)
{
XfdashboardGnomeShellSearchProviderPluginPrivate *priv;
XfdashboardSearchManager *searchManager;
@@ -200,7 +200,7 @@ static gboolean plugin_enable(XfdashboardPlugin *self, gpointer inUserData)
GError *error;
gchar *pluginID;
- g_return_val_if_fail(inUserData, XFDASHBOARD_PLUGIN_ACTION_HANDLED);
+ g_return_if_fail(inUserData);
priv=(XfdashboardGnomeShellSearchProviderPluginPrivate*)inUserData;
error=NULL;
@@ -238,7 +238,7 @@ static gboolean plugin_enable(XfdashboardPlugin *self, gpointer inUserData)
if(searchManager) g_object_unref(searchManager);
if(gnomeShellSearchProvidersPath) g_object_unref(gnomeShellSearchProvidersPath);
- return(XFDASHBOARD_PLUGIN_ACTION_HANDLED);
+ return;
}
@@ -313,7 +313,7 @@ static gboolean plugin_enable(XfdashboardPlugin *self, gpointer inUserData)
if(searchManager) g_object_unref(searchManager);
if(gnomeShellSearchProvidersPath) g_object_unref(gnomeShellSearchProvidersPath);
- return(XFDASHBOARD_PLUGIN_ACTION_HANDLED);
+ return;
}
/* Create monitor to get notified about new, changed and removed search providers */
@@ -354,13 +354,10 @@ static gboolean plugin_enable(XfdashboardPlugin *self, gpointer inUserData)
if(enumerator) g_object_unref(enumerator);
if(searchManager) g_object_unref(searchManager);
if(gnomeShellSearchProvidersPath) g_object_unref(gnomeShellSearchProvidersPath);
-
- /* All done */
- return(XFDASHBOARD_PLUGIN_ACTION_HANDLED);
}
/* Plugin disable function */
-static gboolean plugin_disable(XfdashboardPlugin *self, gpointer inUserData)
+static void plugin_disable(XfdashboardPlugin *self, gpointer inUserData)
{
XfdashboardGnomeShellSearchProviderPluginPrivate *priv;
XfdashboardSearchManager *searchManager;
@@ -369,7 +366,7 @@ static gboolean plugin_disable(XfdashboardPlugin *self, gpointer inUserData)
gboolean success;
gchar *pluginID;
- g_return_val_if_fail(inUserData, XFDASHBOARD_PLUGIN_ACTION_HANDLED);
+ g_return_if_fail(inUserData);
priv=(XfdashboardGnomeShellSearchProviderPluginPrivate*)inUserData;
@@ -422,9 +419,6 @@ static gboolean plugin_disable(XfdashboardPlugin *self, gpointer inUserData)
g_list_free_full(priv->providers, g_free);
priv->providers=NULL;
}
-
- /* All done */
- return(XFDASHBOARD_PLUGIN_ACTION_HANDLED);
}
/* Plugin initialization function */
diff --git a/plugins/hot-corner/plugin.c b/plugins/hot-corner/plugin.c
index 5cb9450..1d7d17d 100644
--- a/plugins/hot-corner/plugin.c
+++ b/plugins/hot-corner/plugin.c
@@ -40,19 +40,17 @@ static XfdashboardHotCorner *hotCorner=NULL;
G_MODULE_EXPORT void plugin_init(XfdashboardPlugin *self);
/* Plugin enable function */
-static gboolean plugin_enable(XfdashboardPlugin *self, gpointer inUserData)
+static void plugin_enable(XfdashboardPlugin *self, gpointer inUserData)
{
/* Create instance of hot corner */
if(!hotCorner)
{
hotCorner=xfdashboard_hot_corner_new();
}
-
- return(XFDASHBOARD_PLUGIN_ACTION_HANDLED);
}
/* Plugin disable function */
-static gboolean plugin_disable(XfdashboardPlugin *self, gpointer inUserData)
+static void plugin_disable(XfdashboardPlugin *self, gpointer inUserData)
{
/* Destroy instance of hot corner */
if(hotCorner)
@@ -60,8 +58,6 @@ static gboolean plugin_disable(XfdashboardPlugin *self, gpointer inUserData)
g_object_unref(hotCorner);
hotCorner=NULL;
}
-
- return(XFDASHBOARD_PLUGIN_ACTION_HANDLED);
}
/* Plugin initialization function */
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list