[Xfce4-commits] [apps/xfdashboard] 04/08: Revert usage of singleton in XfdashboardWindowTrackerX11 as access to singleton is not possible and throws compiler error

[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 68b91878e23d791929f35b97c5b29add5d450ca5
Author: Stephan Haller <nomad at froevel.de>
Date:   Tue Apr 4 17:37:32 2017 +0200

    Revert usage of singleton in XfdashboardWindowTrackerX11 as access to singleton is not possible and throws compiler error
---
 libxfdashboard/x11/window-tracker-x11.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/libxfdashboard/x11/window-tracker-x11.c b/libxfdashboard/x11/window-tracker-x11.c
index e333a83..f254649 100644
--- a/libxfdashboard/x11/window-tracker-x11.c
+++ b/libxfdashboard/x11/window-tracker-x11.c
@@ -1796,23 +1796,23 @@ guint32 xfdashboard_window_tracker_x11_get_time(void)
 	if(timestamp>0) return(timestamp);
 
 	/* Next we try to retrieve timestamp of last X11 event in clutter */
-	XFDASHBOARD_DEBUG(_xfdashboard_window_tracker_singleton, WINDOWS, "No timestamp for windows - trying timestamp of last X11 event in Clutter");
+	XFDASHBOARD_DEBUG(NULL, WINDOWS, "No timestamp for windows - trying timestamp of last X11 event in Clutter");
 	timestamp=(guint32)clutter_x11_get_current_event_time();
 	if(timestamp!=0)
 	{
-		XFDASHBOARD_DEBUG(_xfdashboard_window_tracker_singleton, WINDOWS,
+		XFDASHBOARD_DEBUG(NULL, WINDOWS,
 							"Got timestamp %u of last X11 event in Clutter",
 							timestamp);
 		return(timestamp);
 	}
 
 	/* Last resort is to get X11 server time via stage windows */
-	XFDASHBOARD_DEBUG(_xfdashboard_window_tracker_singleton, WINDOWS, "No timestamp for windows - trying last resort via stage windows");
+	XFDASHBOARD_DEBUG(NULL, WINDOWS, "No timestamp for windows - trying last resort via stage windows");
 
 	display=gdk_display_get_default();
 	if(!display)
 	{
-		XFDASHBOARD_DEBUG(_xfdashboard_window_tracker_singleton, WINDOWS, "No default display found in GDK to get timestamp for windows");
+		XFDASHBOARD_DEBUG(NULL, WINDOWS, "No default display found in GDK to get timestamp for windows");
 		return(0);
 	}
 
@@ -1829,7 +1829,7 @@ guint32 xfdashboard_window_tracker_x11_get_time(void)
 			window=gdk_x11_window_lookup_for_display(display, clutter_x11_get_stage_window(stage));
 			if(!window)
 			{
-				XFDASHBOARD_DEBUG(_xfdashboard_window_tracker_singleton, WINDOWS,
+				XFDASHBOARD_DEBUG(NULL, WINDOWS,
 									"No GDK window found for stage %p to get timestamp for windows",
 									stage);
 				continue;
@@ -1841,7 +1841,7 @@ guint32 xfdashboard_window_tracker_x11_get_time(void)
 			eventMask=gdk_window_get_events(window);
 			if(!(eventMask & GDK_PROPERTY_CHANGE_MASK))
 			{
-				XFDASHBOARD_DEBUG(_xfdashboard_window_tracker_singleton, WINDOWS,
+				XFDASHBOARD_DEBUG(NULL, WINDOWS,
 									"GDK window %p for stage %p does not support GDK_PROPERTY_CHANGE_MASK to get timestamp for windows",
 									window,
 									stage);
@@ -1854,7 +1854,7 @@ guint32 xfdashboard_window_tracker_x11_get_time(void)
 	g_slist_free(stages);
 
 	/* Return timestamp of last resort */
-	XFDASHBOARD_DEBUG(_xfdashboard_window_tracker_singleton, WINDOWS,
+	XFDASHBOARD_DEBUG(NULL, WINDOWS,
 						"Last resort timestamp for windows %s (%u)",
 						timestamp ? "found" : "not found",
 						timestamp);

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