[gnome-contacts] Handle an uncommon case in individuals_change
- From: Alexander Larsson <alexl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-contacts] Handle an uncommon case in individuals_change
- Date: Fri, 9 Sep 2011 12:18:42 +0000 (UTC)
commit ac136fd82c2eb4355db44591d704b2a5e0a75c46
Author: Alexander Larsson <alexl redhat com>
Date: Thu Sep 8 21:23:54 2011 +0200
Handle an uncommon case in individuals_change
It may be that all personas we see have contacts-new-contact for some
weird reason. Handle this nicely
src/contacts-store.vala | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/contacts-store.vala b/src/contacts-store.vala
index 2b96275..c8fc616 100644
--- a/src/contacts-store.vala
+++ b/src/contacts-store.vala
@@ -106,8 +106,10 @@ public class Contacts.Store : GLib.Object {
}
}
- var c = Contact.from_individual (old_individual);
- c.replace_individual (main_individual);
+ if (main_individual != null) {
+ var c = Contact.from_individual (old_individual);
+ c.replace_individual (main_individual);
+ }
foreach (var i in replacements) {
if (i != main_individual) {
/* Already replaced this old_individual, i.e. we're splitting
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]