From 027bbe0fd9cb3eaddfdfc1ba4ea722e75edf71e6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 12 Jul 2004 05:57:41 +0000 Subject: [PATCH] Include the update_counter check in the HAVE_XSYNC condition, since Mon Jul 12 01:56:26 2004 Matthias Clasen * gdk/x11/gdkwindow-x11.c (gdk_toplevel_x11_free_contents): Include the update_counter check in the HAVE_XSYNC condition, since update_counter isn't present in the !HAVE_XSYNC case. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gdk/x11/gdkwindow-x11.c | 4 ++-- 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0928ba5d95..4d51c745ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Jul 12 01:56:26 2004 Matthias Clasen + + * gdk/x11/gdkwindow-x11.c (gdk_toplevel_x11_free_contents): + Include the update_counter check in the HAVE_XSYNC condition, + since update_counter isn't present in the !HAVE_XSYNC case. + Mon Jul 12 00:52:04 2004 Matthias Clasen * gtk/stock-icons/Makefile.am: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0928ba5d95..4d51c745ce 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Mon Jul 12 01:56:26 2004 Matthias Clasen + + * gdk/x11/gdkwindow-x11.c (gdk_toplevel_x11_free_contents): + Include the update_counter check in the HAVE_XSYNC condition, + since update_counter isn't present in the !HAVE_XSYNC case. + Mon Jul 12 00:52:04 2004 Matthias Clasen * gtk/stock-icons/Makefile.am: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0928ba5d95..4d51c745ce 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Mon Jul 12 01:56:26 2004 Matthias Clasen + + * gdk/x11/gdkwindow-x11.c (gdk_toplevel_x11_free_contents): + Include the update_counter check in the HAVE_XSYNC condition, + since update_counter isn't present in the !HAVE_XSYNC case. + Mon Jul 12 00:52:04 2004 Matthias Clasen * gtk/stock-icons/Makefile.am: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0928ba5d95..4d51c745ce 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Mon Jul 12 01:56:26 2004 Matthias Clasen + + * gdk/x11/gdkwindow-x11.c (gdk_toplevel_x11_free_contents): + Include the update_counter check in the HAVE_XSYNC condition, + since update_counter isn't present in the !HAVE_XSYNC case. + Mon Jul 12 00:52:04 2004 Matthias Clasen * gtk/stock-icons/Makefile.am: diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 9b749909ac..f8ef65ac4c 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -1050,17 +1050,17 @@ gdk_toplevel_x11_free_contents (GdkDisplay *display, g_object_unref (toplevel->group_leader); toplevel->group_leader = NULL; } +#ifdef HAVE_XSYNC if (toplevel->update_counter != None) { -#ifdef HAVE_XSYNC XSyncDestroyCounter (GDK_DISPLAY_XDISPLAY (display), toplevel->update_counter); toplevel->update_counter = None; XSyncIntToValue (&toplevel->current_counter_value, 0); XSyncIntToValue (&toplevel->pending_counter_value, 0); -#endif } +#endif } void