diff options
author | Eric Koegel <eric.koegel@gmail.com> | 2017-04-19 15:32:45 +0300 |
---|---|---|
committer | Eric Koegel <eric.koegel@gmail.com> | 2017-04-19 18:46:00 +0300 |
commit | f4279d5b2ebe5121f7f5948bbf30226d73ade701 (patch) | |
tree | d92e07044f3d99f7cfe23ecb50cda9d4e1a20240 /src/xfdesktop-icon-view.c | |
parent | 33a766247421244353a05281eff36966a9265a47 (diff) | |
download | xfdesktop-f4279d5b2ebe5121f7f5948bbf30226d73ade701.tar.gz |
Fix a couple more screen deprecation warnings
And remove an unneeded gtk_style_set call.
Diffstat (limited to 'src/xfdesktop-icon-view.c')
-rw-r--r-- | src/xfdesktop-icon-view.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/xfdesktop-icon-view.c b/src/xfdesktop-icon-view.c index a2227622..cac2bb04 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; |