diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2007-11-04 07:23:22 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2007-11-04 07:23:22 +0800 |
| commit | 48334a065723ce15f191adf391de444f72ae2efb (patch) | |
| tree | bb0cc93a6b36e376f2ca8153483291369bc2b9e7 /libempathy-gtk/empathy-avatar-chooser.c | |
| parent | b07f56b36a34bfcd490f3a14c3315f998de425f3 (diff) | |
| download | gsoc2013-empathy-48334a065723ce15f191adf391de444f72ae2efb.tar gsoc2013-empathy-48334a065723ce15f191adf391de444f72ae2efb.tar.gz gsoc2013-empathy-48334a065723ce15f191adf391de444f72ae2efb.tar.bz2 gsoc2013-empathy-48334a065723ce15f191adf391de444f72ae2efb.tar.lz gsoc2013-empathy-48334a065723ce15f191adf391de444f72ae2efb.tar.xz gsoc2013-empathy-48334a065723ce15f191adf391de444f72ae2efb.tar.zst gsoc2013-empathy-48334a065723ce15f191adf391de444f72ae2efb.zip | |
Rename empathy_contact_factory_set_name() to _set_alias(). Implements
2007-11-03 Xavier Claessens <xclaesse@gmail.com>
* 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
Diffstat (limited to 'libempathy-gtk/empathy-avatar-chooser.c')
| -rw-r--r-- | libempathy-gtk/empathy-avatar-chooser.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c index bc5f07e9b..0b3487af7 100644 --- a/libempathy-gtk/empathy-avatar-chooser.c +++ b/libempathy-gtk/empathy-avatar-chooser.c @@ -545,8 +545,9 @@ empathy_avatar_chooser_set (EmpathyAvatarChooser *chooser, void empathy_avatar_chooser_get_image_data (EmpathyAvatarChooser *chooser, - gchar **data, - gsize *data_size) + const gchar **data, + gsize *data_size, + const gchar **mime_type) { EmpathyAvatarChooserPriv *priv; @@ -560,5 +561,8 @@ empathy_avatar_chooser_get_image_data (EmpathyAvatarChooser *chooser, if (*data_size) { *data_size = priv->image_data_size; } + if (mime_type) { + *mime_type = "png"; + } } |