diff options
| author | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-07-30 20:52:30 +0800 |
|---|---|---|
| committer | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-08-20 18:03:06 +0800 |
| commit | 6338748568d1a37c423568e91e60eb838188a3c2 (patch) | |
| tree | 595ab57251f486b7daedfe76d241e8cec567f3c9 /src | |
| parent | 6388cda27235b0bb0f19fbd94eef5ca138cf075b (diff) | |
| download | gsoc2013-empathy-6338748568d1a37c423568e91e60eb838188a3c2.tar gsoc2013-empathy-6338748568d1a37c423568e91e60eb838188a3c2.tar.gz gsoc2013-empathy-6338748568d1a37c423568e91e60eb838188a3c2.tar.bz2 gsoc2013-empathy-6338748568d1a37c423568e91e60eb838188a3c2.tar.lz gsoc2013-empathy-6338748568d1a37c423568e91e60eb838188a3c2.tar.xz gsoc2013-empathy-6338748568d1a37c423568e91e60eb838188a3c2.tar.zst gsoc2013-empathy-6338748568d1a37c423568e91e60eb838188a3c2.zip | |
tpaw-images: move the default avatar definition from Empathy to tp-aw
https://bugzilla.gnome.org/show_bug.cgi?id=699492
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-call-observer.c | 4 | ||||
| -rw-r--r-- | src/empathy-call-window.c | 3 | ||||
| -rw-r--r-- | src/empathy-event-manager.c | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/empathy-call-observer.c b/src/empathy-call-observer.c index 41e9bdfc1..733199cff 100644 --- a/src/empathy-call-observer.c +++ b/src/empathy-call-observer.c @@ -22,8 +22,8 @@ #include "empathy-call-observer.h" #include <glib/gi18n-lib.h> +#include <tp-account-widgets/tpaw-images.h> -#include "empathy-images.h" #include "empathy-notify-manager.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP @@ -115,7 +115,7 @@ display_reject_notification (EmpathyCallObserver *self, emp_contact = empathy_contact_dup_from_tp_contact (contact); pixbuf = empathy_notify_manager_get_pixbuf_for_notification ( - self->priv->notify_mgr, emp_contact, EMPATHY_IMAGE_AVATAR_DEFAULT); + self->priv->notify_mgr, emp_contact, TPAW_IMAGE_AVATAR_DEFAULT); if (pixbuf != NULL) { diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index cac15bc66..5f10d919e 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -27,6 +27,7 @@ #include <farstream/fs-utils.h> #include <tp-account-widgets/tpaw-builder.h> #include <tp-account-widgets/tpaw-camera-monitor.h> +#include <tp-account-widgets/tpaw-images.h> #include "empathy-about-dialog.h" #include "empathy-audio-sink.h" @@ -1892,7 +1893,7 @@ init_contact_avatar_with_size (EmpathyContact *contact, if (pixbuf_avatar == NULL) { pixbuf_avatar = empathy_pixbuf_from_icon_name_sized ( - EMPATHY_IMAGE_AVATAR_DEFAULT, size); + TPAW_IMAGE_AVATAR_DEFAULT, size); } gtk_image_set_from_pixbuf (GTK_IMAGE (image_widget), pixbuf_avatar); diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index fd6e659b2..f2d197580 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -23,6 +23,7 @@ #include "empathy-event-manager.h" #include <glib/gi18n.h> +#include <tp-account-widgets/tpaw-images.h> #include "empathy-call-utils.h" #include "empathy-connection-aggregator.h" @@ -1165,7 +1166,7 @@ check_presence (EmpathyEventManager *manager, { event_manager_add (manager, NULL, contact, EMPATHY_EVENT_TYPE_PRESENCE_OFFLINE, - EMPATHY_IMAGE_AVATAR_DEFAULT, + TPAW_IMAGE_AVATAR_DEFAULT, empathy_contact_get_alias (contact), _("Disconnected"), NULL, NULL, NULL); } @@ -1186,7 +1187,7 @@ check_presence (EmpathyEventManager *manager, { event_manager_add (manager, NULL, contact, EMPATHY_EVENT_TYPE_PRESENCE_ONLINE, - EMPATHY_IMAGE_AVATAR_DEFAULT, + TPAW_IMAGE_AVATAR_DEFAULT, empathy_contact_get_alias (contact), _("Connected"), NULL, NULL, NULL); } |