gconf r2654 - in trunk: . defaults gconf

[kmaraas svn gnome org]

Author: kmaraas
Date: Tue Aug 19 09:35:01 2008
New Revision: 2654
URL: http://svn.gnome.org/viewvc/gconf?rev=2654&view=rev

Log:
2008-08-19  Kjartan Maraas  <kmaraas gnome org>

	* defaults/Makefile.am: Add distclean rule.
	* gconf/gconfd.c: (get_on_system_bus):
	* gconf/gconfd.h: Fix some warnings.

Modified:
   trunk/ChangeLog
   trunk/defaults/Makefile.am
   trunk/gconf/gconfd.c
   trunk/gconf/gconfd.h

Modified: trunk/defaults/Makefile.am
==============================================================================
--- trunk/defaults/Makefile.am	(original)
+++ trunk/defaults/Makefile.am	Tue Aug 19 09:35:01 2008
@@ -54,3 +54,5 @@
 	$(polkit_DATA)		\
 	$(dbus_services_DATA)
 
+DISTCLEANFILES = org.gnome.gconf.defaults.policy
+

Modified: trunk/gconf/gconfd.c
==============================================================================
--- trunk/gconf/gconfd.c	(original)
+++ trunk/gconf/gconfd.c	Tue Aug 19 09:35:01 2008
@@ -678,7 +678,6 @@
 {
   DBusConnection *connection;
   DBusError bus_error;
-  int result;
 
   dbus_error_init (&bus_error);
   connection = dbus_bus_get (DBUS_BUS_SYSTEM, &bus_error);

Modified: trunk/gconf/gconfd.h
==============================================================================
--- trunk/gconf/gconfd.h	(original)
+++ trunk/gconf/gconfd.h	Tue Aug 19 09:35:01 2008
@@ -46,6 +46,9 @@
 				    GConfSources  *modified_sources,
                                     const char    *key);
 
+void
+gconfd_clear_cache_for_sources (GConfSources *sources);
+
 void gconfd_need_log_cleanup (void);
 
 G_END_DECLS