[Xfce4-commits] [apps/xfdashboard] 01/01: Turn signal XfdashboardWindowTracker::screen-size-changed into a simple notification signal without additional data

[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 daffb4f2f00c938421ed94491112f165e5eee549
Author: Stephan Haller <nomad at froevel.de>
Date:   Wed May 10 15:40:16 2017 +0200

    Turn signal XfdashboardWindowTracker::screen-size-changed into a simple notification signal without additional data
---
 libxfdashboard/stage.c                  | 27 ++++++++++++++-------------
 libxfdashboard/window-tracker.c         |  6 ++----
 libxfdashboard/window-tracker.h         |  2 +-
 libxfdashboard/x11/window-tracker-x11.c |  2 +-
 4 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/libxfdashboard/stage.c b/libxfdashboard/stage.c
index dfd8c18..7e2365a 100644
--- a/libxfdashboard/stage.c
+++ b/libxfdashboard/stage.c
@@ -1473,15 +1473,19 @@ static void _xfdashboard_stage_on_monitor_removed(XfdashboardStage *self,
 
 /* Screen size has changed */
 static void _xfdashboard_stage_on_screen_size_changed(XfdashboardStage *self,
-														gint inWidth,
-														gint inHeight,
 														gpointer inUserData)
 {
-	gfloat				stageWidth, stageHeight;
+	XfdashboardWindowTracker	*windowTracker;
+	gint						screenWidth, screenHeight;
+	gfloat						stageWidth, stageHeight;
 
 	g_return_if_fail(XFDASHBOARD_IS_STAGE(self));
-	g_return_if_fail(inWidth>0);
-	g_return_if_fail(inHeight>0);
+	g_return_if_fail(XFDASHBOARD_IS_WINDOW_TRACKER(inUserData));
+
+	windowTracker=XFDASHBOARD_WINDOW_TRACKER(inUserData);
+
+	/* Get screen size */
+	xfdashboard_window_tracker_get_screen_size(windowTracker, &screenWidth, &screenHeight);
 
 	/* Get current size of stage */
 	clutter_actor_get_size(CLUTTER_ACTOR(self), &stageWidth, &stageHeight);
@@ -1489,15 +1493,15 @@ static void _xfdashboard_stage_on_screen_size_changed(XfdashboardStage *self,
 	/* If either stage's width or height does not match screen's width or height
 	 * resize the stage.
 	 */
-	if((gint)stageWidth!=inWidth ||
-		(gint)stageHeight!=inHeight)
+	if((gint)stageWidth!=screenWidth ||
+		(gint)stageHeight!=screenHeight)
 	{
 		XFDASHBOARD_DEBUG(self, ACTOR,
 							"Screen resized to %dx%d but stage has size of %dx%d - resizing stage",
-							inWidth, inHeight,
+							screenWidth, screenHeight,
 							(gint)stageWidth, (gint)stageHeight);
 
-		clutter_actor_set_size(CLUTTER_ACTOR(self), inWidth, inHeight);
+		clutter_actor_set_size(CLUTTER_ACTOR(self), screenWidth, screenHeight);
 	}
 }
 
@@ -1960,10 +1964,7 @@ static void xfdashboard_stage_init(XfdashboardStage *self)
 		(clutter_major_version==1 && clutter_minor_version<17) ||
 		(clutter_major_version==1 && clutter_minor_version==17 && clutter_micro_version<2))
 	{
-		gint					screenWidth, screenHeight;
-
-		xfdashboard_window_tracker_get_screen_size(priv->windowTracker, &screenWidth, &screenHeight);
-		_xfdashboard_stage_on_screen_size_changed(self, screenWidth, screenHeight, priv->windowTracker);
+		_xfdashboard_stage_on_screen_size_changed(self, priv->windowTracker);
 
 		g_signal_connect_swapped(priv->windowTracker,
 									"screen-size-changed",
diff --git a/libxfdashboard/window-tracker.c b/libxfdashboard/window-tracker.c
index 508f879..81dc88e 100644
--- a/libxfdashboard/window-tracker.c
+++ b/libxfdashboard/window-tracker.c
@@ -362,11 +362,9 @@ void xfdashboard_window_tracker_default_init(XfdashboardWindowTrackerInterface *
 							G_STRUCT_OFFSET(XfdashboardWindowTrackerInterface, screen_size_changed),
 							NULL,
 							NULL,
-							_xfdashboard_marshal_VOID__INT_INT,
+							g_cclosure_marshal_VOID__VOID,
 							G_TYPE_NONE,
-							2,
-							G_TYPE_INT,
-							G_TYPE_INT);
+							0);
 
 		XfdashboardWindowTrackerSignals[SIGNAL_WINDOW_MANAGER_CHANGED]=
 			g_signal_new("window-manager-changed",
diff --git a/libxfdashboard/window-tracker.h b/libxfdashboard/window-tracker.h
index e93a47a..68d434f 100644
--- a/libxfdashboard/window-tracker.h
+++ b/libxfdashboard/window-tracker.h
@@ -111,7 +111,7 @@ struct _XfdashboardWindowTrackerInterface
 	void (*monitor_removed)(XfdashboardWindowTracker *self, XfdashboardWindowTrackerMonitor *inMonitor);
 	void (*monitor_geometry_changed)(XfdashboardWindowTracker *self, XfdashboardWindowTrackerMonitor *inMonitor);
 
-	void (*screen_size_changed)(XfdashboardWindowTracker *self, gint inWidth, gint inHeight);
+	void (*screen_size_changed)(XfdashboardWindowTracker *self);
 
 	void (*window_manager_changed)(XfdashboardWindowTracker *self);
 };
diff --git a/libxfdashboard/x11/window-tracker-x11.c b/libxfdashboard/x11/window-tracker-x11.c
index f0d73e9..ef59958 100644
--- a/libxfdashboard/x11/window-tracker-x11.c
+++ b/libxfdashboard/x11/window-tracker-x11.c
@@ -1087,7 +1087,7 @@ static void _xfdashboard_window_tracker_x11_on_screen_size_changed(XfdashboardWi
 						"Screen size changed to %dx%d",
 						w,
 						h);
-	g_signal_emit_by_name(self, "screen-size-changed", w, h);
+	g_signal_emit_by_name(self, "screen-size-changed");
 }
 
 /* Window manager has changed */

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