continue;
}
- var source_uri = s.peek_relative_uri ();
-
- if (!this._persona_stores.has_key (source_uri))
+ var uid = s.peek_uid ();
+ if (!this._persona_stores.has_key (uid))
{
added_sources.add (s);
}
*/
private void _add_address_book (E.Source s)
{
- string relative_uri = s.peek_relative_uri ();
-
- if (this._persona_stores.has_key (relative_uri))
+ string uid = s.peek_uid ();
+ if (this._persona_stores.has_key (uid))
return;
- debug ("Adding address book '%s'.", relative_uri);
+ debug ("Adding address book '%s'.", uid);
var store = new Edsf.PersonaStore (s);
private bool _is_quiescent = false;
private E.BookClient _addressbook;
private E.BookClientView _ebookview;
- private string _addressbook_uri = null;
private E.SourceList? _source_list = null;
private E.Source _source;
private string _query_str;
*/
public PersonaStore (E.Source s)
{
- string uri = s.peek_relative_uri ();
- Object (id: uri, display_name: uri);
+ string eds_uid = s.peek_uid ();
+ Object (id: eds_uid, display_name: eds_uid);
this._source = s;
- this._addressbook_uri = uri;
this._personas = new HashMap<string, Persona> ();
this._personas_ro = this._personas.read_only_view;
this._query_str = "(contains \"x-evolution-any-field\" \"\")";
{
foreach (var s in g.peek_sources ())
{
- if (s.peek_relative_uri () == this.id &&
- s.peek_uid () == this._addressbook.get_source ().peek_uid ())
+ if (s.peek_uid () == this.id)
{
/* We've found ourself. */
return true;