Merge branch '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 5060ae593eee4fbafceb924bf6da03b3c02ed403..1636e289648ac721d8180a02b6e38511bb112442 100644 (file)
--- a/libempathy-gtk/empathy-avatar-chooser.h
+++ b/libempathy-gtk/empathy-avatar-chooser.h
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA  02110-1301  USA
  *
  * Authors: Based on Novell's e-image-chooser.
  *          Xavier Claessens <xclaesse@gmail.com>
@@ -24,37 +24,44 @@
 #ifndef __EMPATHY_AVATAR_CHOOSER_H__
 #define __EMPATHY_AVATAR_CHOOSER_H__
 
-#include <gtk/gtkbutton.h>
-
-#include <libempathy/empathy-avatar.h>
+#include <gio/gio.h>
+#include <gtk/gtk.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;
 };
 
-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_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__ */