This is an automated email from the git hooks/post-receive script. eric pushed a commit to branch master in repository xfce/xfdesktop.
commit f4279d5b2ebe5121f7f5948bbf30226d73ade701 Author: Eric Koegel <eric.koe...@gmail.com> Date: Wed Apr 19 15:32:45 2017 +0300 Fix a couple more screen deprecation warnings And remove an unneeded gtk_style_set call. --- src/xfdesktop-icon-view.c | 17 +++++++---------- src/xfdesktop-window-icon-manager.c | 2 +- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/xfdesktop-icon-view.c b/src/xfdesktop-icon-view.c index a222762..cac2bb0 100644 --- a/src/xfdesktop-icon-view.c +++ b/src/xfdesktop-icon-view.c @@ -1878,10 +1878,7 @@ xfdesktop_icon_view_realize(GtkWidget *widget) icon_view->priv->parent_window = gtk_widget_get_toplevel(widget); g_return_if_fail(icon_view->priv->parent_window); gtk_widget_set_window(widget, gtk_widget_get_window(icon_view->priv->parent_window)); - - gtk_widget_set_style(widget, - gtk_style_attach(gtk_widget_get_style(widget), - gtk_widget_get_window(widget))); + /* we need this call here to initalize some members of icon_view->priv, * those depend on custom style properties */ xfdesktop_icon_view_style_updated(widget); @@ -2491,21 +2488,21 @@ xfdesktop_rectangle_is_bounded_by(GdkRectangle *rect, static void xfdesktop_icon_view_setup_grids_xinerama(XfdesktopIconView *icon_view) { - GdkScreen *gscreen; + GdkDisplay *display; GdkRectangle *monitor_geoms, cell_rect; gint nmonitors, i, row, col; DBG("entering"); - - gscreen = gtk_widget_get_screen(GTK_WIDGET(icon_view)); - - nmonitors = gdk_screen_get_n_monitors(gscreen); + + display = gtk_widget_get_display(GTK_WIDGET(icon_view)); + + nmonitors = gdk_display_get_n_monitors(display); if(nmonitors == 1) /* optimisation */ return; monitor_geoms = g_new0(GdkRectangle, nmonitors); for(i = 0; i < nmonitors; ++i) - gdk_screen_get_monitor_geometry(gscreen, i, &monitor_geoms[i]); + gdk_monitor_get_geometry(gdk_display_get_monitor(display, i), &monitor_geoms[i]); /* cubic time; w00t! */ cell_rect.width = cell_rect.height = CELL_SIZE; diff --git a/src/xfdesktop-window-icon-manager.c b/src/xfdesktop-window-icon-manager.c index f1c4ea9..4c7c48a 100644 --- a/src/xfdesktop-window-icon-manager.c +++ b/src/xfdesktop-window-icon-manager.c @@ -128,7 +128,7 @@ xfdesktop_window_icon_manager_set_property(GObject *object, switch(property_id) { case PROP_SCREEN: wmanager->priv->gscreen = g_value_peek_pointer(value); - wmanager->priv->wnck_screen = wnck_screen_get(gdk_screen_get_number(wmanager->priv->gscreen)); + wmanager->priv->wnck_screen = wnck_screen_get(0); break; default: -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits