Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 344293 | Differences between
and this patch

Collapse All | Expand All

(-)a/gtk/window-decorator/gtk-window-decorator.c (-15 / +18 lines)
Lines 2635-2640 get_window_prop (Window xwindow, Link Here
2635
		 Atom   atom,
2635
		 Atom   atom,
2636
		 Window *val)
2636
		 Window *val)
2637
{
2637
{
2638
    Display *dpy = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
2638
    Atom   type;
2639
    Atom   type;
2639
    int	   format;
2640
    int	   format;
2640
    gulong nitems;
2641
    gulong nitems;
Lines 2647-2653 get_window_prop (Window xwindow, Link Here
2647
    gdk_error_trap_push ();
2648
    gdk_error_trap_push ();
2648
2649
2649
    type = None;
2650
    type = None;
2650
    result = XGetWindowProperty (gdk_display,
2651
    result = XGetWindowProperty (dpy,
2651
				 xwindow,
2652
				 xwindow,
2652
				 atom,
2653
				 atom,
2653
				 0, G_MAXLONG,
2654
				 0, G_MAXLONG,
Lines 4940-4946 force_quit_dialog_realize (GtkWidget *dialog, Link Here
4940
    WnckWindow *win = data;
4941
    WnckWindow *win = data;
4941
4942
4942
    gdk_error_trap_push ();
4943
    gdk_error_trap_push ();
4943
    XSetTransientForHint (gdk_display,
4944
    XSetTransientForHint (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
4944
			  GDK_WINDOW_XID (dialog->window),
4945
			  GDK_WINDOW_XID (dialog->window),
4945
			  wnck_window_get_xid (win));
4946
			  wnck_window_get_xid (win));
4946
    gdk_display_sync (gdk_display_get_default ());
4947
    gdk_display_sync (gdk_display_get_default ());
Lines 4950-4966 force_quit_dialog_realize (GtkWidget *dialog, Link Here
4950
static char *
4951
static char *
4951
get_client_machine (Window xwindow)
4952
get_client_machine (Window xwindow)
4952
{
4953
{
4953
    Atom   atom, type;
4954
    Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
4954
    gulong nitems, bytes_after;
4955
    Atom    atom, type;
4955
    guchar *str = NULL;
4956
    gulong  nitems, bytes_after;
4956
    int    format, result;
4957
    guchar  *str = NULL;
4957
    char   *retval;
4958
    int     format, result;
4959
    char    *retval;
4958
4960
4959
    atom = XInternAtom (gdk_display, "WM_CLIENT_MACHINE", FALSE);
4961
    atom = XInternAtom (xdisplay, "WM_CLIENT_MACHINE", FALSE);
4960
4962
4961
    gdk_error_trap_push ();
4963
    gdk_error_trap_push ();
4962
4964
4963
    result = XGetWindowProperty (gdk_display,
4965
    result = XGetWindowProperty (xdisplay,
4964
				 xwindow, atom,
4966
				 xwindow, atom,
4965
				 0, G_MAXLONG,
4967
				 0, G_MAXLONG,
4966
				 FALSE, XA_STRING, &type, &format, &nitems,
4968
				 FALSE, XA_STRING, &type, &format, &nitems,
Lines 4987-4992 get_client_machine (Window xwindow) Link Here
4987
static void
4989
static void
4988
kill_window (WnckWindow *win)
4990
kill_window (WnckWindow *win)
4989
{
4991
{
4992
    GdkDisplay      *gdk_display = gdk_display_get_default ();
4993
    Display         *xdisplay    = GDK_DISPLAY_XDISPLAY (gdk_display);
4990
    WnckApplication *app;
4994
    WnckApplication *app;
4991
4995
4992
    app = wnck_window_get_application (win);
4996
    app = wnck_window_get_application (win);
Lines 5012-5019 kill_window (WnckWindow *win) Link Here
5012
    }
5016
    }
5013
5017
5014
    gdk_error_trap_push ();
5018
    gdk_error_trap_push ();
5015
    XKillClient (gdk_display, wnck_window_get_xid (win));
5019
    XKillClient (xdisplay, wnck_window_get_xid (win));
5016
    gdk_display_sync (gdk_display_get_default ());
5020
    gdk_display_sync (gdk_display);
5017
    gdk_error_trap_pop ();
5021
    gdk_error_trap_pop ();
5018
}
5022
}
5019
5023
Lines 5597-5605 static int Link Here
5597
update_shadow (void)
5601
update_shadow (void)
5598
{
5602
{
5599
    decor_shadow_options_t opt;
5603
    decor_shadow_options_t opt;
5600
    Display		   *xdisplay = gdk_display;
5604
    GdkDisplay		   *display  = gdk_display_get_default ();
5601
    GdkDisplay		   *display = gdk_display_get_default ();
5605
    Display		   *xdisplay = GDK_DISPLAY_XDISPLAY (display);
5602
    GdkScreen		   *screen = gdk_display_get_default_screen (display);
5606
    GdkScreen		   *screen   = gdk_display_get_default_screen (display);
5603
5607
5604
    opt.shadow_radius  = shadow_radius;
5608
    opt.shadow_radius  = shadow_radius;
5605
    opt.shadow_opacity = shadow_opacity;
5609
    opt.shadow_opacity = shadow_opacity;
5606
-

Return to bug 344293