[mutter/wip/ui-on-own-connection: 8/13] ui: Kill off meta_ui_get_screen_number

[Jasper St. Pierre <jstpierre src gnome org>]

commit ee7c58984adf660d6609779a9ce37202cfc486d6
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Sun Apr 6 16:15:46 2014 -0400

    ui: Kill off meta_ui_get_screen_number
    
    GTK+ always opens the DefaultScreen now, so we can do the same.

 src/core/display.c |    2 +-
 src/ui/ui.c        |    6 ------
 src/ui/ui.h        |    2 --
 3 files changed, 1 insertions(+), 9 deletions(-)
---
diff --git a/src/core/display.c b/src/core/display.c
index c234ad8..648aaf4 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -832,7 +832,7 @@ meta_display_open (void)
    * now it always manages exactly one screen as specified by the DISPLAY
    * environment variable.
    */
-  i = meta_ui_get_screen_number ();
+  i = DefaultScreen (the_display->xdisplay);
   screen = meta_screen_new (the_display, i, timestamp);
 
   if (!screen)
diff --git a/src/ui/ui.c b/src/ui/ui.c
index c5d1842..11de813 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -66,12 +66,6 @@ meta_ui_get_display (void)
   return GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
 }
 
-gint
-meta_ui_get_screen_number (void)
-{
-  return gdk_screen_get_number (gdk_screen_get_default ());
-}
-
 /* For XInput2 */
 #include "display-private.h"
 
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 165129f..e59c0b5 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -44,8 +44,6 @@ void meta_ui_init (void);
 
 Display* meta_ui_get_display (void);
 
-gint meta_ui_get_screen_number (void);
-
 MetaUI* meta_ui_new (Display *xdisplay,
                      Screen  *screen);
 void    meta_ui_free (MetaUI *ui);