gnome-control-center r8762 - in trunk/capplets: appearance display

[ssp svn gnome org]

Author: ssp
Date: Tue Jun 17 23:52:37 2008
New Revision: 8762
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=8762&view=rev

Log:
+Tue Jun 17 19:51:03 2008  Sïren Sandmann  <sandmann redhat com>
+
+	* Merge randr-12 to trunk
+
+Tue Jun 17 18:29:46 2008  Sïren Sandmann  <sandmann redhat com>
+
+	* Port to changes in gnome-desktop
+
+2008-06-04  Federico Mena Quintero  <federico novell com>
+
+	* xrandr-capplet.c (driver_is_randr_10): New function, currently
+	unused, to detect whether the graphics driver used in the X server
+	only supports the RANDR 1.0 API.  We may find this information
+	useful to tell the user that not all the features in the capplet
+	will work as intended, or to actually disable features that won't work.
+
+2008-05-29  Federico Mena Quintero  <federico novell com>
+
+	* xrandr-capplet.c (apply): Before applying the settings, check if
+	the X server supports the Virtual size we need.
+	(check_required_virtual_size): New function; does the checking
+	against what the X server supports.
+	This still needs to present a friendly dialog box.
+	(compute_virtual_size_for_configuration): New function.
+
+Wed May 14 18:16:10 2008  Sïren Sandmann  <sandmann redhat com>
+
+	* xrandr-capplet.c: Add GNOME_DESKTOP_USE_UNSTABLE_API define
+
+	* scrollarea.[ch]: Add copyright statement
+
+2008-05-14  Soren Sandmann Pedersen  <sandmann redhat com>
+
+	* *: Check in new RandR 1.2 enabled capplet
+



Added:
   trunk/capplets/display/TODO
      - copied unchanged from r8761, /branches/randr-12/capplets/display/TODO
   trunk/capplets/display/build.sh
      - copied unchanged from r8761, /branches/randr-12/capplets/display/build.sh
   trunk/capplets/display/display-capplet.glade
      - copied unchanged from r8761, /branches/randr-12/capplets/display/display-capplet.glade
   trunk/capplets/display/foo-marshal.c
      - copied unchanged from r8761, /branches/randr-12/capplets/display/foo-marshal.c
   trunk/capplets/display/foo-marshal.h
      - copied unchanged from r8761, /branches/randr-12/capplets/display/foo-marshal.h
   trunk/capplets/display/scrollarea.c
      - copied unchanged from r8761, /branches/randr-12/capplets/display/scrollarea.c
   trunk/capplets/display/scrollarea.h
      - copied unchanged from r8761, /branches/randr-12/capplets/display/scrollarea.h
   trunk/capplets/display/xrandr-capplet.c
      - copied unchanged from r8761, /branches/randr-12/capplets/display/xrandr-capplet.c
Modified:
   trunk/capplets/appearance/appearance-desktop.c
   trunk/capplets/display/ChangeLog
   trunk/capplets/display/Makefile.am

Modified: trunk/capplets/appearance/appearance-desktop.c
==============================================================================
--- trunk/capplets/appearance/appearance-desktop.c	(original)
+++ trunk/capplets/appearance/appearance-desktop.c	Tue Jun 17 23:52:37 2008
@@ -901,6 +901,13 @@
   uri = gconf_client_get_string (data->client,
                                  WP_FILE_KEY,
                                  NULL);
+
+  if (uri && *uri == '\0')
+  {
+    g_free (uri);
+    uri = NULL;
+  }
+  
   if (uri == NULL)
     uri = g_strdup ("(none)");
 

Modified: trunk/capplets/display/Makefile.am
==============================================================================
--- trunk/capplets/display/Makefile.am	(original)
+++ trunk/capplets/display/Makefile.am	Tue Jun 17 23:52:37 2008
@@ -1,9 +1,18 @@
 # This is used in GNOMECC_CAPPLETS_CFLAGS
 cappletname = display
 
+gladedir = $(pkgdatadir)/glade
+dist_glade_DATA = display-capplet.glade
+
 bin_PROGRAMS = gnome-display-properties
 
-gnome_display_properties_SOURCES = main.c
+gnome_display_properties_SOURCES =	\
+	xrandr-capplet.c		\
+	scrollarea.c			\
+	foo-marshal.c			\
+	scrollarea.h			\
+	foo-marshal.h
+
 gnome_display_properties_LDFLAGS = -export-dynamic
 gnome_display_properties_LDADD = \
 	$(DISPLAY_CAPPLET_LIBS) \