#include <gio/gio.h>
#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-contact-factory.h>
+#include <libempathy/empathy-tp-contact-factory.h>
#include "empathy-avatar-chooser.h"
#include "empathy-conf.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include <libempathy/empathy-debug.h>
+/**
+ * SECTION:empathy-avatar-chooser
+ * @title: EmpathyAvatarChooser
+ * @short_description: A widget used to change avatar
+ * @include: libempathy-gtk/empathy-avatar-chooser.h
+ *
+ * #EmpathyAvatarChooser is a widget which extends #GtkButton to
+ * provide a way of changing avatar.
+ */
+
+/**
+ * EmpathyAvatarChooser:
+ * @parent: parent object
+ *
+ * Widget which extends #GtkButton to provide a way of changing avatar.
+ */
+
#define AVATAR_SIZE_SAVE 96
#define AVATAR_SIZE_VIEW 64
#define DEFAULT_DIR DATADIR"/pixmaps/faces"
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyAvatarChooser)
typedef struct {
- EmpathyContactFactory *contact_factory;
- McAccount *account;
- EmpathyTpContactFactory *tp_contact_factory;
+ EmpathyTpContactFactory *factory;
+ TpConnection *connection;
GtkFileChooser *chooser_dialog;
gulong ready_handler_id;
} EmpathyAvatarChooserPriv;
static void avatar_chooser_finalize (GObject *object);
-static void avatar_chooser_set_account (EmpathyAvatarChooser *self,
- McAccount *account);
+static void avatar_chooser_set_connection (EmpathyAvatarChooser *self,
+ TpConnection *connection);
static void avatar_chooser_set_image (EmpathyAvatarChooser *chooser,
EmpathyAvatar *avatar,
GdkPixbuf *pixbuf,
enum {
PROP_0,
- PROP_ACCOUNT
+ PROP_CONNECTION
};
static guint signals [LAST_SIGNAL];
EmpathyAvatarChooserPriv *priv = GET_PRIV (object);
switch (param_id) {
- case PROP_ACCOUNT:
- g_value_set_object (value, priv->account);
+ case PROP_CONNECTION:
+ g_value_set_object (value, priv->connection);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
EmpathyAvatarChooser *self = EMPATHY_AVATAR_CHOOSER (object);
switch (param_id) {
- case PROP_ACCOUNT:
- avatar_chooser_set_account (self, g_value_get_object (value));
+ case PROP_CONNECTION:
+ avatar_chooser_set_connection (self, g_value_get_object (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
object_class->get_property = avatar_chooser_get_property;
object_class->set_property = avatar_chooser_set_property;
+ /**
+ * EmpathyAvatarChooser::changed:
+ * @chooser: an #EmpathyAvatarChooser
+ *
+ * Emitted when the chosen avatar has changed.
+ *
+ */
signals[CHANGED] =
g_signal_new ("changed",
G_TYPE_FROM_CLASS (klass),
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
- param_spec = g_param_spec_object ("account",
- "McAccount",
- "McAccount whose avatar should be "
+ /**
+ * EmpathyAvatarChooser:connection:
+ *
+ * The #TpConnection whose avatar should be shown and modified by
+ * the #EmpathyAvatarChooser instance.
+ */
+ param_spec = g_param_spec_object ("connection",
+ "TpConnection",
+ "TpConnection whose avatar should be "
"shown and modified by this widget",
- MC_TYPE_ACCOUNT,
+ TP_TYPE_CONNECTION,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class,
- PROP_ACCOUNT,
+ PROP_CONNECTION,
param_spec);
g_type_class_add_private (object_class, sizeof (EmpathyAvatarChooserPriv));
G_CALLBACK (avatar_chooser_clicked_cb),
chooser);
- priv->contact_factory = empathy_contact_factory_dup_singleton ();
-
empathy_avatar_chooser_set (chooser, NULL);
}
priv = GET_PRIV (object);
- avatar_chooser_set_account (EMPATHY_AVATAR_CHOOSER (object), NULL);
- g_assert (priv->account == NULL);
- g_assert (priv->tp_contact_factory == NULL);
-
- g_object_unref (priv->contact_factory);
+ avatar_chooser_set_connection (EMPATHY_AVATAR_CHOOSER (object), NULL);
+ g_assert (priv->connection == NULL);
+ g_assert (priv->factory == NULL);
if (priv->avatar != NULL) {
empathy_avatar_unref (priv->avatar);
}
static void
-avatar_chooser_tp_cf_ready_cb (EmpathyTpContactFactory *tp_cf,
- GParamSpec *unused,
- EmpathyAvatarChooser *self)
+avatar_chooser_set_connection (EmpathyAvatarChooser *self,
+ TpConnection *connection)
{
EmpathyAvatarChooserPriv *priv = GET_PRIV (self);
- gboolean ready;
-
- /* sanity check that we're listening on the right ETpCF */
- g_assert (priv->tp_contact_factory == tp_cf);
-
- ready = empathy_tp_contact_factory_is_ready (tp_cf);
- gtk_widget_set_sensitive (GTK_WIDGET (self), ready);
-}
-
-static void
-avatar_chooser_set_account (EmpathyAvatarChooser *self,
- McAccount *account)
-{
- EmpathyAvatarChooserPriv *priv = GET_PRIV (self);
-
- if (priv->account != NULL) {
- g_object_unref (priv->account);
- priv->account = NULL;
- g_assert (priv->tp_contact_factory != NULL);
+ if (priv->connection != NULL) {
+ g_object_unref (priv->connection);
+ priv->connection = NULL;
- g_signal_handler_disconnect (priv->tp_contact_factory,
- priv->ready_handler_id);
- priv->ready_handler_id = 0;
-
- g_object_unref (priv->tp_contact_factory);
- priv->tp_contact_factory = NULL;
+ g_object_unref (priv->factory);
+ priv->factory = NULL;
}
- if (account != NULL) {
- priv->account = g_object_ref (account);
- priv->tp_contact_factory = g_object_ref (
- empathy_contact_factory_get_tp_factory (
- priv->contact_factory, priv->account));
-
- priv->ready_handler_id = g_signal_connect (
- priv->tp_contact_factory, "notify::ready",
- G_CALLBACK (avatar_chooser_tp_cf_ready_cb), self);
- avatar_chooser_tp_cf_ready_cb (priv->tp_contact_factory, NULL,
- self);
+ if (connection != NULL) {
+ priv->connection = g_object_ref (connection);
+ priv->factory = empathy_tp_contact_factory_dup_singleton (connection);
}
}
EmpathyAvatar *avatar)
{
EmpathyAvatarChooserPriv *priv = GET_PRIV (chooser);
- EmpathyTpContactFactory *tp_cf = priv->tp_contact_factory;
guint max_width = 0, max_height = 0, max_size = 0;
gchar **mime_types = NULL;
gboolean needs_conversion = FALSE;
gchar *converted_image_data = NULL;
gsize converted_image_size = 0;
- /* This should only be called if the user is setting a new avatar,
- * which should only be allowed once the avatar requirements have been
- * discovered.
- */
- g_return_val_if_fail (tp_cf != NULL, NULL);
- g_return_val_if_fail (empathy_tp_contact_factory_is_ready (tp_cf),
- NULL);
-
- g_object_get (tp_cf,
+ g_object_get (priv->factory,
"avatar-mime-types", &mime_types, /* Needs g_strfreev-ing */
"avatar-max-width", &max_width,
"avatar-max-height", &max_height,
&converted_image_size,
new_format_name,
&error, NULL);
+ g_object_unref (pixbuf_scaled);
if (!saved) {
g_free (new_format_name);
"gtk-dialog-question",
GTK_ICON_SIZE_DIALOG);
}
+
+ g_free (filename);
}
gtk_file_chooser_set_preview_widget_active (file_chooser, TRUE);
priv->chooser_dialog = NULL;
- if (response == GTK_RESPONSE_CANCEL) {
- goto out;
- }
-
- /* Check if we went non-ready since displaying the dialog. */
- if (!empathy_tp_contact_factory_is_ready (priv->tp_contact_factory)) {
- DEBUG ("Can't set avatar when contact factory isn't ready.");
- goto out;
- }
-
if (response == GTK_RESPONSE_OK) {
gchar *filename;
gchar *path;
avatar_chooser_clear_image (chooser);
}
-out:
gtk_widget_destroy (widget);
}
g_free (saved_dir);
}
+/**
+ * empathy_avatar_chooser_new:
+ *
+ * Creates a new #EmpathyAvatarChooser.
+ *
+ * Return value: a new #EmpathyAvatarChooser
+ */
GtkWidget *
empathy_avatar_chooser_new ()
{
return g_object_new (EMPATHY_TYPE_AVATAR_CHOOSER, NULL);
}
+/**
+ * empathy_avatar_chooser_set:
+ * @chooser: an #EmpathyAvatarChooser
+ * @avatar: a new #EmpathyAvatar
+ *
+ * Sets the @chooser to display the avatar indicated by @avatar.
+ */
void
empathy_avatar_chooser_set (EmpathyAvatarChooser *chooser,
EmpathyAvatar *avatar)
}
}
+/**
+ * empathy_avatar_chooser_get_image_data:
+ * @chooser: an #EmpathyAvatarChooser
+ * @data: avatar bytes
+ * @data_size: size of @data
+ * @mime_type: avatar mime-type
+ *
+ * Gets image data about the currently selected avatar.
+ */
void
empathy_avatar_chooser_get_image_data (EmpathyAvatarChooser *chooser,
const gchar **data,
projects / empathy.git / blobdiff