diff options
| author | Raul Gutierrez Segales <raul.gutierrez.segales@collabora.co.uk> | 2011-03-11 00:40:14 +0000 |
|---|---|---|
| committer | Travis Reitter <travis.reitter@collabora.co.uk> | 2011-03-11 14:30:56 -0800 |
| commit | f4ca6a2e378783a6c392a12ebfbd11ef3ac8d084 (patch) | |
| tree | 1dc595dcaa6c62ad44338cdbfe5b13ffa242cf51 /tools | |
| parent | 986cd0293f51aa47aa6c3af741d448b05769de1b (diff) | |
folks-inspect: print an Avatar's uri
Fixes: bgo#644165 - An individual's avatar shouldn't be replaced by a null
avatar
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/inspect/Makefile.am | 3 | ||||
| -rw-r--r-- | tools/inspect/utils.vala | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/tools/inspect/Makefile.am b/tools/inspect/Makefile.am index 715574a..bb815b5 100644 --- a/tools/inspect/Makefile.am +++ b/tools/inspect/Makefile.am @@ -2,6 +2,7 @@ VALAFLAGS = \ --vapidir=$(top_srcdir)/folks \ --pkg=readline \ --pkg=gobject-2.0 \ + --pkg=gio-2.0 \ --pkg=gee-1.0 \ --pkg=folks \ $(NULL) @@ -22,12 +23,14 @@ folks_inspect_SOURCES = \ $(NULL) folks_inspect_LDADD = \ $(LIBREADLINE) \ + $(GIO_LIBS) \ $(GLIB_LIBS) \ $(GEE_LIBS) \ $(top_builddir)/folks/libfolks.la \ $(NULL) folks_inspect_CFLAGS = \ -I$(top_srcdir)/folks \ + $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ $(NULL) diff --git a/tools/inspect/utils.vala b/tools/inspect/utils.vala index 12e3b17..e62975c 100644 --- a/tools/inspect/utils.vala +++ b/tools/inspect/utils.vala @@ -258,7 +258,11 @@ private class Folks.Inspect.Utils } else if (prop_name == "avatar") { - return "%p".printf (prop_value.get_object ()); + string ret = null; + File avatar = (File) prop_value.get_object (); + if (avatar != null) + ret = avatar.get_uri (); + return ret; } else if (prop_name == "im-addresses") { |