[dconf] drop fixes.vapi
- From: Ryan Lortie <ryanl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dconf] drop fixes.vapi
- Date: Wed, 26 Oct 2011 19:03:11 +0000 (UTC)
commit 5db4ce0c2921527696b5c9f0cba0f6dd1baed0b0
Author: Ryan Lortie <desrt desrt ca>
Date: Wed Oct 19 17:49:16 2011 -0400
drop fixes.vapi
These changes are upstream by now.
bin/Makefile.am | 2 +-
bin/dconf-update.vala | 2 +-
bin/fixes.vapi | 4 ----
3 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/bin/Makefile.am b/bin/Makefile.am
index d3252cc..1c5fe2d 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -6,7 +6,7 @@ bin_PROGRAMS = dconf
dconf_VALAFLAGS = --vapidir ../client --pkg=gio-2.0 --pkg=posix --pkg=dconf
dconf_LDADD = $(gio_LIBS) ../client/libdconf.so.0
-dconf_SOURCES = dconf.vala dconf-update.vala dconf-dump.vala ../gvdb/gvdb-builder.c gvdb.vapi fixes.vapi
+dconf_SOURCES = dconf.vala dconf-update.vala dconf-dump.vala ../gvdb/gvdb-builder.c gvdb.vapi
completiondir = $(sysconfdir)/bash_completion.d
completion_DATA = dconf-bash-completion.sh
diff --git a/bin/dconf-update.vala b/bin/dconf-update.vala
index 2446c16..5835999 100644
--- a/bin/dconf-update.vala
+++ b/bin/dconf-update.vala
@@ -188,7 +188,7 @@ void maybe_update_from_directory (string dirname) throws GLib.Error {
var system_bus = Bus.get_sync (BusType.SYSTEM);
system_bus.emit_signal (null, "/ca/desrt/dconf/Writer/" + Path.get_basename (filename), "ca.desrt.dconf.Writer",
"WritabilityNotify", new Variant ("(s)", "/"));
- flush_the_bus (system_bus);
+ system_bus.flush_sync ();
} catch {
/* if we can't, ... don't. */
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]