[gnome-settings-daemon/docking-stations] Remove gnome_settings_session_get_screen()

[Federico Mena Quintero <federico src gnome org>]

commit 5c1665726a6a79dbeec2fd82517e9fcbe2026670
Author: Federico Mena Quintero <federico gnome org>
Date:   Tue Jan 10 17:49:36 2012 -0600

    Remove gnome_settings_session_get_screen()
    
    As of gnome-desktop 3.3.4, gnome_rr_screen_new() creates a singleton
    for the specified GdkScreen.  So, we no longer need a singleton-creating
    function of our own.
    
    Signed-off-by: Federico Mena Quintero <federico gnome org>

 configure.ac                                   |    2 +-
 gnome-settings-daemon/gnome-settings-session.c |   15 ---------------
 gnome-settings-daemon/gnome-settings-session.h |    5 -----
 plugins/color/gsd-color-manager.c              |    2 +-
 plugins/power/gsd-power-manager.c              |    2 +-
 plugins/xrandr/gsd-xrandr-manager.c            |    2 +-
 6 files changed, 4 insertions(+), 24 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 08b1a2f..91f9a3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,7 +50,7 @@ GLIB_REQUIRED_VERSION=2.29.14
 GTK_REQUIRED_VERSION=2.99.3
 GCONF_REQUIRED_VERSION=2.6.1
 GIO_REQUIRED_VERSION=2.26.0
-GNOME_DESKTOP_REQUIRED_VERSION=3.3.1
+GNOME_DESKTOP_REQUIRED_VERSION=3.3.4
 LIBNOTIFY_REQUIRED_VERSION=0.7.3
 UPOWER_GLIB_REQUIRED_VERSION=0.9.1
 PA_REQUIRED_VERSION=0.9.16
diff --git a/gnome-settings-daemon/gnome-settings-session.c b/gnome-settings-daemon/gnome-settings-session.c
index d7c90ed..47d36de 100644
--- a/gnome-settings-daemon/gnome-settings-session.c
+++ b/gnome-settings-daemon/gnome-settings-session.c
@@ -308,21 +308,6 @@ gnome_settings_session_new (void)
 	return GNOME_SETTINGS_SESSION (session);
 }
 
-GnomeRRScreen *
-gnome_settings_session_get_screen (GError **error)
-{
-	static GnomeRRScreen *screen = NULL;
-
-	if (screen != NULL)
-		return g_object_ref (screen);
-
-	screen = gnome_rr_screen_new (gdk_screen_get_default (), error);
-	if (screen != NULL)
-		g_object_add_weak_pointer (G_OBJECT (screen), (gpointer *) &screen);
-
-	return screen;
-}
-
 UpClient *
 gnome_settings_session_get_upower_client (void)
 {
diff --git a/gnome-settings-daemon/gnome-settings-session.h b/gnome-settings-daemon/gnome-settings-session.h
index 9105d75..fb49d4c 100644
--- a/gnome-settings-daemon/gnome-settings-session.h
+++ b/gnome-settings-daemon/gnome-settings-session.h
@@ -24,9 +24,6 @@
 
 #include <glib-object.h>
 
-#define GNOME_DESKTOP_USE_UNSTABLE_API
-#include <libgnome-desktop/gnome-rr.h>
-
 #include <libupower-glib/upower.h>
 
 G_BEGIN_DECLS
@@ -63,8 +60,6 @@ GType			 gnome_settings_session_state_get_type	(void);
 GnomeSettingsSession	*gnome_settings_session_new		(void);
 GnomeSettingsSessionState gnome_settings_session_get_state	(GnomeSettingsSession	*session);
 
-GnomeRRScreen           *gnome_settings_session_get_screen      (GError **error);
-
 UpClient                *gnome_settings_session_get_upower_client (void);
 
 
diff --git a/plugins/color/gsd-color-manager.c b/plugins/color/gsd-color-manager.c
index b2a8adc..2e479b6 100644
--- a/plugins/color/gsd-color-manager.c
+++ b/plugins/color/gsd-color-manager.c
@@ -1550,7 +1550,7 @@ gsd_color_manager_start (GsdColorManager *manager,
         gnome_settings_profile_start (NULL);
 
         /* coldplug the list of screens */
-        priv->x11_screen = gnome_settings_session_get_screen (error);
+        priv->x11_screen = gnome_rr_screen_new (gdk_screen_get_default (), error);
         if (priv->x11_screen == NULL)
                 goto out;
 
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index ad1aa11..30e9fe1 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -3455,7 +3455,7 @@ gsd_power_manager_start (GsdPowerManager *manager,
                           G_CALLBACK (idle_idletime_alarm_expired_cb), manager);
 
         /* coldplug the list of screens */
-        manager->priv->x11_screen = gnome_settings_session_get_screen (error);
+        manager->priv->x11_screen = gnome_rr_screen_new (gdk_screen_get_default (), error);
         if (manager->priv->x11_screen == NULL)
                 return FALSE;
 
diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
index 6bff7d7..a498e5b 100644
--- a/plugins/xrandr/gsd-xrandr-manager.c
+++ b/plugins/xrandr/gsd-xrandr-manager.c
@@ -1961,7 +1961,7 @@ gsd_xrandr_manager_start (GsdXrandrManager *manager,
         log_open ();
         log_msg ("------------------------------------------------------------\nSTARTING XRANDR PLUGIN\n");
 
-        manager->priv->rw_screen = gnome_settings_session_get_screen (error);
+        manager->priv->rw_screen = gnome_rr_screen_new (gdk_screen_get_default (), error);
 
         if (manager->priv->rw_screen == NULL) {
                 log_msg ("Could not initialize the RANDR plugin%s%s\n",