aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSushma Rai <rsushma@src.gnome.org>2005-08-22 18:37:18 +0800
committerSushma Rai <rsushma@src.gnome.org>2005-08-22 18:37:18 +0800
commit879ed4784ca4f90e0992c4627e45965e48c85a6b (patch)
treea3c6bba9e8bac787da50e1e434599a037bf9b5d8
parentc9f3f90495ce3a9dea36e5923bab3e241325f36c (diff)
downloadgsoc2013-evolution-879ed4784ca4f90e0992c4627e45965e48c85a6b.tar
gsoc2013-evolution-879ed4784ca4f90e0992c4627e45965e48c85a6b.tar.gz
gsoc2013-evolution-879ed4784ca4f90e0992c4627e45965e48c85a6b.tar.bz2
gsoc2013-evolution-879ed4784ca4f90e0992c4627e45965e48c85a6b.tar.lz
gsoc2013-evolution-879ed4784ca4f90e0992c4627e45965e48c85a6b.tar.xz
gsoc2013-evolution-879ed4784ca4f90e0992c4627e45965e48c85a6b.tar.zst
gsoc2013-evolution-879ed4784ca4f90e0992c4627e45965e48c85a6b.zip
Using e_contact_get() for E_CONTACT_IS_LIST. See #314152.
Patch submitted by "ross@burtonini.com (Ross Burton)". svn path=/trunk/; revision=30197
-rw-r--r--addressbook/ChangeLog11
-rw-r--r--addressbook/gui/widgets/eab-contact-display.c8
2 files changed, 15 insertions, 4 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 2d63614344..b9d9f42bfc 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,4 +1,13 @@
-2005-08-19 Devashish Sharma <sdevashish@novell.com>
+2005-08-22 Sushma Rai <rsushma@novell.com>
+
+ * gui/widgets/eab-contact-display.c
+ (eab_contact_display_render_normal): Using e_contact_get() instead of
+ e_contact_get_const() for E_CONTACT_IS_LIST. Patch to fix #314152, by
+ "ross@burtonini.com (Ross Burton)".
+ Also fixed some compile time warnings.
+ (eab_contact_display_render_compact): Fixed some compile time warnings.
+
+2005-08-22 Devashish Sharma <sdevashish@novell.com>
* gui/contact-editor/e-contact-editor.c (categories_clicked): Makes Edit
categories dialog non-modal.
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index 8613d92e3e..d96c1a323d 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -412,7 +412,8 @@ eab_contact_display_render_normal (EABContactDisplay *display, EContact *contact
gtk_html_stream_write (html_stream, "<body>\n", 7);
if (contact) {
- char *str, *html;
+ const char *str;
+ char *html;
EContactPhoto *photo;
gtk_html_stream_printf (html_stream, "<table cellspacing=\"20\" border=\"0\"><td valign=\"top\">");
@@ -437,7 +438,7 @@ eab_contact_display_render_normal (EABContactDisplay *display, EContact *contact
}
- if (e_contact_get_const (contact, E_CONTACT_IS_LIST))
+ if (e_contact_get (contact, E_CONTACT_IS_LIST))
render_contact_list (html_stream, contact);
else
render_contact (html_stream, contact);
@@ -465,7 +466,8 @@ eab_contact_display_render_compact (EABContactDisplay *display, EContact *contac
gtk_html_stream_write (html_stream, "<body>\n", 7);
if (contact) {
- char *str, *html;
+ const char *str;
+ char *html;
EContactPhoto *photo;
gtk_html_stream_printf (html_stream,