aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Trowbridge <trow@ximian.com>2001-09-15 15:18:16 +0800
committerJon Trowbridge <trow@src.gnome.org>2001-09-15 15:18:16 +0800
commit576a04e67d0f059992afbb1afdca67fb668288f4 (patch)
tree97491ce2b432242d1363273b66a7530bced29f78
parent9fff8d12468458dc467d5f67ff7cd3bd5372df41 (diff)
downloadgsoc2013-evolution-576a04e67d0f059992afbb1afdca67fb668288f4.tar
gsoc2013-evolution-576a04e67d0f059992afbb1afdca67fb668288f4.tar.gz
gsoc2013-evolution-576a04e67d0f059992afbb1afdca67fb668288f4.tar.bz2
gsoc2013-evolution-576a04e67d0f059992afbb1afdca67fb668288f4.tar.lz
gsoc2013-evolution-576a04e67d0f059992afbb1afdca67fb668288f4.tar.xz
gsoc2013-evolution-576a04e67d0f059992afbb1afdca67fb668288f4.tar.zst
gsoc2013-evolution-576a04e67d0f059992afbb1afdca67fb668288f4.zip
We can't use NULL as the first arg for e_addressbook_show_contact_editor
2001-09-15 Jon Trowbridge <trow@ximian.com> * gui/component/select-names/e-select-names-text-model.c (e_select_names_text_model_activate_obj): We can't use NULL as the first arg for e_addressbook_show_contact_editor anymore. Damn. (#8535) svn path=/trunk/; revision=12853
-rw-r--r--addressbook/ChangeLog5
-rw-r--r--addressbook/gui/component/select-names/e-select-names-text-model.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 3e9208e7f2..48bfa5118b 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,10 @@
2001-09-15 Jon Trowbridge <trow@ximian.com>
+ * gui/component/select-names/e-select-names-text-model.c
+ (e_select_names_text_model_activate_obj): We can't use NULL as the
+ first arg for e_addressbook_show_contact_editor anymore. Damn.
+ (#8535)
+
* backend/ebook/e-book-listener.c (e_book_listener_stop): Make
"stop" do nothing but set the stopped flag, as in
e-book-view-listener.c.
diff --git a/addressbook/gui/component/select-names/e-select-names-text-model.c b/addressbook/gui/component/select-names/e-select-names-text-model.c
index 782b7ebb90..d2e77d6316 100644
--- a/addressbook/gui/component/select-names/e-select-names-text-model.c
+++ b/addressbook/gui/component/select-names/e-select-names-text-model.c
@@ -728,10 +728,10 @@ e_select_names_text_model_activate_obj (ETextModel *model, gint n)
g_return_if_fail (i >= 0);
card = e_select_names_model_get_card (source, i);
- g_return_if_fail (card);
+ g_return_if_fail (card != NULL);
/* present read-only contact editor when someone double clicks from here */
- contact_editor = e_addressbook_show_contact_editor (NULL, card, FALSE, FALSE);
+ contact_editor = e_addressbook_show_contact_editor (e_card_get_book (card), card, FALSE, FALSE);
e_contact_editor_raise (contact_editor);
}