diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2011-10-19 17:49:16 -0400 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2011-10-19 17:49:16 -0400 |
| commit | 5db4ce0c2921527696b5c9f0cba0f6dd1baed0b0 (patch) | |
| tree | f07bf5388a13e9e169755cd969ef008022b23876 | |
| parent | 1ec44d63e5560d00098954890661be9fb944ada6 (diff) | |
| download | dconf-5db4ce0c2921527696b5c9f0cba0f6dd1baed0b0.tar.gz | |
drop fixes.vapi
These changes are upstream by now.
| -rw-r--r-- | bin/Makefile.am | 2 | ||||
| -rw-r--r-- | bin/dconf-update.vala | 2 | ||||
| -rw-r--r-- | 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. */ } diff --git a/bin/fixes.vapi b/bin/fixes.vapi deleted file mode 100644 index ada6ab6..0000000 --- a/bin/fixes.vapi +++ /dev/null @@ -1,4 +0,0 @@ -[CCode (cname = "g_dbus_connection_flush_sync")] -void flush_the_bus (GLib.DBusConnection connection, GLib.Cancellable? cancellable = null) throws GLib.Error; -[CCode (cname = "G_VARIANT_TYPE_STRING_ARRAY")] -public static GLib.VariantType STRING_ARRAY; |