[Xfce4-commits] <exo:versioning-from-0.3-to-1> Remove exo_intern_string() and exo_intern_static_string().

[Jannis Pohlmann]

Updating branch refs/heads/versioning-from-0.3-to-1
         to 0d7c388f8875a32d902cd94ca492787c812121d4 (commit)
       from 796215a00b477d8ad10fd5a3d1c6b575739ef2ba (commit)

commit 0d7c388f8875a32d902cd94ca492787c812121d4
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Thu Aug 13 16:40:57 2009 +0200

    Remove exo_intern_string() and exo_intern_static_string().

 docs/reference/exo-sections.txt     |    2 -
 docs/reference/tmpl/exo-string.sgml |   20 +-------------
 exo/exo-string.c                    |   50 -----------------------------------
 exo/exo-string.h                    |    7 -----
 exo/exo.symbols                     |    2 -
 5 files changed, 1 insertions(+), 80 deletions(-)

diff --git a/docs/reference/exo-sections.txt b/docs/reference/exo-sections.txt
index 2f48f94..fc4210f 100644
--- a/docs/reference/exo-sections.txt
+++ b/docs/reference/exo-sections.txt
@@ -490,8 +490,6 @@ exo_str_is_equal
 exo_str_replace
 exo_strdup_strftime
 exo_strndupv
-exo_intern_string
-exo_intern_static_string
 I_
 </SECTION>
 
diff --git a/docs/reference/tmpl/exo-string.sgml b/docs/reference/tmpl/exo-string.sgml
index e9b2388..b8ed5f0 100644
--- a/docs/reference/tmpl/exo-string.sgml
+++ b/docs/reference/tmpl/exo-string.sgml
@@ -67,27 +67,9 @@ Stable
 @Returns: 
 
 
-<!-- ##### FUNCTION exo_intern_string ##### -->
-<para>
-
-</para>
-
- at string: 
- at Returns: 
-
-
-<!-- ##### FUNCTION exo_intern_static_string ##### -->
-<para>
-
-</para>
-
- at string: 
- at Returns: 
-
-
 <!-- ##### MACRO I_ ##### -->
 <para>
-  Shortcut for exo_intern_static_string().
+  Shortcut for g_intern_static_string().
 </para>
 
 @string: a static string.
diff --git a/exo/exo-string.c b/exo/exo-string.c
index 7a40d18..2f90b73 100644
--- a/exo/exo-string.c
+++ b/exo/exo-string.c
@@ -385,55 +385,5 @@ exo_strndupv (gchar **strv,
 
 
 
-/**
- * exo_intern_string:
- * @string: a string
- *
- * Returns a canonical representation for @string. Interned strings can
- * be compared for equality by comparing the pointers, instead of using strcmp()
- * or exo_str_is_equal(). exo_intern_string() takes a copy of the @string for its
- * internal usage, so @string does not need to be static.
- *
- * Return value: a canonical representation for the string
- *
- * Since: 0.3.1.1
- */
-G_CONST_RETURN gchar*
-exo_intern_string (const gchar *string)
-{
-#if GLIB_CHECK_VERSION(2,9,0)
-  return g_intern_string (string);
-#else
-  return (string != NULL) ? g_quark_to_string (g_quark_from_string (string)) : NULL;
-#endif
-}
-
-
-
-/**
- * exo_intern_static_string:
- * @string: a static string
- *
- * Returns a canonical representation for @string. Interned strings can
- * be compared for equality by comparing the pointers, instead of using strcmp()
- * or exo_str_is_equal(). exo_intern_static_string() does not copy the string,
- * therefore @string must not be freed or modified.
- *
- * Return value: a canonical representation for the string
- *
- * Since: 0.3.1.1
- */
-G_CONST_RETURN gchar*
-exo_intern_static_string (const gchar *string)
-{
-#if GLIB_CHECK_VERSION(2,9,0)
-  return g_intern_static_string (string);
-#else
-  return (string != NULL) ? g_quark_to_string (g_quark_from_static_string (string)) : NULL;
-#endif
-}
-
-
-
 #define __EXO_STRING_C__
 #include <exo/exo-aliasdef.c>
diff --git a/exo/exo-string.h b/exo/exo-string.h
index f872fb1..40a7689 100644
--- a/exo/exo-string.h
+++ b/exo/exo-string.h
@@ -46,14 +46,7 @@ gchar                *exo_strdup_strftime        (const gchar     *format,
 gchar               **exo_strndupv               (gchar          **strv,
                                                   gint             num) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
 
-G_CONST_RETURN gchar *exo_intern_string          (const gchar     *string);
-G_CONST_RETURN gchar *exo_intern_static_string   (const gchar     *string);
-
-#if GLIB_CHECK_VERSION(2,9,0)
 #define I_(string) (g_intern_static_string ((string)))
-#else
-#define I_(string) (exo_intern_static_string ((string)))
-#endif
 
 G_END_DECLS
 
diff --git a/exo/exo.symbols b/exo/exo.symbols
index 60b55a7..7f5fbf7 100644
--- a/exo/exo.symbols
+++ b/exo/exo.symbols
@@ -284,8 +284,6 @@ exo_str_is_equal
 exo_str_replace G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT
 exo_strdup_strftime G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT
 exo_strndupv G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT
-exo_intern_string
-exo_intern_static_string
 #endif
 #endif