summaryrefslogtreecommitdiff
path: root/src/ui/ui.c
diff options
context:
space:
mode:
authorZenWalker <[email protected]>2017-07-29 02:10:08 +0200
committerZenWalker <[email protected]>2017-07-29 02:10:08 +0200
commited1a6302c87c6070bbec549ec36c5b56c12a6564 (patch)
tree1e5042d3a0e8159065360af12d9f9467d6f5f134 /src/ui/ui.c
parentc3ab92182c2a97d74c5b8cbd6dade9b48fab5c95 (diff)
downloadmarco-ed1a6302c87c6070bbec549ec36c5b56c12a6564.tar.bz2
marco-ed1a6302c87c6070bbec549ec36c5b56c12a6564.tar.xz
avoid deprecated gdk_display_get_screen
Diffstat (limited to 'src/ui/ui.c')
-rw-r--r--src/ui/ui.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/ui/ui.c b/src/ui/ui.c
index 2c1747ff..767f72b3 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -279,7 +279,7 @@ meta_ui_new (Display *xdisplay,
g_assert (gdisplay == gdk_display_get_default ());
g_assert (xdisplay == GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
- ui->frames = meta_frames_new (XScreenNumberOfScreen (screen));
+ ui->frames = meta_frames_new ();
/* This does not actually show any widget. MetaFrames has been hacked so
* that showing it doesn't actually do anything. But we need the flags
* set for GTK to deliver events properly. */
@@ -321,11 +321,10 @@ meta_ui_create_frame_window (MetaUI *ui,
gint x,
gint y,
gint width,
- gint height,
- gint screen_no)
+ gint height)
{
GdkDisplay *display = gdk_x11_lookup_xdisplay (xdisplay);
- GdkScreen *screen = gdk_display_get_screen (display, screen_no);
+ GdkScreen *screen = gdk_display_get_default_screen (display);
GdkWindowAttr attrs;
gint attributes_mask;
GdkWindow *window;
@@ -686,7 +685,7 @@ meta_ui_theme_get_frame_borders (MetaUI *ui,
if (!font_desc)
{
GdkDisplay *display = gdk_x11_lookup_xdisplay (ui->xdisplay);
- GdkScreen *screen = gdk_display_get_screen (display, XScreenNumberOfScreen (ui->xscreen));
+ GdkScreen *screen = gdk_display_get_default_screen (display);
GtkWidgetPath *widget_path;
style = gtk_style_context_new ();