diff options
author | Xavier Claessens <xclaesse@gmail.com> | 2007-05-25 05:58:26 +0800 |
---|---|---|
committer | Xavier Claessens <xclaesse@src.gnome.org> | 2007-05-25 05:58:26 +0800 |
commit | 654ac27bdf5aaac64c9a3ed4e2bfa55eccdd6557 (patch) | |
tree | 206ef8e29eb82baceaaa22281554ecaee58ee221 /data/22x22 | |
parent | dfaa395ba24f5ab5d309d30e7f16acd8bb106255 (diff) | |
download | gsoc2013-empathy-654ac27bdf5aaac64c9a3ed4e2bfa55eccdd6557.tar gsoc2013-empathy-654ac27bdf5aaac64c9a3ed4e2bfa55eccdd6557.tar.gz gsoc2013-empathy-654ac27bdf5aaac64c9a3ed4e2bfa55eccdd6557.tar.bz2 gsoc2013-empathy-654ac27bdf5aaac64c9a3ed4e2bfa55eccdd6557.tar.lz gsoc2013-empathy-654ac27bdf5aaac64c9a3ed4e2bfa55eccdd6557.tar.xz gsoc2013-empathy-654ac27bdf5aaac64c9a3ed4e2bfa55eccdd6557.tar.zst gsoc2013-empathy-654ac27bdf5aaac64c9a3ed4e2bfa55eccdd6557.zip |
Preset the server only for jabber protocol to conference.server. This
2007-05-25 Xavier Claessens <xclaesse@gmail.com>
* libempathy-gtk/gossip-new-chatroom-dialog.c: Preset the server only
for jabber protocol to conference.server. This fixes a warning.
* libempathy-gtk/gossip-group-chat.h:
* libempathy-gtk/gossip-group-chat.c: gossip_group_chat_set_topic() is
a public function.
* libempathy-gtk/empathy-images.h:
* libempathy-gtk/empathy-main-window.glade:
* libempathy-gtk/empathy-status-icon.glade: Make use of
empathy-new-message icon name.
* libempathy-gtk/gossip-contact-list-store.c: By default we sort by
contacts names.
* libempathy-gtk/gossip-chat.c: Do not display composing state if
it's our own contact that is composing.
* src/empathy-chat-main.c:
* libempathy/empathy-tp-chat.c:
* libempathy/empathy-tp-chat.h: Make possible to build the id based on
the account and the channel's name. For private chats that means the
contact's id.
* libempathy-gtk/gossip-chat-window.c: Un-comment the code related to
chatrooms that is now implemented. We can now Show/Hide contact list
for group chats, DnD contact on the window to begin a discussion, join
a new chatroom.
* libempathy-gtk/gossip-account-chooser.c: Add a FIXME message.
* data/22x22/empathy-new-message.png:
* data/22x22/empathy-proto-irc.png:
* data/22x22/Makefile.am:
* data/32x32/empathy-proto-irc.png:
* data/32x32/Makefile.am:
* data/gtalk.profile:
* data/16x16/empathy-new-message:
* data/16x16/empathy-message-new.png:
* data/16x16/empathy-proto-irc.png:
* data/16x16/Makefile.am:
* data/scalable/empathy-proto-irc.svg:
* data/scalable/Makefile.am:
* data/irc.profile: Adding icons for empathy-new-message and IRC
protocol. Make use of the irc icon in the irc profile.
svn path=/trunk/; revision=91
Diffstat (limited to 'data/22x22')
-rw-r--r-- | data/22x22/Makefile.am | 2 | ||||
-rw-r--r-- | data/22x22/empathy-new-message.png | bin | 0 -> 955 bytes | |||
-rw-r--r-- | data/22x22/empathy-proto-irc.png | bin | 0 -> 1185 bytes |
3 files changed, 2 insertions, 0 deletions
diff --git a/data/22x22/Makefile.am b/data/22x22/Makefile.am index e552f6e5a..ce814e53c 100644 --- a/data/22x22/Makefile.am +++ b/data/22x22/Makefile.am @@ -1,9 +1,11 @@ icondir = $(datadir)/icons/hicolor/22x22/apps icon_DATA = \ empathy.png \ + empathy-new-message.png \ empathy-proto-ekiga.png \ empathy-proto-google-talk.png \ empathy-proto-msn.png \ empathy-proto-gizmo.png \ + empathy-proto-irc.png \ empathy-proto-jabber.png EXTRA_DIST = $(icon_DATA) diff --git a/data/22x22/empathy-new-message.png b/data/22x22/empathy-new-message.png Binary files differnew file mode 100644 index 000000000..f75737ff2 --- /dev/null +++ b/data/22x22/empathy-new-message.png diff --git a/data/22x22/empathy-proto-irc.png b/data/22x22/empathy-proto-irc.png Binary files differnew file mode 100644 index 000000000..fefb85130 --- /dev/null +++ b/data/22x22/empathy-proto-irc.png |