diff options
Diffstat (limited to 'libempathy-gtk')
-rw-r--r-- | libempathy-gtk/empathy-avatar-chooser.c | 4 | ||||
-rw-r--r-- | libempathy-gtk/empathy-images.h | 1 | ||||
-rw-r--r-- | libempathy-gtk/empathy-log-window.c | 3 | ||||
-rw-r--r-- | libempathy-gtk/empathy-roster-contact.c | 4 | ||||
-rw-r--r-- | libempathy-gtk/empathy-theme-adium.c | 3 |
5 files changed, 8 insertions, 7 deletions
diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c index f6a423dbd..60556ff17 100644 --- a/libempathy-gtk/empathy-avatar-chooser.c +++ b/libempathy-gtk/empathy-avatar-chooser.c @@ -26,12 +26,12 @@ #include <glib/gi18n-lib.h> #include <tp-account-widgets/tpaw-camera-monitor.h> #include <tp-account-widgets/tpaw-gsettings.h> +#include <tp-account-widgets/tpaw-images.h> #ifdef HAVE_CHEESE #include <cheese-avatar-chooser.h> #endif /* HAVE_CHEESE */ -#include "empathy-images.h" #include "empathy-ui-utils.h" #include "empathy-utils.h" @@ -349,7 +349,7 @@ avatar_chooser_clear_image (EmpathyAvatarChooser *self) tp_clear_pointer (&self->priv->mime_type, g_free); self->priv->changed = TRUE; - image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_AVATAR_DEFAULT, + image = gtk_image_new_from_icon_name (TPAW_IMAGE_AVATAR_DEFAULT, GTK_ICON_SIZE_DIALOG); gtk_button_set_image (GTK_BUTTON (self), image); } diff --git a/libempathy-gtk/empathy-images.h b/libempathy-gtk/empathy-images.h index 8ee40f2a9..3b7b8fdf9 100644 --- a/libempathy-gtk/empathy-images.h +++ b/libempathy-gtk/empathy-images.h @@ -45,7 +45,6 @@ G_BEGIN_DECLS #define EMPATHY_IMAGE_VIDEO_CALL "camera-web" #define EMPATHY_IMAGE_LOG "document-open-recent" #define EMPATHY_IMAGE_DOCUMENT_SEND "document-send" -#define EMPATHY_IMAGE_AVATAR_DEFAULT "avatar-default-symbolic" /* FIXME: need a better icon! */ #define EMPATHY_IMAGE_EDIT_MESSAGE "format-text-direction-ltr" #define EMPATHY_IMAGE_MIC "audio-input-microphone-symbolic" diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c index 9094f6946..f294502c6 100644 --- a/libempathy-gtk/empathy-log-window.c +++ b/libempathy-gtk/empathy-log-window.c @@ -28,6 +28,7 @@ #include <glib/gi18n-lib.h> #include <telepathy-glib/proxy-subclass.h> #include <tp-account-widgets/tpaw-builder.h> +#include <tp-account-widgets/tpaw-images.h> #include <tp-account-widgets/tpaw-camera-monitor.h> #include "action-chain-internal.h" @@ -1875,7 +1876,7 @@ add_event_to_store (EmpathyLogWindow *self, gtk_list_store_insert_with_values (store, NULL, -1, COL_WHO_TYPE, COL_TYPE_NORMAL, COL_WHO_ICON, room ? EMPATHY_IMAGE_GROUP_MESSAGE - : EMPATHY_IMAGE_AVATAR_DEFAULT, + : TPAW_IMAGE_AVATAR_DEFAULT, COL_WHO_NAME, name, COL_WHO_NAME_SORT_KEY, sort_key, COL_WHO_ID, tpl_entity_get_identifier (entity), diff --git a/libempathy-gtk/empathy-roster-contact.c b/libempathy-gtk/empathy-roster-contact.c index 2db024a3d..22b360075 100644 --- a/libempathy-gtk/empathy-roster-contact.c +++ b/libempathy-gtk/empathy-roster-contact.c @@ -2,8 +2,8 @@ #include "empathy-roster-contact.h" #include <glib/gi18n-lib.h> +#include <tp-account-widgets/tpaw-images.h> -#include "empathy-images.h" #include "empathy-ui-utils.h" #include "empathy-utils.h" @@ -125,7 +125,7 @@ avatar_loaded_cb (GObject *source, if (pixbuf == NULL) { pixbuf = empathy_pixbuf_from_icon_name_sized ( - EMPATHY_IMAGE_AVATAR_DEFAULT, AVATAR_SIZE); + TPAW_IMAGE_AVATAR_DEFAULT, AVATAR_SIZE); } gtk_image_set_from_pixbuf (GTK_IMAGE (self->priv->avatar), pixbuf); diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c index 721a0b4e5..5fd61d339 100644 --- a/libempathy-gtk/empathy-theme-adium.c +++ b/libempathy-gtk/empathy-theme-adium.c @@ -23,6 +23,7 @@ #include "empathy-theme-adium.h" #include <glib/gi18n-lib.h> +#include <tp-account-widgets/tpaw-images.h> #include <tp-account-widgets/tpaw-time.h> #include <tp-account-widgets/tpaw-utils.h> @@ -953,7 +954,7 @@ theme_adium_add_message (EmpathyThemeAdium *self, { if (!self->priv->data->default_avatar_filename) self->priv->data->default_avatar_filename = - empathy_filename_from_icon_name (EMPATHY_IMAGE_AVATAR_DEFAULT, + empathy_filename_from_icon_name (TPAW_IMAGE_AVATAR_DEFAULT, GTK_ICON_SIZE_DIALOG); avatar_filename = self->priv->data->default_avatar_filename; |