[Xfce4-commits] <libxfce4util:nick/abi-changes> Remove xfce_strip_context.

[Nick Schermer]

Updating branch refs/heads/nick/abi-changes
         to cc33d8ad94d9302b9b80df7ee332abdafd72b132 (commit)
       from b05fd97f745c3ab09a15d96df66971ce5dd5c0b3 (commit)

commit cc33d8ad94d9302b9b80df7ee332abdafd72b132
Author: Nick Schermer <nick at xfce.org>
Date:   Fri Jun 10 20:37:55 2011 +0200

    Remove xfce_strip_context.
    
    There is g_strip_context() for quite a while now.

 docs/libxfce4util-sections.txt    |    1 -
 docs/tmpl/xfce-i18n.sgml          |   10 ----------
 libxfce4util/libxfce4util.symbols |    1 -
 libxfce4util/xfce-i18n.c          |   27 ---------------------------
 libxfce4util/xfce-i18n.h          |    5 -----
 5 files changed, 0 insertions(+), 44 deletions(-)

diff --git a/docs/libxfce4util-sections.txt b/docs/libxfce4util-sections.txt
index 007856c..b2bb0bf 100644
--- a/docs/libxfce4util-sections.txt
+++ b/docs/libxfce4util-sections.txt
@@ -18,7 +18,6 @@ LIBXFCE4UTIL_CHECK_VERSION
 <TITLE>Internationalisation</TITLE>
 <FILE>xfce-i18n</FILE>
 xfce_textdomain
-xfce_strip_context
 xfce_get_file_localized
 xfce_get_file_localized_r
 xfce_get_dir_localized
diff --git a/docs/tmpl/xfce-i18n.sgml b/docs/tmpl/xfce-i18n.sgml
index 89a8fb1..a61bd59 100644
--- a/docs/tmpl/xfce-i18n.sgml
+++ b/docs/tmpl/xfce-i18n.sgml
@@ -36,16 +36,6 @@ Internationalization</ulink>
 @encoding: 
 
 
-<!-- ##### FUNCTION xfce_strip_context ##### -->
-<para>
-
-</para>
-
- at msgid: 
- at msgval: 
- at Returns: 
-
-
 <!-- ##### FUNCTION xfce_get_file_localized ##### -->
 <para>
 
diff --git a/libxfce4util/libxfce4util.symbols b/libxfce4util/libxfce4util.symbols
index 8d5ed5c..b28b14e 100644
--- a/libxfce4util/libxfce4util.symbols
+++ b/libxfce4util/libxfce4util.symbols
@@ -77,7 +77,6 @@ xfce_mkdirhier
 #if IN_HEADER(__XFCE_I18N_H__)
 #if IN_SOURCE(__XFCE_I18N_C__)
 xfce_textdomain
-xfce_strip_context
 xfce_get_file_localized G_GNUC_MALLOC
 xfce_get_file_localized_r
 xfce_get_dir_localized G_GNUC_MALLOC
diff --git a/libxfce4util/xfce-i18n.c b/libxfce4util/xfce-i18n.c
index 87eb495..9c7f6d6 100644
--- a/libxfce4util/xfce-i18n.c
+++ b/libxfce4util/xfce-i18n.c
@@ -163,33 +163,6 @@ xfce_textdomain (const gchar *package,
 }
 
 
-/**
- * xfce_strip_context:
- * @msgid  : a string that may be translated.
- * @msgval : a possible translation for @msgid or the same as @msgid.
- *
- * Portable replacement for g_strip_context() introduced in GLib 2.4. You
- * prefer this method over g_strip_context() cause it allows your software
- * to be used with older versions of GLib as well, though libxfce4util also
- * defines a macro named g_strip_context() that simply calls xfce_strip_context()
- * if an older GLib version is detected.
- *
- * Return value: @msgval, unless @msgval is identical to @msgid and contains a
- *               '|' character, in which case a pointer to the substring of @msgid
- *               after the first '|' character is returned
- *
- * Since: 4.2
- *
- * Deprecated:4.4: Use g_strip_context() instead.
- **/
-G_CONST_RETURN gchar*
-xfce_strip_context (const gchar *msgid,
-                    const gchar *msgval)
-{
-  return g_strip_context (msgid, msgval);
-}
-
-
 
 /**
  * xfce_get_file_localized:
diff --git a/libxfce4util/xfce-i18n.h b/libxfce4util/xfce-i18n.h
index d96da1d..782a657 100644
--- a/libxfce4util/xfce-i18n.h
+++ b/libxfce4util/xfce-i18n.h
@@ -69,11 +69,6 @@ void                  xfce_textdomain           (const gchar *package,
                                                  const gchar *localedir,
                                                  const gchar *encoding);
 
-#if defined(LIBXFCE4UTIL_COMPILATION) || !defined(XFCE_DISABLE_DEPRECATED)
-G_CONST_RETURN gchar* xfce_strip_context        (const gchar *msgid,
-                                                 const gchar *msgval);
-#endif
-
 gchar*                xfce_get_file_localized   (const gchar *filename) G_GNUC_MALLOC;
 gchar*                xfce_get_file_localized_r (gchar       *buffer,
                                                  gsize        length,