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

[empathy.git] / libempathy-gtk / empathy-avatar-chooser.h

diff --git a/libempathy-gtk/empathy-avatar-chooser.h b/libempathy-gtk/empathy-avatar-chooser.h
index d12c843bc024441abeb4fa90c7538cd064408cd5..1636e289648ac721d8180a02b6e38511bb112442 100644 (file)
--- a/libempathy-gtk/empathy-avatar-chooser.h
+++ b/libempathy-gtk/empathy-avatar-chooser.h
@@ -24,43 +24,44 @@
 #ifndef __EMPATHY_AVATAR_CHOOSER_H__
 #define __EMPATHY_AVATAR_CHOOSER_H__
 
+#include <gio/gio.h>
 #include <gtk/gtk.h>
-
-#include <libempathy/empathy-contact.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
-#define EMPATHY_TYPE_AVATAR_CHOOSER           (empathy_avatar_chooser_get_type ())
-#define EMPATHY_AVATAR_CHOOSER(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMPATHY_TYPE_AVATAR_CHOOSER, EmpathyAvatarChooser))
+#define EMPATHY_TYPE_AVATAR_CHOOSER        (empathy_avatar_chooser_get_type ())
+#define EMPATHY_AVATAR_CHOOSER(obj)        (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMPATHY_TYPE_AVATAR_CHOOSER, EmpathyAvatarChooser))
 #define EMPATHY_AVATAR_CHOOSER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EMPATHY_TYPE_AVATAR_CHOOSER, EmpathyAvatarChooserClass))
-#define EMPATHY_IS_AVATAR_CHOOSER(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMPATHY_TYPE_AVATAR_CHOOSER))
+#define EMPATHY_IS_AVATAR_CHOOSER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMPATHY_TYPE_AVATAR_CHOOSER))
 #define EMPATHY_IS_AVATAR_CHOOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EMPATHY_TYPE_AVATAR_CHOOSER))
 
 typedef struct _EmpathyAvatarChooser        EmpathyAvatarChooser;
 typedef struct _EmpathyAvatarChooserClass   EmpathyAvatarChooserClass;
 typedef struct _EmpathyAvatarChooserPrivate EmpathyAvatarChooserPrivate;
 
-struct _EmpathyAvatarChooser {
-       GtkButton parent;
+struct _EmpathyAvatarChooser
+{
+  GtkButton parent;
 
-       /*<private>*/
-       EmpathyAvatarChooserPrivate *priv;
+  /*<private>*/
+  EmpathyAvatarChooserPrivate *priv;
 };
 
-struct _EmpathyAvatarChooserClass {
-       GtkButtonClass parent_class;
+struct _EmpathyAvatarChooserClass
+{
+  GtkButtonClass parent_class;
 };
 
-GType      empathy_avatar_chooser_get_type       (void);
-GtkWidget *empathy_avatar_chooser_new            (void);
-void       empathy_avatar_chooser_set            (EmpathyAvatarChooser *chooser,
-                                                 EmpathyAvatar        *avatar);
-void       empathy_avatar_chooser_get_image_data (EmpathyAvatarChooser *chooser,
-                                                 const gchar         **data,
-                                                 gsize                *data_size,
-                                                 const gchar         **mime_type);
+GType empathy_avatar_chooser_get_type (void);
+
+GtkWidget *empathy_avatar_chooser_new (TpAccount *account);
 
-void       empathy_avatar_chooser_set_account (EmpathyAvatarChooser *self,
-                                                 TpAccount *account);
+void empathy_avatar_chooser_apply_async (EmpathyAvatarChooser *self,
+    GAsyncReadyCallback callback,
+    gpointer user_data);
+gboolean empathy_avatar_chooser_apply_finish (EmpathyAvatarChooser *self,
+    GAsyncResult *result,
+    GError **error);
 
 #endif /* __EMPATHY_AVATAR_CHOOSER_H__ */