[Xfce4-commits] [apps/xfdashboard] 01/01: Fix signal definition for action to enable, disable or configure a XfdashboardPlugin instance

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

nomad pushed a commit to branch master
in repository apps/xfdashboard.

commit b2195fb94094a0651f4de0c0ebdc6ed2fedf54b5
Author: Stephan Haller <nomad at froevel.de>
Date:   Fri Feb 12 08:23:18 2016 +0100

    Fix signal definition for action to enable, disable or configure a XfdashboardPlugin instance
---
 xfdashboard/marshal.list |   15 ++++++++-------
 xfdashboard/plugin.c     |   19 ++++++++-----------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/xfdashboard/marshal.list b/xfdashboard/marshal.list
index feb9730..42824a7 100644
--- a/xfdashboard/marshal.list
+++ b/xfdashboard/marshal.list
@@ -1,11 +1,12 @@
+VOID:FLOAT,FLOAT
+VOID:INT,INT
+VOID:INT,INT,INT,INT
 VOID:OBJECT,OBJECT
-BOOLEAN:OBJECT
 VOID:OBJECT,FLOAT,FLOAT
-BOOLEAN:OBJECT,FLOAT,FLOAT
-VOID:INT,INT,INT,INT
-VOID:FLOAT,FLOAT
-BOOLEAN:OBJECT,ENUM
 VOID:OBJECT,OBJECT,OBJECT
-BOOLEAN:OBJECT,STRING,OBJECT
-VOID:INT,INT
 VOID:STRING,BOOLEAN
+BOOLEAN:OBJECT
+BOOLEAN:OBJECT,ENUM
+BOOLEAN:OBJECT,FLOAT,FLOAT
+BOOLEAN:OBJECT,STRING,OBJECT
+BOOLEAN:VOID
diff --git a/xfdashboard/plugin.c b/xfdashboard/plugin.c
index 3ebd2f0..4dafce3 100644
--- a/xfdashboard/plugin.c
+++ b/xfdashboard/plugin.c
@@ -863,10 +863,9 @@ static void xfdashboard_plugin_class_init(XfdashboardPluginClass *klass)
 						G_STRUCT_OFFSET(XfdashboardPluginClass, enable),
 						g_signal_accumulator_true_handled,
 						NULL,
-						_xfdashboard_marshal_BOOLEAN__OBJECT,
+						_xfdashboard_marshal_BOOLEAN__VOID,
 						G_TYPE_BOOLEAN,
-						1,
-						XFDASHBOARD_TYPE_PLUGIN);
+						0);
 
 	XfdashboardPluginSignals[ACTION_DISABLE]=
 		g_signal_new("disable",
@@ -875,10 +874,9 @@ static void xfdashboard_plugin_class_init(XfdashboardPluginClass *klass)
 						G_STRUCT_OFFSET(XfdashboardPluginClass, disable),
 						g_signal_accumulator_true_handled,
 						NULL,
-						_xfdashboard_marshal_BOOLEAN__OBJECT,
+						_xfdashboard_marshal_BOOLEAN__VOID,
 						G_TYPE_BOOLEAN,
-						1,
-						XFDASHBOARD_TYPE_PLUGIN);
+						0);
 
 	XfdashboardPluginSignals[ACTION_CONFIGURE]=
 		g_signal_new("configure",
@@ -887,10 +885,9 @@ static void xfdashboard_plugin_class_init(XfdashboardPluginClass *klass)
 						G_STRUCT_OFFSET(XfdashboardPluginClass, configure),
 						g_signal_accumulator_true_handled,
 						NULL,
-						_xfdashboard_marshal_BOOLEAN__OBJECT,
+						_xfdashboard_marshal_BOOLEAN__VOID,
 						G_TYPE_BOOLEAN,
-						1,
-						XFDASHBOARD_TYPE_PLUGIN);
+						0);
 }
 
 /* Object initialization
@@ -1035,7 +1032,7 @@ void xfdashboard_plugin_enable(XfdashboardPlugin *self)
 	}
 
 	/* Emit signal action 'enable' to enable plugin */
-	g_signal_emit(self, XfdashboardPluginSignals[ACTION_ENABLE], 0, self, &result);
+	g_signal_emit(self, XfdashboardPluginSignals[ACTION_ENABLE], 0, &result);
 	g_debug("Plugin '%s' enabled", priv->id);
 
 	/* Set enabled state */
@@ -1060,7 +1057,7 @@ void xfdashboard_plugin_disable(XfdashboardPlugin *self)
 	}
 
 	/* Emit signal action 'disable' to disable plugin */
-	g_signal_emit(self, XfdashboardPluginSignals[ACTION_DISABLE], 0, self, &result);
+	g_signal_emit(self, XfdashboardPluginSignals[ACTION_DISABLE], 0, &result);
 	g_debug("Plugin '%s' disabled", priv->id);
 
 	/* Set disabled state, i.e. revert to initialized state */

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.