[Xfce4-commits] [apps/xfdashboard] 02/02: Fix typos and I changed a wrong signal handler (reverted it)

[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 03d90d3b9078be7a20557364538f2418b3ca01c0
Author: Stephan Haller <nomad at froevel.de>
Date:   Tue Jun 21 10:41:08 2016 +0200

    Fix typos and I changed a wrong signal handler (reverted it)
---
 libxfdashboard/live-window.c    | 2 +-
 libxfdashboard/live-workspace.c | 7 ++++++-
 libxfdashboard/quicklaunch.c    | 3 ---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/libxfdashboard/live-window.c b/libxfdashboard/live-window.c
index f518655..15afc06 100644
--- a/libxfdashboard/live-window.c
+++ b/libxfdashboard/live-window.c
@@ -141,7 +141,7 @@ static void _xfdashboard_live_window_on_clicked(XfdashboardLiveWindow *self, Clu
 	action=XFDASHBOARD_CLICK_ACTION(inUserData);
 
 	/* Only emit any of these signals if click was perform with left button */
-	if(xfdashboard_click_action_get_button(inAction)!=1) return;
+	if(xfdashboard_click_action_get_button(action)!=1) return;
 
 	/* Check if click happened in "close button" */
 	if(clutter_actor_is_visible(priv->actorClose))
diff --git a/libxfdashboard/live-workspace.c b/libxfdashboard/live-workspace.c
index a1afec9..e3491f6 100644
--- a/libxfdashboard/live-workspace.c
+++ b/libxfdashboard/live-workspace.c
@@ -226,10 +226,15 @@ static ClutterActor* _xfdashboard_live_workspace_create_and_add_window_actor(Xfd
 /* This actor was clicked */
 static void _xfdashboard_live_workspace_on_clicked(XfdashboardLiveWorkspace *self, ClutterActor *inActor, gpointer inUserData)
 {
+	XfdashboardClickAction			*action;
+
 	g_return_if_fail(XFDASHBOARD_IS_LIVE_WORKSPACE(self));
+	g_return_if_fail(XFDASHBOARD_IS_CLICK_ACTION(inUserData));
+
+	action=XFDASHBOARD_CLICK_ACTION(inUserData);
 
 	/* Only emit signal if click was perform with left button */
-	if(xfdashboard_click_action_get_button(inAction)==1)
+	if(xfdashboard_click_action_get_button(action)==1)
 	{
 		/* Emit "clicked" signal */
 		g_signal_emit(self, XfdashboardLiveWorkspaceSignals[SIGNAL_CLICKED], 0);
diff --git a/libxfdashboard/quicklaunch.c b/libxfdashboard/quicklaunch.c
index 571efbb..023c2d0 100644
--- a/libxfdashboard/quicklaunch.c
+++ b/libxfdashboard/quicklaunch.c
@@ -321,9 +321,6 @@ static void _xfdashboard_quicklaunch_on_favourite_clicked(XfdashboardQuicklaunch
 	priv=self->priv;
 	button=XFDASHBOARD_APPLICATION_BUTTON(inUserData);
 
-	/* Only emit any of these signals if click was perform with left button */
-	if(xfdashboard_click_action_get_button(inAction)!=1) return;
-
 	/* If user wants to activate the last active windows for a running instance
 	 * of application whose button was clicked, then check if a window exists
 	 * and activate it. Otherwise launch a new instance.

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