Replace empathy_connection_get_protocol by tp_connection_parse_object_path

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

diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index 62cd1a81b04e0788f3a524f746a59e987d5560bf..e6bcfebfc68e017145953ee407a3b5d00effd520 100644 (file)
--- a/libempathy/empathy-utils.h
+++ b/libempathy/empathy-utils.h
@@ -38,7 +38,7 @@
 #include "empathy-contact.h"
 
 #define EMPATHY_GET_PRIV(obj,type) ((type##Priv*) ((type*)obj)->priv)
-#define G_STR_EMPTY(x) ((x) == NULL || (x)[0] == '\0')
+#define EMP_STR_EMPTY(x) ((x) == NULL || (x)[0] == '\0')
 
 G_BEGIN_DECLS
 
@@ -74,23 +74,10 @@ const gchar * empathy_presence_to_str               (McPresence       presence);
 McPresence    empathy_presence_from_str             (const gchar     *str);
 gchar *       empathy_file_lookup                   (const gchar     *filename,
                                                     const gchar     *subdir);
-
-typedef gboolean (*EmpathyRunUntilReadyFunc)        (GObject         *object,
-                                                    gpointer         user_data);
-void          empathy_run_until_ready               (gpointer         object);
-void          empathy_run_until_ready_full          (gpointer         object,
-                                                    const gchar     *signal,
-                                                    EmpathyRunUntilReadyFunc  func,
-                                                    gpointer         user_data,
-                                                    GMainLoop      **loop);
-McAccount *  empathy_channel_get_account            (TpChannel       *channel);
 gboolean     empathy_proxy_equal                    (gconstpointer    a,
                                                     gconstpointer    b);
 guint        empathy_proxy_hash                     (gconstpointer    key);
-
-/* Temporary utility function, should be replaces by better voip infrastructure
- * soon */
-void empathy_start_call_with_contact (EmpathyContact *contact);
+gboolean     empathy_check_available_state          (void);
 
 G_END_DECLS