Using "gconstpointer" instead of "const gpointer". Fixes #309175.

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 54d6480..7355aa6 100644 (file)
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-05  Sushma Rai  <rsushma@novell.com>
+
+       * libebook/e-contact.[ch]: Using gconstpointer instead of 
+       const gpointer for return value of e_contact_get_const(). Fixes #309175.
+
 2005-07-04  Sushma Rai  <rsushma@novell.com>
 
        * libedata-book/e-book-backend-sexp.c (prop_info_table[]): Added

diff --git a/addressbook/libebook/e-contact.c b/addressbook/libebook/e-contact.c
index da03d9a..6f447d3 100644 (file)
--- a/addressbook/libebook/e-contact.c
+++ b/addressbook/libebook/e-contact.c
@@ -1215,7 +1215,7 @@ e_contact_get_property (GObject *object,
        else if (info->t & E_CONTACT_FIELD_TYPE_SYNTHETIC) {
                switch (info->field_id) {
                case E_CONTACT_NAME_OR_ORG: {
-                       char *str;
+                       const char *str;
 
                        str = e_contact_get_const (contact, E_CONTACT_FILE_AS);
                        if (!str)
@@ -1525,7 +1525,7 @@ free_const_data (gpointer data, GObject *where_object_was)
  *
  * Return value: Depends on the field's type, owned by the #EContact.
  **/
-const gpointer
+gconstpointer
 e_contact_get_const (EContact *contact, EContactField field_id)
 {
        gboolean is_string = FALSE;

diff --git a/addressbook/libebook/e-contact.h b/addressbook/libebook/e-contact.h
index 4a2d95d..f2bcac6 100644 (file)
--- a/addressbook/libebook/e-contact.h
+++ b/addressbook/libebook/e-contact.h
@@ -264,7 +264,7 @@ EContact*               e_contact_new_from_vcard   (const char *vcard);
 EContact*               e_contact_duplicate        (EContact *contact);
 
 gpointer                e_contact_get              (EContact *contact, EContactField field_id);
-const gpointer          e_contact_get_const        (EContact *contact, EContactField field_id);
+gconstpointer          e_contact_get_const        (EContact *contact, EContactField field_id);
 void                    e_contact_set              (EContact *contact, EContactField field_id, gpointer value);
 
 /* the following two calls return and take a GList of