[gnome-contacts] Don't use deprecated is_writeable property
- From: Alexander Larsson <alexl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-contacts] Don't use deprecated is_writeable property
- Date: Mon, 19 Sep 2011 12:34:39 +0000 (UTC)
commit 7a497ecdb1950f7ab4e374955b29b73546be0af2
Author: Alexander Larsson <alexl redhat com>
Date: Mon Sep 19 14:16:58 2011 +0200
Don't use deprecated is_writeable property
Replacement is is_persona_store
src/contacts-contact-pane.vala | 2 +-
src/contacts-contact.vala | 6 +++---
src/contacts-linking.vala | 10 +++++-----
3 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/src/contacts-contact-pane.vala b/src/contacts-contact-pane.vala
index 87da378..14311e3 100644
--- a/src/contacts-contact-pane.vala
+++ b/src/contacts-contact-pane.vala
@@ -1216,7 +1216,7 @@ public class Contacts.ContactPane : Grid {
persona_list.sort (Contact.compare_persona_by_store);
foreach (var p in persona_list) {
- if (p.store.is_writeable) {
+ if (p.store.is_primary_store) {
editing_persona_primary = p;
}
}
diff --git a/src/contacts-contact.vala b/src/contacts-contact.vala
index 2ac3479..a3d61fe 100644
--- a/src/contacts-contact.vala
+++ b/src/contacts-contact.vala
@@ -532,11 +532,11 @@ public class Contacts.Contact : GLib.Object {
if (store_a == store_b)
return 0;
- if (store_a.is_writeable && store_b.is_writeable)
+ if (store_a.is_primary_store && store_b.is_primary_store)
return 0;
- if (store_a.is_writeable)
+ if (store_a.is_primary_store)
return -1;
- if (store_b.is_writeable)
+ if (store_b.is_primary_store)
return 1;
if (store_a.type_id == "eds" && store_b.type_id == "eds")
diff --git a/src/contacts-linking.vala b/src/contacts-linking.vala
index 7acfc08..42a5844 100644
--- a/src/contacts-linking.vala
+++ b/src/contacts-linking.vala
@@ -421,19 +421,19 @@ namespace Contacts {
if (persona_can_link_to (p1, other_linkables)) {
write_persona = p1;
linkables = other_linkables;
- if (write_persona.store.is_writeable)
+ if (write_persona.store.is_primary_store)
break; // Exit if we find a primary persona, as we prefer these
}
}
- if (write_persona == null || !write_persona.store.is_writeable) {
+ if (write_persona == null || !write_persona.store.is_primary_store) {
foreach (var p2 in other.individual.personas) {
if (persona_can_link_to (p2, main_linkables)) {
// Only override main persona if its a primary store persona
- if (write_persona == null || p2.store.is_writeable) {
+ if (write_persona == null || p2.store.is_primary_store) {
write_persona = p2;
linkables = main_linkables;
- if (write_persona.store.is_writeable)
+ if (write_persona.store.is_primary_store)
break; // Exit if we find a primary persona, as we prefer these
}
}
@@ -521,7 +521,7 @@ namespace Contacts {
foreach (var p2 in individual.personas) {
if (p2 != persona_to_unlink && persona_can_link_to (p2, main_persona_additions)) {
main_persona = p2;
- if (main_persona.store.is_writeable)
+ if (main_persona.store.is_primary_store)
break; // Exit if we find a primary persona, as we prefer these
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]