gnome-desktop r5424 - trunk/libgnome-desktop

[federico svn gnome org]

Author: federico
Date: Fri Mar  6 20:37:11 2009
New Revision: 5424
URL: http://svn.gnome.org/viewvc/gnome-desktop?rev=5424&view=rev

Log:
Move struct GnomeRRScreen to a private header, so we can use it from gnome-rr-config.c as well

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

Added:
   trunk/libgnome-desktop/gnome-rr-private.h
Modified:
   trunk/libgnome-desktop/ChangeLog
   trunk/libgnome-desktop/Makefile.am
   trunk/libgnome-desktop/gnome-rr.c

Modified: trunk/libgnome-desktop/Makefile.am
==============================================================================
--- trunk/libgnome-desktop/Makefile.am	(original)
+++ trunk/libgnome-desktop/Makefile.am	Fri Mar  6 20:37:11 2009
@@ -27,6 +27,7 @@
 	gnome-rr.c		\
 	gnome-rr-config.c	\
 	gnome-rr-labeler.c	\
+	gnome-rr-private.h	\
 	edid-parse.c		\
 	edid.h			\
 	private.h

Added: trunk/libgnome-desktop/gnome-rr-private.h
==============================================================================
--- (empty file)
+++ trunk/libgnome-desktop/gnome-rr-private.h	Fri Mar  6 20:37:11 2009
@@ -0,0 +1,39 @@
+#ifndef GNOME_RR_PRIVATE_H
+#define GNOME_RR_PRIVATE_H
+
+typedef struct ScreenInfo ScreenInfo;
+
+struct ScreenInfo
+{
+    int			min_width;
+    int			max_width;
+    int			min_height;
+    int			max_height;
+
+    XRRScreenResources *resources;
+    
+    GnomeRROutput **	outputs;
+    GnomeRRCrtc **	crtcs;
+    GnomeRRMode **	modes;
+    
+    GnomeRRScreen *	screen;
+
+    GnomeRRMode **	clone_modes;
+};
+
+struct GnomeRRScreen
+{
+    GdkScreen *			gdk_screen;
+    GdkWindow *			gdk_root;
+    Display *			xdisplay;
+    Screen *			xscreen;
+    Window			xroot;
+    ScreenInfo *		info;
+    
+    int				randr_event_base;
+    
+    GnomeRRScreenChanged	callback;
+    gpointer			data;
+};
+
+#endif

Modified: trunk/libgnome-desktop/gnome-rr.c
==============================================================================
--- trunk/libgnome-desktop/gnome-rr.c	(original)
+++ trunk/libgnome-desktop/gnome-rr.c	Fri Mar  6 20:37:11 2009
@@ -35,44 +35,10 @@
 #include <X11/Xatom.h>
 
 #include "private.h"
+#include "gnome-rr-private.h"
 
 #define DISPLAY(o) ((o)->info->screen->xdisplay)
 
-typedef struct ScreenInfo ScreenInfo;
-
-struct ScreenInfo
-{
-    int			min_width;
-    int			max_width;
-    int			min_height;
-    int			max_height;
-
-    XRRScreenResources *resources;
-    
-    GnomeRROutput **	outputs;
-    GnomeRRCrtc **	crtcs;
-    GnomeRRMode **	modes;
-    
-    GnomeRRScreen *	screen;
-
-    GnomeRRMode **	clone_modes;
-};
-
-struct GnomeRRScreen
-{
-    GdkScreen *			gdk_screen;
-    GdkWindow *			gdk_root;
-    Display *			xdisplay;
-    Screen *			xscreen;
-    Window			xroot;
-    ScreenInfo *		info;
-    
-    int				randr_event_base;
-    
-    GnomeRRScreenChanged	callback;
-    gpointer			data;
-};
-
 struct GnomeRROutput
 {
     ScreenInfo *	info;