From 654ac27bdf5aaac64c9a3ed4e2bfa55eccdd6557 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Thu, 24 May 2007 21:58:26 +0000 Subject: Preset the server only for jabber protocol to conference.server. This 2007-05-25 Xavier Claessens * 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 --- src/empathy-chat-main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/empathy-chat-main.c') diff --git a/src/empathy-chat-main.c b/src/empathy-chat-main.c index 31918d32f..86b4608bd 100644 --- a/src/empathy-chat-main.c +++ b/src/empathy-chat-main.c @@ -113,7 +113,7 @@ new_channel_cb (EmpathyChandler *chandler, mc = gossip_mission_control_new (); account = mission_control_get_account_for_connection (mc, tp_conn, NULL); - id = empathy_tp_chat_build_id (account, tp_chan); + id = empathy_tp_chat_build_id_for_chan (account, tp_chan); chat = gossip_chat_window_find_chat_by_id (id); g_free (id); -- cgit v1.2.3