diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2007-05-31 14:34:41 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2007-05-31 14:34:41 +0800 |
| commit | 6fe758a0d83f6872585a177a2e821d4105642308 (patch) | |
| tree | 50d79a5ae475063c38e4e62cdaaa3c3817220077 /src | |
| parent | a0c9dc2f22f510378063be5a8c872bfe8c92bd10 (diff) | |
| download | gsoc2013-empathy-6fe758a0d83f6872585a177a2e821d4105642308.tar gsoc2013-empathy-6fe758a0d83f6872585a177a2e821d4105642308.tar.gz gsoc2013-empathy-6fe758a0d83f6872585a177a2e821d4105642308.tar.bz2 gsoc2013-empathy-6fe758a0d83f6872585a177a2e821d4105642308.tar.lz gsoc2013-empathy-6fe758a0d83f6872585a177a2e821d4105642308.tar.xz gsoc2013-empathy-6fe758a0d83f6872585a177a2e821d4105642308.tar.zst gsoc2013-empathy-6fe758a0d83f6872585a177a2e821d4105642308.zip | |
Fix warning when selecting all accounts.
2007-05-31 Xavier Claessens <xclaesse@gmail.com>
* libempathy-gtk/gossip-account-chooser.c: Fix warning when selecting
all accounts.
* src/empathy-accounts-main.c:
* libempathy-gtk/empathy-status-icon.c:
* libempathy-gtk/gossip-accounts-dialog.h:
* libempathy-gtk/gossip-accounts-dialog.c:
* libempathy-gtk/gossip-preferences.h:
* libempathy-gtk/gossip-preferences.c: Set parent window.
* libempathy-gtk/empathy-main-window.c: Implement favorite chatroom
menu and fix a leak.
* libempathy-gtk/Makefile.am:
* libempathy/Makefile.am:
* libempathy/gossip-chatroom.c:
* libempathy/gossip-chatroom.h:
* libempathy/gossip-chatroom-manager.c:
* libempathy/gossip-chatroom-manager.h:
* libempathy/gossip-chatroom-manager.dtd:
* libempathy-gtk/gossip-chatrooms-window.glade:
* libempathy-gtk/gossip-chatrooms-window.c:
* libempathy-gtk/gossip-chatrooms-window.h: New files to implement
favorite chatrooms and a window to show them.
* libempathy-gtk/gossip-chat.c: Fix tooltip leaked.
* libempathy-gtk/gossip-chat-window.h:
* libempathy-gtk/gossip-chat-window.c: Do not use deprecated
gtk_object_sink(). Implement favorite chatroom features. Find a chat
by comparing the account AND the chat ID.
* src/empathy-chat-main.c:
* libempathy/empathy-tp-chat.h:
* libempathy/empathy-tp-chat.c:
* libempathy/gossip-utils.h:
* libempathy/gossip-utils.c: empathy_tp_chat_get_id() returns the Text
channel's name. The chat ID is unique only for a specified account.
* libempathy/empathy-tp-contact-list.c: Fix some leaks and add a FIXME
comment for a leak not yet fixed.
* TODO: Would be cool to have a glade catalog for libempathy-gtk.
svn path=/trunk/; revision=100
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-accounts-main.c | 2 | ||||
| -rw-r--r-- | src/empathy-chat-main.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/empathy-accounts-main.c b/src/empathy-accounts-main.c index 954b3cea7..1f53e131e 100644 --- a/src/empathy-accounts-main.c +++ b/src/empathy-accounts-main.c @@ -44,7 +44,7 @@ main (int argc, char *argv[]) gtk_init (&argc, &argv); - dialog = gossip_accounts_dialog_show (); + dialog = gossip_accounts_dialog_show (NULL); g_signal_connect (dialog, "destroy", G_CALLBACK (destroy_cb), diff --git a/src/empathy-chat-main.c b/src/empathy-chat-main.c index 86b4608bd..fb0964934 100644 --- a/src/empathy-chat-main.c +++ b/src/empathy-chat-main.c @@ -113,8 +113,8 @@ 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_for_chan (account, tp_chan); - chat = gossip_chat_window_find_chat_by_id (id); + id = gossip_get_channel_id (account, tp_chan); + chat = gossip_chat_window_find_chat (account, id); g_free (id); g_object_unref (mc); @@ -185,7 +185,7 @@ main (int argc, char *argv[]) debug_mode = TRUE; } - exit_timeout_start (); + //sexit_timeout_start (); chandler = empathy_chandler_new (BUS_NAME, OBJECT_PATH); g_signal_connect (chandler, "new-channel", |