diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-04-28 00:57:59 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-04-28 00:57:59 +0800 |
| commit | 92172bae28e5fa2a91d87bc9e715c9bad01d888f (patch) | |
| tree | 5ab52ee86f040652b5caa29bae94455b3ee51221 /libempathy-gtk/empathy-images.h | |
| parent | 2430f28d4659fdfc428b0bdf89d774b0c7b9cdc6 (diff) | |
| parent | 474cd4639af3a45919b69ae4a3cc637c376e90bd (diff) | |
| download | gsoc2013-empathy-92172bae28e5fa2a91d87bc9e715c9bad01d888f.tar gsoc2013-empathy-92172bae28e5fa2a91d87bc9e715c9bad01d888f.tar.gz gsoc2013-empathy-92172bae28e5fa2a91d87bc9e715c9bad01d888f.tar.bz2 gsoc2013-empathy-92172bae28e5fa2a91d87bc9e715c9bad01d888f.tar.lz gsoc2013-empathy-92172bae28e5fa2a91d87bc9e715c9bad01d888f.tar.xz gsoc2013-empathy-92172bae28e5fa2a91d87bc9e715c9bad01d888f.tar.zst gsoc2013-empathy-92172bae28e5fa2a91d87bc9e715c9bad01d888f.zip | |
Merge remote-tracking branch 'pochu-public/log-window-619866' into empathy-skype
Conflicts:
libempathy-gtk/empathy-log-window.c
libempathy/empathy-message.c
Diffstat (limited to 'libempathy-gtk/empathy-images.h')
| -rw-r--r-- | libempathy-gtk/empathy-images.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libempathy-gtk/empathy-images.h b/libempathy-gtk/empathy-images.h index 86f1db641..e2512d495 100644 --- a/libempathy-gtk/empathy-images.h +++ b/libempathy-gtk/empathy-images.h @@ -47,6 +47,10 @@ G_BEGIN_DECLS #define EMPATHY_IMAGE_DOCUMENT_SEND "document-send" #define EMPATHY_IMAGE_AVATAR_DEFAULT "avatar-default" +#define EMPATHY_IMAGE_CALL_MISSED "call-start" +#define EMPATHY_IMAGE_CALL_INCOMING "call-start" +#define EMPATHY_IMAGE_CALL_OUTGOING "call-stop" + G_END_DECLS #endif /* __EMPATHY_IMAGES_ICONS_H__ */ |