Hello community, here is the log from the commit of package metacity for openSUSE:Factory checked in at Fri Sep 24 00:20:10 CEST 2010. -------- --- GNOME/metacity/metacity.changes 2010-08-27 14:44:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/metacity/metacity.changes 2010-09-16 10:06:09.000000000 +0200 @@ -1,0 +2,20 @@ +Thu Sep 16 09:55:35 CEST 2010 - vuntz@opensuse.org + +- Update to version 2.30.2: + + Replace GDK drawing API with cairo + + Removes usage of gdk_display + + Stop confusing GDK's grab tracking + + Allow building with Gtk+-3.0 + + Replace deprecated GDK symbols + + Fixes for compiling with GSeal + + Fix crash with --sync option + + Fix very unlikely crasher + + Remove deprecated Encoding key from desktop files + + Fix memory leak in theme optimisation + + Use correct timestamp for focus stealing prevention + + Don't warn about a missing session file + + Updated translations. +- Update metacity-key-list-binding.patch with patch attached to + bgo#609101, that got applied to mutter. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- metacity-2.30.1.tar.bz2 New: ---- metacity-2.30.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ metacity.spec ++++++ --- /var/tmp/diff_new_pack.uqelaw/_old 2010-09-24 00:19:57.000000000 +0200 +++ /var/tmp/diff_new_pack.uqelaw/_new 2010-09-24 00:19:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package metacity (Version 2.30.1) +# spec file for package metacity (Version 2.30.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -32,8 +32,8 @@ BuildRequires: zenity License: GPLv2+ Group: System/GUI/GNOME -Version: 2.30.1 -Release: 5 +Version: 2.30.2 +Release: 1 Summary: A Fast Window Manager for the GNOME 2.x Desktop Source: %{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM metacity-uninitialized-variables.patch bgo619524 vuntz@opensuse.org -- Fix uninitialized variables ++++++ metacity-2.30.1.tar.bz2 -> metacity-2.30.2.tar.bz2 ++++++ ++++ 71901 lines of diff (skipped) ++++++ metacity-key-list-binding.patch ++++++ --- /var/tmp/diff_new_pack.uqelaw/_old 2010-09-24 00:19:58.000000000 +0200 +++ /var/tmp/diff_new_pack.uqelaw/_new 2010-09-24 00:19:58.000000000 +0200 @@ -1,13 +1,109 @@ -Index: metacity-2.28.1/src/core/prefs.c -=================================================================== ---- metacity-2.28.1.orig/src/core/prefs.c -+++ metacity-2.28.1/src/core/prefs.c -@@ -2272,7 +2272,7 @@ find_and_update_list_binding (MetaKeyPre +commit 8875e73765ac0279d5f58a95598db04c3a51ecfa +Author: Owen W. Taylor <otaylor@fishsoup.net> +Date: Thu Feb 18 14:04:05 2010 -0500 + + Fix crash on startup with list bindings + + When we are reading bindings initially, update_list_binding() needs + to be passed the correct "string list type" since we are calling + it with a list of strings instead of a list of GConfValue. + + https://bugzilla.gnome.org/show_bug.cgi?id=609101 + +diff --git a/src/core/prefs.c b/src/core/prefs.c +index 702add8..55a56d1 100644 +--- a/src/core/prefs.c ++++ b/src/core/prefs.c +@@ -126,11 +126,20 @@ static gboolean handle_preference_update_enum (const gchar *key, GConfValue *val + + static gboolean update_key_binding (const char *name, + const char *value); +-static gboolean find_and_update_list_binding (MetaKeyPref *bindings, +- const char *name, +- GSList *value); +-static gboolean update_key_list_binding (const char *name, +- GSList *value); ++ ++typedef enum ++ { ++ META_LIST_OF_STRINGS, ++ META_LIST_OF_GCONFVALUE_STRINGS ++ } MetaStringListType; ++ ++static gboolean find_and_update_list_binding (MetaKeyPref *bindings, ++ const char *name, ++ GSList *value, ++ MetaStringListType type_of_value); ++static gboolean update_key_list_binding (const char *name, ++ GSList *value, ++ MetaStringListType type_of_value); + static gboolean update_command (const char *name, + const char *value); + static gboolean update_workspace_name (const char *name, +@@ -145,12 +154,6 @@ static char* gconf_key_for_workspace_name (int i); + + static void queue_changed (MetaPreference pref); + +-typedef enum +- { +- META_LIST_OF_STRINGS, +- META_LIST_OF_GCONFVALUE_STRINGS +- } MetaStringListType; +- + static gboolean update_list_binding (MetaKeyPref *binding, + GSList *value, + MetaStringListType type_of_value); +@@ -1149,7 +1152,7 @@ change_notify (GConfClient *client, + + list = value ? gconf_value_get_list (value) : NULL; + +- if (update_key_list_binding (key, list)) ++ if (update_key_list_binding (key, list, META_LIST_OF_GCONFVALUE_STRINGS)) + queue_changed (META_PREF_KEYBINDINGS); + } + else +@@ -1919,7 +1922,7 @@ init_bindings (void) + { + list_val = gconf_client_get_list (default_client, key, GCONF_VALUE_STRING, NULL); + +- update_key_list_binding (key, list_val); ++ update_key_list_binding (key, list_val, META_LIST_OF_STRINGS); + g_slist_foreach (list_val, (GFunc)g_free, NULL); + g_slist_free (list_val); + } +@@ -2304,9 +2307,10 @@ update_key_binding (const char *name, + } + + static gboolean +-find_and_update_list_binding (MetaKeyPref *bindings, +- const char *name, +- GSList *value) ++find_and_update_list_binding (MetaKeyPref *bindings, ++ const char *name, ++ GSList *value, ++ MetaStringListType type_of_value) + { + const char *key; + int i; +@@ -2327,16 +2331,17 @@ find_and_update_list_binding (MetaKeyPref *bindings, g_free (name_without_suffix); if (bindings[i].name) - return update_list_binding (&bindings[i], value, META_LIST_OF_GCONFVALUE_STRINGS); -+ return update_list_binding (&bindings[i], value, META_LIST_OF_STRINGS); ++ return update_list_binding (&bindings[i], value, type_of_value); else return FALSE; } + + static gboolean +-update_key_list_binding (const char *name, +- GSList *value) ++update_key_list_binding (const char *name, ++ GSList *value, ++ MetaStringListType type_of_value) + { +- return find_and_update_list_binding (key_bindings, name, value); ++ return find_and_update_list_binding (key_bindings, name, value, type_of_value); + } + + static gboolean ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org