rpms/gnome-panel/devel gnome-panel-2.10.1-no-window-group-for-you.patch, NONE, 1.1 gnome-panel.spec, 1.67, 1.68

[fedora-cvs-commits at redhat.com]

Author: markmc

Update of /cvs/dist/rpms/gnome-panel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26476

Modified Files:
	gnome-panel.spec 
Added Files:
	gnome-panel-2.10.1-no-window-group-for-you.patch 
Log Message:
* Wed May 11 2005 Mark McLoughlin <markmc at redhat.com> 2.10.1-10
- Fix "dialogs pop up under panel dialogs" issue (bug #156425)


gnome-panel-2.10.1-no-window-group-for-you.patch:
 ChangeLog        |   13 +++++++++++++
 panel-toplevel.c |    3 +--
 xstuff.c         |   31 -------------------------------
 xstuff.h         |    2 --
 4 files changed, 14 insertions(+), 35 deletions(-)

--- NEW FILE gnome-panel-2.10.1-no-window-group-for-you.patch ---
--- gnome-panel-2.10.1/gnome-panel/ChangeLog.no-window-group-for-you	2005-04-03 14:13:45.000000000 -0400
+++ gnome-panel-2.10.1/gnome-panel/ChangeLog	2005-05-11 04:54:28.000000000 -0400
@@ -0,0 +1,13 @@
+2005-05-11  Mark McLoughlin  <mark at skynet.ie>
+
+	Fix "dialogs pop up under panel dialogs" issue by
+	making each panel be in its own window group and
+	the dialogs part of the default group. Bug #303570
+
+	* panel-toplevel.c: (panel_toplevel_realize):
+	Just set the group leader to be the panel itself
+	rather than making a futile effort to foil gtk.
+	
+	* xstuff.[ch]: 
+	(xstuff_set_no_group): remove.
+
--- gnome-panel-2.10.1/gnome-panel/panel-toplevel.c.no-window-group-for-you	2005-03-07 09:15:16.000000000 -0500
+++ gnome-panel-2.10.1/gnome-panel/panel-toplevel.c	2005-05-11 04:54:28.000000000 -0400
@@ -44,7 +44,6 @@
 #include "panel-widget.h"
 #include "panel-bindings.h"
 #include "panel-struts.h"
-#include "xstuff.h"
 #include "panel-config-global.h"
 #include "panel-lockdown.h"
 
@@ -2684,8 +2683,8 @@
 
 	panel_struts_set_window_hint (toplevel);
 	panel_xutils_set_window_type (widget->window, PANEL_XUTILS_TYPE_DOCK);
-	xstuff_set_no_group (widget->window);
 
+	gdk_window_set_group (widget->window, widget->window);
 	gdk_window_set_geometry_hints (widget->window, NULL, GDK_HINT_POS);
 
 	panel_toplevel_move_resize_window (toplevel, TRUE, TRUE);
--- gnome-panel-2.10.1/gnome-panel/xstuff.c.no-window-group-for-you	2005-03-07 09:15:16.000000000 -0500
+++ gnome-panel-2.10.1/gnome-panel/xstuff.c	2005-05-11 04:54:28.000000000 -0400
@@ -183,37 +183,6 @@
 	return gdk_net_wm_supports (gdk_atom_intern (hint, FALSE));
 }
 
-void
-xstuff_set_no_group (GdkWindow *win)
-{
-	XWMHints *old_wmhints;
-	XWMHints wmhints = {0};
-
-	XDeleteProperty (GDK_WINDOW_XDISPLAY (win),
-			 GDK_WINDOW_XWINDOW (win),
-			 panel_atom_get ("WM_CLIENT_LEADER"));
-
-	old_wmhints = XGetWMHints (GDK_WINDOW_XDISPLAY (win),
-				   GDK_WINDOW_XWINDOW (win));
-	/* General paranoia */
-	if (old_wmhints != NULL) {
-		memcpy (&wmhints, old_wmhints, sizeof (XWMHints));
-		XFree (old_wmhints);
-
-		wmhints.flags &= ~WindowGroupHint;
-		wmhints.window_group = 0;
-	} else {
-		/* General paranoia */
-		wmhints.flags = StateHint;
-		wmhints.window_group = 0;
-		wmhints.initial_state = NormalState;
-	}
-
-	XSetWMHints (GDK_WINDOW_XDISPLAY (win),
-		     GDK_WINDOW_XWINDOW (win),
-		     &wmhints);
-}
-
 /* This is such a broken stupid function. */   
 void
 xstuff_set_pos_size (GdkWindow *window, int x, int y, int w, int h)
--- gnome-panel-2.10.1/gnome-panel/xstuff.h.no-window-group-for-you	2003-03-07 02:00:06.000000000 -0500
+++ gnome-panel-2.10.1/gnome-panel/xstuff.h	2005-05-11 04:54:28.000000000 -0400
@@ -9,8 +9,6 @@
 gboolean xstuff_is_compliant_wm		(void);
 gboolean xstuff_net_wm_supports         (const char *hint);
 
-void xstuff_set_no_group	        (GdkWindow *win);
-
 void xstuff_unsetup_desktop_area	(void);
 void xstuff_set_pos_size		(GdkWindow *window,
 					 int x, int y,


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- gnome-panel.spec	4 May 2005 15:00:27 -0000	1.67
+++ gnome-panel.spec	11 May 2005 08:58:37 -0000	1.68
@@ -23,7 +23,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.10.1
-Release: 9
+Release: 10
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -75,6 +75,7 @@
 Patch2: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
 Patch3: gnome-panel-2.10.1-no-huge-icons.patch
 Patch4: gnome-panel-2.10.1-fix-recent-items-crash.patch
+Patch5: gnome-panel-2.10.1-no-window-group-for-you.patch
 
 %description
 
@@ -101,6 +102,7 @@
 %patch2 -p1 -b .speak-to-us-ye-old-wise-fish
 %patch3 -p1 -b .no-huge-icons
 %patch4 -p1 -b .fix-recent-items-crash
+%patch5 -p1 -b .no-window-group-for-you
 
 cp -f %{SOURCE1} gnome-panel/panel-default-setup.entries
 cp -f %{SOURCE3} gnome-panel/panel-compatibility.schemas
@@ -239,6 +241,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed May 11 2005 Mark McLoughlin <markmc at redhat.com> 2.10.1-10
+- Fix "dialogs pop up under panel dialogs" issue (bug #156425)
+
 * Wed May  4 2005 Mark McLoughlin <markmc at redhat.com> 2.10.1-9
 - Fix crash with "Recent Documents" menu (bug #156633)