[metacity] tabpopup: use default screen

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 4d9358e5ac9e575c9880322e8a9167c5a6d6cc8b
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sun Jun 12 00:51:37 2016 +0300

    tabpopup: use default screen

 src/core/screen.c      |    2 --
 src/include/tabpopup.h |    1 -
 src/ui/tabpopup.c      |    4 +---
 3 files changed, 1 insertions(+), 6 deletions(-)
---
diff --git a/src/core/screen.c b/src/core/screen.c
index 30b3048..f3f50e9 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -1370,7 +1370,6 @@ meta_screen_ensure_tab_popup (MetaScreen      *screen,
     }
 
   screen->tab_popup = meta_ui_tab_popup_new (entries,
-                                             screen->number,
                                              len,
                                              5, /* FIXME */
                                              TRUE);
@@ -1442,7 +1441,6 @@ meta_screen_ensure_workspace_popup (MetaScreen *screen)
     }
 
   screen->tab_popup = meta_ui_tab_popup_new (entries,
-                                             screen->number,
                                              len,
                                              layout.cols,
                                              FALSE);
diff --git a/src/include/tabpopup.h b/src/include/tabpopup.h
index aa5744c..80aacf8 100644
--- a/src/include/tabpopup.h
+++ b/src/include/tabpopup.h
@@ -47,7 +47,6 @@ struct _MetaTabEntry
 };
 
 MetaTabPopup*   meta_ui_tab_popup_new          (const MetaTabEntry *entries,
-                                                int                 screen_number,
                                                 int                 entry_count,
                                                 int                 width,
                                                 gboolean            outline);
diff --git a/src/ui/tabpopup.c b/src/ui/tabpopup.c
index 4262227..a6cd154 100644
--- a/src/ui/tabpopup.c
+++ b/src/ui/tabpopup.c
@@ -188,7 +188,6 @@ tab_entry_new (const MetaTabEntry *entry,
 
 MetaTabPopup*
 meta_ui_tab_popup_new (const MetaTabEntry *entries,
-                       int                 screen_number,
                        int                 entry_count,
                        int                 width,
                        gboolean            outline)
@@ -208,8 +207,7 @@ meta_ui_tab_popup_new (const MetaTabEntry *entries,
 
   popup = g_new (MetaTabPopup, 1);
 
-  screen = gdk_display_get_screen (gdk_display_get_default (),
-                                   screen_number);
+  screen = gdk_screen_get_default ();
   visual = gdk_screen_get_rgba_visual (screen);
 
   if (outline)