Merge remote-tracking branch 'origin/gnome-3-8'

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

diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index ed603a80f2f5c680866230cc58760476924aaa09..440fe83504c406e7000a8a3d95cde3b572fd7cfb 100644 (file)
--- a/libempathy/empathy-utils.h
+++ b/libempathy/empathy-utils.h
@@ -27,14 +27,11 @@
 
 #include <glib.h>
 #include <glib-object.h>
-
-#include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
-#include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <folks/folks.h>
 #include <folks/folks-telepathy.h>
-#include <telepathy-glib/account-manager.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-contact.h"
 
@@ -46,8 +43,8 @@ G_BEGIN_DECLS
 void empathy_init (void);
 
 /* XML */
-gboolean empathy_xml_validate (xmlDoc *doc,
-    const gchar *dtd_filename);
+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,
@@ -63,9 +60,6 @@ const gchar * empathy_presence_to_str (TpConnectionPresenceType presence);
 TpConnectionPresenceType empathy_presence_from_str (const gchar *str);
 gchar * empathy_file_lookup (const gchar *filename,
     const gchar *subdir);
-gboolean empathy_proxy_equal (gconstpointer a,
-    gconstpointer    b);
-guint empathy_proxy_hash (gconstpointer key);
 gboolean empathy_check_available_state (void);
 gint empathy_uint_compare (gconstpointer a,
     gconstpointer b);
@@ -113,6 +107,29 @@ gboolean empathy_account_has_uri_scheme_tel (TpAccount *account);
 TpContact * empathy_get_tp_contact_for_individual (FolksIndividual *individual,
     TpConnection *conn);
 
+void empathy_individual_can_audio_video_call (FolksIndividual *individual,
+    gboolean *can_audio_call,
+    gboolean *can_video_call,
+    EmpathyContact **out_contact);
+
+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);
+
+const gchar * const * empathy_individual_get_client_types (
+    FolksIndividual *individual);
+
+GVariant * empathy_asv_to_vardict (const GHashTable *asv);
+
+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) \