Rename from libtelepathy-people to libfolks.

diff --git a/.gitignore b/.gitignore
index f1a2d17..298267f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -43,22 +43,22 @@ Makefile.in
 /shave-libtool
 /stamp-h1
 /tags
-/telepathy-people-*.tar.bz2
-/telepathy-people-*.tar.bz2.asc
-/telepathy-people-*/
+/folks-*.tar.bz2
+/folks-*.tar.bz2.asc
+/folks-*/
 /xmldocs.make
 
-/telepathy-people/alias.c
-/telepathy-people/individual.c
-/telepathy-people/individual-aggregator.c
-/telepathy-people/persona.c
-/telepathy-people/persona-store.c
-/telepathy-people/telepathy-people.h
-/telepathy-people/telepathy-people.pc
-/telepathy-people/telepathy-people-uninstalled.pc
-/telepathy-people/telepathy-people.vapi
-/telepathy-people/lowlevel.gi
-/telepathy-people/lowlevel.vapi
-/telepathy-people/tp-persona.c
+/folks/alias.c
+/folks/individual.c
+/folks/individual-aggregator.c
+/folks/persona.c
+/folks/persona-store.c
+/folks/folks.h
+/folks/folks.pc
+/folks/folks-uninstalled.pc
+/folks/folks.vapi
+/folks/lowlevel.gi
+/folks/lowlevel.vapi
+/folks/tp-persona.c
 
 /tests/test-*[^ch]

diff --git a/Makefile.am b/Makefile.am
index 170e9ac..eaf1050 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS = \
-       telepathy-people \
+       folks \
        $(NULL)
 
 ACLOCAL_AMFLAGS = -I m4
@@ -9,8 +9,8 @@ DISTCHECK_CONFIGURE_FLAGS =             \
        --disable-scrollkeeper          \
        --disable-schemas-install
 
-telepathy_peopledocdir = ${prefix}/doc/telepathy-people
-telepathy_peopledoc_DATA = \
+folksdocdir = ${prefix}/doc/folks
+folksdoc_DATA = \
        ChangeLog \
        README \
        COPYING \
@@ -20,7 +20,7 @@ telepathy_peopledoc_DATA = \
        $(NULL)
 
 EXTRA_DIST = \
-       $(telepathy_peopledoc_DATA) \
+       $(folksdoc_DATA) \
        autogen.sh \
        $(NULL)
 

diff --git a/configure.ac b/configure.ac
index 604e434..74d29a2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,25 +1,25 @@
 dnl If not 1, append datestamp to the version number
-m4_define(tpp_released, 0)
+m4_define(folks_released, 0)
 
-m4_define([tpp_major_version], [0])
-m4_define([tpp_minor_version], [1])
-m4_define([tpp_micro_version], [0])
-m4_define([tpp_nano_version], [0])
+m4_define([folks_major_version], [0])
+m4_define([folks_minor_version], [1])
+m4_define([folks_micro_version], [0])
+m4_define([folks_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
-m4_define([tpp_base_version],
-                    [tpp_major_version.tpp_minor_version.tpp_micro_version])
-m4_define([tpp_full_version],
-                    [m4_if(tpp_nano_version, 0, [tpp_base_version],
-                                         [tpp_base_version].[tpp_nano_version])])
+m4_define([folks_base_version],
+                [folks_major_version.folks_minor_version.folks_micro_version])
+m4_define([folks_full_version],
+                [m4_if(folks_nano_version, 0, [folks_base_version],
+                        [folks_base_version].[folks_nano_version])])
 
-m4_define(tpp_maybe_datestamp,
-                    m4_esyscmd([if test x]tpp_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi]))
+m4_define(folks_maybe_datestamp,
+                    m4_esyscmd([if test x]folks_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi]))
 
-m4_define(tpp_version, tpp_full_version[]tpp_maybe_datestamp)
+m4_define(folks_version, folks_full_version[]folks_maybe_datestamp)
 
 
-AC_INIT(telepathy-people, tpp_version, telepathy-people)
+AC_INIT(folks, folks_version, folks)
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AC_PREREQ(2.59)
@@ -50,23 +50,23 @@ AC_SUBST(LDFLAGS)
 
 GLIB_REQUIRED=2.12.0
 
-PKG_CHECK_MODULES(LIBTPP,
+PKG_CHECK_MODULES(LIBFOLKS,
                   glib-2.0 >= $GLIB_REQUIRED
                   gobject-2.0 >= $GLIB_REQUIRED
                   dbus-glib-1
                   gee-1.0
                   telepathy-vala
                   )
-AC_SUBST(LIBTPP_CFLAGS)
-AC_SUBST(LIBTPP_LIBS)
+AC_SUBST(LIBFOLKS_CFLAGS)
+AC_SUBST(LIBFOLKS_LIBS)
 
-PKG_CHECK_MODULES(LIBTPP_LOWLEVEL,
+PKG_CHECK_MODULES(LIBLOWLEVEL,
                   glib-2.0 >= $GLIB_REQUIRED
                   gobject-2.0 >= $GLIB_REQUIRED
                   telepathy-glib
                   )
-AC_SUBST(LIBTPP_LOWLEVEL_CFLAGS)
-AC_SUBST(LIBTPP_LOWLEVEL_LIBS)
+AC_SUBST(LIBLOWLEVEL_CFLAGS)
+AC_SUBST(LIBLOWLEVEL_LIBS)
 
 GTK_DOC_CHECK([1.10])
 
@@ -92,7 +92,7 @@ AS_COMPILER_FLAG(-Wno-unused-parameter,
         wno_unused_parameter=yes,
         wno_unused_parameter=no)
 
-ifelse(tpp_released, 1, [],
+ifelse(folks_released, 1, [],
     [
         if test x$werror = xyes; then
             ERROR_CFLAGS="$ERROR_CFLAGS -Werror"
@@ -118,8 +118,8 @@ AC_SUBST(ERROR_CFLAGS)
 # -----------------------------------------------------------
 
 AC_CONFIG_FILES([Makefile
-       telepathy-people/Makefile
-       telepathy-people/telepathy-people.pc
+       folks/Makefile
+       folks/folks.pc
 ])
 
 AC_OUTPUT

diff --git a/telepathy-people/Makefile.am b/folks/Makefile.am
similarity index 64%
rename from telepathy-people/Makefile.am
rename to folks/Makefile.am
index 6c0e808..7b70b4c 100644 (file)
--- a/telepathy-people/Makefile.am
+++ b/folks/Makefile.am
@@ -2,7 +2,7 @@ GEN_INTROSPECT = $(shell pkg-config vala-1.0 --variable="gen_introspect")
 VAPIGEN = $(shell pkg-config vala-1.0 --variable="vapigen")
 
 AM_CPPFLAGS = \
-       $(LIBTPP_CFLAGS) \
+       $(LIBFOLKS_CFLAGS) \
        -include $(CONFIG_HEADER) \
        -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \
        $(NULL)
@@ -12,10 +12,10 @@ VALAFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --variable=va
 VALAFLAGS += --vapidir=.
 VALAFLAGS += --pkg gobject-2.0 --pkg gio-2.0 --pkg gee-1.0 --pkg dbus-glib-1 --pkg telepathy-glib
 
-libtelepathy_peopledir = $(includedir)/telepathy-people
+libfolksdir = $(includedir)/folks
 lib_LTLIBRARIES = \
        liblowlevel.la \
-       libtelepathy-people.la \
+       libfolks.la \
        $(NULL)
 
 # FIXME: cut the redundancy here with lowlevel_sources, etc.
@@ -25,11 +25,11 @@ liblowlevel_la_SOURCES = \
        $(NULL)
 
 liblowlevel_la_CPPFLAGS = \
-       $(LIBTPP_LOWLEVEL_CFLAGS) \
+       $(LIBLOWLEVEL_CFLAGS) \
        $(NULL)
 
 liblowlevel_la_LDFLAGS = \
-       $(LIBTPP_LOWLEVEL_LIBS) \
+       $(LIBLOWLEVEL_LIBS) \
        $(NULL)
 
 lowlevel_sources = \
@@ -40,7 +40,7 @@ lowlevel_sources = \
 # FIXME: wrap lines
 # FIXME: use a better path to the .so file
 lowlevel.gi: $(lowlevel_sources) liblowlevel.la
-       $(VGI_V)$(GEN_INTROSPECT) --namespace=Tpp lowlevel.h \
+       $(VGI_V)$(GEN_INTROSPECT) --namespace=Folks lowlevel.h \
                $(shell pkg-config telepathy-glib --cflags) .libs/liblowlevel.so > lowlevel.gi
 
 lowlevel.vapi: lowlevel.gi
@@ -50,7 +50,7 @@ internal_vapi_files = \
        lowlevel.vapi \
        $(NULL)
 
-libtelepathy_people_la_VALASOURCES = \
+libfolks_la_VALASOURCES = \
        alias.vala \
        individual.vala \
        individual-aggregator.vala \
@@ -59,39 +59,39 @@ libtelepathy_people_la_VALASOURCES = \
        tp-persona.vala \
        $(NULL)
 
-libtelepathy_people_la_SOURCES = \
-       telepathy-people.vala.stamp \
-       $(libtelepathy_people_la_VALASOURCES:.vala=.c) \
+libfolks_la_SOURCES = \
+       folks.vala.stamp \
+       $(libfolks_la_VALASOURCES:.vala=.c) \
        $(lowlevel_sources) \
        $(NULL)
 
-libtelepathy_people_la_LIBADD = \
-       $(LIBTPP_LIBS) \
+libfolks_la_LIBADD = \
+       $(LIBFOLKS_LIBS) \
        $(NULL)
 
-telepathy_peopledir = $(includedir)/telepathy-people
+folksdir = $(includedir)/folks
 
-telepathy_people_HEADERS = \
-       telepathy-people.h \
+folks_HEADERS = \
+       folks.h \
        $(NULL)
 
-telepathy-people.h $(libtelepathy_people_la_VALASOURCES:.vala=.c) $(libtelepathy_people_la_VALASOURCES:.vala=.h): telepathy-people.vala.stamp
+folks.h $(libfolks_la_VALASOURCES:.vala=.c) $(libfolks_la_VALASOURCES:.vala=.h): folks.vala.stamp
 
-telepathy-people.vapi telepathy-people.vala.stamp: $(libtelepathy_people_la_VALASOURCES) $(internal_vapi_files)
-       $(VALA_V)$(VALAC) $(VALAFLAGS) -C --pkg lowlevel -H telepathy-people.h --library telepathy-people $(libtelepathy_people_la_VALASOURCES)
+folks.vapi folks.vala.stamp: $(libfolks_la_VALASOURCES) $(internal_vapi_files)
+       $(VALA_V)$(VALAC) $(VALAFLAGS) -C --pkg lowlevel -H folks.h --library folks $(libfolks_la_VALASOURCES)
        touch $@
 
-pkgconfig_in = telepathy-people.pc.in
+pkgconfig_in = folks.pc.in
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(pkgconfig_in:.in=)
 
 BUILT_SOURCES = \
-       telepathy-people.h \
-       telepathy-people.vala.stamp \
-       telepathy-people.vapi \
+       folks.h \
+       folks.vala.stamp \
+       folks.vapi \
        lowlevel.gi \
        lowlevel.vapi \
-       $(libtelepathy_people_la_VALASOURCES:.vala=.c) \
+       $(libfolks_la_VALASOURCES:.vala=.c) \
        $(pkgconfig_in:.in=) \
        $(NULL)
 
@@ -99,8 +99,8 @@ CLEANFILES = $(BUILT_SOURCES)
 
 EXTRA_DIST = \
        $(pkgconfig_in) \
-       telepathy-people.vala.stamp \
-       telepathy-people.vapi \
+       folks.vala.stamp \
+       folks.vapi \
        lowlevel.vapi \
        $(NULL)
 
@@ -108,7 +108,7 @@ DISTCLEANFILES = \
        $(NULL)
 
 MAINTAINERCLEANFILES = \
-       $(libtelepathy_people_la_VALASOURCES:.vala=.c) \
+       $(libfolks_la_VALASOURCES:.vala=.c) \
        $(NULL)
 
 # set up the verbosity rules to avoid some build noise

diff --git a/telepathy-people/alias.vala b/folks/alias.vala
similarity index 95%
rename from telepathy-people/alias.vala
rename to folks/alias.vala
index 2ac9b3d..70c4664 100644 (file)
--- a/telepathy-people/alias.vala
+++ b/folks/alias.vala
@@ -20,7 +20,7 @@
 
 using GLib;
 
-public interface Tpp.Alias : Object
+public interface Folks.Alias : Object
 {
   public abstract string alias { get; set; }
 }

diff --git a/telepathy-people/telepathy-people.pc.in b/folks/folks.pc.in
similarity index 67%
rename from telepathy-people/telepathy-people.pc.in
rename to folks/folks.pc.in
index b5a1c39..806b7c8 100644 (file)
--- a/telepathy-people/telepathy-people.pc.in
+++ b/folks/folks.pc.in
@@ -7,9 +7,9 @@ datarootdir=@datarootdir@
 datadir=@datadir@
 vapidir=@datadir@/vala/vapi
 
-Name: Telepathy People
-Description: The Telepathy People meta-contacts library
+Name: Folks
+Description: The Folks meta-contacts library
 Version: @VERSION@
 Requires: glib-2.0 gobject-2.0
-Libs: -L${libdir} -ltelepathy-people
+Libs: -L${libdir} -lfolks
 Cflags: -I${includedir}

diff --git a/telepathy-people/individual-aggregator.vala b/folks/individual-aggregator.vala
similarity index 97%
rename from telepathy-people/individual-aggregator.vala
rename to folks/individual-aggregator.vala
index 0d8ebf9..edcb966 100644 (file)
--- a/telepathy-people/individual-aggregator.vala
+++ b/folks/individual-aggregator.vala
@@ -21,9 +21,9 @@
 using GLib;
 using Gee;
 using Tp;
-using Tpp.PersonaStore;
+using Folks.PersonaStore;
 
-public class Tpp.IndividualAggregator : Object
+public class Folks.IndividualAggregator : Object
 {
   private HashMap<string, PersonaStore> stores;
 

diff --git a/telepathy-people/individual.vala b/folks/individual.vala
similarity index 96%
rename from telepathy-people/individual.vala
rename to folks/individual.vala
index 56953a6..5695174 100644 (file)
--- a/telepathy-people/individual.vala
+++ b/folks/individual.vala
@@ -19,9 +19,9 @@
  */
 
 using GLib;
-using Tpp.Alias;
+using Folks.Alias;
 
-public class Tpp.Individual : Object, Alias
+public class Folks.Individual : Object, Alias
 {
   private GLib.List<Persona> _personas;
 

diff --git a/telepathy-people/lowlevel.c b/folks/lowlevel.c
similarity index 85%
rename from telepathy-people/lowlevel.c
rename to folks/lowlevel.c
index 7a6b409..d82fac7 100644 (file)
--- a/telepathy-people/lowlevel.c
+++ b/folks/lowlevel.c
@@ -28,7 +28,7 @@
 
 #include "lowlevel.h"
 
-G_DEFINE_TYPE (TppLowlevel, tpp_lowlevel, G_TYPE_OBJECT);
+G_DEFINE_TYPE (FolksLowlevel, folks_lowlevel, G_TYPE_OBJECT);
 
 static void
 connection_ensure_channel_cb (TpConnection *conn,
@@ -63,7 +63,8 @@ connection_ensure_channel_cb (TpConnection *conn,
 }
 
 void
-tpp_lowlevel_connection_open_contact_list_channel_async (TppLowlevel *lowlevel,
+folks_lowlevel_connection_open_contact_list_channel_async (
+    FolksLowlevel *lowlevel,
     TpConnection *conn,
     const char *name,
     GAsyncReadyCallback callback,
@@ -78,7 +79,7 @@ tpp_lowlevel_connection_open_contact_list_channel_async (TppLowlevel *lowlevel,
 
   tp_asv_set_static_string (request, TP_IFACE_CHANNEL ".TargetID", name);
   result = g_simple_async_result_new (G_OBJECT (conn), callback, user_data,
-      tpp_lowlevel_connection_open_contact_list_channel_finish);
+      folks_lowlevel_connection_open_contact_list_channel_finish);
   tp_cli_connection_interface_requests_call_ensure_channel (conn, -1, request,
       connection_ensure_channel_cb, result, NULL, G_OBJECT (conn));
 }
@@ -87,7 +88,8 @@ tpp_lowlevel_connection_open_contact_list_channel_async (TppLowlevel *lowlevel,
  * but neither seems to be supported (without breaking the binding to the async
  * function) */
 TpChannel *
-tpp_lowlevel_connection_open_contact_list_channel_finish (TppLowlevel *lowlevel,
+folks_lowlevel_connection_open_contact_list_channel_finish (
+    FolksLowlevel *lowlevel,
     GAsyncResult *result,
     GError **error)
 {
@@ -103,24 +105,24 @@ tpp_lowlevel_connection_open_contact_list_channel_finish (TppLowlevel *lowlevel,
     return NULL;
 
   g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (conn),
-        tpp_lowlevel_connection_open_contact_list_channel_finish), NULL);
+        folks_lowlevel_connection_open_contact_list_channel_finish), NULL);
 
   return g_simple_async_result_get_op_res_gpointer (
       G_SIMPLE_ASYNC_RESULT (result));
 }
 
 static void
-tpp_lowlevel_class_init (TppLowlevelClass *klass)
+folks_lowlevel_class_init (FolksLowlevelClass *klass)
 {
 }
 
 static void
-tpp_lowlevel_init (TppLowlevel *self)
+folks_lowlevel_init (FolksLowlevel *self)
 {
 }
 
-TppLowlevel *
-tpp_lowlevel_new ()
+FolksLowlevel *
+folks_lowlevel_new ()
 {
-  return TPP_LOWLEVEL (g_object_new (TPP_TYPE_LOWLEVEL, NULL));
+  return FOLKS_LOWLEVEL (g_object_new (FOLKS_TYPE_LOWLEVEL, NULL));
 }

diff --git a/telepathy-people/lowlevel.h b/folks/lowlevel.h
similarity index 52%
rename from telepathy-people/lowlevel.h
rename to folks/lowlevel.h
index a16cd3b..d0d9751 100644 (file)
--- a/telepathy-people/lowlevel.h
+++ b/folks/lowlevel.h
@@ -18,8 +18,8 @@
  *       Travis Reitter <travis.reitter@collabora.co.uk>
  */
 
-#ifndef TPP_LOWLEVEL_H
-#define TPP_LOWLEVEL_H
+#ifndef FOLKS_LOWLEVEL_H
+#define FOLKS_LOWLEVEL_H
 
 #include <glib.h>
 #include <glib-object.h>
@@ -29,43 +29,45 @@
 
 G_BEGIN_DECLS
 
-typedef struct _TppLowlevel TppLowlevel;
-typedef struct _TppLowlevelClass TppLowlevelClass;
+typedef struct _FolksLowlevel FolksLowlevel;
+typedef struct _FolksLowlevelClass FolksLowlevelClass;
 
-struct _TppLowlevel {
+struct _FolksLowlevel {
   /*<private>*/
   GObject parent;
 };
 
-struct _TppLowlevelClass {
+struct _FolksLowlevelClass {
   /*<private>*/
   GObjectClass parent_class;
 };
 
-GType tpp_lowlevel_get_type (void);
+GType folks_lowlevel_get_type (void);
 
-#define TPP_TYPE_LOWLEVEL (tpp_lowlevel_get_type ())
-#define TPP_LOWLEVEL(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TPP_TYPE_LOWLEVEL, TppLowlevel))
-#define TPP_LOWLEVEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TPP_TYPE_LOWLEVEL, TppLowlevelClass))
-#define TPP_IS_LOWLEVEL(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TPP_TYPE_LOWLEVEL))
-#define TPP_IS_LOWLEVEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TPP_TYPE_LOWLEVEL))
-#define TPP_LOWLEVEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TPP_TYPE_LOWLEVEL, TppLowlevelClass))
+#define FOLKS_TYPE_LOWLEVEL (folks_lowlevel_get_type ())
+#define FOLKS_LOWLEVEL(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), FOLKS_TYPE_LOWLEVEL, FolksLowlevel))
+#define FOLKS_LOWLEVEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FOLKS_TYPE_LOWLEVEL, FolksLowlevelClass))
+#define FOLKS_IS_LOWLEVEL(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), FOLKS_TYPE_LOWLEVEL))
+#define FOLKS_IS_LOWLEVEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FOLKS_TYPE_LOWLEVEL))
+#define FOLKS_LOWLEVEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), FOLKS_TYPE_LOWLEVEL, FolksLowlevelClass))
 
-TppLowlevel *
-tpp_lowlevel_new (void) G_GNUC_WARN_UNUSED_RESULT;
+FolksLowlevel *
+folks_lowlevel_new (void) G_GNUC_WARN_UNUSED_RESULT;
 
 void
-tpp_lowlevel_connection_open_contact_list_channel_async (TppLowlevel *lowlevel,
+folks_lowlevel_connection_open_contact_list_channel_async (
+    FolksLowlevel *lowlevel,
     TpConnection *conn,
     const char *name,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
 TpChannel *
-tpp_lowlevel_connection_open_contact_list_channel_finish (TppLowlevel *lowlevel,
+folks_lowlevel_connection_open_contact_list_channel_finish (
+    FolksLowlevel *lowlevel,
     GAsyncResult *result,
     GError **error);
 
 G_END_DECLS
 
-#endif /* TPP_LOWLEVEL_H */
+#endif /* FOLKS_LOWLEVEL_H */

diff --git a/telepathy-people/persona-store.vala b/folks/persona-store.vala
similarity index 98%
rename from telepathy-people/persona-store.vala
rename to folks/persona-store.vala
index d5eafdc..a08c51f 100644 (file)
--- a/telepathy-people/persona-store.vala
+++ b/folks/persona-store.vala
@@ -22,14 +22,14 @@ using GLib;
 using Gee;
 using Tp;
 using Tp.ContactFeature;
-using Tpp.Individual;
-using Tpp.Lowlevel;
-using Tpp.Persona;
-using Tpp.TpPersona;
+using Folks.Individual;
+using Folks.Lowlevel;
+using Folks.Persona;
+using Folks.TpPersona;
 
 /* FIXME: split out the TpAccount-specific parts into a new subclass, since
  * PersonaStore should also be used by non-Telepathy sources */
-public class Tpp.PersonaStore : Object
+public class Folks.PersonaStore : Object
 {
   private HashMap<string, Channel> channels;
   private Connection conn;

diff --git a/telepathy-people/persona.vala b/folks/persona.vala
similarity index 94%
rename from telepathy-people/persona.vala
rename to folks/persona.vala
index 87d3938..9dd6a93 100644 (file)
--- a/telepathy-people/persona.vala
+++ b/folks/persona.vala
@@ -19,11 +19,11 @@
  */
 
 using GLib;
-using Tpp.Alias;
+using Folks.Alias;
 
 /* FIXME: have this class implement a number of interfaces: Avatar, Alias,
  * Presence, etc. */
-public abstract class Tpp.Persona : Object, Alias
+public abstract class Folks.Persona : Object, Alias
 {
   /* interface Alias */
   public abstract string alias { get; set; }

diff --git a/telepathy-people/tp-persona.vala b/folks/tp-persona.vala
similarity index 94%
rename from telepathy-people/tp-persona.vala
rename to folks/tp-persona.vala
index 34f7079..add3cd4 100644 (file)
--- a/telepathy-people/tp-persona.vala
+++ b/folks/tp-persona.vala
@@ -20,10 +20,10 @@
 
 using GLib;
 using Tp;
-using Tpp.Alias;
-using Tpp.Persona;
+using Folks.Alias;
+using Folks.Persona;
 
-public class Tpp.TpPersona : Persona, Alias
+public class Folks.TpPersona : Persona, Alias
 {
   /* interface Alias */
   public override string alias { get; set; }