Date: Sun, 18 Apr 2004 11:35:18 +0200 (CEST) From: Matt Lancereau <matt@rimasec.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: ale@FreeBSD.org Subject: ports/65698: [maintainer update] x11-wm/xfce4-session Message-ID: <200404180935.i3I9ZIox005196@fly.mos.bsd-blax.org> Resent-Message-ID: <200404180940.i3I9eCRL017298@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 65698 >Category: ports >Synopsis: [maintainer update] x11-wm/xfce4-session >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Apr 18 02:40:12 PDT 2004 >Closed-Date: >Last-Modified: >Originator: Matt Lancereau >Release: FreeBSD 5.2.1-RELEASE-p5 i386 >Organization: >Environment: System: FreeBSD fly.mos.bsd-blax.org 5.2.1-RELEASE-p5 FreeBSD 5.2.1-RELEASE-p5 #1: Sun Apr 18 09:19:44 CEST 2004 root@fly.mos.bsd-blax.org:/usr/obj/usr/src/sys/FLY i386 >Description: - Fix the quit dialog box by using dynamic detection of gtk version - Add another MASTER_SITE >How-To-Repeat: >Fix: --- xfce4-session.diff begins here --- 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 */ --- xfce4-session.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200404180935.i3I9ZIox005196>