gnome-settings-daemon r65 - in trunk: . plugins/background plugins/media-keys/actions

[ssp svn gnome org]

Author: ssp
Date: Fri Jan 25 20:18:25 2008
New Revision: 65
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=65&view=rev

Log:
2008-01-25  Soren Sandmann  <sandmann redhat com>

	* plugins/background/gsd-background-manager.c
	(GNOME_DESKTOP_USE_UNSTABLE_API): Define this macro before
	including gnome-bg.h



Modified:
   trunk/ChangeLog
   trunk/plugins/background/gsd-background-manager.c
   trunk/plugins/media-keys/actions/acme-volume.c

Modified: trunk/plugins/background/gsd-background-manager.c
==============================================================================
--- trunk/plugins/background/gsd-background-manager.c	(original)
+++ trunk/plugins/background/gsd-background-manager.c	Fri Jan 25 20:18:25 2008
@@ -38,6 +38,7 @@
 #include <gconf/gconf-client.h>
 #include <libgnomevfs/gnome-vfs.h>
 
+#define GNOME_DESKTOP_USE_UNSTABLE_API
 #include <libgnomeui/gnome-bg.h>
 #include <X11/Xatom.h>
 

Modified: trunk/plugins/media-keys/actions/acme-volume.c
==============================================================================
--- trunk/plugins/media-keys/actions/acme-volume.c	(original)
+++ trunk/plugins/media-keys/actions/acme-volume.c	Fri Jan 25 20:18:25 2008
@@ -115,5 +115,6 @@
 	vol = ACME_VOLUME  (g_object_new (acme_volume_oss_get_type (), NULL));
 	return vol;
 #endif
+	return NULL;
 }