From 02fcffa26b4b145153f63e24ea047414d8951eb5 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Thu, 14 Jun 2007 20:34:28 +0000 Subject: Use gtk-info for contact informaiton. 2007-06-14 Xavier Claessens * libempathy-gtk/empathy-images.h: * libempathy-gtk/gossip-chat.c: Use gtk-info for contact informaiton. * data/22x22/empathy-proto-salut.png: * data/22x22/Makefile.am: * data/16x16/empathy-proto-salut.png: * data/16x16/Makefile.am: * data/scalable/empathy-proto-salut.svg: * data/scalable/Makefile.am: * data/salut.profile: Add salut icon. Fixes bug #447659 (Michael Monreal). svn path=/trunk/; revision=157 --- ChangeLog | 13 ++ data/16x16/Makefile.am | 4 +- data/16x16/empathy-proto-salut.png | Bin 0 -> 863 bytes data/22x22/Makefile.am | 4 +- data/22x22/empathy-proto-salut.png | Bin 0 -> 1534 bytes data/salut.profile | 2 +- data/scalable/Makefile.am | 4 +- data/scalable/empathy-proto-salut.svg | 322 ++++++++++++++++++++++++++++++++++ libempathy-gtk/empathy-images.h | 2 +- libempathy-gtk/gossip-chat.c | 1 - 10 files changed, 346 insertions(+), 6 deletions(-) create mode 100644 data/16x16/empathy-proto-salut.png create mode 100644 data/22x22/empathy-proto-salut.png create mode 100644 data/scalable/empathy-proto-salut.svg diff --git a/ChangeLog b/ChangeLog index d734de610..57009ffa7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2007-06-14 Xavier Claessens + + * libempathy-gtk/empathy-images.h: + * libempathy-gtk/gossip-chat.c: Use gtk-info for contact informaiton. + + * data/22x22/empathy-proto-salut.png: + * data/22x22/Makefile.am: + * data/16x16/empathy-proto-salut.png: + * data/16x16/Makefile.am: + * data/scalable/empathy-proto-salut.svg: + * data/scalable/Makefile.am: + * data/salut.profile: Add salut icon. Fixes bug #447659 (Michael Monreal). + 2007-06-14 Xavier Claessens * libempathy-gtk/gossip-contact-list-view.c: Show logs when right diff --git a/data/16x16/Makefile.am b/data/16x16/Makefile.am index 0b4d6067b..23bcdf927 100644 --- a/data/16x16/Makefile.am +++ b/data/16x16/Makefile.am @@ -15,5 +15,7 @@ icon_DATA = \ empathy-proto-msn.png \ empathy-proto-gizmo.png \ empathy-proto-irc.png \ - empathy-proto-jabber.png + empathy-proto-jabber.png \ + empathy-proto-salut.png + EXTRA_DIST = $(icon_DATA) diff --git a/data/16x16/empathy-proto-salut.png b/data/16x16/empathy-proto-salut.png new file mode 100644 index 000000000..8ff47406e Binary files /dev/null and b/data/16x16/empathy-proto-salut.png differ diff --git a/data/22x22/Makefile.am b/data/22x22/Makefile.am index 987201956..450851c12 100644 --- a/data/22x22/Makefile.am +++ b/data/22x22/Makefile.am @@ -8,5 +8,7 @@ icon_DATA = \ empathy-proto-msn.png \ empathy-proto-gizmo.png \ empathy-proto-irc.png \ - empathy-proto-jabber.png + empathy-proto-jabber.png \ + empathy-proto-salut.png + EXTRA_DIST = $(icon_DATA) diff --git a/data/22x22/empathy-proto-salut.png b/data/22x22/empathy-proto-salut.png new file mode 100644 index 000000000..447e59cb5 Binary files /dev/null and b/data/22x22/empathy-proto-salut.png differ diff --git a/data/salut.profile b/data/salut.profile index e9b346b39..08094128c 100644 --- a/data/salut.profile +++ b/data/salut.profile @@ -2,7 +2,7 @@ Manager=salut Protocol=salut DisplayName=Salut -IconName = empathy-proto-jabber +IconName = empathy-proto-salut ConfigurationUI = salut Capabilities = chat-p2p, chat-room, chat-room-list, voice-p2p, supports-avatars, supports-alias diff --git a/data/scalable/Makefile.am b/data/scalable/Makefile.am index b8b12c3d4..3146c20f6 100644 --- a/data/scalable/Makefile.am +++ b/data/scalable/Makefile.am @@ -12,5 +12,7 @@ icon_DATA = \ empathy-proto-msn.svg \ empathy-proto-gizmo.svg \ empathy-proto-irc.svg \ - empathy-proto-jabber.svg + empathy-proto-jabber.svg \ + empathy-proto-salut.svg + EXTRA_DIST = $(icon_DATA) diff --git a/data/scalable/empathy-proto-salut.svg b/data/scalable/empathy-proto-salut.svg new file mode 100644 index 000000000..cd9827459 --- /dev/null +++ b/data/scalable/empathy-proto-salut.svg @@ -0,0 +1,322 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/libempathy-gtk/empathy-images.h b/libempathy-gtk/empathy-images.h index 5fb4e7173..ee92f0ab4 100644 --- a/libempathy-gtk/empathy-images.h +++ b/libempathy-gtk/empathy-images.h @@ -35,7 +35,7 @@ G_BEGIN_DECLS #define EMPATHY_IMAGE_MESSAGE "empathy-message" #define EMPATHY_IMAGE_NEW_MESSAGE "empathy-new-message" #define EMPATHY_IMAGE_TYPING "empathy-typing" -#define EMPATHY_IMAGE_CONTACT_INFORMATION "empathy-contact-information" +#define EMPATHY_IMAGE_CONTACT_INFORMATION "gtk-info" #define EMPATHY_IMAGE_GROUP_MESSAGE "empathy-group-message" G_END_DECLS diff --git a/libempathy-gtk/gossip-chat.c b/libempathy-gtk/gossip-chat.c index 657535d5a..1ad76b7f5 100644 --- a/libempathy-gtk/gossip-chat.c +++ b/libempathy-gtk/gossip-chat.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include -- cgit v1.2.1