diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2004-04-18 10:05:00 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2004-04-18 10:05:00 +0000 |
| commit | cd8a832b5dfa3f5590898ba43933ab53257db614 (patch) | |
| tree | 4c8ebe8c3dcd0af80e40a0f5fdf86792709fc683 /x11-wm | |
| parent | - Add another MASTER_SITE (diff) | |
- Fix the quit dialog box by using dynamic detection of gtk version
- Add another MASTER_SITE
PR: ports/65698
Submitted by: Matt Lancereau <matt@bsd-blax.org> (maintainer)
Notes
Notes:
svn path=/head/; revision=107403
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/xfce4-session/Makefile | 6 | ||||
| -rw-r--r-- | x11-wm/xfce4-session/files/patch-shutdown.c | 57 |
2 files changed, 60 insertions, 3 deletions
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile index a5d320e5b7c4..0b337714ae0b 100644 --- a/x11-wm/xfce4-session/Makefile +++ b/x11-wm/xfce4-session/Makefile @@ -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 --git a/x11-wm/xfce4-session/files/patch-shutdown.c b/x11-wm/xfce4-session/files/patch-shutdown.c new file mode 100644 index 000000000000..7f4e5ffd7de9 --- /dev/null +++ b/x11-wm/xfce4-session/files/patch-shutdown.c @@ -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 */ |