[evolution-data-server] Revert unintentional API break in libedataserver.

[Matthew Barnes <mbarnes src gnome org>]

commit 98642d78324fd926af28e2f2072c2499a68e2f92
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Apr 24 11:01:11 2012 -0400

    Revert unintentional API break in libedataserver.
    
    Partially reverses commit 90eb7da3ab9b00f504f5fed1f740c59485356f41.
    
    Apparently this unintentionally broke language bindings.
    
    Instead of renaming the e_source_peek_uid() and e_source_peek_name()
    functions themselves, leave the old functions alone and define aliases
    for the new names:
    
       #define e_source_get_uid            e_source_peek_uid
       #define e_source_get_display_name   e_source_peek_name
    
    Using the new names throughout Evo and EDS is very helpful in reducing
    diff noise between "master" and the "account-mgmt" branches so I can see
    the important differences, so I don't want to revert the commit entirely.

 .../libedataserver/libedataserver-sections.txt     |    8 ++++----
 libedataserver/e-source.c                          |    8 ++++----
 libedataserver/e-source.h                          |   11 +++++------
 3 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/docs/reference/libedataserver/libedataserver-sections.txt b/docs/reference/libedataserver/libedataserver-sections.txt
index 8d981b7..92d07ac 100644
--- a/docs/reference/libedataserver/libedataserver-sections.txt
+++ b/docs/reference/libedataserver/libedataserver-sections.txt
@@ -397,8 +397,8 @@ e_source_set_absolute_uri
 e_source_set_color_spec
 e_source_set_readonly
 e_source_peek_group
-e_source_get_uid
-e_source_get_display_name
+e_source_peek_uid
+e_source_peek_name
 e_source_peek_relative_uri
 e_source_peek_absolute_uri
 e_source_peek_color_spec
@@ -413,8 +413,8 @@ e_source_get_duped_property
 e_source_build_absolute_uri
 e_source_equal
 e_source_xmlstr_equal
-e_source_peek_uid
-e_source_peek_name
+e_source_get_uid
+e_source_get_display_name
 <SUBSECTION Standard>
 E_SOURCE
 E_IS_SOURCE
diff --git a/libedataserver/e-source.c b/libedataserver/e-source.c
index d33d10b..4b96575 100644
--- a/libedataserver/e-source.c
+++ b/libedataserver/e-source.c
@@ -740,7 +740,7 @@ e_source_peek_group (ESource *source)
 }
 
 /**
- * e_source_get_uid:
+ * e_source_peek_uid:
  * @source: an #ESource
  *
  * Returns the unique identifier string for @source.
@@ -748,7 +748,7 @@ e_source_peek_group (ESource *source)
  * Returns: the source's unique ID
  **/
 const gchar *
-e_source_get_uid (ESource *source)
+e_source_peek_uid (ESource *source)
 {
 	g_return_val_if_fail (E_IS_SOURCE (source), NULL);
 
@@ -756,7 +756,7 @@ e_source_get_uid (ESource *source)
 }
 
 /**
- * e_source_get_display_name:
+ * e_source_peek_name:
  * @source: an #ESource
  *
  * Returns the display name for @source.
@@ -764,7 +764,7 @@ e_source_get_uid (ESource *source)
  * Returns: the source's display name
  **/
 const gchar *
-e_source_get_display_name (ESource *source)
+e_source_peek_name (ESource *source)
 {
 	g_return_val_if_fail (E_IS_SOURCE (source), NULL);
 
diff --git a/libedataserver/e-source.h b/libedataserver/e-source.h
index 5dbf056..8e0db20 100644
--- a/libedataserver/e-source.h
+++ b/libedataserver/e-source.h
@@ -99,8 +99,8 @@ void		e_source_set_readonly		(ESource *source,
 						 gboolean readonly);
 struct _ESourceGroup *
 		e_source_peek_group		(ESource *source);
-const gchar *	e_source_get_uid		(ESource *source);
-const gchar *	e_source_get_display_name	(ESource *source);
+const gchar *	e_source_peek_uid		(ESource *source);
+const gchar *	e_source_peek_name		(ESource *source);
 const gchar *	e_source_peek_relative_uri	(ESource *source);
 const gchar *	e_source_peek_absolute_uri	(ESource *source);
 const gchar *	e_source_peek_color_spec	(ESource *source);
@@ -125,10 +125,9 @@ gboolean	e_source_equal			(ESource *a,
 gboolean	e_source_xmlstr_equal		(const gchar *a,
 						 const gchar *b);
 
-#ifndef EDS_DISABLE_DEPRECATED
-#define e_source_peek_uid		e_source_get_uid
-#define e_source_peek_name		e_source_get_display_name
-#endif /* EDS_DISABLE_DEPRECATED */
+/* New names to be used in the upcoming ESource rewrite. */
+#define e_source_get_uid		e_source_peek_uid
+#define e_source_get_display_name	e_source_peek_name
 
 G_END_DECLS