[next] telepathy-glib: Deprecate tp_g_key_file_get_(u)int64, GLib has it since 2.26

[Xavier Claessens]

Module: telepathy-glib
Branch: next
Commit: e83233400f60acaac9838966b504801f00206132
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=e83233400f60acaac9838966b504801f00206132

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Wed Oct 10 14:15:01 2012 +0200

Deprecate tp_g_key_file_get_(u)int64, GLib has it since 2.26

---

 telepathy-glib/protocol.c |    4 ++--
 telepathy-glib/util.c     |    2 ++
 telepathy-glib/util.h     |    4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/telepathy-glib/protocol.c b/telepathy-glib/protocol.c
index 919b4a6..e600059 100644
--- a/telepathy-glib/protocol.c
+++ b/telepathy-glib/protocol.c
@@ -1267,7 +1267,7 @@ parse_default_value (GValue *value,
     case 'u':
     case 't':
         {
-          guint64 v = tp_g_key_file_get_uint64 (file, group, key, &error);
+          guint64 v = g_key_file_get_uint64 (file, group, key, &error);
 
           if (error != NULL)
             {
@@ -1308,7 +1308,7 @@ parse_default_value (GValue *value,
         }
       else
         {
-          gint64 v = tp_g_key_file_get_int64 (file, group, key, &error);
+          gint64 v = g_key_file_get_int64 (file, group, key, &error);
 
           if (error != NULL)
             {
diff --git a/telepathy-glib/util.c b/telepathy-glib/util.c
index 4d606d1..c8b1aa2 100644
--- a/telepathy-glib/util.c
+++ b/telepathy-glib/util.c
@@ -829,6 +829,7 @@ tp_strv_contains (const gchar * const *strv,
  * 0 if the key was not found or could not be parsed.
  *
  * Since: 0.7.31
+ * Deprecated: Since 0.UNRELEASED. Use g_key_file_get_int64() instead.
  */
 gint64
 tp_g_key_file_get_int64 (GKeyFile *key_file,
@@ -877,6 +878,7 @@ tp_g_key_file_get_int64 (GKeyFile *key_file,
  * or 0 if the key was not found or could not be parsed.
  *
  * Since: 0.7.31
+ * Deprecated: Since 0.UNRELEASED. Use g_key_file_get_uint64() instead.
  */
 guint64
 tp_g_key_file_get_uint64 (GKeyFile *key_file,
diff --git a/telepathy-glib/util.h b/telepathy-glib/util.h
index 3dcf35c..50e794d 100644
--- a/telepathy-glib/util.h
+++ b/telepathy-glib/util.h
@@ -91,10 +91,14 @@ gchar *tp_escape_as_identifier (const gchar *name) G_GNUC_WARN_UNUSED_RESULT;
 
 gboolean tp_strv_contains (const gchar * const *strv, const gchar *str);
 
+#ifndef TP_DISABLE_DEPRECATED
+_TP_DEPRECATED_IN_UNRELEASED_FOR(g_key_file_get_int64)
 gint64 tp_g_key_file_get_int64 (GKeyFile *key_file, const gchar *group_name,
     const gchar *key, GError **error);
+_TP_DEPRECATED_IN_UNRELEASED_FOR(g_key_file_get_uint64)
 guint64 tp_g_key_file_get_uint64 (GKeyFile *key_file, const gchar *group_name,
     const gchar *key, GError **error);
+#endif
 
 gulong tp_g_signal_connect_object (gpointer instance,
     const gchar *detailed_signal, GCallback c_handler, gpointer gobject,