r20431 - in /desktop/unstable/metacity/debian: changelog patches/10_ignore_callbacks.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Wed Jun 24 10:05:59 UTC 2009
Author: joss
Date: Wed Jun 24 10:05:57 2009
New Revision: 20431
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20431
Log:
10_ignore_callbacks.patch: stolen upstream. Fix a bug leading to
some callbacks being ignored. Closes: #533917.
Added:
desktop/unstable/metacity/debian/patches/10_ignore_callbacks.patch
Modified:
desktop/unstable/metacity/debian/changelog
desktop/unstable/metacity/debian/patches/series
Modified: desktop/unstable/metacity/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/changelog?rev=20431&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/changelog (original)
+++ desktop/unstable/metacity/debian/changelog Wed Jun 24 10:05:57 2009
@@ -1,8 +1,9 @@
-metacity (1:2.26.0-3) UNRELEASED; urgency=low
-
- * Break gnome-panel < 2.26. Closes: #533917.
-
- -- Josselin Mouette <joss at debian.org> Mon, 22 Jun 2009 11:55:17 +0200
+metacity (1:2.26.0-3) unstable; urgency=low
+
+ * 10_ignore_callbacks.patch: stolen upstream. Fix a bug leading to
+ some callbacks being ignored. Closes: #533917.
+
+ -- Josselin Mouette <joss at debian.org> Wed, 24 Jun 2009 12:04:26 +0200
metacity (1:2.26.0-2) unstable; urgency=low
Added: desktop/unstable/metacity/debian/patches/10_ignore_callbacks.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/patches/10_ignore_callbacks.patch?rev=20431&op=file
==============================================================================
--- desktop/unstable/metacity/debian/patches/10_ignore_callbacks.patch (added)
+++ desktop/unstable/metacity/debian/patches/10_ignore_callbacks.patch Wed Jun 24 10:05:57 2009
@@ -1,0 +1,122 @@
+From 178b5ff626d747026fc9d03c7908c3f203fbd263 Mon Sep 17 00:00:00 2001
+From: Thomas James Alexander Thurman <tthurman at src.gnome.org>
+Date: Thu, 12 Mar 2009 01:09:41 +0000
+Subject: fix problem where the previous code ignored callbacks for properties whose
+
+ * src/core/window-props.c: fix problem where the previous
+ code ignored callbacks for properties whose values weren't
+ looked up. Closes #572573.
+
+
+svn path=/trunk/; revision=4191
+---
+Index: metacity-2.26.0/src/core/window-props.c
+===================================================================
+--- metacity-2.26.0.orig/src/core/window-props.c 2009-02-05 02:10:05.000000000 +0100
++++ metacity-2.26.0/src/core/window-props.c 2009-06-24 12:05:07.325691850 +0200
+@@ -63,12 +63,6 @@ typedef struct MetaWindowPropHooks
+ ReloadValueFunc reload_func;
+ } MetaWindowPropHooks;
+
+-static void init_prop_value (MetaDisplay *display,
+- Atom property,
+- MetaPropValue *value);
+-static void reload_prop_value (MetaWindow *window,
+- MetaPropValue *value,
+- gboolean initial);
+ static MetaWindowPropHooks* find_hooks (MetaDisplay *display,
+ Atom property);
+
+@@ -118,23 +112,34 @@ meta_window_reload_properties_from_xwind
+ g_return_if_fail (n_properties > 0);
+
+ values = g_new0 (MetaPropValue, n_properties);
+-
+- i = 0;
+- while (i < n_properties)
++
++ for (i=0; i<n_properties; i++)
+ {
+- init_prop_value (window->display, properties[i], &values[i]);
+- ++i;
++ MetaWindowPropHooks *hooks = find_hooks (window->display,
++ properties[i]);
++
++ if (!hooks || hooks->type == META_PROP_VALUE_INVALID)
++ {
++ values[i].type = META_PROP_VALUE_INVALID;
++ values[i].atom = None;
++ }
++ else
++ {
++ values[i].type = hooks->type;
++ values[i].atom = properties[i];
++ }
+ }
+
+ meta_prop_get_values (window->display, xwindow,
+ values, n_properties);
+
+- i = 0;
+- while (i < n_properties)
++ for (i=0; i<n_properties; i++)
+ {
+- reload_prop_value (window, &values[i], initial);
+-
+- ++i;
++ MetaWindowPropHooks *hooks = find_hooks (window->display,
++ properties[i]);
++
++ if (hooks && hooks->reload_func != NULL)
++ (* hooks->reload_func) (window, &values[i], initial);
+ }
+
+ meta_prop_free_values (values, n_properties);
+@@ -142,37 +147,6 @@ meta_window_reload_properties_from_xwind
+ g_free (values);
+ }
+
+-/* Fill in the MetaPropValue used to get the value of "property" */
+-static void
+-init_prop_value (MetaDisplay *display,
+- Atom property,
+- MetaPropValue *value)
+-{
+- MetaWindowPropHooks *hooks = find_hooks (display, property);
+-
+- if (!hooks || hooks->type == META_PROP_VALUE_INVALID)
+- {
+- value->type = META_PROP_VALUE_INVALID;
+- value->atom = None;
+- }
+- else
+- {
+- value->type = hooks->type;
+- value->atom = property;
+- }
+-}
+-
+-static void
+-reload_prop_value (MetaWindow *window,
+- MetaPropValue *value,
+- gboolean initial)
+-{
+- MetaWindowPropHooks *hooks = find_hooks (window->display, value->atom);
+-
+- if (hooks && hooks->reload_func != NULL)
+- (* hooks->reload_func) (window, value, initial);
+-}
+-
+ static void
+ reload_wm_client_machine (MetaWindow *window,
+ MetaPropValue *value,
+@@ -1469,6 +1443,9 @@ meta_display_free_window_prop_hooks (Met
+ display->prop_hooks_table = NULL;
+ }
+
++/**
++ * Finds the hooks for a particular property.
++ */
+ static MetaWindowPropHooks*
+ find_hooks (MetaDisplay *display,
+ Atom property)
Modified: desktop/unstable/metacity/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/patches/series?rev=20431&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/patches/series (original)
+++ desktop/unstable/metacity/debian/patches/series Wed Jun 24 10:05:57 2009
@@ -1,3 +1,4 @@
01_Wcast-align.patch
+10_ignore_callbacks.patch
90_autotools.patch
99_ltmain_as-needed.patch
More information about the pkg-gnome-commits
mailing list