projects
/
platform
/
upstream
/
folks.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a25f761
)
Revert "build fix: Only depend on Gee 0.8.3, since 0.8.4 isn't released yet"
author
Travis Reitter
<travis.reitter@collabora.co.uk>
Mon, 18 Feb 2013 01:04:17 +0000
(17:04 -0800)
committer
Travis Reitter
<travis.reitter@collabora.co.uk>
Mon, 18 Feb 2013 01:04:36 +0000
(17:04 -0800)
This reverts commit
ad77950c7a628399e59ac3d04f07f95bb21f1887
.
NEWS
patch
|
blob
|
history
backends/eds/lib/edsf-persona.vala
patch
|
blob
|
history
backends/key-file/kf-persona.vala
patch
|
blob
|
history
backends/telepathy/lib/tpf-persona.vala
patch
|
blob
|
history
configure.ac
patch
|
blob
|
history
folks/individual-aggregator.vala
patch
|
blob
|
history
folks/individual.vala
patch
|
blob
|
history
tests/eds/link-personas.vala
patch
|
blob
|
history
tests/eds/set-im-addresses.vala
patch
|
blob
|
history
diff --git
a/NEWS
b/NEWS
index
1518d83
..
24199a4
100644
(file)
--- a/
NEWS
+++ b/
NEWS
@@
-2,7
+2,7
@@
Overview of changes from libfolks 0.8.0 to libfolks 0.9.0
=========================================================
Dependencies:
=========================================================
Dependencies:
-• libgee ≥ 0.8.
3
+• libgee ≥ 0.8.
4
Major changes:
• Added an ofono backend
Major changes:
• Added an ofono backend
diff --git
a/backends/eds/lib/edsf-persona.vala
b/backends/eds/lib/edsf-persona.vala
index
82444ad
..
02c68e6
100644
(file)
--- a/
backends/eds/lib/edsf-persona.vala
+++ b/
backends/eds/lib/edsf-persona.vala
@@
-526,8
+526,8
@@
public class Edsf.Persona : Folks.Persona,
* doesn't as it's a linkable property, so always has to be loaded anyway. */
private HashMultiMap<string, ImFieldDetails> _im_addresses =
new HashMultiMap<string, ImFieldDetails> (null, null,
* doesn't as it's a linkable property, so always has to be loaded anyway. */
private HashMultiMap<string, ImFieldDetails> _im_addresses =
new HashMultiMap<string, ImFieldDetails> (null, null,
-
(Gee.HashDataFunc)
AbstractFieldDetails<string>.hash_static,
-
(Gee.EqualDataFunc)
AbstractFieldDetails<string>.equal_static);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
/**
* {@inheritDoc}
/**
* {@inheritDoc}
@@
-960,9
+960,8
@@
public class Edsf.Persona : Folks.Persona,
this._local_ids_ro = this._local_ids.read_only_view;
this._web_service_addresses =
new HashMultiMap<string, WebServiceFieldDetails> (
this._local_ids_ro = this._local_ids.read_only_view;
this._web_service_addresses =
new HashMultiMap<string, WebServiceFieldDetails> (
- null, null,
- (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
- (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
this._email_addresses_ro = this._email_addresses.read_only_view;
this._groups = new HashSet<string> ();
this._groups_ro = this._groups.read_only_view;
this._email_addresses_ro = this._email_addresses.read_only_view;
this._groups = new HashSet<string> ();
this._groups_ro = this._groups.read_only_view;
@@
-1301,9
+1300,8
@@
public class Edsf.Persona : Folks.Persona,
private void _update_web_services_addresses ()
{
var new_services = new HashMultiMap<string, WebServiceFieldDetails> (
private void _update_web_services_addresses ()
{
var new_services = new HashMultiMap<string, WebServiceFieldDetails> (
- null, null,
- (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
- (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var services = this.contact.get_attribute ("X-FOLKS-WEB-SERVICES-IDS");
if (services != null)
var services = this.contact.get_attribute ("X-FOLKS-WEB-SERVICES-IDS");
if (services != null)
@@
-1619,8
+1617,8
@@
public class Edsf.Persona : Folks.Persona,
{
var im_eds_map = Persona._get_im_eds_map ();
var new_im_addresses = new HashMultiMap<string, ImFieldDetails> (null,
{
var im_eds_map = Persona._get_im_eds_map ();
var new_im_addresses = new HashMultiMap<string, ImFieldDetails> (null,
- null,
(Gee.HashDataFunc)
AbstractFieldDetails<string>.hash_static,
-
(Gee.EqualDataFunc)
AbstractFieldDetails<string>.equal_static);
+ null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
foreach (var im_proto in im_eds_map.get_keys ())
{
foreach (var im_proto in im_eds_map.get_keys ())
{
diff --git
a/backends/key-file/kf-persona.vala
b/backends/key-file/kf-persona.vala
index
2d4b2eb
..
e9f742e
100644
(file)
--- a/
backends/key-file/kf-persona.vala
+++ b/
backends/key-file/kf-persona.vala
@@
-145,9
+145,8
@@
public class Folks.Backends.Kf.Persona : Folks.Persona,
/* Add the new IM addresses to the key file and build a normalised
* table of them to set as the new property value */
var new_im_addresses = new HashMultiMap<string, ImFieldDetails> (
/* Add the new IM addresses to the key file and build a normalised
* table of them to set as the new property value */
var new_im_addresses = new HashMultiMap<string, ImFieldDetails> (
- null, null,
- (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
- (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
foreach (var protocol2 in im_addresses.get_keys ())
{
foreach (var protocol2 in im_addresses.get_keys ())
{
@@
-232,9
+231,8
@@
public class Folks.Backends.Kf.Persona : Folks.Persona,
* table of them to set as the new property value */
var new_web_service_addresses =
new HashMultiMap<string, WebServiceFieldDetails> (
* table of them to set as the new property value */
var new_web_service_addresses =
new HashMultiMap<string, WebServiceFieldDetails> (
- null, null,
- (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
- (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
foreach (var web_service2 in web_service_addresses.get_keys ())
{
foreach (var web_service2 in web_service_addresses.get_keys ())
{
@@
-327,14
+325,12
@@
public class Folks.Backends.Kf.Persona : Folks.Persona,
this.iid, this.display_id);
this._im_addresses = new HashMultiMap<string, ImFieldDetails> (
this.iid, this.display_id);
this._im_addresses = new HashMultiMap<string, ImFieldDetails> (
- null, null,
- (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
- (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
this._web_service_addresses =
new HashMultiMap<string, WebServiceFieldDetails> (
this._web_service_addresses =
new HashMultiMap<string, WebServiceFieldDetails> (
- null, null,
- (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
- (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
this._anti_links = new HashSet<string> ();
this._anti_links_ro = this._anti_links.read_only_view;
this._anti_links = new HashSet<string> ();
this._anti_links_ro = this._anti_links.read_only_view;
diff --git
a/backends/telepathy/lib/tpf-persona.vala
b/backends/telepathy/lib/tpf-persona.vala
index
15fa9be
..
d7fc067
100644
(file)
--- a/
backends/telepathy/lib/tpf-persona.vala
+++ b/
backends/telepathy/lib/tpf-persona.vala
@@
-389,8
+389,8
@@
public class Tpf.Persona : Folks.Persona,
* doesn't as it's a linkable property, so always has to be loaded anyway. */
private HashMultiMap<string, ImFieldDetails> _im_addresses =
new HashMultiMap<string, ImFieldDetails> (null, null,
* doesn't as it's a linkable property, so always has to be loaded anyway. */
private HashMultiMap<string, ImFieldDetails> _im_addresses =
new HashMultiMap<string, ImFieldDetails> (null, null,
-
(Gee.HashDataFunc)
AbstractFieldDetails<string>.hash_static,
-
(Gee.EqualDataFunc)
AbstractFieldDetails<string>.equal_static);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
/**
* A mapping of IM protocol to an (unordered) set of IM addresses.
/**
* A mapping of IM protocol to an (unordered) set of IM addresses.
diff --git
a/configure.ac
b/configure.ac
index
0e45b08
..
e577fee
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-180,7
+180,7
@@
TRACKER_SPARQL_REQUIRED=0.15.2
EBOOK_REQUIRED=3.5.3
EDATASERVER_REQUIRED=3.5.3.1
ZEITGEIST_REQUIRED=0.3.14
EBOOK_REQUIRED=3.5.3
EDATASERVER_REQUIRED=3.5.3.1
ZEITGEIST_REQUIRED=0.3.14
-GEE_REQUIRED=0.8.
3
+GEE_REQUIRED=0.8.
4
AC_SUBST([TRACKER_SPARQL_MAJOR])
AC_SUBST([TRACKER_SPARQL_MAJOR])
diff --git
a/folks/individual-aggregator.vala
b/folks/individual-aggregator.vala
index
b168863
..
53bcbf7
100644
(file)
--- a/
folks/individual-aggregator.vala
+++ b/
folks/individual-aggregator.vala
@@
-1983,14
+1983,12
@@
public class Folks.IndividualAggregator : Object
{
/* ``protocols_addrs_set`` will be passed to the new Kf.Persona */
var protocols_addrs_set = new HashMultiMap<string, ImFieldDetails> (
{
/* ``protocols_addrs_set`` will be passed to the new Kf.Persona */
var protocols_addrs_set = new HashMultiMap<string, ImFieldDetails> (
- null, null,
- (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
- (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var web_service_addrs_set =
new HashMultiMap<string, WebServiceFieldDetails> (
var web_service_addrs_set =
new HashMultiMap<string, WebServiceFieldDetails> (
- null, null,
- (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
- (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
/* List of local_ids */
var local_ids = new Gee.HashSet<string> ();
/* List of local_ids */
var local_ids = new Gee.HashSet<string> ();
diff --git
a/folks/individual.vala
b/folks/individual.vala
index
7fb026d
..
d3fafed
100644
(file)
--- a/
folks/individual.vala
+++ b/
folks/individual.vala
@@
-1721,16
+1721,14
@@
public class Folks.Individual : Object,
() =>
{
this._im_addresses = new HashMultiMap<string, ImFieldDetails> (
() =>
{
this._im_addresses = new HashMultiMap<string, ImFieldDetails> (
- null, null,
- (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
- (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
},
() =>
{
var new_im_addresses = new HashMultiMap<string, ImFieldDetails> (
},
() =>
{
var new_im_addresses = new HashMultiMap<string, ImFieldDetails> (
- null, null,
- (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
- (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
foreach (var persona in this._persona_set)
{
foreach (var persona in this._persona_set)
{
@@
-1772,19
+1770,15
@@
public class Folks.Individual : Object,
{
this._web_service_addresses =
new HashMultiMap<string, WebServiceFieldDetails> (null, null,
{
this._web_service_addresses =
new HashMultiMap<string, WebServiceFieldDetails> (null, null,
- (Gee.HashDataFunc)
- AbstractFieldDetails<string>.hash_static,
- (Gee.EqualDataFunc)
- AbstractFieldDetails<string>.equal_static);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
},
() =>
{
var new_web_service_addresses =
new HashMultiMap<string, WebServiceFieldDetails> (null, null,
},
() =>
{
var new_web_service_addresses =
new HashMultiMap<string, WebServiceFieldDetails> (null, null,
- (Gee.HashDataFunc)
- AbstractFieldDetails<string>.hash_static,
- (Gee.EqualDataFunc)
- AbstractFieldDetails<string>.equal_static);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
foreach (var persona in this._persona_set)
{
foreach (var persona in this._persona_set)
{
diff --git
a/tests/eds/link-personas.vala
b/tests/eds/link-personas.vala
index
3dbb2cb
..
6b4443a
100644
(file)
--- a/
tests/eds/link-personas.vala
+++ b/
tests/eds/link-personas.vala
@@
-224,9
+224,8
@@
public class LinkPersonasTests : Folks.TestCase
{
v1 = Value (typeof (MultiMap));
var im_addrs1 = new HashMultiMap<string, ImFieldDetails> (
{
v1 = Value (typeof (MultiMap));
var im_addrs1 = new HashMultiMap<string, ImFieldDetails> (
- null, null,
- (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
- (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
if (this._linking_method == LinkingMethod.EMAIL_AS_IM_ADDRESS)
im_addrs1.set ("jabber",
new ImFieldDetails (this._auto_linkable_email));
if (this._linking_method == LinkingMethod.EMAIL_AS_IM_ADDRESS)
im_addrs1.set ("jabber",
new ImFieldDetails (this._auto_linkable_email));
@@
-239,9
+238,8
@@
public class LinkPersonasTests : Folks.TestCase
{
v1 = Value (typeof (MultiMap));
var wsa1 = new HashMultiMap<string, WebServiceFieldDetails> (
{
v1 = Value (typeof (MultiMap));
var wsa1 = new HashMultiMap<string, WebServiceFieldDetails> (
- null, null,
- (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
- (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
wsa1.set ("twitter", new WebServiceFieldDetails (this._im_address_1));
v1.set_object (wsa1);
details1.insert (wsk, (owned) v1);
wsa1.set ("twitter", new WebServiceFieldDetails (this._im_address_1));
v1.set_object (wsa1);
details1.insert (wsk, (owned) v1);
@@
-259,9
+257,8
@@
public class LinkPersonasTests : Folks.TestCase
{
v3 = Value (typeof (MultiMap));
var im_addrs2 = new HashMultiMap<string, ImFieldDetails> (
{
v3 = Value (typeof (MultiMap));
var im_addrs2 = new HashMultiMap<string, ImFieldDetails> (
- null, null,
- (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
- (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
im_addrs2.set ("yahoo", new ImFieldDetails (this._im_address_2));
v3.set_object (im_addrs2);
details2.insert ("im-addresses", (owned) v3);
im_addrs2.set ("yahoo", new ImFieldDetails (this._im_address_2));
v3.set_object (im_addrs2);
details2.insert ("im-addresses", (owned) v3);
@@
-270,9
+267,8
@@
public class LinkPersonasTests : Folks.TestCase
{
v3 = Value (typeof (MultiMap));
var wsa2 = new HashMultiMap<string, WebServiceFieldDetails> (
{
v3 = Value (typeof (MultiMap));
var wsa2 = new HashMultiMap<string, WebServiceFieldDetails> (
- null, null,
- (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
- (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
wsa2.set ("lastfm", new WebServiceFieldDetails (this._im_address_2));
v3.set_object (wsa2);
details2.insert (wsk, (owned) v3);
wsa2.set ("lastfm", new WebServiceFieldDetails (this._im_address_2));
v3.set_object (wsa2);
details2.insert (wsk, (owned) v3);
diff --git
a/tests/eds/set-im-addresses.vala
b/tests/eds/set-im-addresses.vala
index
db0736b
..
3808e17
100644
(file)
--- a/
tests/eds/set-im-addresses.vala
+++ b/
tests/eds/set-im-addresses.vala
@@
-126,11
+126,8
@@
public class SetIMAddressesTests : Folks.TestCase
foreach (var p in i.personas)
{
var im_addrs = new HashMultiMap<string, ImFieldDetails> (
foreach (var p in i.personas)
{
var im_addrs = new HashMultiMap<string, ImFieldDetails> (
- null, null,
- (Gee.HashDataFunc)
- AbstractFieldDetails<string>.hash_static,
- (Gee.EqualDataFunc)
- AbstractFieldDetails<string>.equal_static);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
im_addrs.set ("jabber",
new ImFieldDetails ("bernie@example.org"));
((ImDetails) p).im_addresses = im_addrs;
im_addrs.set ("jabber",
new ImFieldDetails ("bernie@example.org"));
((ImDetails) p).im_addresses = im_addrs;