diff options
Diffstat (limited to 'mate-panel/xstuff.c')
-rw-r--r-- | mate-panel/xstuff.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mate-panel/xstuff.c b/mate-panel/xstuff.c index 02627a18..7108d570 100644 --- a/mate-panel/xstuff.c +++ b/mate-panel/xstuff.c @@ -3,6 +3,7 @@ * * Copyright (C) 2000, 2001 Eazel, Inc. * 2002 Sun Microsystems Inc. + * Copyright (C) 2012-2021 MATE Developers * * Authors: George Lebl <[email protected]> * Mark McLoughlin <[email protected]> @@ -206,8 +207,9 @@ draw_zoom_animation_composited (GdkScreen *gscreen, gtk_window_move (GTK_WINDOW (win), wx, wy); - g_signal_connect (G_OBJECT (win), "draw", - G_CALLBACK (zoom_draw), zoom); + g_signal_connect (win, "draw", + G_CALLBACK (zoom_draw), + zoom); /* see doc for gtk_widget_set_app_paintable() */ gtk_widget_realize (win); @@ -232,7 +234,7 @@ draw_zoom_animation (GdkScreen *gscreen, int i, j; GC frame_gc; XGCValues gcv; - GdkColor color = { 65535, 65535, 65535 }; + GdkColor color = { .pixel = 0, .red = 65535, .green = 65535, .blue = 65535 }; Display *dpy; Window root_win; int screen; @@ -346,8 +348,6 @@ xstuff_zoom_animate (GtkWidget *widget, GdkScreen *gscreen; GdkRectangle rect, dest; GtkAllocation allocation; - GdkMonitor *monitor; - GdkDisplay *display; if (opt_rect) rect = *opt_rect; @@ -375,8 +375,8 @@ xstuff_zoom_animate (GtkWidget *widget, pixbuf, orientation); g_object_unref (pixbuf); } else { - display = gdk_screen_get_display (gscreen); - monitor = gdk_display_get_monitor_at_window (display, + GdkDisplay *display = gdk_screen_get_display (gscreen); + GdkMonitor *monitor = gdk_display_get_monitor_at_window (display, gtk_widget_get_window (widget)); gdk_monitor_get_geometry (monitor, &dest); |