summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--defaults/Makefile.am2
-rw-r--r--gconf/gconfd.c1
-rw-r--r--gconf/gconfd.h3
4 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b3b961d..67d186c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,14 @@
-=========================== 2.23.2 ==========================
+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.
2008-08-19 Kjartan Maraas <kmaraas@gnome.org>
* configure.in: Check for polkit-policy-file-validate
to fix make distcheck.
+=========================== 2.23.2 ==========================
2008-07-11 Matthias Clasen <mclasen@redhat.com>
diff --git a/defaults/Makefile.am b/defaults/Makefile.am
index 48aaec0c..76796153 100644
--- a/defaults/Makefile.am
+++ b/defaults/Makefile.am
@@ -54,3 +54,5 @@ CLEANFILES = \
$(polkit_DATA) \
$(dbus_services_DATA)
+DISTCLEANFILES = org.gnome.gconf.defaults.policy
+
diff --git a/gconf/gconfd.c b/gconf/gconfd.c
index 1004075a..78bdd515 100644
--- a/gconf/gconfd.c
+++ b/gconf/gconfd.c
@@ -678,7 +678,6 @@ get_on_system_bus (void)
{
DBusConnection *connection;
DBusError bus_error;
- int result;
dbus_error_init (&bus_error);
connection = dbus_bus_get (DBUS_BUS_SYSTEM, &bus_error);
diff --git a/gconf/gconfd.h b/gconf/gconfd.h
index ddcf286b..e5b37fb8 100644
--- a/gconf/gconfd.h
+++ b/gconf/gconfd.h
@@ -46,6 +46,9 @@ void gconfd_notify_other_listeners (GConfDatabase *modified_db,
GConfSources *modified_sources,
const char *key);
+void
+gconfd_clear_cache_for_sources (GConfSources *sources);
+
void gconfd_need_log_cleanup (void);
G_END_DECLS