Hello community,
here is the log from the commit of package xfwm4 for openSUSE:Factory checked
in at 2012-08-22 12:18:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xfwm4 (Old)
and /work/SRC/openSUSE:Factory/.xfwm4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfwm4", Maintainer is "xfce-maintain...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xfwm4/xfwm4.changes 2012-05-08
11:51:30.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xfwm4.new/xfwm4.changes 2012-08-22
12:19:08.000000000 +0200
@@ -1,0 +2,13 @@
+Sat Aug 18 19:33:50 UTC 2012 - g...@opensuse.org
+
+- add xfwm4-implement-net_wm_moveresize_cancel-message.patch in
+ order to implement NET_WM_MOVERESIZE_CANCEL message as gtk+-3.4
+ now uses it (bxo#8949)
+- add xfwm4-fix-crash-in-settings-dialog.patch in order to fix a
+ crash in settings dialog with wrong title alignment value
+ (bxo#9108)
+- add xfwm4-fix-bug-in-workspace-deletion.patch which reverts part
+ of git commit 8637c3a as this breaks deletetion of current
+ workspace (bxo#8827)
+
+-------------------------------------------------------------------
New:
----
xfwm4-fix-bug-in-workspace-deletion.patch
xfwm4-fix-crash-in-settings-dialog.patch
xfwm4-implement-net_wm_moveresize_cancel-message.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfwm4.spec ++++++
--- /var/tmp/diff_new_pack.HgC2mn/_old 2012-08-22 12:19:09.000000000 +0200
+++ /var/tmp/diff_new_pack.HgC2mn/_new 2012-08-22 12:19:09.000000000 +0200
@@ -31,6 +31,12 @@
Source5: Kelabu-xfwm4.tar.bz2
Source6: COPYING.Kelabu
Source7: xfwm4.xml
+# PATCH-FIX-UPSTREAM xfwm4-implement-net_wm_moveresize_cancel-message.patch
bxo#8949 g...@opensuse.org -- Implement NET_WM_MOVERESIZE_CANCEL message as
gtk+-3.4 now uses it (backported from upstream git)
+Patch0: xfwm4-implement-net_wm_moveresize_cancel-message.patch
+# PATCH-FIX-UPSTREAM xfwm4-fix-crash-in-settings-dialog.patch bxo#9108
g...@opensuse.org -- Fix crash in settings dialog with wrong title alignment
value (backported from upstream git)
+Patch1: xfwm4-fix-crash-in-settings-dialog.patch
+# PATCH-FIX-UPSTREAM xfwm4-fix-bug-in-workspace-deletion.patch bxo#8827
g...@opensuse.org -- Revert part of git commit 8637c3a as this breaks
deletetion of current workspace (backported from upstream git)
+Patch2: xfwm4-fix-bug-in-workspace-deletion.patch
BuildRequires: fdupes
BuildRequires: intltool
BuildRequires: update-desktop-files
@@ -78,6 +84,9 @@
%prep
%setup -q -a1 -a3 -a5
cp %{SOURCE2} %{SOURCE4} %{SOURCE6} .
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
export CFLAGS="%{optflags} -fno-strict-aliasing"
++++++ xfwm4-fix-bug-in-workspace-deletion.patch ++++++
>From 0003144fdff6f3508b604103065512eb839ab838 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <four...@xfce.org>
Date: Wed, 18 Jul 2012 22:30:36 +0200
Subject: [PATCH 12/14] Revert part of git commit 8637c3a as this breaks
deletetion of current workspace (bug 8827)
---
src/workspaces.c | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/workspaces.c b/src/workspaces.c
index fb19ab0..f57eec9 100644
--- a/src/workspaces.c
+++ b/src/workspaces.c
@@ -492,7 +492,8 @@ workspaceInsert (ScreenInfo * screen_info, guint position)
void
workspaceDelete (ScreenInfo * screen_info, guint position)
{
- guint count;
+ Client *c;
+ guint i, count;
g_return_if_fail (screen_info != NULL);
@@ -504,6 +505,14 @@ workspaceDelete (ScreenInfo * screen_info, guint position)
return;
}
+ for (c = screen_info->clients, i = 0; i < screen_info->client_count; c =
c->next, i++)
+ {
+ if (c->win_workspace > position)
+ {
+ clientSetWorkspace (c, c->win_workspace - 1, TRUE);
+ }
+ }
+
workspaceSetCount(screen_info, count - 1);
}
--
1.7.7
++++++ xfwm4-fix-crash-in-settings-dialog.patch ++++++
>From f09ea920648d4414c747d390d7cfb2aed230c1e7 Mon Sep 17 00:00:00 2001
From: Mike Massonnet <mmasson...@xfce.org>
Date: Sun, 15 Jul 2012 19:28:15 +0200
Subject: [PATCH 11/14] Fix crash in settings dialog with wrong title
alignment value (bug #9108)
---
settings-dialogs/xfwm4-settings.c | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/settings-dialogs/xfwm4-settings.c
b/settings-dialogs/xfwm4-settings.c
index 711bce0..212e4e7 100644
--- a/settings-dialogs/xfwm4-settings.c
+++ b/settings-dialogs/xfwm4-settings.c
@@ -1591,17 +1591,19 @@ xfwm_settings_title_button_alignment_changed
(GtkComboBox *combo,
float align = 0.5f;
model = gtk_combo_box_get_model (combo);
- gtk_combo_box_get_active_iter (combo, &iter);
- gtk_tree_model_get (model, &iter, 1, &value, -1);
+ if (gtk_combo_box_get_active_iter (combo, &iter))
+ {
+ gtk_tree_model_get (model, &iter, 1, &value, -1);
- if (g_str_equal (value, "left"))
- align = 0.0f;
- else if (g_str_equal (value, "right"))
- align = 1.0f;
+ if (g_str_equal (value, "left"))
+ align = 0.0f;
+ else if (g_str_equal (value, "right"))
+ align = 1.0f;
- gtk_button_set_alignment (GTK_BUTTON (button), align, 0.5f);
+ g_free (value);
+ }
- g_free (value);
+ gtk_button_set_alignment (GTK_BUTTON (button), align, 0.5f);
}
--
1.7.7
++++++ xfwm4-implement-net_wm_moveresize_cancel-message.patch ++++++
>From 0b39bbe0b3b5bf514dea223ec96cd25ea4e1444f Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <four...@xfce.org>
Date: Wed, 18 Jul 2012 22:12:07 +0200
Subject: [PATCH 10/14] Implement NET_WM_MOVERESIZE_CANCEL message (bug #8949)
as gtk+-3.4 now uses it.
---
src/display.h | 3 ++-
src/moveresize.c | 15 +++++++++++++--
src/netwm.c | 7 ++++++-
3 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/display.h b/src/display.h
index 1ad2ef8..8797237 100644
--- a/src/display.h
+++ b/src/display.h
@@ -163,7 +163,8 @@ enum
NET_WM_MOVERESIZE_SIZE_LEFT,
NET_WM_MOVERESIZE_MOVE,
NET_WM_MOVERESIZE_SIZE_KEYBOARD,
- NET_WM_MOVERESIZE_MOVE_KEYBOARD
+ NET_WM_MOVERESIZE_MOVE_KEYBOARD,
+ NET_WM_MOVERESIZE_CANCEL
};
enum
diff --git a/src/moveresize.c b/src/moveresize.c
index 9893c30..a98bdf7 100644
--- a/src/moveresize.c
+++ b/src/moveresize.c
@@ -827,7 +827,7 @@ clientMoveEventFilter (XEvent * xevent, gpointer data)
eventFilterStatus status = EVENT_FILTER_STOP;
MoveResizeData *passdata = (MoveResizeData *) data;
Client *c = NULL;
- gboolean moving = TRUE;
+ gboolean moving;
XWindowChanges wc;
int prev_x, prev_y;
@@ -840,6 +840,12 @@ clientMoveEventFilter (XEvent * xevent, gpointer data)
display_info = screen_info->display_info;
configure_flags = NO_CFG_FLAG;
+ /*
+ * Clients may choose to end the move operation,
+ * we use XFWM_FLAG_MOVING_RESIZING for that.
+ */
+ moving = FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
+
/* Update the display time */
myDisplayUpdateCurrentTime (display_info, xevent);
@@ -1294,7 +1300,12 @@ clientResizeEventFilter (XEvent * xevent, gpointer data)
screen_info = c->screen_info;
display_info = screen_info->display_info;
status = EVENT_FILTER_STOP;
- resizing = TRUE;
+
+ /*
+ * Clients may choose to end the resize operation,
+ * we use XFWM_FLAG_MOVING_RESIZING for that.
+ */
+ resizing = FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
frame_x = frameX (c);
frame_y = frameY (c);
diff --git a/src/netwm.c b/src/netwm.c
index 545e64a..1352f08 100644
--- a/src/netwm.c
+++ b/src/netwm.c
@@ -695,10 +695,15 @@ clientNetMoveResize (Client * c, XClientMessageEvent * ev)
resize = TRUE; /* Resize */
break;
case NET_WM_MOVERESIZE_MOVE:
- default:
event->type = ButtonPress;
resize = FALSE; /* Move */
break;
+ case NET_WM_MOVERESIZE_CANCEL:
+ FLAG_UNSET (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
+ /* Walk through */
+ default: /* Do nothing */
+ return;
+ break;
}
if (!FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
--
1.7.7
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
