Hello community, here is the log from the commit of package mutter for openSUSE:Factory checked in at 2012-05-08 06:46:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mutter (Old) and /work/SRC/openSUSE:Factory/.mutter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mutter", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/mutter/mutter.changes 2012-04-20 15:18:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mutter.new/mutter.changes 2012-05-08 06:47:11.000000000 +0200 @@ -1,0 +2,6 @@ +Sat May 5 07:50:00 UTC 2012 - [email protected] + +- Add mutter-fix-crash-when-frame-is-NULL.patch: fixes crashes in + various extensions. + +------------------------------------------------------------------- New: ---- mutter-fix-crash-when-frame-is-NULL.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mutter.spec ++++++ --- /var/tmp/diff_new_pack.ll0XjQ/_old 2012-05-08 06:47:12.000000000 +0200 +++ /var/tmp/diff_new_pack.ll0XjQ/_new 2012-05-08 06:47:12.000000000 +0200 @@ -24,6 +24,8 @@ Group: System/GUI/GNOME Url: http://www.gnome.org Source: http://download.gnome.org/sources/mutter/3.4/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM mutter-fix-crash-when-frame-is-NULL.patch bgo#675254 [email protected] -- fixes crashes in extensions. +Patch0: mutter-fix-crash-when-frame-is-NULL.patch BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel BuildRequires: gobject-introspection-devel >= 0.9.5 @@ -88,6 +90,7 @@ %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream %if 0%{?BUILD_FROM_VCS} ++++++ mutter-fix-crash-when-frame-is-NULL.patch ++++++ >From c669a3892e377daaf31a574618a4f8566bd9df61 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" <[email protected]> Date: Tue, 1 May 2012 13:40:08 -0400 Subject: [PATCH] meta_window_move_frame(): fix crash when frame is NULL When meta_frame_calc_borders() was made to take a NULL frame argument, a crash was accidentally introduced into meta_window_move_frame(). This partially reverts 8c1b2d5. https://bugzilla.gnome.org/show_bug.cgi?id=675254 --- src/core/window.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/core/window.c b/src/core/window.c index 08e413c..e51de1b 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -5080,18 +5080,20 @@ meta_window_move_frame (MetaWindow *window, { int x = root_x_nw; int y = root_y_nw; - MetaFrameBorders borders; - - meta_frame_calc_borders (window->frame, &borders); - /* root_x_nw and root_y_nw correspond to where the top of - * the visible frame should be. Offset by the distance between - * the origin of the window and the origin of the enclosing - * window decorations. - */ - x += window->frame->child_x - borders.invisible.left; - y += window->frame->child_y - borders.invisible.top; + if (window->frame) + { + MetaFrameBorders borders; + meta_frame_calc_borders (window->frame, &borders); + /* root_x_nw and root_y_nw correspond to where the top of + * the visible frame should be. Offset by the distance between + * the origin of the window and the origin of the enclosing + * window decorations. + */ + x += window->frame->child_x - borders.invisible.left; + y += window->frame->child_y - borders.invisible.top; + } meta_window_move (window, user_op, x, y); } -- 1.7.10 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
