diff options
| -rw-r--r-- | applets/clock/clock.c | 3 | ||||
| -rw-r--r-- | applets/fish/fish.c | 3 | ||||
| -rw-r--r-- | applets/wncklet/window-list.c | 7 | ||||
| -rw-r--r-- | mate-panel/panel-action-button.c | 4 | ||||
| -rw-r--r-- | mate-panel/panel-toplevel.c | 3 |
5 files changed, 8 insertions, 12 deletions
diff --git a/applets/clock/clock.c b/applets/clock/clock.c index fee7edf2..0eee5766 100644 --- a/applets/clock/clock.c +++ b/applets/clock/clock.c @@ -922,8 +922,7 @@ position_calendar_popup (ClockData *cd) button_w = allocation.width; button_h = allocation.height; - screen = gtk_window_get_screen (GTK_WINDOW (cd->calendar_popup)); - display = gdk_screen_get_display (screen); + display = gtk_widget_get_display (GTK_WIDGET (cd->calendar_popup)); n = gdk_display_get_n_monitors (display); for (i = 0; i < n; i++) { diff --git a/applets/fish/fish.c b/applets/fish/fish.c index 45ce9228..e0898334 100644 --- a/applets/fish/fish.c +++ b/applets/fish/fish.c @@ -937,8 +937,7 @@ static void display_fortune_dialog(FishApplet* fish) clear_fortune_text (fish); - screen = gtk_widget_get_screen (GTK_WIDGET (fish)); - display = gdk_screen_get_display (screen); + display = gtk_widget_get_display (GTK_WIDGET (fish)); display_name = g_strdup (gdk_display_get_name (display)); g_spawn_async_with_pipes (NULL, /* working directory */ argv, diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c index 93785cc1..3e828264 100644 --- a/applets/wncklet/window-list.c +++ b/applets/wncklet/window-list.c @@ -786,16 +786,15 @@ gboolean window_list_applet_fill(MatePanelApplet* applet) tasklist->applet = GTK_WIDGET(applet); provider = gtk_css_provider_new (); - screen = gdk_screen_get_default (); gtk_css_provider_load_from_data (provider, ".mate-panel-menu-bar button,\n" " #tasklist-button {\n" " padding: 0px;\n" " margin: 0px;\n }", -1, NULL); - gtk_style_context_add_provider_for_screen (screen, - GTK_STYLE_PROVIDER (provider), - GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + gtk_style_context_add_provider_for_screen (gtk_widget_get_screen (tasklist->applet), + GTK_STYLE_PROVIDER (provider), + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); g_object_unref (provider); mate_panel_applet_set_flags(MATE_PANEL_APPLET(tasklist->applet), MATE_PANEL_APPLET_EXPAND_MAJOR | MATE_PANEL_APPLET_EXPAND_MINOR | MATE_PANEL_APPLET_HAS_HANDLE); diff --git a/mate-panel/panel-action-button.c b/mate-panel/panel-action-button.c index 6fad288f..25759d58 100644 --- a/mate-panel/panel-action-button.c +++ b/mate-panel/panel-action-button.c @@ -343,7 +343,7 @@ static void panel_action_shutdown (GtkWidget *widget) { #ifdef HAVE_WAYLAND - GdkDisplay *display = gdk_screen_get_display (gdk_screen_get_default ()); + GdkDisplay *display = gdk_display_get_default (); if (GDK_IS_WAYLAND_DISPLAY (display)) { GtkWidget *dialog, *hbox, *buttonbox, *shutdown_btn, *label; @@ -424,7 +424,7 @@ panel_action_shutdown_reboot_is_disabled (void) if (panel_lockdown_get_disable_log_out()) return TRUE; #ifdef HAVE_WAYLAND - GdkDisplay *display = gdk_screen_get_display (gdk_screen_get_default()); + GdkDisplay *display = gdk_display_get_default (); if (!(panel_lockdown_get_disable_log_out()) && (GDK_IS_WAYLAND_DISPLAY (display))) return FALSE; #endif diff --git a/mate-panel/panel-toplevel.c b/mate-panel/panel-toplevel.c index 2eb6e77a..a57c42e9 100644 --- a/mate-panel/panel-toplevel.c +++ b/mate-panel/panel-toplevel.c @@ -852,12 +852,11 @@ static void panel_toplevel_rotate_to_pointer(PanelToplevel* toplevel, int pointe #ifdef HAVE_X11 static gboolean panel_toplevel_warp_pointer_increment(PanelToplevel* toplevel, int keyval, int increment) { - GdkScreen *screen; GdkWindow *root_window; GdkDevice *device; int new_x, new_y; - screen = gtk_window_get_screen (GTK_WINDOW (toplevel)); + GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (toplevel)); g_return_val_if_fail (GDK_IS_X11_SCREEN (screen), FALSE); root_window = gdk_screen_get_root_window (screen); device = gdk_seat_get_pointer (gdk_display_get_default_seat (gtk_widget_get_display (GTK_WIDGET(root_window)))); |