Updated Greek translation

[empathy.git] / libempathy / empathy-utils.h

diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index 96d201d3e26daa3cdd65cac421f1da7a3faff33f..a9ff0d89060df76b63fc7d0471a1ba90e95082f7 100644 (file)
--- a/libempathy/empathy-utils.h
+++ b/libempathy/empathy-utils.h
@@ -36,15 +36,12 @@
 #include "empathy-contact.h"
 
 #define EMPATHY_GET_PRIV(obj,type) ((type##Priv *) ((type *) obj)->priv)
-#define EMP_STR_EMPTY(x) ((x) == NULL || (x)[0] == '\0')
 
 G_BEGIN_DECLS
 
 void empathy_init (void);
 
 /* XML */
-gboolean empathy_xml_validate_from_resource (xmlDoc *doc,
-    const gchar *dtd_resourcename);
 xmlNodePtr empathy_xml_node_get_child (xmlNodePtr node,
     const gchar *child_name);
 xmlChar * empathy_xml_node_get_child_content (xmlNodePtr node,
@@ -94,8 +91,6 @@ gchar *empathy_format_currency (gint amount,
     guint scale,
     const gchar *currency);
 
-gboolean empathy_account_has_uri_scheme_tel (TpAccount *account);
-
 TpContact * empathy_get_tp_contact_for_individual (FolksIndividual *individual,
     TpConnection *conn);
 
@@ -107,9 +102,6 @@ void empathy_individual_can_audio_video_call (FolksIndividual *individual,
 gboolean empathy_client_types_contains_mobile_device (
     const GStrv types);
 
-FolksIndividual * empathy_create_individual_from_tp_contact (
-    TpContact *contact);
-
 FolksIndividual * empathy_ensure_individual_from_tp_contact (
     TpContact *contact);
 
@@ -122,51 +114,6 @@ GVariant * empathy_boxed_to_variant (GType gtype,
     const gchar *variant_type,
     gpointer boxed);
 
-/* Copied from wocky/wocky-utils.h */
-
-#define empathy_implement_finish_void(source, tag) \
-    if (g_simple_async_result_propagate_error (\
-      G_SIMPLE_ASYNC_RESULT (result), error)) \
-      return FALSE; \
-    g_return_val_if_fail (g_simple_async_result_is_valid (result, \
-            G_OBJECT(source), tag), \
-        FALSE); \
-    return TRUE;
-
-#define empathy_implement_finish_copy_pointer(source, tag, copy_func, \
-    out_param) \
-    GSimpleAsyncResult *_simple; \
-    _simple = (GSimpleAsyncResult *) result; \
-    if (g_simple_async_result_propagate_error (_simple, error)) \
-      return FALSE; \
-    g_return_val_if_fail (g_simple_async_result_is_valid (result, \
-            G_OBJECT (source), tag), \
-        FALSE); \
-    if (out_param != NULL) \
-      *out_param = copy_func ( \
-          g_simple_async_result_get_op_res_gpointer (_simple)); \
-    return TRUE;
-
-#define empathy_implement_finish_return_copy_pointer(source, tag, copy_func) \
-    GSimpleAsyncResult *_simple; \
-    _simple = (GSimpleAsyncResult *) result; \
-    if (g_simple_async_result_propagate_error (_simple, error)) \
-      return NULL; \
-    g_return_val_if_fail (g_simple_async_result_is_valid (result, \
-            G_OBJECT (source), tag), \
-        NULL); \
-    return copy_func (g_simple_async_result_get_op_res_gpointer (_simple));
-
-#define empathy_implement_finish_return_pointer(source, tag) \
-    GSimpleAsyncResult *_simple; \
-    _simple = (GSimpleAsyncResult *) result; \
-    if (g_simple_async_result_propagate_error (_simple, error)) \
-      return NULL; \
-    g_return_val_if_fail (g_simple_async_result_is_valid (result, \
-            G_OBJECT (source), tag), \
-        NULL); \
-    return g_simple_async_result_get_op_res_gpointer (_simple);
-
 G_END_DECLS
 
 #endif /*  __EMPATHY_UTILS_H__ */