diff options
Diffstat (limited to 'x11-wm/compiz')
| -rw-r--r-- | x11-wm/compiz/Makefile | 2 | ||||
| -rw-r--r-- | x11-wm/compiz/files/patch-gtk_window-decorator_gtk-window-decorator.c | 54 |
2 files changed, 53 insertions, 3 deletions
diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile index fe81043df637..3bca40e76b7f 100644 --- a/x11-wm/compiz/Makefile +++ b/x11-wm/compiz/Makefile @@ -7,7 +7,7 @@ PORTNAME= compiz PORTVERSION= 0.8.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-wm MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/ diff --git a/x11-wm/compiz/files/patch-gtk_window-decorator_gtk-window-decorator.c b/x11-wm/compiz/files/patch-gtk_window-decorator_gtk-window-decorator.c index 53b82dae3979..1c853c4e2d99 100644 --- a/x11-wm/compiz/files/patch-gtk_window-decorator_gtk-window-decorator.c +++ b/x11-wm/compiz/files/patch-gtk_window-decorator_gtk-window-decorator.c @@ -1,5 +1,14 @@ ---- gtk/window-decorator/gtk-window-decorator.c.orig 2010-04-06 18:29:25.000000000 +0200 -+++ gtk/window-decorator/gtk-window-decorator.c 2010-04-06 18:40:04.000000000 +0200 +--- gtk/window-decorator/gtk-window-decorator.c.orig 2009-08-15 09:24:40.000000000 +0200 ++++ gtk/window-decorator/gtk-window-decorator.c 2010-10-29 12:56:37.000000000 +0200 +@@ -2671,7 +2671,7 @@ get_window_prop (Window xwindow, + gdk_error_trap_push (); + + type = None; +- result = XGetWindowProperty (gdk_display, ++ result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), + xwindow, + atom, + 0, G_MAXLONG, @@ -4233,7 +4233,7 @@ show_tooltip (const char *text) static void hide_tooltip (void) @@ -9,3 +18,44 @@ g_get_current_time (&tooltip_last_popdown); gtk_widget_hide (tip_window); +@@ -4966,7 +4966,7 @@ force_quit_dialog_realize (GtkWidget *di + WnckWindow *win = data; + + gdk_error_trap_push (); +- XSetTransientForHint (gdk_display, ++ XSetTransientForHint (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), + GDK_WINDOW_XID (dialog->window), + wnck_window_get_xid (win)); + gdk_display_sync (gdk_display_get_default ()); +@@ -4982,11 +4982,11 @@ get_client_machine (Window xwindow) + int format, result; + char *retval; + +- atom = XInternAtom (gdk_display, "WM_CLIENT_MACHINE", FALSE); ++ atom = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "WM_CLIENT_MACHINE", FALSE); + + gdk_error_trap_push (); + +- result = XGetWindowProperty (gdk_display, ++ result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), + xwindow, atom, + 0, G_MAXLONG, + FALSE, XA_STRING, &type, &format, &nitems, +@@ -5038,7 +5038,7 @@ kill_window (WnckWindow *win) + } + + gdk_error_trap_push (); +- XKillClient (gdk_display, wnck_window_get_xid (win)); ++ XKillClient (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), wnck_window_get_xid (win)); + gdk_display_sync (gdk_display_get_default ()); + gdk_error_trap_pop (); + } +@@ -5623,7 +5623,7 @@ static int + update_shadow (void) + { + decor_shadow_options_t opt; +- Display *xdisplay = gdk_display; ++ Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); + GdkDisplay *display = gdk_display_get_default (); + GdkScreen *screen = gdk_display_get_default_screen (display); + |