commit fed14b06f3a6625998ec5b7d46c9ef71c06799a3 Author: Guillaume Desmottes Date: Mon Jan 25 16:46:36 2010 +0000 prepare 2.29.6 release NEWS | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 2 +- 2 files changed, 59 insertions(+), 1 deletions(-) commit e3496e8e45bc201a55f64c000933ca30df86e43a Author: Guillaume Desmottes Date: Mon Jan 18 12:35:36 2010 +0000 Show protocol in compat mode too There is no reason to not to (#607207). libempathy-gtk/empathy-contact-list-store.c | 8 ++------ src/empathy-main-window.c | 3 --- 2 files changed, 2 insertions(+), 9 deletions(-) commit 99ff3fc5e1115987daffeb3ba3ea75bace884247 Author: Guillaume Desmottes Date: Mon Jan 18 12:34:54 2010 +0000 contact_list_store_update_list_mode_foreach: remove useless show_protocol variable libempathy-gtk/empathy-contact-list-store.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) commit 3b3954e6e71f30324c88a2d70cbcc5375a19aaae Author: Guillaume Desmottes Date: Mon Jan 18 12:34:28 2010 +0000 contact_list_store_contact_update: remove useless show_protocol variable libempathy-gtk/empathy-contact-list-store.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) commit 2b6d806d6e22c20387f6cd9a9308c570dd4a7fb0 Author: Will Thompson Date: Mon Jan 25 15:45:07 2010 +0000 Ellipsize connection error infobars This prevents your contact list being forcibly expanded horizontally when an account with a long name fails to connect. Fixes: #608043 src/empathy-main-window.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit bbf4bebc4c243fb47d9e0698af88621f859a7449 Author: Will Thompson Date: Mon Jan 25 15:44:56 2010 +0000 Fix building nst plugin out of tree. nautilus-sendto-plugin/Makefile.am | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 386ee2dc8453117ff1a2042ff0428a34d646b952 Author: Guillaume Desmottes Date: Mon Jan 25 14:57:09 2010 +0000 accounts_dialog_accounts_setup: use empathy_connection_managers_prepare_async That way we are sure that the callback is called even if the managers is already ready (#607925). src/empathy-accounts-dialog.c | 33 +++++++++++++++++---------------- 1 files changed, 17 insertions(+), 16 deletions(-) commit 6a09345e6cc8002dcb2da52da273c949107b9de3 Merge: 906f3a0 5c94274 Author: Guillaume Desmottes Date: Mon Jan 25 14:19:05 2010 +0000 Merge commit 'kaserf/buttons-infobar-606329' commit 906f3a0b0c501c9878c7ad1f77d6d3b9a36361dc Author: Guillaume Desmottes Date: Mon Jan 25 14:03:57 2010 +0000 split strings to no translate markups src/empathy-account-assistant.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) commit 367020d3ffc220ced07c93c3cc13841ed2a383ab Author: Guillaume Desmottes Date: Mon Jan 25 12:48:31 2010 +0000 there is no reasy why error would be NULL if e_book_get_self failed src/empathy-auto-salut-account-helper.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commit 95cd2370571dafcd4aab34ebb93499b915a70bcb Author: Guillaume Desmottes Date: Mon Jan 25 12:43:10 2010 +0000 remove create_salut_account_if_needed as it's done in the assistant now src/empathy-auto-salut-account-helper.c | 109 ------------------------------- src/empathy-auto-salut-account-helper.h | 2 - 2 files changed, 0 insertions(+), 111 deletions(-) commit 3ee94f0e0e9c0757735f9bae72ce12ae9749d790 Author: Guillaume Desmottes Date: Mon Jan 25 12:22:37 2010 +0000 rephrase the salut error page src/empathy-account-assistant.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) commit b5b352cfbea1dd9ae47dbea05a37ab5fc523e9b6 Author: Guillaume Desmottes Date: Mon Jan 25 12:16:38 2010 +0000 add a hint about how to reach the accounts dialog src/empathy-account-assistant.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) commit 1b15b1d3623dd0f2fc584e50d8ae981aea50c9be Author: Guillaume Desmottes Date: Mon Jan 25 12:08:31 2010 +0000 Split markups and translated string to make this easier for translators src/empathy-account-assistant.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) commit 0aaa3f2b2c4c6ad3e7d52d13a28103a6490c26ce Author: Guillaume Desmottes Date: Mon Jan 25 12:00:15 2010 +0000 rename build_error_page to build_error_vbox src/empathy-account-assistant.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit ef60aa9e573bea328d0cad4b3619912b021d0d9b Author: Guillaume Desmottes Date: Mon Jan 25 11:57:38 2010 +0000 account_assistant_page_forward_func: never go forward after the salut page This fix a bug if user chooses to not create a salut account. src/empathy-account-assistant.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) commit 1a42d308197d71aac322a61978eb5dce266bbe95 Author: Guillaume Desmottes Date: Mon Jan 25 11:51:40 2010 +0000 Display 'back' button in the import and create page src/empathy-account-assistant.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 001c1043c2670229dc379edf90d6f9041371d0d7 Author: Guillaume Desmottes Date: Fri Jan 22 14:15:48 2010 +0000 Fix account creation regression Each time we add a new account, a new page is added to the assistant. So checking if id equal PAGE_ENTER_CREATE is not enough as the next pages will have an id greater than that. src/empathy-account-assistant.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) commit 3bda80255069253fcb801673c3c81c8d1cd4a67e Author: Guillaume Desmottes Date: Fri Jan 22 11:56:51 2010 +0000 Don't display the salut page after the create one if there is no need to src/empathy-account-assistant.c | 30 +++++++++++++++++++++++++++--- 1 files changed, 27 insertions(+), 3 deletions(-) commit f1cca624fa83a3a1fe33a227edd4b8c6f0e0978c Author: Guillaume Desmottes Date: Fri Jan 22 10:58:45 2010 +0000 Don't display the salut page after the import one if there is no need to src/empathy-account-assistant.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) commit cc1003c0f40aa8165194c0412a63da672ce0e869 Author: Guillaume Desmottes Date: Thu Jan 21 17:34:31 2010 +0000 Display the salut page after the create one src/empathy-account-assistant.c | 33 +++++++++++++++------------------ 1 files changed, 15 insertions(+), 18 deletions(-) commit ebafe1dbc235b57e286fce9901ca65652fdc9898 Author: Guillaume Desmottes Date: Thu Jan 21 16:38:31 2010 +0000 Display the salut page after the import one src/empathy-account-assistant.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) commit 933b597933edb8a02b4cda32fe08290dbb1e1903 Author: Guillaume Desmottes Date: Thu Jan 21 15:33:10 2010 +0000 rename should_create_salut_account to display_salut_page src/empathy-account-assistant.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit 1943ad3113ef82a02f4c30b6f6ad8b19a56c3ee8 Author: Guillaume Desmottes Date: Thu Jan 21 15:28:58 2010 +0000 Display an error message if Salut is not installed Please enter the commit message for your changes. Lines starting src/empathy-account-assistant.c | 40 +++++++++++++++++++++++++++++++------- 1 files changed, 32 insertions(+), 8 deletions(-) commit 5321b5a3fca104ceeb265c053da7460a1809a53f Author: Guillaume Desmottes Date: Thu Jan 21 15:28:32 2010 +0000 factor out build_error_page src/empathy-account-assistant.c | 52 ++++++++++++++++++++++++--------------- 1 files changed, 32 insertions(+), 20 deletions(-) commit c4cdb393343d6c7a18364d01202f8b150233c145 Author: Guillaume Desmottes Date: Thu Jan 21 14:46:59 2010 +0000 assistant: move creation of the page from _init to _constructed We are going to need the connection managers received as a property. src/empathy-account-assistant.c | 41 ++++++++++++++++++++------------------ 1 files changed, 22 insertions(+), 19 deletions(-) commit a24db41f217eea1cbf929cc3e623c50ca626db4b Author: Guillaume Desmottes Date: Thu Jan 21 14:33:00 2010 +0000 Pass a ready EmpathyConnectionManagers to empathy_account_assistant_show This kinda suck but we have to construct the assistant in a sync way so can't wait for the manager to become ready. src/empathy-account-assistant.c | 31 ++++++++++++-- src/empathy-account-assistant.h | 5 ++- src/empathy.c | 43 ++++++++++++++++---- tests/interactive/test-empathy-account-assistant.c | 25 ++++++++++-- 4 files changed, 87 insertions(+), 17 deletions(-) commit fcfdcc4011d7131d852d19474eb09eaa4a6e43d7 Author: Guillaume Desmottes Date: Thu Jan 21 14:03:06 2010 +0000 Move all the tests checking if we should display the the assistant to a single function We used to check that in a lot of different places. Refactor the code to make it clearer and easier to understand. src/empathy.c | 88 ++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 63 insertions(+), 25 deletions(-) commit 54190b275f2328e9e43ccfcfafaa63177fe1018f Author: Guillaume Desmottes Date: Wed Jan 20 16:51:11 2010 +0000 Don't display the salut page if there is no need to create the account src/empathy-account-assistant.c | 57 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) commit 6328e566344f1f6bd83bc01f4951d2c1fd680f6e Author: Guillaume Desmottes Date: Wed Jan 20 16:03:38 2010 +0000 set the salut-account-created gconf key once the account has been created src/empathy-account-assistant.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) commit e18077ddd872c65bcca5f755fce4abceb0eebfab Author: Guillaume Desmottes Date: Wed Jan 20 15:54:24 2010 +0000 don't set display name if there is already one defined Display name is already set for the salut account. src/empathy-account-assistant.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) commit a33e906abb007ae8f56377140c74db11dc1742ad Author: Guillaume Desmottes Date: Wed Jan 20 15:50:38 2010 +0000 account-assistant: use existing code to create the salut account and respect the settings defined by user src/empathy-account-assistant.c | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) commit 9a0777b347b50e56840190472cda3d979c6f3045 Author: Guillaume Desmottes Date: Wed Jan 20 14:58:14 2010 +0000 account-assistant: add a page to configure the salut account This will let user filling his details if we failed to fetch them and so give him a chance to actually create the Salut account (#596575). src/empathy-account-assistant.c | 136 +++++++++++++++++++++++++++++++++++---- 1 files changed, 124 insertions(+), 12 deletions(-) commit 3e258d7e2a040df13320f34af03f034bc88008d9 Author: Guillaume Desmottes Date: Wed Jan 20 14:51:35 2010 +0000 account-widget-salut: don't display advanced properties in simple mode .../empathy-account-widget-local-xmpp.ui | 2 +- libempathy-gtk/empathy-account-widget.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-) commit 17ea62102f51a9d6e50a12f516fec4af60ce0c88 Author: Guillaume Desmottes Date: Wed Jan 20 14:50:44 2010 +0000 factor out and export create_salut_account_settings src/empathy-auto-salut-account-helper.c | 113 ++++++++++++++++++------------- src/empathy-auto-salut-account-helper.h | 3 + 2 files changed, 68 insertions(+), 48 deletions(-) commit b7936254660d147c7fb683a477b2db728ea72723 Author: Łukasz Jernaś Date: Sat Jan 23 14:04:13 2010 +0100 rename "Hidden" to "Invisible" in docs help/C/status-icons.page | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 5c94274e5bd070ea580716fe8dbaad32b901654e Author: Felix Kaser Date: Sun Jan 24 22:58:13 2010 +0100 remove custom style for buttons in infobar the custom style for the buttons in the infobar is not needed. fixes bug #606329 src/empathy-main-window.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) commit 6ba051c2deb8c8b5f1148ac2173f6901d50d1a89 Author: Guillaume Desmottes Date: Fri Jan 22 12:40:42 2010 +0000 notify_ready_cb: use g_simple_async_result_complete instead of _in_idle libempathy/empathy-connection-managers.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 07961d71bdc15756e355c701a02856dbcd801bdd Author: Guillaume Desmottes Date: Fri Jan 22 12:35:35 2010 +0000 replace empathy_connection_managers_call_when_ready by prepare_{async_finish} functions libempathy-gtk/empathy-protocol-chooser.c | 11 ++-- libempathy/empathy-connection-managers.c | 78 ++++++++++++----------------- libempathy/empathy-connection-managers.h | 11 ++-- src/empathy-import-widget.c | 11 ++-- src/empathy.c | 12 +++-- 5 files changed, 57 insertions(+), 66 deletions(-) commit 90d96b199a4f4e1912403d52f38581e8c86752a1 Author: Guillaume Desmottes Date: Thu Jan 21 12:23:50 2010 +0000 empathy-protocol-chooser: use empathy_connection_managers_call_when_ready libempathy-gtk/empathy-protocol-chooser.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) commit 61caee80d36af8064a9c0953ce4ee7123bf6115d Author: Guillaume Desmottes Date: Thu Jan 21 12:05:50 2010 +0000 empathy.c: use empathy_connection_managers_call_when_ready src/empathy.c | 32 +++++++++++--------------------- 1 files changed, 11 insertions(+), 21 deletions(-) commit 7ed6676eb0dc2c05718774fbc1939d6a8a5c6445 Author: Guillaume Desmottes Date: Thu Jan 21 12:05:33 2010 +0000 empathy-import-widget: use empathy_connection_managers_call_when_ready src/empathy-import-widget.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) commit f6d60f33a0ab2af025e7d13a8dea9a93c6eab3f9 Author: Guillaume Desmottes Date: Thu Jan 21 11:57:18 2010 +0000 add empathy_connection_managers_call_when_ready That's easier to use than checking if ready and connecting a callback. libempathy/empathy-connection-managers.c | 63 ++++++++++++++++++++++++++++++ libempathy/empathy-connection-managers.h | 10 +++++ 2 files changed, 73 insertions(+), 0 deletions(-) commit ec21e853954665c0f3ad8f7d16001a77e535715d Author: Guillaume Desmottes Date: Fri Jan 22 10:23:34 2010 +0000 spspps-interval has been renamed to config-interval data/element-properties | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 7c0d4aca42f309b89684636ad84fd4969eac6943 Author: Thomas Meire Date: Thu Jan 21 01:20:08 2010 +0100 Capture the escape key on the chat view and search bar, to make it hide the search bar libempathy-gtk/empathy-chat.c | 3 +++ libempathy-gtk/empathy-search-bar.c | 34 ++++++++++++++++++++++++++++------ libempathy-gtk/empathy-search-bar.h | 1 + 3 files changed, 32 insertions(+), 6 deletions(-) commit cc0b2a8f267d1396ecae90452f4623d5b4c5ebb1 Author: Thomas Meire Date: Tue Jan 19 23:03:28 2010 +0100 removed some trailing spaces libempathy-gtk/empathy-chat.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 0c011e92bb7f0d3d14117b0c2f6bf4b73a1a30e7 Author: Thomas Meire Date: Tue Jan 19 21:29:51 2010 +0100 added a "find" menu item libempathy-gtk/empathy-chat.c | 17 ++++++++++++----- libempathy-gtk/empathy-chat.h | 1 + src/empathy-chat-window.c | 16 ++++++++++++++++ src/empathy-chat-window.ui | 9 +++++++++ 4 files changed, 38 insertions(+), 5 deletions(-) commit 6e4d8ededbb01dfd7bf5bbbb31fc05d6d6ca161a Author: Thomas Meire Date: Tue Jan 19 18:39:52 2010 +0100 improve behaviour of match_case callback libempathy-gtk/empathy-search-bar.c | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) commit ba2326210afd63d1ae622c57b76b3b1f56ab4e9e Author: Thomas Meire Date: Tue Jan 19 17:25:36 2010 +0100 add match_case option to find_abilities libempathy-gtk/empathy-chat-text-view.c | 49 +++++++++++++++++++++--------- libempathy-gtk/empathy-chat-view.c | 2 + libempathy-gtk/empathy-chat-view.h | 2 + libempathy-gtk/empathy-log-window.c | 3 ++ libempathy-gtk/empathy-search-bar.c | 11 ++++-- libempathy-gtk/empathy-theme-adium.c | 1 + 6 files changed, 49 insertions(+), 19 deletions(-) commit 0f812eb93730b84b7cbb60aaacf803aabdd6f9c5 Author: Thomas Meire Date: Tue Jan 19 16:55:09 2010 +0100 respect match_case in chat_text_view_highlight libempathy-gtk/empathy-chat-text-view.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) commit a60052ef99b114614a598bc6fd623ae4bd6b4d52 Author: Thomas Meire Date: Tue Jan 19 15:26:56 2010 +0100 Use gtk_text_iter_[backward/forward]_search for case sensitive searches, keep the custom version for case insensitive searches libempathy-gtk/empathy-chat-text-view.c | 46 +++++++++++++++++++++++-------- 1 files changed, 34 insertions(+), 12 deletions(-) commit 20941452d76810e181d91510168a7204c986edbd Author: Thomas Meire Date: Sun Jan 17 12:25:40 2010 +0100 added checkbox callback libempathy-gtk/empathy-search-bar.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) commit 1d1701965496cb0d66a759cb4f7996de44a02044 Author: Thomas Meire Date: Sun Jan 17 11:29:49 2010 +0100 added case sensitive search for adium themes (reverted previous commit) libempathy-gtk/empathy-chat-text-view.c | 14 ++++++++++---- libempathy-gtk/empathy-chat-view.c | 12 ++++++++---- libempathy-gtk/empathy-chat-view.h | 12 ++++++++---- libempathy-gtk/empathy-log-window.c | 9 +++++++-- libempathy-gtk/empathy-search-bar.c | 11 ++++++++--- libempathy-gtk/empathy-theme-adium.c | 18 ++++++++---------- 6 files changed, 49 insertions(+), 27 deletions(-) commit a988a27966b67140d57695edd32b8563cb3a2d03 Author: Thomas Meire Date: Sun Jan 17 10:05:26 2010 +0100 make the adium theme respect new_search libempathy-gtk/empathy-theme-adium.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commit d128e3a36e43a08a9dfe4a2c42b9485e146faeae Author: Thomas Meire Date: Sat Jan 16 23:41:32 2010 +0100 added case sensitive highlighting for adium themes libempathy-gtk/empathy-chat-text-view.c | 4 +++- libempathy-gtk/empathy-chat-view.c | 5 +++-- libempathy-gtk/empathy-chat-view.h | 6 ++++-- libempathy-gtk/empathy-log-window.c | 4 ++-- libempathy-gtk/empathy-search-bar.c | 6 +++--- libempathy-gtk/empathy-theme-adium.c | 5 +++-- 6 files changed, 18 insertions(+), 12 deletions(-) commit 993766233887be988d3864c64be85c83989d42ad Author: Thomas Meire Date: Sat Jan 16 16:41:50 2010 +0100 simple toggle button to match the case libempathy-gtk/empathy-search-bar.c | 7 +++++++ libempathy-gtk/empathy-search-bar.ui | 12 ++++++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) commit aab9053d638c375560d8784eee995969b004b5ba Author: Thomas Meire Date: Sat Jan 16 14:55:54 2010 +0100 remove priv->last_search and factor out empathy_search_bar_search libempathy-gtk/empathy-search-bar.c | 87 ++++++++++++++++------------------- 1 files changed, 40 insertions(+), 47 deletions(-) commit aa27406264f677978586a2f2ae583ab672b1029c Author: Ken VanDine Date: Wed Jan 20 11:20:39 2010 +0000 Make the "Edit Custom Messages" window 420px wide by default (#607463) libempathy-gtk/empathy-status-preset-dialog.ui | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 4cbba43910919eac6cf0eda94988b7a5ae6563d1 Author: Guillaume Desmottes Date: Wed Jan 20 11:07:28 2010 +0000 add empathy-auto-salut-account-helper.c to POTFILES.in po/POTFILES.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 12cf97ee46d91833368b27fa93c0da91e284e350 Author: Olivier Crête Date: Tue Jan 19 19:29:05 2010 -0500 Re-send sps/pps regulary with H.264 data/element-properties | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 38069d2a7ed386cc85876aaefaa0dee9cd2ee484 Author: Guillaume Desmottes Date: Tue Jan 19 15:11:16 2010 +0000 Call create_salut_account_if_needed when the assistant is closed That way we only try to create the account if the assistant properly terminates (#607436). src/empathy-account-assistant.c | 3 +++ src/empathy.c | 1 - tests/interactive/Makefile.am | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) commit 902b24c56151985da6eadedc748803d686a07a62 Author: Guillaume Desmottes Date: Tue Jan 19 14:54:46 2010 +0000 Don't pass managers to create_salut_account_if_needed It can dup it itself. src/empathy-auto-salut-account-helper.c | 24 +++++++++++++++++++++--- src/empathy-auto-salut-account-helper.h | 2 +- src/empathy.c | 3 +-- 3 files changed, 23 insertions(+), 6 deletions(-) commit 452df1568e0a3e74a49c92c00840e15c788215ce Author: Guillaume Desmottes Date: Tue Jan 19 14:40:57 2010 +0000 move create_salut_account_if_needed and should_create_salut_account to a new file src/Makefile.am | 1 + src/empathy-auto-salut-account-helper.c | 215 +++++++++++++++++++++++++++++++ src/empathy-auto-salut-account-helper.h | 35 +++++ src/empathy.c | 182 +-------------------------- 4 files changed, 252 insertions(+), 181 deletions(-) commit c4f65286eb3b7f82d25afa63c5204a98bd85408a Author: Guillaume Desmottes Date: Tue Jan 19 14:03:11 2010 +0000 account-assistant: disable Google Talk when creating a new account Google Talk doesn't support inband registration (#607455). src/empathy-account-assistant.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 8da0a6feaddfa5ab7df373f0f85c7124b31774e8 Author: Guillaume Desmottes Date: Tue Jan 19 14:01:26 2010 +0000 Pass a boolean saying if the protocol is Google Talk or not to EmpathyProtocolChooserFilterFunc That's the only way to filter Google Talk if we want to. libempathy-gtk/empathy-protocol-chooser.c | 5 ++++- libempathy-gtk/empathy-protocol-chooser.h | 4 +++- src/empathy-account-assistant.c | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) commit 3241a32e5b7fc4ee8ae8907fbdde74d98660ebca Author: Guillaume Desmottes Date: Tue Jan 19 13:49:37 2010 +0000 add_register_buttons: don't show the register buttons in simple mode We use another page in the assistant to create new accounts (#607455). libempathy-gtk/empathy-account-widget.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 48a4f5ec33f06f0e26017fcf7fc4c235a8e6d7df Author: Guillaume Desmottes Date: Tue Jan 19 13:42:12 2010 +0000 account-widget: check that the apply button actually exist before modifying it It's not created in the 'simple' version of the widget. (#607455) libempathy-gtk/empathy-account-widget.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit f7cee33cf8bd3598f9d9869797d7d0737573b6c6 Author: Cosimo Cecchi Date: Tue Jan 19 14:59:28 2010 +0100 Make sure the column spacing is the same for all protocols. libempathy-gtk/empathy-account-widget-groupwise.ui | 2 +- libempathy-gtk/empathy-account-widget-msn.ui | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit eefb547a9d4ea02155a5602802b6bf20fed23005 Author: Kjartan Maraas Date: Tue Jan 19 14:14:07 2010 +0100 Updated Norwegian bokmål translation po/nb.po | 159 ++++++++++++++++++++++--------------------------------------- 1 files changed, 57 insertions(+), 102 deletions(-) commit d9364ce3c97b72e1ff96a499ff6343e4efa49d05 Author: Xavier Claessens Date: Mon Jan 18 20:37:39 2010 +0100 Add a remove button below the accounts treeview instead of the in-treeview icon. src/empathy-accounts-dialog.c | 74 +++++++++++++++++++++++++++++++-------- src/empathy-accounts-dialog.ui | 40 ++++++++++++++++++--- 2 files changed, 93 insertions(+), 21 deletions(-) commit 73ac36ec1868e3000155ccf7c18a6b29e461984d Author: Jorge González Date: Mon Jan 18 19:07:44 2010 +0100 Updated Spanish translation po/es.po | 153 +++++++++++++++++++++++++++++--------------------------------- 1 files changed, 72 insertions(+), 81 deletions(-) commit fbb51c0510a2c4c21ac0ef1f846cb04510546005 Author: Guillaume Desmottes Date: Mon Jan 18 17:10:16 2010 +0000 all.xml: remove unused and redundant external-type They are either not used anymore or already defined in generic-types.xml extensions/all.xml | 26 -------------------------- 1 files changed, 0 insertions(+), 26 deletions(-) commit 2350876b533822606ad8080e53840fb55de83f3a Author: Guillaume Desmottes Date: Mon Jan 18 16:59:45 2010 +0000 remove Channel_Handler.xml; we don't use it since a while extensions/Channel_Handler.xml | 62 ---------------------------------------- extensions/Makefile.am | 1 - extensions/misc.xml | 1 - 3 files changed, 0 insertions(+), 64 deletions(-) commit 602c58582b0e7add0585c7f8e708d16acaf25668 Author: Guillaume Desmottes Date: Thu Jan 14 14:05:54 2010 +0000 remove Tube_Handler.xml extensions/Makefile.am | 1 - extensions/Tube_Handler.xml | 57 ------------------------------------------- extensions/misc.xml | 1 - 3 files changed, 0 insertions(+), 59 deletions(-) commit c30eaa7a26e66671c53c81f85296443e7c8198bd Author: Guillaume Desmottes Date: Thu Jan 14 14:11:47 2010 +0000 remove empathy-tube-handler.c and empathy-tube-dispatch libempathy/Makefile.am | 2 - libempathy/empathy-dispatcher.c | 1 - libempathy/empathy-tube-handler.c | 288 ----------------------- libempathy/empathy-tube-handler.h | 64 ----- po/POTFILES.in | 1 - src/.gitignore | 3 - src/Makefile.am | 5 +- src/empathy-tube-dispatch.c | 467 ------------------------------------- src/empathy-tube-dispatch.h | 75 ------ 9 files changed, 1 insertions(+), 905 deletions(-) commit edf04ad86a916e81ce13fda6c9544ea78eb6b809 Author: Guillaume Desmottes Date: Thu Jan 14 14:31:54 2010 +0000 stop dispatching tube channels (#599159) Tube applications should use the ChannelDispatcher. libempathy/empathy-dispatcher.c | 1 - src/empathy-event-manager.c | 123 --------------------------------------- src/empathy.c | 6 -- 3 files changed, 0 insertions(+), 130 deletions(-) commit 7d9ef8cc5b24cb51018c37d81b686edb8a458823 Author: Cosimo Cecchi Date: Mon Jan 18 17:30:46 2010 +0100 Unify the infobar and the account name widgets. src/empathy-accounts-dialog.c | 60 ++++++++++++++++++++++++++++++---------- src/empathy-accounts-dialog.ui | 37 +------------------------ 2 files changed, 46 insertions(+), 51 deletions(-) commit 8a8ebfdbb3f7caf4a05d75a7530052d19ececabf Author: G.Balaji Date: Mon Jan 18 20:40:02 2010 +0530 Changed the return string of empathy_presence_get_default_message to Invisible so that we display Invisible to the user. This fix bug #603472 libempathy/empathy-utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit abe61c3e3f10ceeb911cfe6ee1ae16617adfac70 Author: Thomas Meire Date: Mon Jan 18 14:53:23 2010 +0000 Fix /join command with one channel (#607306) libempathy-gtk/empathy-chat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 508ae6971b3b64e6f5db47cf1c452d70137993c9 Author: Guillaume Desmottes Date: Mon Jan 18 11:15:26 2010 +0000 fix identation src/empathy-accounts-dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 7a3f2ebca0e3b23f384a6173645e94b4a424704d Author: Guillaume Desmottes Date: Fri Jan 15 12:15:27 2010 +0000 Stop greysing and blinking the protocol icon We now have another icon showing the connection status so there is no point to display it (in an unclear way) in the protocol icon as well. src/empathy-accounts-dialog.c | 24 ------------------------ 1 files changed, 0 insertions(+), 24 deletions(-) commit 2680f3635db17529e00ea200a625c53e0a0b0209 Author: Guillaume Desmottes Date: Fri Jan 15 11:27:16 2010 +0000 update account in treeview when it's disabled src/empathy-accounts-dialog.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit efcf558673f83faf9621fe644ea1c20c78756d9f Author: Guillaume Desmottes Date: Fri Jan 15 10:48:15 2010 +0000 update treeview when account's status is changed src/empathy-accounts-dialog.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) commit e7dc37cd2c4be8c8ab892bfcebf57249c4a15460 Author: Guillaume Desmottes Date: Thu Jan 14 16:02:43 2010 +0000 accounts-dialog: display status of accounts in the treeview (#605309) src/empathy-accounts-dialog.c | 78 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) commit d8a99a7d7f833b1e6fae18661d1fb54ef22133b1 Author: Guillaume Desmottes Date: Thu Jan 14 15:43:16 2010 +0000 rename accounts_dialog_model_pixbuf_data_func to accounts_dialog_model_protocol_pixbuf_data_func src/empathy-accounts-dialog.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit c9b1a29662c4a681f7e53a4bdf7477e326b45298 Author: Guillaume Desmottes Date: Fri Jan 15 16:13:49 2010 +0000 accounts-dialog: remember the account and password param when changing protocol (#605532) src/empathy-accounts-dialog.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) commit f82cf307e75f0446b4e590b0036a179b64862939 Author: Guillaume Desmottes Date: Fri Jan 15 16:13:24 2010 +0000 account-widget: add empathy_account_widget_set_{account,password}_param This will be used to restore the account and password params when switching widgets. libempathy-gtk/empathy-account-widget.c | 32 +++++++++++++++++++++++++++++++ libempathy-gtk/empathy-account-widget.h | 6 +++++ 2 files changed, 38 insertions(+), 0 deletions(-) commit 3d2438bfc48b2858c2800feb9ca96fda3634a089 Author: Jorge González Date: Mon Jan 18 06:19:10 2010 +0100 Updated Spanish translation po/es.po | 163 ++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 79 insertions(+), 84 deletions(-) commit f687777360a213c638374c1d497ca849717ce174 Author: Javier Jardón Date: Sun Jan 17 21:05:38 2010 +0100 Support silent build rules with automake 1.11 Support silent build rules, requires at least automake-1.11. Disable by either passing --disable-silent-rules to configure or passing V=1 to make. Fixes https://bugzilla.gnome.org/show_bug.cgi?id=585364 Signed-off-by: Jonny Lamb .gitignore | 2 - configure.ac | 11 +++--- data/Makefile.am | 2 +- extensions/Makefile.am | 30 ++++++++--------- libempathy-gtk/Makefile.am | 15 ++++---- libempathy/Makefile.am | 15 ++++---- m4/shave.m4 | 77 ------------------------------------------ shave-libtool.in | 69 -------------------------------------- shave.in | 79 -------------------------------------------- src/Makefile.am | 5 +-- tools/Makefile.am | 20 +++++------ tools/shave.mk | 1 - 12 files changed, 46 insertions(+), 280 deletions(-) commit 6a1aecd8b35cee47c56326d4babc46a146a91be0 Author: Felix Kaser Date: Sat Jan 16 16:15:31 2010 +0100 set presence to offline when account is disabled else the presence is empty and no icon is shown in the infobar (#604706) src/empathy-accounts-dialog.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) commit 605672f66eb239c2aed2de45cf737f9278374614 Author: Guillaume Desmottes Date: Fri Jan 15 14:04:48 2010 +0000 Consider connected account which doesn't implement presence as available (#604700) src/empathy-accounts-dialog.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) commit 878db108e421ef8ed628ffb7e223b1ee6e031909 Author: Guillaume Desmottes Date: Fri Jan 15 14:10:37 2010 +0000 Rephrase the TP_CONNECTION_STATUS_REASON_REQUESTED message to make it clearer (#606510) libempathy/empathy-utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 2734f01164697128745c9a16e417521cff7a9370 Author: Guillaume Desmottes Date: Thu Jan 14 12:58:38 2010 +0000 No need to get RequestableChannelClasses if ContactCapability is implemented We use it only as a fallback if it's not. libempathy/empathy-tp-contact-factory.c | 38 ++++++++++++++++++------------ 1 files changed, 23 insertions(+), 15 deletions(-) commit a551a0d1cdf34a3f36d21d235257a652db264f7e Author: Guillaume Desmottes Date: Thu Jan 14 12:48:22 2010 +0000 factor out channel_classes_to_capabilities libempathy/empathy-tp-contact-factory.c | 122 +++++++++++++++---------------- 1 files changed, 58 insertions(+), 64 deletions(-) commit b61b45cfe0862f75d7d60708484a588bb54c9cae Author: Guillaume Desmottes Date: Wed Jan 13 15:17:01 2010 +0000 Use ContactCapabilities to get audio/video caps (#599163) libempathy/empathy-tp-contact-factory.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) commit 5d54cdabd84b5425e36596426dec5025e09f7de5 Author: Guillaume Desmottes Date: Wed Jan 13 14:49:14 2010 +0000 Stop using the old Capabilities iface if ContactCapabilities is implemented libempathy/empathy-tp-contact-factory.c | 40 +++++++++++++++--------------- 1 files changed, 20 insertions(+), 20 deletions(-) commit 398f69f13a9c9ee415fba5b1b393f27984b558bc Author: Guillaume Desmottes Date: Wed Jan 13 14:06:12 2010 +0000 Claim that contacts support stream tube if it's announced in their contact capabilities libempathy/empathy-tp-contact-factory.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) commit 0fc14712b0e218d6ab5244eb995cc632d02f3b34 Author: Guillaume Desmottes Date: Wed Jan 13 13:59:23 2010 +0000 Claim that contacts support FT if it's announced in their contact capabilities (#599164) libempathy/empathy-tp-contact-factory.c | 91 +++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) commit af80a92b8af244fff6567706d8a79010e2c21cc7 Author: Guillaume Desmottes Date: Wed Jan 13 13:55:24 2010 +0000 Don't assume contacts support FT if ContactCapabilities is implemented libempathy/empathy-tp-contact-factory.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) commit 49c0ca0a3327016e3b4b64490c6494ef0383ce7e Author: Guillaume Desmottes Date: Thu Jan 14 11:38:18 2010 +0000 account-widget: use empathy_account_widget_changed libempathy-gtk/empathy-account-widget.c | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-) commit 6dfc3153eb4551778f2cdbb6f9acc48013c7ddc4 Author: Guillaume Desmottes Date: Thu Jan 14 11:31:03 2010 +0000 account-widget-irc: Call empathy_account_widget_changed when network combobox is changed By calling this function we'll activate the connect button and record that the widget contains pending changes (#606642). libempathy-gtk/empathy-account-widget-irc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 7f3762d3676e2b0711793f82f6cd789ba237106a Author: Guillaume Desmottes Date: Thu Jan 14 11:30:37 2010 +0000 add empathy_account_widget_changed as protected method libempathy-gtk/empathy-account-widget.c | 10 ++++++++++ libempathy-gtk/empathy-account-widget.h | 3 +++ 2 files changed, 13 insertions(+), 0 deletions(-) commit b4cac9d1b0e95f27e294b71d6aa653d86f1a9287 Author: Khaled Hosny Date: Thu Jan 14 13:18:04 2010 +0200 Updated Arabic translation po/ar.po | 917 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 475 insertions(+), 442 deletions(-) commit 89ca489b3fd31b1faf3ff85c37dd30b89bce3cf0 Author: Claude Paroz Date: Wed Jan 13 21:40:22 2010 +0100 Updated French translation po/fr.po | 1890 ++++++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 1114 insertions(+), 776 deletions(-) commit 03e17755a77004fca9cabd9213123fc8c498fc4e Author: Kjartan Maraas Date: Wed Jan 13 18:53:19 2010 +0100 Updated Norwegian bokmål translation po/nb.po | 476 +++++++++++++++++++++++++++++++++----------------------------- 1 files changed, 252 insertions(+), 224 deletions(-) commit 2ea53064d10dfe8ab13f6a7af3355a3f56d2d56f Author: Guillaume Desmottes Date: Wed Jan 13 10:28:29 2010 +0000 Call xmlCleanupParser() only once when exiting (#600693) This function should only be called when exiting the application as it cleans up the memory allocated by the library itself. Thanks to Lennart for pointing this out. libempathy-gtk/empathy-plist.c | 2 -- libempathy/empathy-chatroom-manager.c | 1 - libempathy/empathy-contact-groups.c | 1 - libempathy/empathy-irc-network-manager.c | 1 - src/empathy.c | 1 + 5 files changed, 1 insertions(+), 5 deletions(-) commit 4ec913aeb99b71c85da47e47490954a22465babc Merge: 23bfa8e e4337e5 Author: Xavier Claessens Date: Wed Jan 13 11:59:24 2010 +0100 Merge branch 'contact' commit e4337e5c450842abd65f7c2fb7d233c2cc1105df Author: Xavier Claessens Date: Wed Jan 13 11:53:46 2010 +0100 Remove the "Contact" alignment from contat widget libempathy-gtk/empathy-contact-dialogs.c | 1 + libempathy-gtk/empathy-contact-list-view.c | 2 + libempathy-gtk/empathy-contact-widget.c | 5 +- libempathy-gtk/empathy-contact-widget.ui | 194 ++++++++++++---------------- 4 files changed, 85 insertions(+), 117 deletions(-) commit 23bfa8e617322d97832303492b03ddfef9184ef7 Author: Guillaume Desmottes Date: Wed Jan 13 10:12:03 2010 +0000 Use the proper enum value when checking FsMediaType FS_MEDIA_TYPE_VIDEO and TP_MEDIA_STREAM_TYPE_VIDEO have actually the same value but newer versions of gcc are smarter and detect this kind of bug. src/empathy-call-window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit f6aaf7478dd61a3696cc27a225a206ec89076a16 Author: Jorge González Date: Tue Jan 12 20:22:12 2010 +0100 Added initial Spanish translation help/es/es.po | 84 +++++++++++++++------------------------------------------ 1 files changed, 22 insertions(+), 62 deletions(-) commit e684a3eff7d6f4ab3e50bd75047a1dc83ace7910 Author: Jorge González Date: Tue Jan 12 20:22:04 2010 +0100 Updated Spanish translation po/es.po | 415 +++++++++++++++++++++++++------------------------------------- 1 files changed, 169 insertions(+), 246 deletions(-) commit 939f04e4a193187fb4bc79a0ecf2ab3c580dc661 Author: Guillaume Desmottes Date: Tue Jan 12 17:05:09 2010 +0000 Revert "Escape the header of the notification (#599431)" This reverts commit 4363fe7a71208ee2d696211838f028ef97700b45. According to the notification spec, headers should not be escaped. Escaping them leads to displaying escaped text in the notification with some daemon (#603498). The bug #599431 was probably due to a bug in the notification-daemon and seems to work fine now. src/empathy-status-icon.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) commit 0ee842ac627f30fa14d75b06cd7147a67090731e Author: Thomas Meire Date: Tue Jan 12 15:34:39 2010 +0000 Add search bar in chat text views (#585168) libempathy-gtk/Makefile.am | 5 +- libempathy-gtk/empathy-chat-text-view.c | 5 +- libempathy-gtk/empathy-chat.c | 17 ++- libempathy-gtk/empathy-search-bar.c | 263 +++++++++++++++++++++++++++++++ libempathy-gtk/empathy-search-bar.h | 64 ++++++++ libempathy-gtk/empathy-search-bar.ui | 110 +++++++++++++ libempathy-gtk/empathy-theme-manager.c | 3 + po/POTFILES.in | 1 + 8 files changed, 463 insertions(+), 5 deletions(-) commit 183fa2e8a94d94a7098120fc43cde9ad83869de6 Author: Guillaume Desmottes Date: Mon Dec 21 11:20:02 2009 +0000 chat_window_create_label: ref the widgets stored as data so we are sure they stay alive when doing DnD src/empathy-chat-window.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) commit 7e1c5b16b61c68e536c005b5286fbe9823db5d2f Author: Guillaume Desmottes Date: Tue Jan 12 11:17:05 2010 +0000 start dev of next version configure.ac | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)