From 48334a065723ce15f191adf391de444f72ae2efb Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Sat, 3 Nov 2007 23:23:22 +0000 Subject: Rename empathy_contact_factory_set_name() to _set_alias(). Implements 2007-11-03 Xavier Claessens * libempathy-gtk/empathy-contact-widget.c: * libempathy-gtk/empathy-avatar-chooser.c: * libempathy-gtk/empathy-avatar-chooser.h: * python/pyempathy/pyempathy.defs: * libempathy/empathy-contact-factory.c: * libempathy/empathy-contact-factory.h: Rename empathy_contact_factory_set_name() to _set_alias(). Implements empathy_contact_factory_set_avatar(). Return the mime_type in empathy_avatar_chooser_get_image_data(). svn path=/trunk/; revision=417 --- libempathy-gtk/empathy-contact-widget.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) (limited to 'libempathy-gtk/empathy-contact-widget.c') diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c index 2fa1b3d9f..51d17bfb7 100644 --- a/libempathy-gtk/empathy-contact-widget.c +++ b/libempathy-gtk/empathy-contact-widget.c @@ -495,14 +495,20 @@ static void contact_widget_avatar_changed_cb (EmpathyAvatarChooser *chooser, EmpathyContactWidget *information) { - McAccount *account; - gchar *data; - gsize size; + if (information->contact && + empathy_contact_is_user (information->contact)) { + McAccount *account; + const gchar *data; + gsize size; + const gchar *mime_type; - account = empathy_contact_get_account (information->contact); - empathy_avatar_chooser_get_image_data (EMPATHY_AVATAR_CHOOSER (information->widget_avatar), - &data, &size); - mc_account_set_avatar_from_data (account, data, size, "png"); + account = empathy_contact_get_account (information->contact); + empathy_avatar_chooser_get_image_data (EMPATHY_AVATAR_CHOOSER (information->widget_avatar), + &data, &size, &mime_type); + empathy_contact_factory_set_avatar (information->factory, + account, + data, size, mime_type); + } } static void @@ -527,12 +533,12 @@ contact_widget_entry_alias_focus_event_cb (GtkEditable *editable, EmpathyContactWidget *information) { if (information->contact) { - const gchar *name; + const gchar *alias; - name = gtk_entry_get_text (GTK_ENTRY (editable)); - empathy_contact_factory_set_name (information->factory, + alias = gtk_entry_get_text (GTK_ENTRY (editable)); + empathy_contact_factory_set_alias (information->factory, information->contact, - name); + alias); } return FALSE; -- cgit v1.2.3