gnome-desktop r5180 - in trunk/libgnome-desktop: . libgnomeui

[federico svn gnome org]

Author: federico
Date: Sat Aug 16 01:46:00 2008
New Revision: 5180
URL: http://svn.gnome.org/viewvc/gnome-desktop?rev=5180&view=rev

Log:
Create a GnomeRRLabeler with a screen configuration rather than with a screen

Signed-off-by: Federico Mena Quintero <federico novell com>


Modified:
   trunk/libgnome-desktop/gnome-rr-labeler.c
   trunk/libgnome-desktop/libgnomeui/gnome-rr-labeler.h

Modified: trunk/libgnome-desktop/gnome-rr-labeler.c
==============================================================================
--- trunk/libgnome-desktop/gnome-rr-labeler.c	(original)
+++ trunk/libgnome-desktop/gnome-rr-labeler.c	Sat Aug 16 01:46:00 2008
@@ -31,7 +31,6 @@
 struct _GnomeRRLabeler {
 	GObject parent;
 
-	GnomeRRScreen *screen;
 	GnomeRRConfig *config;
 
 	int num_outputs;
@@ -70,7 +69,7 @@
 
 	labeler = GNOME_RR_LABELER (object);
 
-	/* We don't destroy the labeler->screen (a GnomeRRScreen) here; let our
+	/* We don't destroy the labeler->config (a GnomeRRConfig*) here; let our
 	 * caller do that instead.
 	 */
 
@@ -203,24 +202,23 @@
 }
 
 static void
-setup_from_rr_screen (GnomeRRLabeler *labeler)
+setup_from_config (GnomeRRLabeler *labeler)
 {
-	labeler->config = gnome_rr_config_new_current (labeler->screen);
 	labeler->num_outputs = count_outputs (labeler->config);
 	make_palette (labeler);
 }
 
 GnomeRRLabeler *
-gnome_rr_labeler_new (GnomeRRScreen *screen)
+gnome_rr_labeler_new (GnomeRRConfig *config)
 {
 	GnomeRRLabeler *labeler;
 
-	g_return_val_if_fail (screen != NULL, NULL);
+	g_return_val_if_fail (config != NULL, NULL);
 
 	labeler = g_object_new (GNOME_TYPE_RR_LABELER, NULL);
-	labeler->screen = screen;
+	labeler->config = config;
 
-	setup_from_rr_screen (labeler);
+	setup_from_config (labeler);
 
 	return labeler;
 }

Modified: trunk/libgnome-desktop/libgnomeui/gnome-rr-labeler.h
==============================================================================
--- trunk/libgnome-desktop/libgnomeui/gnome-rr-labeler.h	(original)
+++ trunk/libgnome-desktop/libgnomeui/gnome-rr-labeler.h	Sat Aug 16 01:46:00 2008
@@ -30,7 +30,7 @@
 #error    GnomeRR is unstable API. You must define GNOME_DESKTOP_USE_UNSTABLE_API before including gnomerr.h
 #endif
 
-#include <libgnomeui/gnome-rr.h>
+#include <libgnomeui/gnome-rr-config.h>
 
 #define GNOME_TYPE_RR_LABELER            (gnome_rr_labeler_get_type ())
 #define GNOME_RR_LABELER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_RR_LABELER, GnomeRRLabeler))
@@ -44,7 +44,7 @@
 
 GType gnome_rr_labeler_get_type (void);
 
-GnomeRRLabeler *gnome_rr_labeler_new (GnomeRRScreen *screen);
+GnomeRRLabeler *gnome_rr_labeler_new (GnomeRRConfig *config);
 
 void gnome_rr_labeler_hide (GnomeRRLabeler *labeler);