Attachment 42102 Details for Bug 65698 – xfce4-session.diff

[patch] xfce4-session.diff

xfce4-session.diff (text/plain), 2.44 KB, created by matt on 2004-04-18 10:40:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: matt

Created: 2004-04-18 10:40:12 UTC

Size: 2.44 KB

patch

obsolete

>diff -ruN xfce4-session.orig/Makefile xfce4-session/Makefile
>--- xfce4-session.orig/Makefile	Sun Apr 18 11:08:00 2004
>+++ xfce4-session/Makefile	Sun Apr 18 11:14:59 2004
>@@ -7,10 +7,10 @@
> 
> PORTNAME=	xfce4-session
> PORTVERSION=	0.1.4
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	x11-wm xfce
>-MASTER_SITES=	ftp://ftp.unix-ag.org/user/bmeurer/xfce4/xfce4-session/ \
>-		http://echobase.homeunix.net/~bmeurer/tmp/xfce4-session/
>+MASTER_SITES=	http://echobase.homeunix.net/~bmeurer/tmp/xfce4-session/ \
>+		http://www.bsd-blax.org/ports/mirrors/
> 
> MAINTAINER=	matt@rimasec.net
> COMMENT=	XFce 4 Session Manager
>diff -ruN xfce4-session.orig/files/patch-aa xfce4-session/files/patch-aa
>--- xfce4-session.orig/files/patch-aa	Thu Jan  1 01:00:00 1970
>+++ xfce4-session/files/patch-aa	Sun Apr 18 11:06:11 2004
>@@ -0,0 +1,57 @@
>+--- xfce4-session/shutdown.c.orig	Sun Apr 18 10:41:07 2004
>++++ xfce4-session/shutdown.c	Sun Apr 18 10:49:51 2004
>+@@ -170,7 +170,8 @@
>+ 
>+ 	/* Try to grab Input on a hidden window first */
>+ 	hidden = gtk_invisible_new();
>+-	gtk_widget_show(hidden);
>++	gtk_widget_show_now(hidden);
>++	gdk_flush();
>+ 
>+ 	for (;;) {
>+ 		if (gdk_pointer_grab(hidden->window, FALSE, 0, NULL, NULL,
>+@@ -201,16 +202,23 @@
>+ 
>+ 	/* this window *should* not be handled by the window manager */
>+ 	g_object_set(G_OBJECT(dialog), "type", GTK_WINDOW_POPUP, NULL);
>++	if ((gtk_major_version >=2) && (gtk_minor_version >= 3)) {
>++		g_object_set (G_OBJECT (dialog), "type_hint",
>++			      GDK_WINDOW_TYPE_HINT_UTILITY, NULL);
>++	}
>++	g_object_set (G_OBJECT (dialog), "decorated", FALSE, NULL);
>+ 
>+ 	/*
>+ 	 * Grabbing the Xserver when accessibility is enabled will cause a
>+ 	 * hang. Found in gnome-session (see #93103 for details).
>+ 	 */
>+ 	accessibility = GTK_IS_ACCESSIBLE(gtk_widget_get_accessible(dialog));
>+-	if (!accessibility) {
>+-		gdk_x11_grab_server();
>+-		drawBackground();
>+-		gdk_flush();
>++	if ((gtk_major_version >=2) && (gtk_minor_version < 3)) {
>++		if (!accessibility) {
>++			gdk_x11_grab_server();
>++			drawBackground();
>++			gdk_flush();
>++		}
>+ 	}
>+ 
>+ 	dbox = GTK_DIALOG(dialog)->vbox;
>+@@ -300,10 +308,12 @@
>+ 
>+ 	gtk_widget_destroy(dialog);
>+ 
>+-	/* ungrab the Xserver */
>+-	if (!accessibility) {
>+-		gdk_x11_ungrab_server();
>+-		refreshBackground();
>++	if ((gtk_major_version >=2) && (gtk_minor_version < 3)) {
>++		/* ungrab the Xserver */
>++		if (!accessibility) {
>++			gdk_x11_ungrab_server();
>++			refreshBackground();
>++		}
>+ 	}
>+ 
>+ 	/* Release Keyboard/Mouse pointer grab */

Actions: View | Diff

Attachments on bug 65698: 42102