platform/upstream/folks.git
13 years agoMerge remote branch 'pwith/build-cleanup'
Travis Reitter [Wed, 14 Jul 2010 23:32:52 +0000 (16:32 -0700)]
Merge remote branch 'pwith/build-cleanup'

Performed quite a modifications to this branch, as it wasn't rebased on top of
the latest build changes (which also made "make distclean" work for the first
time).

Conflicts:
backends/telepathy/Makefile.am
configure.ac

13 years agoBump the configure-time glib requirement (which was implicitly required by our Vala...
Travis Reitter [Wed, 14 Jul 2010 20:12:45 +0000 (13:12 -0700)]
Bump the configure-time glib requirement (which was implicitly required by our Vala flags).

13 years agoMerge remote branch 'pwith/gi-bindings-rebase4'
Travis Reitter [Wed, 14 Jul 2010 15:08:34 +0000 (08:08 -0700)]
Merge remote branch 'pwith/gi-bindings-rebase4'

13 years agoTidy up dependencies in the Telepathy backend
Philip Withnall [Wed, 14 Jul 2010 14:39:17 +0000 (15:39 +0100)]
Tidy up dependencies in the Telepathy backend

13 years agoRemove unnecessary dependencies from folks-telepathy.deps
Philip Withnall [Wed, 14 Jul 2010 13:55:21 +0000 (14:55 +0100)]
Remove unnecessary dependencies from folks-telepathy.deps

13 years agoRemove redundant suffix substitutions in the Telepathy Makefile
Philip Withnall [Wed, 14 Jul 2010 13:48:21 +0000 (14:48 +0100)]
Remove redundant suffix substitutions in the Telepathy Makefile

13 years agoRename VALASOURCES variables in Telepathy backend
Philip Withnall [Wed, 14 Jul 2010 13:40:16 +0000 (14:40 +0100)]
Rename VALASOURCES variables in Telepathy backend

They shouldn't be in upper case, as they could conflict with variables
used by future versions of automake.

13 years agoRearrange the libfolks Makefile
Philip Withnall [Wed, 14 Jul 2010 13:31:23 +0000 (14:31 +0100)]
Rearrange the libfolks Makefile

Commonly-changed variables are now nearer the top. libfolks_la_VALASOURCES
has been renamed to folks_valasources so that it doesn't conflict with any
future automake rules of the same name. Various small formatting changes have
been made too.

13 years agoRemove redundant suffix substitutions in the libfolks Makefile
Philip Withnall [Wed, 14 Jul 2010 13:22:52 +0000 (14:22 +0100)]
Remove redundant suffix substitutions in the libfolks Makefile

13 years agoRemove telepathy-vala dependencies from libfolks
Philip Withnall [Wed, 14 Jul 2010 13:17:17 +0000 (14:17 +0100)]
Remove telepathy-vala dependencies from libfolks

13 years agoTidy up the valac flags for libfolks
Philip Withnall [Wed, 14 Jul 2010 13:15:27 +0000 (14:15 +0100)]
Tidy up the valac flags for libfolks

13 years agoRemove unnecessary dependencies from folks.deps
Philip Withnall [Wed, 14 Jul 2010 13:04:45 +0000 (14:04 +0100)]
Remove unnecessary dependencies from folks.deps

They're not exposed in the public API, so there's no need to list
them as dependencies.

13 years agoSilence the documentation build
Philip Withnall [Wed, 14 Jul 2010 12:12:34 +0000 (13:12 +0100)]
Silence the documentation build

13 years agoConsolidate the tp-vala valaflags into configure.ac
Philip Withnall [Wed, 14 Jul 2010 12:10:04 +0000 (13:10 +0100)]
Consolidate the tp-vala valaflags into configure.ac

Rather than calling pkg-config from various Makefiles to find out the
same information.

13 years agoAdd git.mk for automatic .gitignore generation
Philip Withnall [Wed, 14 Jul 2010 11:57:37 +0000 (12:57 +0100)]
Add git.mk for automatic .gitignore generation

git.mk is copied from pango/git.mk, which is the canonical place to
look for updates to it. It hasn't been modified.

13 years agoAdd generated files to MAINTAINERCLEANFILES
Philip Withnall [Wed, 14 Jul 2010 11:43:04 +0000 (12:43 +0100)]
Add generated files to MAINTAINERCLEANFILES

13 years agoDon't install or EXTRA_DIST the package documentation
Philip Withnall [Wed, 14 Jul 2010 11:40:28 +0000 (12:40 +0100)]
Don't install or EXTRA_DIST the package documentation

It's unnecessary, and automake knows to distribute the files already.

13 years agoFix ChangeLog cleaning
Philip Withnall [Wed, 14 Jul 2010 11:36:10 +0000 (12:36 +0100)]
Fix ChangeLog cleaning

It should be removed optionally during distclean, and forcibly during
maintainerclean.

13 years agoRemove unused gtk-doc lines from build system
Philip Withnall [Wed, 14 Jul 2010 11:27:37 +0000 (12:27 +0100)]
Remove unused gtk-doc lines from build system

We use valadoc instead.

13 years agoRemove unused scrollkeeper lines from Makefile
Philip Withnall [Wed, 14 Jul 2010 11:25:48 +0000 (12:25 +0100)]
Remove unused scrollkeeper lines from Makefile

13 years agoRemove some unused lines from the configure summary
Philip Withnall [Wed, 14 Jul 2010 11:22:15 +0000 (12:22 +0100)]
Remove some unused lines from the configure summary

13 years agoRemove some barely-used silent build machinery from the Makefiles
Philip Withnall [Wed, 14 Jul 2010 11:21:57 +0000 (12:21 +0100)]
Remove some barely-used silent build machinery from the Makefiles

13 years agoFix MIME type memory leak in BackendStore
Philip Withnall [Wed, 14 Jul 2010 09:27:14 +0000 (10:27 +0100)]
Fix MIME type memory leak in BackendStore

13 years agoDon't leak TpfPersona references for each Individual
Philip Withnall [Tue, 13 Jul 2010 13:46:07 +0000 (14:46 +0100)]
Don't leak TpfPersona references for each Individual

Due to bgo#624249, GLib.List.remove() leaks an item reference, so we need to
manually unreference each persona we remove from the personas list in
Individual.

13 years agoBreak a refcycle between TpfPersonaStore and TpfPersona
Philip Withnall [Mon, 12 Jul 2010 15:01:29 +0000 (16:01 +0100)]
Break a refcycle between TpfPersonaStore and TpfPersona

This is achieved by making the pointer that each TpfPersona holds to their
relevant TpfPersonaStore a weak pointer, rather than a referenced pointer.

13 years agoAllow backends to be completely unloaded
Philip Withnall [Fri, 9 Jul 2010 10:03:47 +0000 (11:03 +0100)]
Allow backends to be completely unloaded

This means that if the IndividualAggregator is finalized, all the resources
used by the backends which were loaded are freed. This allows multiple
IndividualAggregator instances to be used sequentially, and also ensures that
all Persona instances get destroyed.

13 years agoExplicitly require Vala.
Travis Reitter [Wed, 14 Jul 2010 06:36:53 +0000 (23:36 -0700)]
Explicitly require Vala.

13 years agoBump nano version after release.
Travis Reitter [Wed, 14 Jul 2010 05:59:31 +0000 (22:59 -0700)]
Bump nano version after release.

13 years agoDistribute the tp-lowlevel metadata file to fix distcheck. FOLKS_0_1_9
Travis Reitter [Wed, 14 Jul 2010 01:08:04 +0000 (18:08 -0700)]
Distribute the tp-lowlevel metadata file to fix distcheck.

13 years agoSpecify tp-lowlevel.h being in the srcdir, to work around a vala-gen-introspect bug.
Travis Reitter [Wed, 14 Jul 2010 01:03:41 +0000 (18:03 -0700)]
Specify tp-lowlevel.h being in the srcdir, to work around a vala-gen-introspect bug.

13 years agoSpecify the vala source files being in the srcdir, to work around a valac bug.
Travis Reitter [Wed, 14 Jul 2010 00:59:59 +0000 (17:59 -0700)]
Specify the vala source files being in the srcdir, to work around a valac bug.

13 years agoWork around bgo #624278 for distcheck
Travis Reitter [Wed, 14 Jul 2010 00:53:11 +0000 (17:53 -0700)]
Work around bgo #624278 for distcheck

13 years agoInclude the backends/telepathy/*.vala files when making a relese.
Travis Reitter [Tue, 13 Jul 2010 16:43:00 +0000 (09:43 -0700)]
Include the backends/telepathy/*.vala files when making a relese.

13 years agoInclude the folks/*.vala files when making a relese.
Travis Reitter [Tue, 13 Jul 2010 16:42:45 +0000 (09:42 -0700)]
Include the folks/*.vala files when making a relese.

13 years agoEnsure we don't unref every TpAccount
Philip Withnall [Sat, 10 Jul 2010 14:12:55 +0000 (15:12 +0100)]
Ensure we don't unref every TpAccount

AccountManager.get_valid_accounts() only transfers the container, and
Vala ignores this unless you assign it to a variable with an unowned
item type.

13 years agoRemove extraneous array length parameter
Philip Withnall [Sat, 10 Jul 2010 13:33:56 +0000 (14:33 +0100)]
Remove extraneous array length parameter

change_favourites_by_request_handles no longer needs an explicit array
length parameter, due to changes in Connection.request_handles.

13 years agoUse a more-flexible a{sv} type for the add_persona_from_details() functions.
Travis Reitter [Tue, 13 Jul 2010 06:22:37 +0000 (23:22 -0700)]
Use a more-flexible a{sv} type for the add_persona_from_details() functions.

13 years agoBump the version for the new PersonaStore/IndividualAggregator API
Travis Reitter [Mon, 12 Jul 2010 23:49:40 +0000 (16:49 -0700)]
Bump the version for the new PersonaStore/IndividualAggregator API

13 years agoCombine the IndividualAggregator:individuals-added and -removed signals.
Travis Reitter [Mon, 12 Jul 2010 23:47:00 +0000 (16:47 -0700)]
Combine the IndividualAggregator:individuals-added and -removed signals.

Also include a backend-supplied message, persona who caused the change, and
reason for the change. This will allow us to pass on the more-detailed
notification bits for Telepathy (eg, "You got kicked from room XYZ by Foo Baz:
'I just felt like booting someone.'").

13 years agoPass along the message, actor, and reason from standard-channel Telepathy contacts.
Travis Reitter [Mon, 12 Jul 2010 23:33:49 +0000 (16:33 -0700)]
Pass along the message, actor, and reason from standard-channel Telepathy contacts.

13 years agoCombine the PersonaStore:personas-added and personas-removed signals.
Travis Reitter [Mon, 12 Jul 2010 22:45:18 +0000 (15:45 -0700)]
Combine the PersonaStore:personas-added and personas-removed signals.

Also include a backend-supplied message, persona who caused the change, and
reason for the change. This will allow us to pass on the more-detailed
notification bits for Telepathy (eg, "You got kicked from room XYZ by Foo Bar:
'I just felt like booting someone.'").

13 years agoBump the required version of tp-glib
Travis Reitter [Mon, 12 Jul 2010 23:48:55 +0000 (16:48 -0700)]
Bump the required version of tp-glib

13 years agoAlso remove Capabilities from Individual.
Travis Reitter [Mon, 12 Jul 2010 18:57:35 +0000 (11:57 -0700)]
Also remove Capabilities from Individual.

13 years agoRemove the Capabilities interface.
Travis Reitter [Mon, 12 Jul 2010 17:27:59 +0000 (10:27 -0700)]
Remove the Capabilities interface.

There are some issues with its design, and it depends upon fixes to tp-glib that
we'd like to punt for now.

13 years agoStrip Capabilities interface from Tpf.Persona.
Travis Reitter [Mon, 12 Jul 2010 17:14:24 +0000 (10:14 -0700)]
Strip Capabilities interface from Tpf.Persona.

14 years agoDon't explicitly state the return type of AccountManager.get_valid_accounts().
Travis Reitter [Fri, 9 Jul 2010 16:32:24 +0000 (09:32 -0700)]
Don't explicitly state the return type of AccountManager.get_valid_accounts().

14 years agoVala doesn't accept GLib.Value as a generic type
Travis Reitter [Thu, 8 Jul 2010 23:33:33 +0000 (16:33 -0700)]
Vala doesn't accept GLib.Value as a generic type

This works around the problem (until we care about the content of the details
hash).

14 years agoUpdate for the new signature of ConnectionRequestHandlesCb.
Travis Reitter [Thu, 8 Jul 2010 23:17:52 +0000 (16:17 -0700)]
Update for the new signature of ConnectionRequestHandlesCb.

14 years agoCast TelepathyGLib.ContactFeature to uint, since tp-lowlevel can't use the symbol...
Travis Reitter [Thu, 8 Jul 2010 22:49:29 +0000 (15:49 -0700)]
Cast TelepathyGLib.ContactFeature to uint, since tp-lowlevel can't use the symbol 'TpContactFeature'.

14 years agoUpdate for the fact that the g-i bindings don't bind the Channel.group_members_change...
Travis Reitter [Thu, 8 Jul 2010 22:41:12 +0000 (15:41 -0700)]
Update for the fact that the g-i bindings don't bind the Channel.group_members_changed signal.

14 years agoUse the existing Tpf.PersonaError instead of the unbound TelepathyGLib.Error.
Travis Reitter [Thu, 8 Jul 2010 21:54:35 +0000 (14:54 -0700)]
Use the existing Tpf.PersonaError instead of the unbound TelepathyGLib.Error.

14 years agoUse uint for TpContactFeature, since the type doesn't exist in the Vala bindings.
Travis Reitter [Thu, 8 Jul 2010 21:28:41 +0000 (14:28 -0700)]
Use uint for TpContactFeature, since the type doesn't exist in the Vala bindings.

14 years agoAdjust for the fact that AccountManager.get_valid_accounts () transfers ownership.
Travis Reitter [Thu, 1 Jul 2010 00:20:52 +0000 (17:20 -0700)]
Adjust for the fact that AccountManager.get_valid_accounts () transfers ownership.

14 years agoAccount.get_object_path() no longer (erroneously) takes an argument.
Travis Reitter [Thu, 1 Jul 2010 00:16:56 +0000 (17:16 -0700)]
Account.get_object_path() no longer (erroneously) takes an argument.

14 years agoMake Tpf.PersonaError public
Travis Reitter [Thu, 1 Jul 2010 00:15:45 +0000 (17:15 -0700)]
Make Tpf.PersonaError public

14 years agoUse the modern TelepathyGLib.Proxy.prepare_async() instead of the old (and unbound...
Travis Reitter [Thu, 1 Jul 2010 00:15:10 +0000 (17:15 -0700)]
Use the modern TelepathyGLib.Proxy.prepare_async() instead of the old (and unbound) TelepathyGLib.Connection.call_when_ready ()

14 years agoAdjust for TelepathyGLib.AccountManager.get_valid_accounts() transferring ownership...
Travis Reitter [Wed, 30 Jun 2010 19:24:16 +0000 (12:24 -0700)]
Adjust for TelepathyGLib.AccountManager.get_valid_accounts() transferring ownership of the list.

14 years agoAdjust to TelepathyGLib.ConnectionContactsByHandleCb implicitly passing the array...
Travis Reitter [Wed, 30 Jun 2010 19:19:50 +0000 (12:19 -0700)]
Adjust to TelepathyGLib.ConnectionContactsByHandleCb implicitly passing the array lengths.

14 years agoContinue adjusting to vapi changes in the g-i-based tp-glib bindings.
Travis Reitter [Wed, 16 Jun 2010 22:42:42 +0000 (15:42 -0700)]
Continue adjusting to vapi changes in the g-i-based tp-glib bindings.

14 years agoCreate our own errordomain for Tpf.Persona errors.
Travis Reitter [Wed, 16 Jun 2010 18:26:35 +0000 (11:26 -0700)]
Create our own errordomain for Tpf.Persona errors.

14 years agoWork-around the g-i bindings missing TpHandle.
Travis Reitter [Wed, 16 Jun 2010 18:23:46 +0000 (11:23 -0700)]
Work-around the g-i bindings missing TpHandle.

14 years agoAdjust to the new tp-glib vala bindings namespace introduced by the g-i version.
Travis Reitter [Wed, 16 Jun 2010 18:23:21 +0000 (11:23 -0700)]
Adjust to the new tp-glib vala bindings namespace introduced by the g-i version.

14 years agoDon't try to strip() a null string
Philip Withnall [Thu, 8 Jul 2010 09:56:36 +0000 (10:56 +0100)]
Don't try to strip() a null string

14 years agoFix notification of favourites changes in Individual
Philip Withnall [Thu, 8 Jul 2010 09:54:43 +0000 (10:54 +0100)]
Fix notification of favourites changes in Individual

14 years agoAllow single personas to be removed through the IndividualManager
Philip Withnall [Wed, 7 Jul 2010 17:15:33 +0000 (18:15 +0100)]
Allow single personas to be removed through the IndividualManager

14 years agoEnsure updates to Persona:groups affect Individuals
Philip Withnall [Wed, 7 Jul 2010 16:00:38 +0000 (17:00 +0100)]
Ensure updates to Persona:groups affect Individuals

14 years agoEnsure personas are only created and added once
Philip Withnall [Wed, 7 Jul 2010 15:12:29 +0000 (16:12 +0100)]
Ensure personas are only created and added once

Previously, IndividualAggregator.add_persona_from_details() would return a
different instance of the same persona than would get added to the
PersonaStore later (through channel change notification). This fixes that
to re-use the original persona created by add_persona_from_details().

14 years agoImprove filtering of empty aliases
Philip Withnall [Wed, 7 Jul 2010 15:11:58 +0000 (16:11 +0100)]
Improve filtering of empty aliases

14 years agoAdd alias notification in Folks.Individual
Philip Withnall [Wed, 7 Jul 2010 12:13:55 +0000 (13:13 +0100)]
Add alias notification in Folks.Individual

14 years agoAdd missing dbus-glib dep to docs build process
Travis Reitter [Mon, 5 Jul 2010 16:59:15 +0000 (09:59 -0700)]
Add missing dbus-glib dep to docs build process

14 years agoRemove the built documentation on distclean
Philip Withnall [Mon, 5 Jul 2010 09:44:02 +0000 (10:44 +0100)]
Remove the built documentation on distclean

14 years agoAdd documentation to every method in the Telepathy backend
Philip Withnall [Thu, 1 Jul 2010 17:08:32 +0000 (18:08 +0100)]
Add documentation to every method in the Telepathy backend

Much of the documentation is inherited from that in the core of libfolks, and
the rest isn't particularly in-depth.

14 years agoAdd the Telepathy backend to the documentation build
Philip Withnall [Thu, 1 Jul 2010 16:51:20 +0000 (17:51 +0100)]
Add the Telepathy backend to the documentation build

14 years agoMake Tpf.PersonaStore.change_is_favourite() internal
Philip Withnall [Fri, 2 Jul 2010 13:31:49 +0000 (14:31 +0100)]
Make Tpf.PersonaStore.change_is_favourite() internal

14 years agoPass changes to Personas' aliases on to Telepathy
Philip Withnall [Fri, 2 Jul 2010 12:24:05 +0000 (13:24 +0100)]
Pass changes to Personas' aliases on to Telepathy

14 years agoActually ref new Personas set for an Individual, so we don't double-unref them later.
Travis Reitter [Fri, 2 Jul 2010 00:01:10 +0000 (17:01 -0700)]
Actually ref new Personas set for an Individual, so we don't double-unref them later.

14 years agoUpdate an Individual's store-persona hash when the persona is removed from its store.
Travis Reitter [Thu, 1 Jul 2010 23:35:49 +0000 (16:35 -0700)]
Update an Individual's store-persona hash when the persona is removed from its store.

14 years agoDon't emit an extraneous 'personas-removed' before we get confirmation from the server.
Travis Reitter [Thu, 1 Jul 2010 22:29:23 +0000 (15:29 -0700)]
Don't emit an extraneous 'personas-removed' before we get confirmation from the server.

14 years agoWhen removing a Tpf.Persona, remove it from the same struct we're cycling through.
Travis Reitter [Thu, 1 Jul 2010 21:53:49 +0000 (14:53 -0700)]
When removing a Tpf.Persona, remove it from the same struct we're cycling through.

14 years agoWhen removing Tpf.Personas from the store, ensure we empty corresponding entries...
Travis Reitter [Thu, 1 Jul 2010 21:47:10 +0000 (14:47 -0700)]
When removing Tpf.Personas from the store, ensure we empty corresponding entries for the persona's handle.

14 years agoBump version.
Travis Reitter [Thu, 1 Jul 2010 17:22:50 +0000 (10:22 -0700)]
Bump version.

14 years agoMerge remote branch 'pwith/fixes3-no-prepare'
Travis Reitter [Thu, 1 Jul 2010 17:16:36 +0000 (10:16 -0700)]
Merge remote branch 'pwith/fixes3-no-prepare'

14 years agoMerge branch 'master' into fixes3-no-prepare
Philip Withnall [Thu, 1 Jul 2010 17:12:11 +0000 (18:12 +0100)]
Merge branch 'master' into fixes3-no-prepare

Conflicts:
backends/telepathy/tpf-persona.vala
folks/individual.vala
folks/persona.vala

14 years agoRemove use of pkg-config directly from a Makefile
Philip Withnall [Thu, 1 Jul 2010 15:09:40 +0000 (16:09 +0100)]
Remove use of pkg-config directly from a Makefile

14 years agoMake configuration fail if vapigen is missing
Philip Withnall [Thu, 1 Jul 2010 15:00:50 +0000 (16:00 +0100)]
Make configuration fail if vapigen is missing

14 years agoSplit up pkg-config dependencies
Philip Withnall [Thu, 1 Jul 2010 14:46:21 +0000 (15:46 +0100)]
Split up pkg-config dependencies

14 years agoApply new interface style convention
Philip Withnall [Thu, 1 Jul 2010 14:25:22 +0000 (15:25 +0100)]
Apply new interface style convention

When a class implements any interfaces (in addition to its superclass), they
should each be put on a new line, and sorted alphabetically.

14 years agoRemove explicit array length from add_new_personas_from_contacts()
Philip Withnall [Thu, 1 Jul 2010 14:22:01 +0000 (15:22 +0100)]
Remove explicit array length from add_new_personas_from_contacts()

14 years agoImprove documentation build rules
Philip Withnall [Wed, 30 Jun 2010 14:46:52 +0000 (15:46 +0100)]
Improve documentation build rules

Ensure that the documentation is rebuilt if any of the sources files it's
extracted from change.

14 years agoClarify documentation of BackendStore.backend_available
Philip Withnall [Wed, 30 Jun 2010 13:57:20 +0000 (14:57 +0100)]
Clarify documentation of BackendStore.backend_available

14 years agoBump required telepathy-glib.
Travis Reitter [Thu, 1 Jul 2010 03:08:32 +0000 (20:08 -0700)]
Bump required telepathy-glib.

14 years agoMerge remote branch 'pwith/interfaces'
Travis Reitter [Thu, 1 Jul 2010 02:46:04 +0000 (19:46 -0700)]
Merge remote branch 'pwith/interfaces'

14 years agoFix audio and video capabilities
Philip Withnall [Wed, 30 Jun 2010 11:38:05 +0000 (12:38 +0100)]
Fix audio and video capabilities

14 years agoFix setting capabilities when Tp returns a null set of capabilities
Philip Withnall [Wed, 30 Jun 2010 11:10:31 +0000 (12:10 +0100)]
Fix setting capabilities when Tp returns a null set of capabilities

14 years agoMerge branch 'master' into fixes3
Philip Withnall [Wed, 30 Jun 2010 11:04:43 +0000 (12:04 +0100)]
Merge branch 'master' into fixes3

Conflicts:
folks/individual.vala

14 years agoMerge branch 'master' into interfaces
Philip Withnall [Wed, 30 Jun 2010 11:00:15 +0000 (12:00 +0100)]
Merge branch 'master' into interfaces

Conflicts:
folks/persona-store.vala
folks/persona.vala

14 years agoOnly warn about unknown personas if the account is already connected
Philip Withnall [Wed, 30 Jun 2010 10:47:42 +0000 (11:47 +0100)]
Only warn about unknown personas if the account is already connected

This fixes spew of "unknown persona in favourites list" messages on startup.

14 years agoHandle the logger service going away gracefully
Philip Withnall [Wed, 30 Jun 2010 10:40:37 +0000 (11:40 +0100)]
Handle the logger service going away gracefully

14 years agoAdd a FIXME about using DBus.Connection.get_object_for_name_owner()
Philip Withnall [Wed, 30 Jun 2010 10:31:44 +0000 (11:31 +0100)]
Add a FIXME about using DBus.Connection.get_object_for_name_owner()

We can't use it at the moment due to bgo#623198.

14 years agoMerge remote branch 'pwith/favourites'
Travis Reitter [Tue, 29 Jun 2010 23:50:34 +0000 (16:50 -0700)]
Merge remote branch 'pwith/favourites'

(Fixed)
Conflicts:
folks/individual.vala
folks/persona.vala