gnome-settings-daemon r160 - in trunk: . plugins/xrandr

[jensg svn gnome org]

Author: jensg
Date: Tue Feb 19 18:54:25 2008
New Revision: 160
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=160&view=rev

Log:
2008-02-19  Jens Granseuer  <jensgr gmx net>

	* configure.ac:
	* plugins/xrandr/Makefile.am:
	* plugins/xrandr/gsd-xrandr-manager.c:
	(gsd_xrandr_manager_class_init), (gsd_xrandr_manager_init),
	(gsd_xrandr_manager_finalize): build with XRandR if available, makes
	setting screen geometry at login time work again (bug #517418)


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/plugins/xrandr/Makefile.am
   trunk/plugins/xrandr/gsd-xrandr-manager.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Feb 19 18:54:25 2008
@@ -164,6 +164,20 @@
 ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS $XINPUT_LIBS"
 
 dnl ---------------------------------------------------------------------------
+dnl - XRandR
+dnl ---------------------------------------------------------------------------
+
+have_randr=no
+AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration,
+  [AC_CHECK_HEADER(X11/extensions/Xrandr.h,
+     have_randr=yes
+     RANDR_LIBS="-lXrandr -lXrender"
+     AC_DEFINE(HAVE_RANDR, 1, [Define if Xrandr extension is available]),
+	  :, [#include <X11/Xlib.h>])], : ,
+       -lXrandr -lXrender $x_libs)
+AC_SUBST(RANDR_LIBS)
+
+dnl ---------------------------------------------------------------------------
 dnl - XFT2
 dnl ---------------------------------------------------------------------------
 
@@ -305,7 +319,7 @@
 else
   AC_MSG_NOTICE([*** Sound capplet will not be built]);
 fi
- 
+
 # ---------------------------------------------------------------------------
 # Plugins
 # ---------------------------------------------------------------------------

Modified: trunk/plugins/xrandr/Makefile.am
==============================================================================
--- trunk/plugins/xrandr/Makefile.am	(original)
+++ trunk/plugins/xrandr/Makefile.am	Tue Feb 19 18:54:25 2008
@@ -1,15 +1,11 @@
-NULL =
-
 plugin_LTLIBRARIES = \
-	libxrandr.la		\
-	$(NULL)
+	libxrandr.la
 
 libxrandr_la_SOURCES = 		\
 	gsd-xrandr-plugin.h	\
 	gsd-xrandr-plugin.c	\
 	gsd-xrandr-manager.h	\
-	gsd-xrandr-manager.c	\
-	$(NULL)
+	gsd-xrandr-manager.c
 
 libxrandr_la_CPPFLAGS = \
 	-I$(top_srcdir)/gnome-settings-daemon		\
@@ -21,29 +17,19 @@
 	$(AM_CFLAGS)
 
 libxrandr_la_LDFLAGS = 		\
-	$(GSD_PLUGIN_LDFLAGS)	\
-	$(NULL)
+	$(GSD_PLUGIN_LDFLAGS)
 
 libxrandr_la_LIBADD  = 		\
 	$(SETTINGS_PLUGIN_LIBS)	\
-	$(NULL)
+	$(RANDR_LIBS)
 
 plugin_in_files = 		\
-	xrandr.gnome-settings-plugin.in	\
-	$(NULL)
+	xrandr.gnome-settings-plugin.in
 
 plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
 
-EXTRA_DIST = 			\
-	$(plugin_in_files)	\
-	$(NULL)
-
-CLEANFILES = 			\
-	$(plugin_DATA)		\
-	$(NULL)
-
-DISTCLEANFILES =		\
-	$(plugin_DATA)		\
-	$(NULL)
+EXTRA_DIST = $(plugin_in_files)
+CLEANFILES = $(plugin_DATA)
+DISTCLEANFILES = $(plugin_DATA)
 
 @GSD_INTLTOOL_PLUGIN_RULE@

Modified: trunk/plugins/xrandr/gsd-xrandr-manager.c
==============================================================================
--- trunk/plugins/xrandr/gsd-xrandr-manager.c	(original)
+++ trunk/plugins/xrandr/gsd-xrandr-manager.c	Tue Feb 19 18:54:25 2008
@@ -35,6 +35,7 @@
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
+#include <gconf/gconf-client.h>
 
 #ifdef HAVE_RANDR
 #include <X11/extensions/Xrandr.h>
@@ -42,17 +43,6 @@
 
 #include "gsd-xrandr-manager.h"
 
-#define GSD_XRANDR_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_XRANDR_MANAGER, GsdXrandrManagerPrivate))
-
-struct GsdXrandrManagerPrivate
-{
-        gboolean dummy;
-};
-
-enum {
-        PROP_0,
-};
-
 static void     gsd_xrandr_manager_class_init  (GsdXrandrManagerClass *klass);
 static void     gsd_xrandr_manager_init        (GsdXrandrManager      *xrandr_manager);
 static void     gsd_xrandr_manager_finalize    (GObject             *object);
@@ -393,15 +383,11 @@
         object_class->constructor = gsd_xrandr_manager_constructor;
         object_class->dispose = gsd_xrandr_manager_dispose;
         object_class->finalize = gsd_xrandr_manager_finalize;
-
-        g_type_class_add_private (klass, sizeof (GsdXrandrManagerPrivate));
 }
 
 static void
 gsd_xrandr_manager_init (GsdXrandrManager *manager)
 {
-        manager->priv = GSD_XRANDR_MANAGER_GET_PRIVATE (manager);
-
 }
 
 static void
@@ -414,8 +400,6 @@
 
         xrandr_manager = GSD_XRANDR_MANAGER (object);
 
-        g_return_if_fail (xrandr_manager->priv != NULL);
-
         G_OBJECT_CLASS (gsd_xrandr_manager_parent_class)->finalize (object);
 }