[dconf] editor: install as bin/dconf-editor
- From: Ryan Lortie <ryanl src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [dconf] editor: install as bin/dconf-editor
- Date: Wed, 19 Aug 2009 17:31:53 +0000 (UTC)
commit 3728084b8d4c55053fb2ef03e878685c48cc1189
Author: Ryan Lortie <desrt desrt ca>
Date: Wed Aug 19 13:27:56 2009 -0400
editor: install as bin/dconf-editor
also, add support for non-strings :)
editor/.gitignore | 2 +-
editor/Makefile.am | 20 ++++++++++----------
editor/dconf.vapi | 1 +
editor/editor.vala | 2 +-
4 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/editor/.gitignore b/editor/.gitignore
index 6cde89b..644ffc3 100644
--- a/editor/.gitignore
+++ b/editor/.gitignore
@@ -2,4 +2,4 @@
*.h
*.vala.stamp
-editor
+dconf-editor
diff --git a/editor/Makefile.am b/editor/Makefile.am
index f2b95bf..e6d72b6 100644
--- a/editor/Makefile.am
+++ b/editor/Makefile.am
@@ -2,24 +2,24 @@ AM_CFLAGS = -I$(top_srcdir)/dconf $(gtk_CFLAGS) \
-Wall -Wmissing-prototypes -Wwrite-strings -g
CFLAGS += -Wno-error
-noinst_PROGRAMS = editor
+bin_PROGRAMS = dconf-editor
-editor_VALASOURCES = \
+dconf_editor_VALASOURCES = \
editor.vala
DEFS =
-BUILT_SOURCES = editor.vala.stamp
+BUILT_SOURCES = dconf-editor.vala.stamp
-editor_LDADD = $(gvariant_LIBS) $(gtk_LIBS) ../dconf/libdconf.la
-editor_SOURCES = \
- editor.vala.stamp \
- $(editor_VALASOURCES:.vala=.c) \
- $(editor_VALASOURCES:.vala=.h)
+dconf_editor_LDADD = $(gvariant_LIBS) $(gtk_LIBS) ../dconf/libdconf.la
+dconf_editor_SOURCES = \
+ dconf-editor.vala.stamp \
+ $(dconf_editor_VALASOURCES:.vala=.c) \
+ $(dconf_editor_VALASOURCES:.vala=.h)
-editor.vala.stamp: $(editor_VALASOURCES)
+dconf-editor.vala.stamp: $(dconf_editor_VALASOURCES)
valac -C --pkg gtk+-2.0 dconf.vapi $^
touch $@
CLEANFILES = *.c *.h editor.vala.stamp
-EXTRA_DIST = $(editor_VALASOURCES)
+EXTRA_DIST = $(dconf_editor_VALASOURCES)
diff --git a/editor/dconf.vapi b/editor/dconf.vapi
index 1184d4c..31e71ec 100644
--- a/editor/dconf.vapi
+++ b/editor/dconf.vapi
@@ -9,6 +9,7 @@ namespace GLib {
public Variant.string (string value);
public weak string get_string (out size_t length = null);
+ public string print (bool add_type);
public int32 get_int32 ();
public GLib.StringBuilder markup_print (GLib.StringBuilder ?string = null,
diff --git a/editor/editor.vala b/editor/editor.vala
index 8ad18e2..c375b8e 100644
--- a/editor/editor.vala
+++ b/editor/editor.vala
@@ -52,7 +52,7 @@ namespace Editor {
var _value = dconf.get (_key);
if (_value != null)
- text = _value.get_string ();
+ text = _value.print (true);
else
text = "<none>";
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]