commit 84d12d32bb206c48ce45c416258f0c1316c2378b Author: Guillaume Desmottes Date: Fri Jun 10 14:49:30 2011 +0200 Prepare 3.1.2 NEWS | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 4 +- release.py | 2 +- 3 files changed, 78 insertions(+), 3 deletions(-) commit c8beb5910b162e26e94c13a57d7d3213f9a3ef84 Author: Emilio Pozuelo Monfort Date: Fri Jun 10 12:47:56 2011 +0100 Cope with tpl_event_get_receiver() returning NULL libempathy-gtk/empathy-log-window.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 65fac9c002b47ba0c8a3e4e0d6c4fa9494b2f771 Author: Guillaume Desmottes Date: Fri Jun 10 12:39:42 2011 +0200 Rationalize use of EMPATHY_IMAGE_CALL_* images (#652270) We now always use call-start for incoming and outgoing calls and call-stop for missed ones. Ideally it would be cool to have different icons for incoming and outgoing but that will do for now. libempathy-gtk/empathy-images.h | 5 +++-- libempathy-gtk/empathy-log-window.c | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) commit 4b892eeb5e6c85706e14a28f5e7e5b9cd4fcd23e Author: Yaron Shahrabani Date: Fri Jun 10 12:53:10 2011 +0300 Updated Hebrew translation. po/he.po | 244 ++++++++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 183 insertions(+), 61 deletions(-) commit 585b25ad427f22c33b8e7344acc051a1c07e1fb9 Merge: f680565 3fe402f Author: Emilio Pozuelo Monfort Date: Fri Jun 10 09:32:28 2011 +0100 Merge branch 'new-log-window' commit 3fe402f9da25077cf075c55263c78d613c62687a Author: Emilio Pozuelo Monfort Date: Thu Jun 9 16:52:05 2011 +0100 Don't unref NULL pointers log_window_got_messages_for_date_cb() can return NULL for unknown event types, so don't unref the result in those cases. libempathy-gtk/empathy-log-window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit d49a19564bc1404c8536da85f97e22ae80e614e7 Author: Emilio Pozuelo Monfort Date: Thu Jun 9 16:50:34 2011 +0100 Don't require telepathy-logger with --enable-call Having it is required for displaying call events in the history window though. configure.ac | 38 +++++++++++++++++++++++++--------- libempathy-gtk/empathy-log-window.c | 23 ++++++++++++++++++-- libempathy/empathy-message.c | 12 ++++++++-- 3 files changed, 57 insertions(+), 16 deletions(-) commit c5353cf8c819b549de202faa3326406f3638a899 Author: Emilio Pozuelo Monfort Date: Thu Jun 9 14:57:14 2011 +0100 empathy_contact_from_tpl_contact: check the accounts match Two contacts may not be the same if only their ids match, so also check the accounts. This was causing us to return the same contact from another account, which would cause "is-user" to not be properly set, confusing the log viewer. libempathy/empathy-contact.c | 30 +++++++++++++++++++++++------- 1 files changed, 23 insertions(+), 7 deletions(-) commit f6805650748b2851dcd22fa04901b91dd3ab0abd Author: Yaron Shahrabani Date: Fri Jun 10 08:07:52 2011 +0300 Updated Hebrew translation. po/he.po | 403 +++++++++++++++++++++++++++++++++++++------------------------- 1 files changed, 240 insertions(+), 163 deletions(-) commit 0265c0ca2e832e5b1a68bdd2d40c62f64ad7233e Author: Daniel Mustieles Date: Thu Jun 9 22:37:56 2011 +0200 Updated Spanish translation po/es.po | 427 +++++++++++++++++++++++++++++++++++++------------------------- 1 files changed, 254 insertions(+), 173 deletions(-) commit f135402a5c7fd43b4349ecb23c541b5540f36ba4 Author: Kjartan Maraas Date: Thu Jun 9 13:49:54 2011 +0200 Updated Norwegian bokmål translation po/nb.po | 648 +++++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 367 insertions(+), 281 deletions(-) commit d74b660be9a8717615a01df58c3d7fa2a3d55bd0 Author: Emilio Pozuelo Monfort Date: Thu Jun 9 12:49:12 2011 +0100 Update empathy-log-window.ui for GTK+ 3 libempathy-gtk/empathy-log-window.ui | 82 ++++++++++++++++++++++++++------- 1 files changed, 64 insertions(+), 18 deletions(-) commit ab11b8cd9cc3cba75af64f2ce7fbce042353d76e Author: Emilio Pozuelo Monfort Date: Thu Jun 9 12:05:45 2011 +0100 Fix typo libempathy-gtk/empathy-log-window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 4b4199bf5fa8b15db6de6016f8dbfa59b41d2d45 Author: Emilio Pozuelo Monfort Date: Thu Jun 9 12:05:11 2011 +0100 Remove unused variables libempathy-gtk/empathy-log-window.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) commit e44cdbfd3407bb6801fed763da5ae3c332305d12 Author: Danielle Madeley Date: Fri May 27 15:48:21 2011 +1000 Use some markup to make the logs more readable Emotes are in italics. Sender's names are in bold. Mark emotes for translation since we've done that for messages. libempathy-gtk/empathy-log-window.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) commit 22306d76874bd8931aa517d48331803fe6fa4c5a Author: Danielle Madeley Date: Fri May 27 15:47:57 2011 +1000 Don't allow interactive searching on the log pane libempathy-gtk/empathy-log-window.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit d2b2bd1716dbffd4b03422ff99111c04e1a975e6 Author: Danielle Madeley Date: Fri May 27 15:37:55 2011 +1000 Remove unrequired COL_WHAT_EXPANDER libempathy-gtk/empathy-log-window.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) commit 2589cc3f824a7ccbea5ed016aa8ff40a7c3de1ae Author: Danielle Madeley Date: Fri May 27 15:36:25 2011 +1000 [log-viewer] set search columns libempathy-gtk/empathy-log-window.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) commit 9f2331fcb2254a28e17a607cc3f614187dd64af9 Author: Emilio Pozuelo Monfort Date: Tue May 17 15:34:08 2011 +0100 log_window_chats_set_selected: only act on normal rows libempathy-gtk/empathy-log-window.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) commit f68071937c2340fd5560c29f4502db146a459b5a Author: Emilio Pozuelo Monfort Date: Mon May 16 18:25:48 2011 +0100 Don't reset the alias when using empathy_contact_from_tpl_contact contact_set_property() calls empathy_contact_set_alias(), which tries to set the alias on the FolksPersona, but we don't want to do that when creating an EmpathyContact from a TplEntity. So just set priv->alias instead of passing it to g_object_new() instead. libempathy/empathy-contact.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) commit 4ee7e811f1686d7a24d951269f46dd8be682ff84 Author: Emilio Pozuelo Monfort Date: Tue May 10 15:35:20 2011 +0100 Use a weak ref to remove the tpcontact from the hashtable Conflicts: libempathy/empathy-contact.c libempathy/empathy-contact.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) commit 88c6ee078f25bc31c60308ca927118f8b1731972 Author: Emilio Pozuelo Monfort Date: Tue May 10 09:31:24 2011 +0100 LogWindow: Don't cut the log messages libempathy-gtk/empathy-log-window.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 0fbbd7093243ca64a98ca6b81b2cf9e3439c041a Author: Emilio Pozuelo Monfort Date: Mon May 9 19:53:32 2011 +0100 LogWindow: better logic for the buttons sensitivity libempathy-gtk/empathy-log-window.c | 67 ++++++++++++++++++++++++++++------ 1 files changed, 55 insertions(+), 12 deletions(-) commit 577effbd7b0a97ce168105feb184ad5671db2bb6 Author: Emilio Pozuelo Monfort Date: Mon May 9 19:51:34 2011 +0100 empathy_contact_from_tpl_contact: set the TpContact If available, so we get extra info like capabilities. Based on a patch from Nicolas Dufresne. Conflicts: libempathy/empathy-contact.c libempathy/empathy-contact.c | 65 ++++++++++++++++++++++++++++++++--------- 1 files changed, 50 insertions(+), 15 deletions(-) commit 7e79c7c05aeee5497f31935ae79db1abee141875 Author: Emilio Pozuelo Monfort Date: Tue May 3 13:37:50 2011 +0100 LogWindow: don't crash if closed while retrieving logs libempathy-gtk/empathy-log-window.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) commit 711272a739ab7add8972c5df146c24b62c0fdcf7 Author: Emilio Pozuelo Monfort Date: Tue May 3 13:28:56 2011 +0100 Show an spinner while logs are being retrieved libempathy-gtk/empathy-log-window.c | 51 +++++++++++++++++++++++++++++++ libempathy-gtk/empathy-log-window.ui | 56 +++++++++++++++++++++++++++++++-- 2 files changed, 103 insertions(+), 4 deletions(-) commit ee8c16e7d70527760ebb2c5894dd85c545daa2e4 Author: Emilio Pozuelo Monfort Date: Tue May 3 11:55:59 2011 +0100 LogWindow: scroll the events view to the end Where newest messages are. libempathy-gtk/empathy-log-window.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) commit 90f40d91fb39eff7e64113411c3efa9f81803418 Author: Emilio Pozuelo Monfort Date: Tue May 3 11:35:53 2011 +0100 LogWindow: select the first normal date by default libempathy-gtk/empathy-log-window.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) commit a879702a4f71baac18c351a7c540d349ad8d20d0 Author: Emilio Pozuelo Monfort Date: Tue May 3 11:22:42 2011 +0100 LogWindow: set 'All accounts' by default libempathy-gtk/empathy-log-window.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 0f14ab8594d2867778bb96059ecad339cd16162d Author: Emilio Pozuelo Monfort Date: Tue May 3 11:22:01 2011 +0100 Add empathy_account_chooser_set_all libempathy-gtk/empathy-account-chooser.c | 24 ++++++++++++++++++++++++ libempathy-gtk/empathy-account-chooser.h | 1 + 2 files changed, 25 insertions(+), 0 deletions(-) commit f5288b26f8c6fc114ae50b99513ec37b7a1aa7fe Author: Danielle Madeley Date: Thu Apr 28 12:33:31 2011 +1000 Ensure tp-logger was compiled with Call support configure.ac | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) commit c9dc1e77d19bb525d8e69e59e53124d9a5c3ca60 Author: Danielle Madeley Date: Thu Apr 28 12:33:17 2011 +1000 tp-logger 0.2.8 is required for Call support Conflicts: configure.ac configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 91eae10335e7802d95c1f80132aa206ac0f5e9ff Author: Emilio Pozuelo Monfort Date: Wed Apr 27 15:53:52 2011 +0100 Display date and time in the event treeview libempathy-gtk/empathy-log-window.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) commit d77b0a9e495b8e20702824deef690dff6e43e95a Author: Emilio Pozuelo Monfort Date: Wed Apr 27 15:10:18 2011 +0100 Make the three panes a bit taller by default libempathy-gtk/empathy-log-window.ui | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 0fecd9297170528afedbb3e8c3da92debbc41136 Author: Emilio Pozuelo Monfort Date: Wed Apr 27 13:02:31 2011 +0100 Add a clear icon to the search entry libempathy-gtk/empathy-log-window.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) commit a5a993d4b067029c8fc6c904762c12aec6740831 Author: Emilio Pozuelo Monfort Date: Wed Apr 27 12:42:37 2011 +0100 Don't use global variables libempathy-gtk/empathy-log-window.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) commit 716f0dfd75b38a218ce75b854e6e00c075f71cbb Author: Emilio Pozuelo Monfort Date: Wed Apr 27 11:47:25 2011 +0100 Fix buttons to work again with multiselection libempathy-gtk/empathy-log-window.c | 85 ++++++++++++++++++++--------------- 1 files changed, 49 insertions(+), 36 deletions(-) commit 4198f9e38072f8e36640af81db324e8787dc8e51 Author: Emilio Pozuelo Monfort Date: Wed Apr 27 11:15:09 2011 +0100 Use a define instead of hardcoding a magic number libempathy-gtk/empathy-log-window.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) commit 652f53c7969e0df0ce9c1fa9b01fb2993f270121 Author: Emilio Pozuelo Monfort Date: Wed Apr 27 11:07:07 2011 +0100 Use a for instead of a do while to avoid returning early So we always free the stuff at the end of the function. libempathy-gtk/empathy-log-window.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) commit 6c7d3bb978f03da13cfc6dbef4d4a5b034283ce1 Author: Emilio Pozuelo Monfort Date: Wed Apr 27 11:02:20 2011 +0100 Don't leak the account and entity libempathy-gtk/empathy-log-window.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) commit e391423b415ea591dfd9c306508330e4d2be5484 Author: Emilio Pozuelo Monfort Date: Wed Apr 27 10:59:08 2011 +0100 Don't leak paths libempathy-gtk/empathy-log-window.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 17e3f7d1ac4f174141c21f7996cce34dd33f8c15 Author: Emilio Pozuelo Monfort Date: Wed Apr 27 10:57:42 2011 +0100 Compare against NULL libempathy-gtk/empathy-log-window.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 710b3bb90a2280396b954803fa73c243bf29bf69 Author: Emilio Pozuelo Monfort Date: Wed Apr 27 10:53:31 2011 +0100 Be neutral libempathy-gtk/empathy-log-window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 2d1b1e2d6e0ac8ee8c841c15938fde5a25ecd038 Author: Emilio Pozuelo Monfort Date: Wed Apr 27 10:53:08 2011 +0100 Style: use braces consistently libempathy-gtk/empathy-log-window.c | 42 +++++++++++++++++++++++++--------- 1 files changed, 31 insertions(+), 11 deletions(-) commit ece7f43a1a51c679fdd9419411c3593ddb597354 Author: Emilio Pozuelo Monfort Date: Wed Apr 27 10:47:45 2011 +0100 Return early if the iter isn't a top level libempathy-gtk/empathy-log-window.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) commit 002bed41aa3e792e5367f9f996cd496461207783 Author: Emilio Pozuelo Monfort Date: Wed Apr 27 10:44:36 2011 +0100 Use a macro for magic numbers libempathy-gtk/empathy-log-window.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) commit dbfd14c60f1748e7608067a082d7a54434317440 Author: Emilio Pozuelo Monfort Date: Wed Apr 27 10:41:27 2011 +0100 Don't leak the account and entity libempathy-gtk/empathy-log-window.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) commit fcd9a97dbf9c6bf6e9e8c7ecd7f8cacdb5c34b4e Author: Emilio Pozuelo Monfort Date: Wed Apr 27 10:36:43 2011 +0100 Use tp_clear_pointer libempathy-gtk/empathy-log-window.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commit baf7517f523381054f85810f0b2d4e20fe05e491 Author: Emilio Pozuelo Monfort Date: Tue Apr 26 23:52:20 2011 +0100 LogWindow: group MUC events properly libempathy-gtk/empathy-log-window.c | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) commit 7c9bdd521147ee2f11c3f88de8f1c17c83fc2508 Author: Emilio Pozuelo Monfort Date: Tue Apr 26 22:38:00 2011 +0100 LogWindow: check the 30min gap with the last message libempathy-gtk/empathy-log-window.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) commit 0b1805580294ff8bafb80d61bf2dde4ab03a213d Author: Emilio Pozuelo Monfort Date: Tue Apr 26 22:23:44 2011 +0100 LogWindow: find the corrent parent for chat events libempathy-gtk/empathy-log-window.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) commit 5ba374369d6d95bc48b46c2d39205512bf663358 Author: Emilio Pozuelo Monfort Date: Tue Apr 26 21:02:32 2011 +0100 LogWindow: Display /me messages properly libempathy-gtk/empathy-log-window.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) commit 11d6539fea44b435f42f43d1faac15c8e41a6bbf Author: Emilio Pozuelo Monfort Date: Tue Apr 26 11:03:23 2011 +0100 make check fixes libempathy-gtk/empathy-log-window.c | 2 +- po/POTFILES.in | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) commit 9f1815808fd5c7331d6c9866ce7c0606b846abf7 Author: Emilio Pozuelo Monfort Date: Tue Apr 26 10:56:59 2011 +0100 Remove more dead code libempathy-gtk/empathy-log-window.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) commit b6f9f49ea121fa1057a0b7b60a907051e7534d72 Author: Emilio Pozuelo Monfort Date: Tue Apr 26 10:28:23 2011 +0100 Use a do while instead of a for loop where appropriate libempathy-gtk/empathy-log-window.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 2815624c23a1a7acc9008926a1c2c513ef884c28 Author: Emilio Pozuelo Monfort Date: Tue Apr 26 10:25:33 2011 +0100 Remove dead code libempathy-gtk/empathy-log-window.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) commit 751af986ebacdebbb22f74c664ddddc4fe583c43 Author: Emilio Pozuelo Monfort Date: Tue Apr 26 10:24:06 2011 +0100 Fix comment libempathy-gtk/empathy-log-window.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) commit 1f1dcde3b69adf85047157f2816c171610019960 Author: Emilio Pozuelo Monfort Date: Tue Apr 26 10:21:58 2011 +0100 Remove stray print statements libempathy-gtk/empathy-log-window.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) commit ab66619794d401c11ca30131bc4acbddaabe2db4 Author: Emilio Pozuelo Monfort Date: Tue Apr 26 10:20:09 2011 +0100 Remove dead code libempathy-gtk/empathy-log-window.c | 30 ------------------------------ 1 files changed, 0 insertions(+), 30 deletions(-) commit d425a5037650360368a5c0da7358046b4e288097 Author: Emilio Pozuelo Monfort Date: Tue Apr 26 10:15:52 2011 +0100 LogWindow: don't add duplicate dates libempathy-gtk/empathy-log-window.c | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) commit e168f565d9bb4ba7ccece873beb40fde959b8d29 Author: Emilio Pozuelo Monfort Date: Tue Apr 26 10:07:27 2011 +0100 LogWindow: add 'Anyone' to search results libempathy-gtk/empathy-log-window.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) commit d423b12b76b8d5979340bdafb7e0532edde05eff Author: Emilio Pozuelo Monfort Date: Tue Apr 26 10:02:20 2011 +0100 LogWindow: select 'Anytime' by default when searching libempathy-gtk/empathy-log-window.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit 30632ed84b27b97089e709688ddbc7f6fb0db69c Author: Emilio Pozuelo Monfort Date: Mon Apr 25 16:04:48 2011 +0100 Block the callback when clearing the store libempathy-gtk/empathy-log-window.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) commit 5f5c01b0844c63141a1f4bf7faaa7eea0553a239 Author: Emilio Pozuelo Monfort Date: Mon Apr 25 15:44:19 2011 +0100 Switch remaining functions to the new style libempathy-gtk/empathy-log-window.c | 456 ++++++++++++++++++----------------- 1 files changed, 238 insertions(+), 218 deletions(-) commit f1f313b03bb414cebfae33e34b7f7c3cc05253ee Author: Emilio Pozuelo Monfort Date: Mon Apr 25 15:24:37 2011 +0100 LogWindow: Add live search support libempathy-gtk/empathy-log-window.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) commit ce498170c595f9b6acec3a8a89f9f0fcb93f195d Author: Emilio Pozuelo Monfort Date: Mon Apr 25 15:11:40 2011 +0100 LogWindow: Show dates properly libempathy-gtk/empathy-log-window.c | 54 +++++++++++++++++++++++++++++----- 1 files changed, 46 insertions(+), 8 deletions(-) commit 3d69902551334b6a930116c6776fb84bb9a14b33 Author: Emilio Pozuelo Monfort Date: Mon Apr 25 13:23:09 2011 +0100 LogWindow: Add multiselection to the 'When' pane libempathy-gtk/empathy-log-window.c | 143 +++++++++++++++++++++++------------ 1 files changed, 93 insertions(+), 50 deletions(-) commit 58db428a7d1c832117fdab2446e7eae7c30db04f Author: Emilio Pozuelo Monfort Date: Mon Apr 25 12:08:14 2011 +0100 Stop processing logger calls when unneeded libempathy-gtk/empathy-log-window.c | 44 ++++++++++++++++++++++++++++------ 1 files changed, 36 insertions(+), 8 deletions(-) commit 9f9677ec63954a870daadfedd51359a631c43ea2 Author: Emilio Pozuelo Monfort Date: Mon Apr 25 12:07:59 2011 +0100 Add _tpl_action_chain_clear libempathy/action-chain-internal.h | 1 + libempathy/action-chain.c | 7 +++++++ 2 files changed, 8 insertions(+), 0 deletions(-) commit 62f5ed896ad09c54be054f6872a69b905db3b8c7 Author: Emilio Pozuelo Monfort Date: Mon Apr 25 10:35:23 2011 +0100 Populate from 'Anyone' when changing the account libempathy-gtk/empathy-log-window.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) commit 4a8794ffe8898d4ddf25bff8a360c36ec8a4d9aa Author: Emilio Pozuelo Monfort Date: Mon Apr 25 10:02:04 2011 +0100 Make 'Anyone' work libempathy-gtk/empathy-log-window.c | 48 ++++++++++++++++++++++++++++++++--- 1 files changed, 44 insertions(+), 4 deletions(-) commit 84424d0c20debc8366861a632b9046d24089e5dc Author: Emilio Pozuelo Monfort Date: Fri Apr 22 12:46:33 2011 +0100 LogWindow: Add multiselection to the 'Who' pane libempathy-gtk/empathy-log-window.c | 290 +++++++++++++++++++++++------------ 1 files changed, 195 insertions(+), 95 deletions(-) commit b37d294b89a2a59f25c78a619aae871e25d6e77b Author: Emilio Pozuelo Monfort Date: Fri Apr 22 09:43:00 2011 +0100 LogWindow: Add multiselection to the 'What' pane libempathy-gtk/empathy-log-window.c | 45 +++++++++++++++++++++++++++++++--- 1 files changed, 41 insertions(+), 4 deletions(-) commit 013aa1784ede94f87f24cb419ac6efbf2e95961b Author: Emilio Pozuelo Monfort Date: Fri Apr 22 09:06:59 2011 +0100 log_window_chats_get_selected -> log_window_get_selected libempathy-gtk/empathy-log-window.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) commit e899cd55697dba16f40d146ec3637ddd6f3bc53b Author: Emilio Pozuelo Monfort Date: Mon May 2 10:47:15 2011 +0100 Don't free an uninitialized variable libempathy-gtk/empathy-log-window.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) commit 8ff470e1b4aef8310f1cfb8627a46fd5a139489f Author: Emilio Pozuelo Monfort Date: Wed Apr 20 16:11:50 2011 +0100 LogWindow: convert the event view to a treeview Following the design. libempathy-gtk/empathy-log-window.c | 401 ++++++++++++++++++++++++++++++---- libempathy-gtk/empathy-log-window.ui | 5 +- 2 files changed, 366 insertions(+), 40 deletions(-) commit 65badd1d8579635ef44bbf7871a0e82d035a84c5 Author: Emilio Pozuelo Monfort Date: Wed Apr 20 16:11:26 2011 +0100 Add icons for missed/incoming/outgoing calls libempathy-gtk/empathy-images.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit 9e762d6902eed60649df3d7462ca7cd3a7ebe43a Author: Emilio Pozuelo Monfort Date: Thu Jun 9 11:36:47 2011 +0100 Adapt to the empathy-dispatcher removal libempathy-gtk/empathy-log-window.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 346d5c25eae1e9bab5ab36cd66885d6bfbe0d262 Author: Emilio Pozuelo Monfort Date: Wed Apr 20 09:32:56 2011 +0100 Complete rewrite of the history window https://bugzilla.gnome.org/show_bug.cgi?id=619866 Conflicts: libempathy-gtk/empathy-log-window.c libempathy-gtk/empathy-log-window.ui libempathy-gtk/empathy-log-window.c | 2697 +++++++++++++++++++++------------- libempathy-gtk/empathy-log-window.h | 12 +- libempathy-gtk/empathy-log-window.ui | 430 ++---- 3 files changed, 1855 insertions(+), 1284 deletions(-) commit f01e2c494ccb02637535b2419e80c172f85a5b5b Author: Guillaume Desmottes Date: Thu Jun 9 13:30:10 2011 +0200 empathy_individual_match_string: match if the string IS a prefix libempathy-gtk/empathy-ui-utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 04d3b8f34e0cab394ac143b9323bd3d00a8abee7 Author: Emilio Pozuelo Monfort Date: Wed Apr 20 09:29:02 2011 +0100 account_chooser_find_account_foreach: check the col type As non ROW_ACCOUNT rows don't have an account. libempathy-gtk/empathy-account-chooser.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) commit 2269bb1dbf55130f4ba625777dbbebc6407f9ce7 Author: Emilio Pozuelo Monfort Date: Wed Apr 20 09:28:09 2011 +0100 AccountChooser: add empathy_account_chooser_get_account_manager() libempathy-gtk/empathy-account-chooser.c | 8 ++++++++ libempathy-gtk/empathy-account-chooser.h | 3 ++- 2 files changed, 10 insertions(+), 1 deletions(-) commit 8d3f7406c2055e4483cdc9639f8463e48b521621 Author: Emilio Pozuelo Monfort Date: Wed Apr 20 09:23:05 2011 +0100 TplActionChain: add _tpl_action_chain_start() libempathy/action-chain-internal.h | 3 +++ libempathy/action-chain.c | 18 +++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletions(-) commit 7a393000d1dd55dc60345f0b2bb51b44215d9607 Author: Emilio Pozuelo Monfort Date: Wed Apr 20 09:21:49 2011 +0100 Copy TplActionChain from telepathy-logger libempathy/Makefile.am | 2 + libempathy/action-chain-internal.h | 47 ++++++++++ libempathy/action-chain.c | 169 ++++++++++++++++++++++++++++++++++++ 3 files changed, 218 insertions(+), 0 deletions(-) commit 669b6782b2bb1c7275092f5923b8930cc2849c98 Author: Emilio Pozuelo Monfort Date: Thu Jun 9 11:17:00 2011 +0100 Handle unknown event types gracefully libempathy/empathy-message.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 36c30139b96a31bd00d81b73f83d3e5dc8f06bf2 Author: Emilio Pozuelo Monfort Date: Wed Apr 20 09:19:10 2011 +0100 Don't ignore call events Conflicts: libempathy/empathy-message.c libempathy/empathy-message.c | 37 +++++++++++++++++++++++-------------- 1 files changed, 23 insertions(+), 14 deletions(-) commit 1ad9211ee247b05a11cc6d5358918611dd3a8fa9 Author: Emilio Pozuelo Monfort Date: Tue Mar 15 17:25:21 2011 +0000 AccountChooser: All -> All accounts libempathy-gtk/empathy-account-chooser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 322ce4bfc48edf2331379809ab53b17254bcd8f2 Author: Emilio Pozuelo Monfort Date: Tue Mar 15 16:40:01 2011 +0000 Add a empathy_account_chooser_has_all_selected So we can know if 'All' is selected in the accounts chooser. libempathy-gtk/empathy-account-chooser.c | 24 ++++++++++++++++++++++++ libempathy-gtk/empathy-account-chooser.h | 1 + 2 files changed, 25 insertions(+), 0 deletions(-) commit 18f8901e810a6843f549b06680d9411d12901e5d Author: Emilio Pozuelo Monfort Date: Thu Jun 9 10:42:58 2011 +0100 Fix typo configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 8944f13286ba5293781f2d57980da284cb2aa29d Merge: 981a137 3f52e59 Author: Emilio Pozuelo Monfort Date: Thu Jun 9 10:28:44 2011 +0100 Merge branch 'call' commit 3f52e59aa058c16a9ba115398681a16b1e289cd1 Author: Emilio Pozuelo Monfort Date: Thu Jun 9 10:22:01 2011 +0100 Update .gitignore for the new files data/.gitignore | 1 + src/.gitignore | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) commit 54af9bea4d1e1f4e15207969f2ab89a012ad4d10 Author: Emilio Pozuelo Monfort Date: Thu Jun 9 09:28:23 2011 +0100 Turn g_prints into DEBUGs src/empathy-call-handler.c | 8 ++++---- src/empathy-call-window.c | 6 +++--- src/empathy-streamed-media-window.c | 2 +- src/empathy-video-src.c | 5 ++++- 4 files changed, 12 insertions(+), 9 deletions(-) commit 043b2fec4b21707ef62aebc3d80fc54c319e90f2 Author: Emilio Pozuelo Monfort Date: Thu Jun 9 09:26:00 2011 +0100 Build fix libempathy-gtk/empathy-call-utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 190ae6377f8b876062b503c31952b9e292068fd2 Author: Emilio Pozuelo Monfort Date: Thu Jun 9 09:17:54 2011 +0100 Set 'Empathy' as program class in empathy-call src/empathy-call.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit a59b409850d16d6612e1d1e02e9d67969b00d988 Author: Emilio Pozuelo Monfort Date: Thu Jun 9 09:16:29 2011 +0100 Port empathy-call to GtkApplication Based on the changes to empathy-av. src/empathy-call.c | 112 +++++++++++++++++++++------------------------------ 1 files changed, 46 insertions(+), 66 deletions(-) commit 70f3ecbecff1194994e950e0e34eaf45bab8a1b2 Author: Emilio Pozuelo Monfort Date: Wed Jun 8 20:07:34 2011 +0100 CallWindow: properly track the dialpad status again This stopped working properly as the latest EvSidebar didn't have notify::current-page anymore. src/empathy-call-window.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) commit 523e8030211e4a0c84e3c5bec0c705818ca3c669 Author: Emilio Pozuelo Monfort Date: Wed Jun 8 20:05:54 2011 +0100 EvSidebar: add a changed signal src/ev-sidebar.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) commit d78ac0b3ee0d22b0b670216373e8b0db0b0479b0 Author: Guillaume Desmottes Date: Wed Mar 16 11:17:02 2011 +0100 call-window: Put the details vbox in a scroll window Conflicts: src/empathy-call-window.c src/empathy-call-window.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) commit 033a72c1af2eeef7cae6d7f8712b56437ce787bd Author: Emilio Pozuelo Monfort Date: Wed Jun 8 19:06:36 2011 +0100 Adapt to EmpathySidebar -> EvSidebar src/empathy-call-window.c | 25 ++++++++++++------------- telepathy-yell | 2 +- 2 files changed, 13 insertions(+), 14 deletions(-) commit 0d4971e462c733f212443c44d53690e9a6d41bc6 Author: Emilio Pozuelo Monfort Date: Tue Jun 7 11:20:11 2011 +0100 Change the page before showing the sidebar To avoid showing it without the dialpad, which would cause the dialpad menu callback to be called to hide it before the page was changed, causing the sidebar to be hidden again! src/empathy-call-window.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 6e258dd8646083c5c17f71318901aad4f529d9ee Author: Emilio Pozuelo Monfort Date: Tue Jun 7 11:19:24 2011 +0100 Factor out the block/set/unblock code src/empathy-call-window.c | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) commit b1008464fa6550f3958a4acad3b8fc5ee5457207 Author: Emilio Pozuelo Monfort Date: Mon Jun 6 13:21:33 2011 +0100 Disable the dialpad when the call ends src/empathy-call-window.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit bd2690ad9d7a7920b5ab8df822fb282982cede22 Author: Emilio Pozuelo Monfort Date: Mon Jun 6 11:29:07 2011 +0100 Make it a toggle button src/empathy-call-window.c | 61 ++++++++++++++++++++++++++++++++++++++----- src/empathy-call-window.ui | 2 +- 2 files changed, 55 insertions(+), 8 deletions(-) commit 6bc173c8f3606c87ff0ba0be84140ac72a4b243c Author: Emilio Pozuelo Monfort Date: Thu Jun 2 11:29:00 2011 +0100 CallWindow: add a dialpad menu entry src/empathy-call-window.c | 18 ++++++++++++++++++ src/empathy-call-window.ui | 7 +++++++ 2 files changed, 25 insertions(+), 0 deletions(-) commit a9f6738541b98e591e51bd321902acc5c8200d9b Author: Emilio Pozuelo Monfort Date: Thu May 26 20:43:46 2011 +0100 Clear audio_output when the call ends So we create a new one when redialing instead of reusing it. src/empathy-call-window.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) commit 9b81fd1bb7e9acee4fa68dd0b205593a2397761c Author: Emilio Pozuelo Monfort Date: Mon May 23 13:12:34 2011 +0100 CallWindow: show 'On hold' in the statusbar when appropriate src/empathy-call-window.c | 41 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 38 insertions(+), 3 deletions(-) commit f6a73795877708151ae8ea751553d4cebd23b968 Author: Emilio Pozuelo Monfort Date: Mon May 23 12:41:35 2011 +0100 Directly call the callback if we're ready Instead of duplicating the code in two places. src/empathy-call-window.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) commit e77ec8904ba6c4372c978ac51ce67d79dd90b869 Author: Emilio Pozuelo Monfort Date: Mon May 16 16:43:59 2011 +0100 Implement empathy_call_handler_start_call() for redialing src/empathy-call-handler.c | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) commit 039a108f7cc13f6fd587cf505cd43552e1a2a392 Author: Emilio Pozuelo Monfort Date: Mon May 16 16:42:17 2011 +0100 CallHandler: move on_call_accepted_cb() around src/empathy-call-handler.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) commit 11f851031af49234479be818c939c8d5edc2420b Author: Emilio Pozuelo Monfort Date: Mon May 16 16:40:21 2011 +0100 CallHandler: emit signal with the correct parameters src/empathy-call-handler.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 62475a9a10093fc2ef93fcb5958c3f9dd29f28a3 Author: Emilio Pozuelo Monfort Date: Mon May 16 16:37:21 2011 +0100 Remove empathy_call_factory_new_call_with_streams It's unused and empathy_call_new_with_streams is better. src/empathy-call-factory.c | 52 -------------------------------------------- src/empathy-call-factory.h | 6 ----- 2 files changed, 0 insertions(+), 58 deletions(-) commit 38e097caec45ba6faaf33b7077ac8795a5ff6b86 Author: Sjoerd Simons Date: Wed May 4 10:41:07 2011 +0100 Correct the interface names used in Empathy.Call.client data/Empathy.Call.client | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) commit 5616cdca13a978612a3762b6584c4f96dd7a334c Author: Sjoerd Simons Date: Tue May 3 20:03:34 2011 +0100 Keep a persistent source video tee around Always keep the video input tee around, so we can easily hook up new video contents even if the camera isn't currently enabled. This fixes issues where a new content is added without the local camera being enabled. src/empathy-call-window.c | 38 +++++++++++++++----------------------- 1 files changed, 15 insertions(+), 23 deletions(-) commit dfd3e3b200d14c9dc1f9ccf8d8bb68efdb48fae3 Author: Emilio Pozuelo Monfort Date: Wed Apr 27 16:23:15 2011 +0100 Don't build a shared telepathy-yell configure.ac | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 6d67672852072737fee47d2ef43031929520afd6 Author: Emilio Pozuelo Monfort Date: Thu Mar 24 14:20:37 2011 +0000 Include yell before anything else Since we want to build against our copy of yell. Otherwise if you have yell installed in /usr, it'll be picked from there as we get -I/usr/include/telepathy-1.0 and telepathy-yell is installed as telepathy-yell/telepathy-yell.h in that directory. src/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit e9d88fb3832f3014e8ed9aaf2ce5bb1f4b96fd49 Author: Sjoerd Simons Date: Wed Mar 23 15:00:08 2011 +0000 Minimize the scope in which we use TpyCallChannel src/empathy-call-window.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) commit 9b68b6c2bd3a55a817857575814d43145644f419 Author: Sjoerd Simons Date: Wed Mar 23 14:45:56 2011 +0000 Prepare the video input pipeline when there is an initial content src/empathy-call-window.c | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) commit 1db300a69d039838d68cd4af8fddbc404f31c74c Author: Sjoerd Simons Date: Wed Mar 23 13:09:09 2011 +0000 Wait for the channel to be ready before handling it src/empathy-call-factory.c | 51 +++++++++++++++++++++++++++++++++++++------- 1 files changed, 43 insertions(+), 8 deletions(-) commit eceb49ae9be0555a9d1f5de1f6c4b72c05315cb1 Author: Sjoerd Simons Date: Tue Mar 22 18:28:33 2011 +0000 Use a new id for accepting without video Conflicts: src/empathy-status-icon.c src/empathy-notifications-approver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit c849a5a953b0ffa1df1dc1383018dbc48254a2fa Author: Sjoerd Simons Date: Tue Mar 22 16:41:51 2011 +0000 Also add Answer with video to the notification dialogs Conflicts: src/empathy-status-icon.c src/empathy-event-manager.c | 1 + src/empathy-event-manager.h | 1 + src/empathy-notifications-approver.c | 35 +++++++++++++++++++++++++++++++++- 3 files changed, 36 insertions(+), 1 deletions(-) commit 6b6213702cba10ca28494e44990f750569856217 Author: Sjoerd Simons Date: Tue Mar 22 16:40:33 2011 +0000 Add Answer with video to the default dialogs We should be able to answer calls with or without video. This patch only implements that for Call type channels, but for clarity have ``Answer with video'' as the only button on SM channels for video calls to be sure it's clear to the user what to expect src/empathy-event-manager.c | 38 +++++++++++++++++++++++++++++--------- 1 files changed, 29 insertions(+), 9 deletions(-) commit f7a474ccd13b1dd5da8c7000b9dd7e347ec5171e Author: Sjoerd Simons Date: Tue Mar 22 13:18:37 2011 +0000 Follow the sending state of the channel to determine whether we should send video src/empathy-call-window.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) commit f2716880b947f4c47a33f1f9347e0454d3b48d4e Author: Sjoerd Simons Date: Thu Mar 17 11:41:25 2011 +0000 When the remote side hangs up, clean up the call channel src/empathy-call-handler.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) commit 2ca45f96fa9f54295cd0416842192cf6e7be671d Author: Sjoerd Simons Date: Thu Mar 17 11:35:46 2011 +0000 Cope with unexpected call channel invalidation src/empathy-call-handler.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) commit cf83cc9c5a936c88e7e22033956001c4638b7d14 Author: Sjoerd Simons Date: Thu Mar 17 11:31:25 2011 +0000 Use modern private structure handling src/empathy-call-handler.c | 4 ++-- src/empathy-call-handler.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) commit b49fd754dd479be529fc12d2e82498ed02d31512 Author: Sjoerd Simons Date: Thu Mar 17 11:29:38 2011 +0000 Correct Call channel refcounting The Call channel will get unreffed by the destroy function that's given to empathy_tp_contact_factory_get_from_id. So don't unref it in the callback explicitely src/empathy-call-factory.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) commit 7992d97253ff1cecb4281191d0af459799ce9a21 Author: Emilio Pozuelo Monfort Date: Tue Mar 15 19:06:20 2011 +0000 Don't start the Call when the streams start Since that can happen before the call is accepted. Instead of that, wait for the Call state to be ACCEPTED. Conflicts: src/empathy-call-window.c src/empathy-call-handler.c | 9 +++++++++ src/empathy-call-window.c | 28 +++++++++++++++------------- 2 files changed, 24 insertions(+), 13 deletions(-) commit 6786331e5d8411c48e0b2700cb20c434add2845d Author: Sjoerd Simons Date: Mon Mar 14 18:43:57 2011 +0000 client file channel file should be Call.DRAFT data/Empathy.Call.client | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit dd332efd3b0abfa789a54a03f105bdf04e0c9b78 Author: Sjoerd Simons Date: Mon Mar 14 13:48:04 2011 +0000 Add depend on new GStreamer for gst_element_request_pad Conflicts: configure.ac configure.ac | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 7253d660e407204ad205feb331fe152f8fff7843 Author: Sjoerd Simons Date: Mon Mar 14 13:23:19 2011 +0000 Reject approval if call was hung up during approval If an incoming call gets ENDED during our approval stage either we or someone else closed it. In that case reject the approval (which will claim and close the channel). A future improvement could be to show a notification in case this happens src/empathy-event-manager.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) commit 11c8e825a7e2a11ae46b567ca3ddf709c0a0e6c8 Author: Sjoerd Simons Date: Mon Mar 14 12:14:32 2011 +0000 Only distroy the video output if it exists src/empathy-call-window.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit a1e3e5d9510ede8853fd74ff53ac3ecb7f1c141f Author: Sjoerd Simons Date: Mon Mar 14 12:14:13 2011 +0000 Monitor the call state and close the channel when it ends src/empathy-call-handler.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) commit 5716e75e552c3e6431e5fc37169a9fa293cc80e6 Author: Sjoerd Simons Date: Mon Mar 14 11:09:23 2011 +0000 Lock the hash table contents when using them src/empathy-audio-sink.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) commit 0679051ae7301209a9eab4bd4995535f119e3462 Author: Sjoerd Simons Date: Mon Mar 14 09:37:43 2011 +0000 Ensure our bin doesn't change state before being in the hash table src/empathy-audio-sink.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) commit c944633078a0769de5e50082e1d8b9e91565f940 Author: Sjoerd Simons Date: Fri Mar 11 19:02:43 2011 +0000 Remove live-adder src/empathy-call-window.c | 116 +++++----------------------------- src/empathy-streamed-media-window.c | 119 +++++------------------------------ 2 files changed, 30 insertions(+), 205 deletions(-) commit e9fb5d29ff44ae35411b02c3715ae9650b61dd25 Author: Sjoerd Simons Date: Fri Mar 11 19:01:17 2011 +0000 Implement request pads for multiple sinks Instead of using an live-adder we're moving to using multiple pulseaudio sinks as pulse can do the right thing (tm). To make this easy for the call window have one bin that handles all the juggling of audiosinks and audio conversion src/empathy-audio-sink.c | 274 ++++++++++++++++++++++++++++++++++++++-------- src/empathy-audio-sink.h | 2 + 2 files changed, 230 insertions(+), 46 deletions(-) commit 8cbd6a5c6addfd360bdd274ac60e3c035b2ebc9b Author: Sjoerd Simons Date: Thu Feb 24 15:25:54 2011 +0000 Keep a ref to our handler instance src/empathy-event-manager.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit b99045fc699ced3076e6a16a8b8bbf015aaa5e23 Author: Sjoerd Simons Date: Wed Feb 23 19:05:56 2011 +0000 More consistent naming of the call handler option configure.ac | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) commit fb14bb8eda81211a5122cff01ca2394cdd46bd2d Author: Sjoerd Simons Date: Wed Feb 23 18:30:14 2011 +0000 make the dots consistent configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit b51267374d508af1f8554476af0c771f330ff813 Author: Sjoerd Simons Date: Wed Feb 23 18:29:30 2011 +0000 auto-detect the presence of farsight configure.ac | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) commit 83cd1c694ff13c9a72a7b45ca5c6eb7e085de4f7 Author: Sjoerd Simons Date: Wed Feb 23 16:50:20 2011 +0000 No need to borrow the connection, it gets passed to us src/empathy-event-manager.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 1c1d3aeebb5a8df81af66cf89df5183edd941fa1 Author: Sjoerd Simons Date: Wed Feb 23 16:50:06 2011 +0000 Trivial coding style fix (>80 chars) src/empathy-event-manager.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 69f9dbdb487ac77e506aca37706141fbcccffccf Author: Sjoerd Simons Date: Wed Feb 23 16:49:26 2011 +0000 Retrieve the contact for incoming calls so we can display it src/empathy-event-manager.c | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) commit 0d3fa03b5a9b8d2d9737c8f39aada70669fde194 Author: Sjoerd Simons Date: Wed Feb 23 16:45:16 2011 +0000 Stop ringing after approving a Channel.Type.Call channel src/empathy-event-manager.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 2f449f6afa43994b4431b07c3ed582b6408a0533 Author: Sjoerd Simons Date: Wed Feb 23 16:44:55 2011 +0000 event-manager Remove HAVE_CALL ifdefs, even if we didn't build the handler we can still approve src/empathy-event-manager.c | 16 +--------------- 1 files changed, 1 insertions(+), 15 deletions(-) commit edce6cf46f60c02c178e386a0f27a05e4309814d Author: Sjoerd Simons Date: Wed Feb 23 16:44:05 2011 +0000 Close call channels after hanging up src/empathy-event-manager.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 808cacc3f55f380743c459648ee8ebe3d4835e36 Author: Sjoerd Simons Date: Wed Feb 23 14:26:15 2011 +0000 Explicitely use the libtelepathy-yell .la file for dependency tracking Conflicts: libempathy/Makefile.am libempathy/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 550aad6f3bbc7840adacd721a573b7f0d976485f Author: Sjoerd Simons Date: Wed Feb 23 11:20:34 2011 +0000 Remove stray debug src/empathy-call-handler.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) commit c850d9b17d93c4e964c95bbaa526008f2431f912 Author: Sjoerd Simons Date: Wed Feb 23 11:39:35 2011 +0000 Only change the UI in the main thread src/empathy-call-window.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) commit 612006042bfb3455072203b6afc3f1c6aa1462a0 Author: Sjoerd Simons Date: Wed Feb 23 11:38:54 2011 +0000 Use target-contact instead of members src/empathy-call-window.c | 74 +++++++++++---------------------------------- 1 files changed, 18 insertions(+), 56 deletions(-) commit 5ba6968d314c8830ab7fb8b0be07b3fa6dc23d06 Author: Sjoerd Simons Date: Wed Feb 23 11:28:23 2011 +0000 Move to using ->priv pointer in the object instance src/empathy-call-window.c | 12 +++++------- src/empathy-call-window.h | 2 ++ 2 files changed, 7 insertions(+), 7 deletions(-) commit 5d709fede1e2cc6e5d3d54d30a5f3aed0752994a Author: Sjoerd Simons Date: Wed Feb 23 11:14:32 2011 +0000 coding style trivia src/empathy-call-factory.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) commit 2d6c887b9369e2db3c3bff166ee6c2c8a595faa4 Author: Sjoerd Simons Date: Wed Feb 23 11:14:06 2011 +0000 Add TargetContact property that's guaranteed to exist on CallHandler Conflicts: src/empathy-call-factory.c src/empathy-call-factory.c | 34 ++++++++++++++++++++++++++++------ src/empathy-call-handler.c | 22 +++++++++++++++++++++- src/empathy-call-handler.h | 3 ++- 3 files changed, 51 insertions(+), 8 deletions(-) commit a6b59ff12bf5563ad4db0427c0c9e41bd8842c25 Author: Sjoerd Simons Date: Wed Feb 23 11:12:07 2011 +0000 Recognize Call channel capabilities libempathy/empathy-contact.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) commit 15bc6e462986ae39f8a2880b60274be9b8d45114 Author: Sjoerd Simons Date: Wed Feb 23 10:42:23 2011 +0000 Don't use wildcards for just one marshal file When a build is triggered from a location that isn't the top build dir, the generated files break as the wrong prefix gets passed for some reason. Given we only create one -marshal file, being smart doesn't actually save us anything, so do things the simple way libempathy/Makefile.am | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit d871bf3cfa46354371d6f99d1a5f182761313d71 Author: Emilio Pozuelo Monfort Date: Fri Mar 11 14:42:14 2011 +0000 Add a .client and a .service file for empathy-call https://bugzilla.gnome.org/show_bug.cgi?id=644500 data/Empathy.Call.client | 21 ++++++++++++++++++++ data/Makefile.am | 9 ++++++- ...esktop.Telepathy.Client.Empathy.Call.service.in | 3 ++ 3 files changed, 31 insertions(+), 2 deletions(-) commit 9be16f5be776b52b54f6fc9b4f8bccb167177162 Author: Emilio Pozuelo Monfort Date: Thu Mar 10 15:12:15 2011 +0000 Check for TP_ERROR_EMERGENCY_CALLS_NOT_SUPPORTED when a call fails libempathy-gtk/empathy-call-utils.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 2906ba60cc084087fae19ee7060a661686f11ab6 Author: Emilio Pozuelo Monfort Date: Thu Feb 24 16:22:15 2011 +0000 Add missing files to POTFILES.in Conflicts: po/POTFILES.in po/POTFILES.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit a826ef6e4581c57834e1286b48afdc87ec8244c2 Author: Emilio Pozuelo Monfort Date: Mon Feb 28 12:29:40 2011 +0000 Return meaningful errors when starting a call fails libempathy-gtk/empathy-call-utils.c | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) commit 1cacc0945f81e0513013b83ca7488589dd6c61f7 Author: Emilio Pozuelo Monfort Date: Wed Feb 23 16:24:53 2011 +0000 empathy_call_new_with_streams: prefer StreamedMedia over Call Conflicts: libempathy-gtk/empathy-call-utils.c libempathy-gtk/empathy-call-utils.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) commit 36581b216476e337425ca8737aa7059062a81d99 Author: Emilio Pozuelo Monfort Date: Wed Feb 23 16:19:48 2011 +0000 Always build telepathy-yell and handle Call channels Just keep empathy-call optional. Conflicts: libempathy-gtk/empathy-call-utils.c libempathy/empathy-channel-factory.c configure.ac | 4 ++-- libempathy-gtk/empathy-call-utils.c | 27 +-------------------------- libempathy-gtk/empathy-new-call-dialog.c | 7 +------ libempathy/empathy-channel-factory.c | 6 +----- src/empathy.c | 4 +--- 5 files changed, 6 insertions(+), 42 deletions(-) commit a5e92745d265b5623c045b6cc90164af89b25ded Author: Emilio Pozuelo Monfort Date: Tue Feb 22 18:15:07 2011 +0000 Show an error dialog if starting a call fails libempathy-gtk/empathy-call-utils.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) commit 5e797f1df68283302038c9723604c87f476a0656 Author: Emilio Pozuelo Monfort Date: Tue Feb 22 18:14:07 2011 +0000 Don't require EmpathyContacts to start a call Conflicts: libempathy-gtk/empathy-contact-menu.c libempathy-gtk/empathy-individual-menu.c libempathy-gtk/empathy-new-call-dialog.c libempathy-gtk/empathy-call-utils.c | 18 +++++------- libempathy-gtk/empathy-call-utils.h | 11 +++----- libempathy-gtk/empathy-contact-menu.c | 8 ++++- libempathy-gtk/empathy-individual-menu.c | 8 ++++- libempathy-gtk/empathy-new-call-dialog.c | 43 +---------------------------- src/empathy-call-factory.c | 3 +- src/empathy-streamed-media-handler.c | 3 +- 7 files changed, 30 insertions(+), 64 deletions(-) commit 0754b2673f0189e892074189535d3dfb6fd2a662 Author: Emilio Pozuelo Monfort Date: Tue Feb 22 17:15:11 2011 +0000 Move empathy_call_* util functions to libempathy-gtk Since we want to pop up a dialog when starting a call fails. Conflicts: libempathy/empathy-utils.c libempathy-gtk/Makefile.am | 2 + libempathy-gtk/empathy-call-utils.c | 174 ++++++++++++++++++++++++++++++ libempathy-gtk/empathy-call-utils.h | 46 ++++++++ libempathy-gtk/empathy-contact-menu.c | 1 + libempathy-gtk/empathy-individual-menu.c | 1 + libempathy-gtk/empathy-new-call-dialog.c | 1 + libempathy/empathy-utils.c | 133 ----------------------- libempathy/empathy-utils.h | 12 -- src/empathy-call-factory.c | 2 + src/empathy-streamed-media-handler.c | 2 + 10 files changed, 229 insertions(+), 145 deletions(-) commit f72a2717725a4865ebd313f7a496bd0e4f99baca Author: Emilio Pozuelo Monfort Date: Tue Feb 22 11:24:26 2011 +0000 Initialize GObject Conflicts: src/empathy.c src/empathy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 7a9b33315229b4747a1b55741ca0493458181a22 Author: Emilio Pozuelo Monfort Date: Mon Feb 21 14:32:22 2011 +0000 Temporarily disable some code src/empathy-call-handler.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) commit e71003c3547c3ecf62813c7716953d745628f8f7 Author: Emilio Pozuelo Monfort Date: Mon Feb 21 14:31:50 2011 +0000 Call: check for priv->members to enable the video button src/empathy-call-window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 3c218b8490700d973fb049037e37c3a3e58c11f7 Author: Emilio Pozuelo Monfort Date: Fri Feb 18 17:05:33 2011 +0000 Use the new empathy_call_create_call_request thoroughly src/empathy-call-factory.c | 20 +------------------- src/empathy-call-factory.h | 5 ----- src/empathy-call-handler.c | 2 +- 3 files changed, 2 insertions(+), 25 deletions(-) commit 3c325292c4321da02ee0bc44a047202905767cc2 Author: Emilio Pozuelo Monfort Date: Mon Feb 21 15:27:33 2011 +0000 Don't use tpy_call_channel_is_receiving_video Rely on src-pad-added to show the remote user's video. src/empathy-call-window.c | 36 ++---------------------------------- 1 files changed, 2 insertions(+), 34 deletions(-) commit 6f62cdace76e62b3ec32c3a83b99db1ef6636dfd Author: Emilio Pozuelo Monfort Date: Mon Feb 21 15:41:16 2011 +0000 Don't use tpy_call_channel_is_sending_video Check if we have initial video instead. src/empathy-call-window.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 9f5331305a835383471406db7e66e0d9c1b97db3 Author: Emilio Pozuelo Monfort Date: Wed Jun 8 16:02:33 2011 +0100 Use EMPATHY_CALL_BUS_NAME_SUFFIX instead of the literal src/empathy-call-factory.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 88c7ff0d33171e9ee7ece04c001f8e5c5fd4a3b9 Author: Emilio Pozuelo Monfort Date: Fri Feb 18 17:00:32 2011 +0000 empathy_call_new_with_streams: start Calls when we support them Conflicts: libempathy/empathy-utils.c libempathy/empathy-utils.c | 90 ++++++++++++++++++++++++++++++++++++++++---- libempathy/empathy-utils.h | 17 +++++--- 2 files changed, 92 insertions(+), 15 deletions(-) commit 8ea5a5768163c694085f9f39f55c1a4895e84798 Author: Emilio Pozuelo Monfort Date: Wed Jun 8 16:01:45 2011 +0100 Define EMPATHY_CALL_BUS_NAME{,_SUFFIX} libempathy/empathy-request-util.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 981a1377f660a9d1e3660dc66613b993b78486fc Author: Jorge González Date: Wed Jun 8 23:07:00 2011 +0200 Updated Spanish translation po/es.po | 640 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 327 insertions(+), 313 deletions(-) commit 58942506c55e5fba09a6e85e9e581b80cb62ac27 Author: Emilio Pozuelo Monfort Date: Fri Feb 18 16:45:21 2011 +0000 Initialize telepathy-yell Conflicts: src/empathy.c src/empathy.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commit 21a8c4b59d8d69c8b2a1ff801e15766ecf5e74cf Author: Emilio Pozuelo Monfort Date: Tue Feb 22 10:22:53 2011 +0000 Show notifications for Calls Conflicts: src/empathy-status-icon.c src/empathy-notifications-approver.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit de4007568e730d95899f235ff06fd1590b1a3dc9 Author: Emilio Pozuelo Monfort Date: Fri Feb 18 16:16:33 2011 +0000 Build an empathy-call binary when we have Call support Conflicts: src/Makefile.am Makefile.am | 2 +- configure.ac | 6 ++++++ src/Makefile.am | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletions(-) commit 0282fd24b52bf8fbb29fb4249079d25e77fb6211 Author: Emilio Pozuelo Monfort Date: Fri Feb 18 16:42:08 2011 +0000 EmpathyEventManager: handle Call channels Conflicts: src/empathy-event-manager.c src/empathy-event-manager.c | 90 +++++++++++++++++++++++++++++++++++++++++-- src/empathy-event-manager.h | 1 + 2 files changed, 87 insertions(+), 4 deletions(-) commit b0578383999a3b0726a7c8cc306aaac6d67b2384 Author: Emilio Pozuelo Monfort Date: Fri Feb 18 16:31:35 2011 +0000 Teach EmpathyChannelFactory how to create Call channels Conflicts: libempathy/empathy-channel-factory.c libempathy/Makefile.am | 2 ++ libempathy/empathy-channel-factory.c | 13 +++++++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) commit ee49de4c751017cb80ea6008560b61b0ee389d76 Author: Emilio Pozuelo Monfort Date: Fri Feb 18 16:26:28 2011 +0000 NewCallDialog: support Calls Conflicts: libempathy-gtk/Makefile.am libempathy-gtk/empathy-new-call-dialog.c libempathy-gtk/Makefile.am | 2 + libempathy-gtk/empathy-new-call-dialog.c | 77 ++++++++++++++++-------------- 2 files changed, 43 insertions(+), 36 deletions(-) commit 00144b08212c401230a79de080316fcbdb5d7a59 Author: Emilio Pozuelo Monfort Date: Fri Feb 18 17:06:56 2011 +0000 Add empathy-call src/empathy-call.c | 195 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 195 insertions(+), 0 deletions(-) commit 9439162db162aff1261c495ef9f6b5847f392f47 Author: Emilio Pozuelo Monfort Date: Fri Feb 18 15:51:12 2011 +0000 Add an EmpathyCallWindowFullscreen class src/empathy-call-window-fullscreen.c | 309 ++++++++++++++++++++++++++++++++++ src/empathy-call-window-fullscreen.h | 77 +++++++++ 2 files changed, 386 insertions(+), 0 deletions(-) commit 94f2c176f6b3ac1b995f9c99c1f5d671c47761b3 Author: Emilio Pozuelo Monfort Date: Fri Feb 18 15:50:55 2011 +0000 Add an EmpathyCallWindow class src/empathy-call-window.c | 3310 +++++++++++++++++++++++++++++++++++++++++++++ src/empathy-call-window.h | 65 + 2 files changed, 3375 insertions(+), 0 deletions(-) commit 5b611a78eac57c9fca84d584d105f07554769965 Author: Emilio Pozuelo Monfort Date: Fri Feb 18 15:50:20 2011 +0000 Add an EmpathyCallHandler class src/empathy-call-handler.c | 1012 ++++++++++++++++++++++++++++++++++++++++++++ src/empathy-call-handler.h | 107 +++++ 2 files changed, 1119 insertions(+), 0 deletions(-) commit d712e4de0df9d94833b516aa1f40a86fc50bd2a5 Author: Emilio Pozuelo Monfort Date: Fri Feb 18 15:49:57 2011 +0000 Add an EmpathyCallFactory class src/empathy-call-factory.c | 331 ++++++++++++++++++++++++++++++++++++++++++++ src/empathy-call-factory.h | 80 +++++++++++ 2 files changed, 411 insertions(+), 0 deletions(-) commit 3784ae7edc461ba02536a69d367a2bb9c689b70b Author: Emilio Pozuelo Monfort Date: Fri Feb 18 15:49:24 2011 +0000 Check for telepathy-yell if requested autogen.sh | 14 +++++++++++++- configure.ac | 17 +++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletions(-) commit 24b58d60a04564fc839cc32a7c01d9fbb878e045 Author: Emilio Pozuelo Monfort Date: Fri Feb 18 14:51:47 2011 +0000 Add telepathy-yell as a submodule .gitmodules | 3 +++ telepathy-yell | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) commit cf5498106385fede11e732c6b9e23464c0f59a3b Author: Emilio Pozuelo Monfort Date: Thu Feb 17 12:06:50 2011 +0000 Add ax_config_dir from audacity m4/ax_config_dir.m4 | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 109 insertions(+), 0 deletions(-) commit e5773f0b667fabbf0597ab2c3600164fc018c727 Author: Danielle Madeley Date: Wed Jun 8 12:54:41 2011 +1000 Check we actually have a part #1 before requesting it We were checking echo->len >= 1, but then requesting index 1 (the second part). So if we didn't have a second part, this would quite happily blow up. libempathy/empathy-tp-chat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit f63939a4648a0ebd64a2ff1468a72036adadb581 Merge: a5656bd eaf1ecc Author: Guillaume Desmottes Date: Wed Jun 8 11:43:59 2011 +0200 Merge branch 'sms-651242' commit a5656bd2eb7a3ff272726e898a0a81462eb438fa Author: Guillaume Desmottes Date: Thu May 5 15:07:27 2011 +0200 use geocode-glib instead of geoclue libempathy/empathy-contact.c | 146 ++++++++---------------------------------- 1 files changed, 28 insertions(+), 118 deletions(-) commit 76d23bc01b65271a4067a13a9f51037004019d42 Author: Guillaume Desmottes Date: Thu May 5 15:06:05 2011 +0200 add an optional dep on geocode-glib configure.ac | 30 ++++++++++++++++++++++++++++++ libempathy-gtk/Makefile.am | 2 ++ libempathy/Makefile.am | 2 ++ 3 files changed, 34 insertions(+), 0 deletions(-) commit b98c0e0b2a91f7deec643288082c12d61982f575 Author: Guillaume Desmottes Date: Tue Jun 7 14:58:12 2011 +0200 individual-view: always display individuals having pending events (#651913) libempathy-gtk/empathy-individual-view.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) commit 49f661f321635b6b0350dbf27aec3548fbff8ee2 Author: Guillaume Desmottes Date: Tue Jun 7 14:53:45 2011 +0200 individual-store: keep track of the number of events associated with each row libempathy-gtk/empathy-individual-store.c | 1 + libempathy-gtk/empathy-individual-store.h | 1 + src/empathy-main-window.c | 84 +++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+), 0 deletions(-) commit 92ee08109f1af2bd3862b6f1c21a7a52adb0f9a4 Author: Yaron Shahrabani Date: Wed Jun 8 09:56:09 2011 +0300 Updated Hebrew translation. po/he.po | 426 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 218 insertions(+), 208 deletions(-) commit 5649964cadfa3dedd5f5c2a355edf8aaea4c9a10 Author: Kristjan SCHMIDT Date: Tue Jun 7 23:10:47 2011 +0200 Updated Esperanto translation po/eo.po | 952 +++++++++++++++++++++++++++++++++----------------------------- 1 files changed, 510 insertions(+), 442 deletions(-) commit b708db960de0882d0e0db9610f5b5ad490581a65 Author: Xavier Claessens Date: Tue May 3 11:27:21 2011 +0200 Adium: Let user select theme variant in preferences Fixes bug #585474 data/org.gnome.Empathy.gschema.xml.in | 5 + libempathy-gtk/empathy-theme-adium.c | 134 +++++++++++----- libempathy-gtk/empathy-theme-adium.h | 5 +- libempathy-gtk/empathy-theme-manager.c | 284 +++++++++++++++++++------------- libempathy/empathy-gsettings.h | 1 + src/empathy-preferences.c | 175 +++++++++++++++++++- src/empathy-preferences.ui | 63 ++++---- 7 files changed, 482 insertions(+), 185 deletions(-) commit f2ee2965a27340b7701c36230eb8ef0e7ecc6e8f Author: Guillaume Desmottes Date: Tue Jun 7 15:13:54 2011 +0200 main_window_flash_foreach: fix FolksIndividual leak src/empathy-main-window.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) commit 5ad816894a9a08c52298a84a183f6d853654f913 Author: Guillaume Desmottes Date: Tue Jun 7 15:12:20 2011 +0200 coding style tweak src/empathy-main-window.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commit 35800bfe0a29ff002cb8ee3c49a771e90e0d4f10 Author: Kjartan Maraas Date: Tue Jun 7 12:44:18 2011 +0200 Updated Norwegian bokmål translation po/nb.po | 993 ++++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 552 insertions(+), 441 deletions(-) commit a662a6d379b9f619647a87a07177cc63d7133ad1 Author: Guillaume Desmottes Date: Tue Jun 7 11:39:38 2011 +0200 account-widget: use tp_g_signal_connect_object to connect on the password-retrieved signal (#652015) Thanks to Roland Dreier for the original patch. libempathy-gtk/empathy-account-widget.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 24bfa52b2a137a2bdafceba1fee199a06a9509ec Author: Travis Reitter Date: Thu May 12 14:37:03 2011 -0700 Require Folks 0.5.1 for the API updates. Closes: bgo#648822 - Port Empathy to Folks 0.5.1 configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 018ba00ead80bed3238273a772ec1fd1c55cf58e Author: Travis Reitter Date: Tue May 10 16:41:04 2011 -0700 Only retrieve server-stored groups for Individuals with TpContacts. Helps: bgo#648822 - Port Empathy to Folks 0.5.1 libempathy-gtk/empathy-individual-store.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) commit a6f6a3b008a9da3e437488b480fdbb2b5d07e9fd Author: Travis Reitter Date: Thu May 5 11:05:04 2011 -0700 Adapt to API change in FolksIndividual::personas-changed. Helps: bgo#648822 - Port Empathy to Folks 0.5.1 libempathy-gtk/empathy-individual-widget.c | 41 ++++++++++++++++++++++----- libempathy-gtk/empathy-persona-store.c | 26 +++++++++++++----- 2 files changed, 52 insertions(+), 15 deletions(-) commit a922c5d3011ce0be0d57f26835d20758cf4c320e Author: Travis Reitter Date: Wed May 4 14:22:36 2011 -0700 Adapt to API change in FolksIndividualAggregator::individuals-changed. Helps: bgo#648822 - Port Empathy to Folks 0.5.1 libempathy/empathy-individual-manager.c | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) commit 0e80ea37d08505e886ef61b03fbb606a8ea3ac36 Author: Travis Reitter Date: Mon May 2 13:17:23 2011 -0700 Adapt to API change in folks_group_details_get_groups(). Helps: bgo#648822 - Port Empathy to Folks 0.5.1 libempathy-gtk/empathy-groups-widget.c | 7 ++++--- libempathy-gtk/empathy-individual-store.c | 21 ++++++++++++++------- 2 files changed, 18 insertions(+), 10 deletions(-) commit a8833fd63b3bc3856cbd885158cba6b8fca1225a Author: Travis Reitter Date: Mon May 2 12:58:04 2011 -0700 Change the type of EmpathyContact.priv.groups to GeeHashSet. This is to adjust to the newer API for folks_group_details_set_groups(). It's also slightly cleaner than using a hash table to implement a set. Helps: bgo#648822 - Port Empathy to Folks 0.5.1 libempathy/empathy-contact.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) commit d4989c9be7b3c6fa016d703e2a32774d5f74f836 Author: Travis Reitter Date: Fri Apr 29 13:57:05 2011 -0700 Adapt to API change in folks_backend_get_persona_stores(). Helps: bgo#648822 - Port Empathy to Folks 0.5.1 libempathy/empathy-individual-manager.c | 6 ++++-- libempathy/empathy-utils.c | 15 +++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) commit 202af99a8fe154b9d03c2d569287fa01f70c0bc6 Author: Travis Reitter Date: Wed Jun 1 10:54:40 2011 -0700 Adapt to API change in FolksIndividual constructor. Helps: bgo#648822 - Port Empathy to Folks 0.5.1 src/empathy-invite-participant-dialog.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) commit 736b4f3d04f1e826dd8252fed88a7445b52ad461 Author: Travis Reitter Date: Fri Apr 29 13:33:04 2011 -0700 Adapt to API break in folks_individual_get_personas. Helps: bgo#648822 - Port Empathy to Folks 0.5.1 libempathy-gtk/empathy-individual-dialogs.c | 15 +- .../empathy-individual-information-dialog.c | 13 +- libempathy-gtk/empathy-individual-linker.c | 70 +++++--- libempathy-gtk/empathy-individual-linker.h | 2 +- libempathy-gtk/empathy-individual-menu.c | 93 ++++++---- libempathy-gtk/empathy-individual-store.c | 121 ++++++++----- libempathy-gtk/empathy-individual-view.c | 70 +++++--- libempathy-gtk/empathy-individual-widget.c | 193 +++++++++++++------- libempathy-gtk/empathy-linking-dialog.c | 14 +- libempathy-gtk/empathy-persona-store.c | 27 ++- libempathy-gtk/empathy-ui-utils.c | 57 ++++--- libempathy/empathy-contact.c | 44 +++-- libempathy/empathy-individual-manager.c | 82 +++++---- libempathy/empathy-individual-manager.h | 2 +- libempathy/empathy-utils.c | 61 +++++-- libempathy/empathy-utils.h | 2 +- src/empathy-invite-participant-dialog.c | 43 +++-- 17 files changed, 575 insertions(+), 334 deletions(-) commit faa40483fd000099a0593c09d0e92b938beaaaa7 Author: Travis Reitter Date: Mon May 2 17:21:04 2011 -0700 Don't conflate TpfPersona and FolksPersona. libempathy-gtk/empathy-individual-store.c | 4 ++-- libempathy-gtk/empathy-individual-widget.c | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) commit a17f14769b6867e240f1f79288ed1d33ec51760b Author: Travis Reitter Date: Mon May 2 17:05:19 2011 -0700 Don't shadow the global definition of 'log'. libempathy-gtk/empathy-chat.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit fcce5893bda44c7e9276b47ba1f9c20b84da8b9e Author: Fran Diéguez Date: Mon Jun 6 00:25:04 2011 +0200 Updated Galician translations po/gl.po | 494 ++++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 270 insertions(+), 224 deletions(-) commit f1aa5a7dba657947d61f916eefaf9cc166196716 Author: Yaron Shahrabani Date: Sat Jun 4 13:50:42 2011 +0300 Updated Hebrew translation. po/he.po | 473 ++++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 259 insertions(+), 214 deletions(-) commit a61ee6daccbde3780e8f46bb51afacb3c009f5a3 Author: Guillaume Desmottes Date: Tue May 31 17:38:42 2011 +0200 invite-participant-dialog: add temporary individuals when searching src/empathy-invite-participant-dialog.c | 141 +++++++++++++++++++++++++++++++ 1 files changed, 141 insertions(+), 0 deletions(-) commit 849aba37bdf0cb62449174c4015a0c09b91d2ad6 Author: Guillaume Desmottes Date: Tue May 31 17:38:13 2011 +0200 export individual_store_add_individual_and_connect and individual_store_remove_individual_and_disconnect libempathy-gtk/empathy-individual-store.c | 4 ++-- libempathy-gtk/empathy-individual-store.h | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) commit eaf1ecca8c31263cef90bfbb4839e7114719eed8 Author: Guillaume Desmottes Date: Fri May 27 15:13:34 2011 +0200 Use tp-glib SMS high level API (#651242) libempathy-gtk/empathy-chat.c | 5 ++- libempathy/empathy-tp-chat.c | 76 ----------------------------------------- libempathy/empathy-tp-chat.h | 2 - src/empathy-chat-manager.c | 2 +- 4 files changed, 4 insertions(+), 81 deletions(-) commit 7625bd2ae11f2c3064e3e208ea82fffa97dc7f18 Author: Guillaume Desmottes Date: Thu May 26 11:10:06 2011 +0200 empathy_avatar_new: stop stealing strings (#650939) It was pretty confusing when reading/reviewing code. libempathy-gtk/empathy-avatar-chooser.c | 24 ++++++++++++---------- libempathy/empathy-contact.c | 33 ++++++++++++++++-------------- libempathy/empathy-contact.h | 6 ++-- 3 files changed, 34 insertions(+), 29 deletions(-) commit ba731f3dceb447ffe8c4b9e168ad1c1a5f99f365 Author: Guillaume Desmottes Date: Thu May 26 10:48:30 2011 +0200 remove useless callback libempathy-gtk/empathy-avatar-chooser.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) commit 9087cb85bdd1483a7e3a1852aac0dca0454b5231 Author: Guillaume Desmottes Date: Thu May 26 10:44:08 2011 +0200 avatar-chooser: replace finalize by dispose It just unref objects. libempathy-gtk/empathy-avatar-chooser.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) commit 405df12b4627f6f6361e8be54f27bce928cd6e5e Author: Guillaume Desmottes Date: Thu May 26 10:36:04 2011 +0200 avatar-chooser: port to TP coding style We just changed most of this file so while we're on it... libempathy-gtk/empathy-avatar-chooser.c | 1693 ++++++++++++++++--------------- libempathy-gtk/empathy-avatar-chooser.h | 43 +- 2 files changed, 899 insertions(+), 837 deletions(-) commit 762682fd8f1850c03aa7afc0578b78fa4571d94a Author: Guillaume Desmottes Date: Thu May 26 10:18:23 2011 +0200 re-order functions so we can get rid of their declarations libempathy-gtk/empathy-avatar-chooser.c | 516 ++++++++++++++----------------- 1 files changed, 240 insertions(+), 276 deletions(-) commit f7986cc0f08137246c406d85235b3f5cd77f951d Author: Guillaume Desmottes Date: Thu May 26 10:07:28 2011 +0200 avatar-chooser: use tp_clear_* libempathy-gtk/empathy-avatar-chooser.c | 20 +++++--------------- 1 files changed, 5 insertions(+), 15 deletions(-) commit d538771d94d50dce4b6568a8f523014aa96d29f9 Author: Guillaume Desmottes Date: Thu May 26 10:01:01 2011 +0200 avatar-chooser: use the self->priv pattern libempathy-gtk/empathy-avatar-chooser.c | 233 ++++++++++++++----------------- libempathy-gtk/empathy-avatar-chooser.h | 3 +- 2 files changed, 110 insertions(+), 126 deletions(-) commit 1b3757bc5cc12a45509adf660fc6008ee1570ef8 Author: Guillaume Desmottes Date: Fri May 27 14:41:11 2011 +0200 Use tp-glib Balance high level API (#651238) src/empathy-main-window.c | 80 ++++++++++++++------------------------------ 1 files changed, 26 insertions(+), 54 deletions(-) commit db6773ebf31853608353b1bb156156879b303569 Author: Guillaume Desmottes Date: Wed Jun 1 11:06:28 2011 +0200 allow user to search for contacts using their full identifier libempathy-gtk/empathy-individual-view.c | 3 ++- libempathy-gtk/empathy-ui-utils.c | 13 ++++++++++++- libempathy-gtk/empathy-ui-utils.h | 3 ++- src/empathy-invite-participant-dialog.c | 15 +++++++++++---- 4 files changed, 27 insertions(+), 7 deletions(-) commit cc6c2b5423c3a1906b5f484c157bc67dd9ee9d86 Author: Guillaume Desmottes Date: Wed Jun 1 11:33:04 2011 +0200 empathy_individual_view_get_individual_menu: don't create a menu if we don't want any feature Fix an assertion error when right clicking in the 'Invite contact' treeview. libempathy-gtk/empathy-individual-view.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit 5d2b0e7740e6929451c630dc072f0ac199f173c3 Merge: ecfcc6c b0bd73c Author: Sjoerd Simons Date: Tue May 31 11:20:21 2011 -0700 Merge branch 'speedup-protocol-chooser' commit ecfcc6cb011230531ef4fe527f4ff045217f714a Author: Guillaume Desmottes Date: Tue May 31 15:36:30 2011 +0200 invite-participant-dialog: add an entry searching the contact list src/empathy-invite-participant-dialog.c | 40 ++++++++++++++++++++++++++++++- 1 files changed, 39 insertions(+), 1 deletions(-) commit 81c5f8b415c5835f200ea9d7d3d917481b6fd506 Author: Guillaume Desmottes Date: Tue May 31 15:34:36 2011 +0200 view_selection_changed_cb: don't unref NULL individual src/empathy-invite-participant-dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 5dc3feb4979804c710d4e872a1f05bc425fd9410 Author: Guillaume Desmottes Date: Tue May 31 15:24:28 2011 +0200 factor out empathy_individual_match_words() libempathy-gtk/empathy-individual-view.c | 34 +---------------------- libempathy-gtk/empathy-ui-utils.c | 42 ++++++++++++++++++++++++++++++ libempathy-gtk/empathy-ui-utils.h | 4 +++ libempathy/empathy-utils.c | 1 - 4 files changed, 48 insertions(+), 33 deletions(-) commit d4e5a5295ff83f664c80fe3af61db0692829ea1b Author: Guillaume Desmottes Date: Tue May 31 15:20:10 2011 +0200 live-search: export few more functions libempathy-gtk/empathy-live-search.c | 23 +++++++++++++++-------- libempathy-gtk/empathy-live-search.h | 7 +++++++ 2 files changed, 22 insertions(+), 8 deletions(-) commit 4a20b26434210820bdcc2d38b9c1f4b35eb36e71 Author: Guillaume Desmottes Date: Tue May 31 14:54:15 2011 +0200 add empathy_individual_view_refilter() libempathy-gtk/empathy-individual-view.c | 8 ++++++++ libempathy-gtk/empathy-individual-view.h | 2 ++ 2 files changed, 10 insertions(+), 0 deletions(-) commit 1c1be234740e2e23f755668ce89483f0225ec329 Author: Chandni Verma Date: Fri May 27 16:13:49 2011 +0530 Chatrooms: Make text input view sensitive on successful password entry Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=651058 libempathy-gtk/empathy-chat.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit de0dd5093afcb898eaad92d0f15f6a342deda980 Author: Guillaume Desmottes Date: Tue May 17 12:43:39 2011 +0200 use tp_channel_dispatch_operation_claim_async() (#650386) libempathy/empathy-auth-factory.c | 6 +++--- src/empathy-call-observer.c | 5 +++-- src/empathy-event-manager.c | 16 ++++++++++------ 3 files changed, 16 insertions(+), 11 deletions(-) commit 920122ee2e7be94a844d8f6736df2aab9f688a1d Author: Guillaume Desmottes Date: Tue May 17 12:41:54 2011 +0200 bump tp-glib dep to 0.15.1 tp_channel_dispatch_operation_claim_with_async() has been introduced in 0.15.0 but suffers a race (fdo #37280) fixed in 0.15.1. configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit b0bd73cfa5658971f12c86a1f3711cab663a3f40 Author: Sjoerd Simons Date: Sun May 29 09:02:32 2011 -0700 Use pixbuf for PixbufCellRenderer in protocol chooser If an icon-name is given to a PixbufCellRenderer it will re-load the image from the icon theme every time the size gets requested for a different cell. Which happens a *LOT*. Instead load the icon the row is added to the model, such that the cell renderer can simply request the size of the pixbuf. This massive speeds up the performance of the protocol chooser combobox. libempathy-gtk/empathy-account-chooser.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) commit c1189dd5d21d40fd7773f3c13d24d55f7e897713 Author: Carles Ferrando Date: Sun May 29 17:55:20 2011 +0200 [l10n]Updated Catalan (Valencian) translation po/ca@valencia.po | 2377 +++++++++++++++++++++++++++++++---------------------- 1 files changed, 1384 insertions(+), 993 deletions(-) commit 8a43221ed3a42fb8949b7568a29723197f204364 Author: Sjoerd Simons Date: Sun May 29 08:02:42 2011 -0700 Don't set priv when it's not used libempathy-gtk/empathy-chat.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) commit 05f66bda423f72350a5d766583946b48bf729757 Author: Daniel Mustieles Date: Thu May 26 20:04:21 2011 +0200 Updated Spanish translation po/es.po | 204 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 106 insertions(+), 98 deletions(-) commit 2f24b24251d1dce47dfd5fd34a6642ea2cd8a653 Author: Guillaume Desmottes Date: Thu May 26 18:43:18 2011 +0200 don't build avatar_chooser_set_avatar_from_pixbuf if building without cheese libempathy-gtk/empathy-avatar-chooser.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 67929359fee3036b7af9485854f009ce15b83f9d Author: Xavier Claessens Date: Sun May 22 10:41:16 2011 +0200 Adium: Convert NSDateFormatter to strftime libempathy-gtk/empathy-theme-adium.c | 155 ++++++++++++++++++++++++++++++++-- 1 files changed, 149 insertions(+), 6 deletions(-) commit e54915d63afa880d8fd3bb8764652efcb4a59165 Author: Xavier Claessens Date: Thu May 26 12:45:30 2011 +0200 Stop live search when main window gets hidden libempathy-gtk/empathy-live-search.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) commit 984e946f6bb2c385394db123f1b2edea05d9209b Author: Xavier Claessens Date: Thu May 26 12:00:58 2011 +0200 Stop dealing with iconification of main window, just hide/present it It does not work with gnome-shell, unity and indicators anyway, so it is just complex code for no benefit anymore. libempathy-gtk/empathy-ui-utils.c | 53 ------------------------------------- libempathy-gtk/empathy-ui-utils.h | 3 -- src/empathy-status-icon.c | 8 +++--- 3 files changed, 4 insertions(+), 60 deletions(-) commit ff175f03615bdbd8d05bf352b3e4b49d59b3ce25 Author: Xavier Claessens Date: Thu May 26 11:59:48 2011 +0200 Do not show the main window when creating it, it will be presented if not start hidden src/empathy.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 943d659bf3c2c966c5944faa4d05a576f9630906 Author: Xavier Claessens Date: Thu May 26 11:57:24 2011 +0200 Do not present chat window from empathy_chat_window_get_default() It is already handled in empathy_chat_window_present_chat() src/empathy-chat-window.c | 18 ------------------ 1 files changed, 0 insertions(+), 18 deletions(-) commit baeea6e11b647b788693ce6e16cccc18cd0b8402 Author: Raluca Elena Podiuc Date: Sun Apr 10 22:19:14 2011 +0200 libempathy-gtk: avatar chooser from cheese (#521747) pixbuf saved into buffer as png -> set avatar from buffer libempathy-gtk/empathy-avatar-chooser.c | 105 ++++++++++++++++++++++++++++-- 1 files changed, 98 insertions(+), 7 deletions(-) commit 87118ba7e4c1a07765ccb762b9ccd603b5facc7b Author: Raluca Elena Podiuc Date: Mon Apr 11 21:34:01 2011 +0200 libempathy-gtk: add dependency on libcheese configure.ac | 20 ++++++++++++++++++++ libempathy-gtk/Makefile.am | 2 ++ 2 files changed, 22 insertions(+), 0 deletions(-) commit a6a4c117c17659134df600c9b96f8cceb07f44ef Author: Guillaume Desmottes Date: Thu May 26 09:05:15 2011 +0200 main_window_connection_changed_cb: still need the priv pointer src/empathy-main-window.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit cddd93283537e99037176b7c01c3ac36bfcb6bf0 Author: Danielle Madeley Date: Thu May 26 16:38:22 2011 +1000 Remove the balance action when an account is removed src/empathy-main-window.c | 86 +++++++++++++++++++++++++-------------------- 1 files changed, 48 insertions(+), 38 deletions(-) commit 465d2ffaf8c2cd31ae1efc7fdcc85b3d5cb0773c Author: Emilio Pozuelo Monfort Date: Wed May 25 12:50:16 2011 +0200 Reopen tabs as SMS channels when appropriate src/empathy-chat-manager.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit ed9505140adea2ad3ef0a8d25057197864ead712 Merge: 5195f67 0a42a79 Author: Guillaume Desmottes Date: Wed May 25 10:24:49 2011 +0200 Merge remote-tracking branch 'glassrose/make-favorite-room-names-more-detailed-646526' commit 5195f67f8a9fce3da49f875868e288df16df6a52 Author: Guillaume Desmottes Date: Thu May 19 14:15:21 2011 +0200 use tp_text_channel_set_chat_state_async() directly libempathy-gtk/empathy-chat.c | 37 +++++++++++++++++++++++++++++++------ libempathy/empathy-tp-chat.c | 19 ------------------- libempathy/empathy-tp-chat.h | 2 -- 3 files changed, 31 insertions(+), 27 deletions(-) commit 515c3eac45ed42be34feac88245a8a509825bf82 Author: Guillaume Desmottes Date: Thu May 19 13:39:17 2011 +0200 tp_chat_dispose: use tp_clear_object() libempathy/empathy-tp-chat.c | 16 ++-------------- 1 files changed, 2 insertions(+), 14 deletions(-) commit 826d5e5fe6079c3960688edb36d21b6bb7825ad3 Author: Guillaume Desmottes Date: Fri Apr 29 10:10:28 2011 +0200 clear_chatrooms: prevent destroying the list twice Unreffing the chatroom may result in destroying the underlying EmpathyTpChat which will fire the invalidated signal and so make us re-call this function. We already set priv->chatrooms to NULL so we won't try to destroy twice the same objects. libempathy/empathy-chatroom-manager.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) commit 5079e73c8edf3b460ed11edc02ffb2cb6b705eac Author: Guillaume Desmottes Date: Fri Apr 29 09:20:02 2011 +0200 EmpathyTpChat: get rid of the destroy signal We should just use invalidated. libempathy-gtk/empathy-chat.c | 15 +++++++----- libempathy/empathy-chatroom-manager.c | 11 +++++---- libempathy/empathy-tp-chat.c | 39 --------------------------------- 3 files changed, 15 insertions(+), 50 deletions(-) commit e74a36868d7abe9c8559567cd4e6d82ce24469af Author: Guillaume Desmottes Date: Tue Feb 15 10:23:21 2011 +0100 event-manager: look for existing messages when approving We may have already received some as the EmpathyTpChat is created earlier now. src/empathy-event-manager.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) commit a286f611ab9e53e4ddbfaa9ed915b1f39d76794a Author: Guillaume Desmottes Date: Mon Feb 14 15:53:07 2011 +0100 EmpathyTpChat: Use a READY property instead of our own ready code libempathy/empathy-channel-factory.c | 3 + libempathy/empathy-tp-chat.c | 345 +++++++++++++++++++--------------- libempathy/empathy-tp-chat.h | 4 +- src/empathy-chat-manager.c | 66 +------- 4 files changed, 205 insertions(+), 213 deletions(-) commit 1a076de82797676d80ce3273dfe075d06111a446 Author: Guillaume Desmottes Date: Fri Nov 12 16:48:42 2010 +0100 remove empathy_tp_chat_get_connection and priv->connection libempathy-gtk/empathy-chat.c | 5 +-- libempathy/empathy-tp-chat.c | 47 +++++++++++++++---------------- libempathy/empathy-tp-chat.h | 1 - src/empathy-chat-window.c | 2 +- src/empathy-invite-participant-dialog.c | 2 +- 5 files changed, 27 insertions(+), 30 deletions(-) commit 0dd8e6cbd7b903d2ce8b56995e4b4ac6ed042f2c Author: Guillaume Desmottes Date: Fri Feb 11 14:53:50 2011 +0100 EmpathyTpChat: inherit from TpTextChannel (#650554) libempathy-gtk/empathy-chat.c | 20 +-- libempathy-gtk/empathy-contact-list-store.c | 9 +-- libempathy/empathy-channel-factory.c | 27 ++++- libempathy/empathy-chatroom-manager.c | 9 +- libempathy/empathy-tp-chat.c | 175 +++++++++++---------------- libempathy/empathy-tp-chat.h | 11 +- src/empathy-chat-manager.c | 15 +-- src/empathy-event-manager.c | 5 +- src/empathy-invite-participant-dialog.c | 5 +- 9 files changed, 125 insertions(+), 151 deletions(-) commit 4e39c2c5adac55793143c110159fa40cc51f324c Author: Guillaume Desmottes Date: Wed Apr 27 16:17:37 2011 +0200 tp-chat: use the self->priv pattern libempathy/empathy-tp-chat.c | 701 +++++++++++++++++++----------------------- libempathy/empathy-tp-chat.h | 3 +- 2 files changed, 317 insertions(+), 387 deletions(-) commit 64d8e268e6be5afc2afd80ff93d9803318dc5953 Author: Guillaume Desmottes Date: Fri Feb 11 14:29:02 2011 +0100 Use the EmpathyChannelFactory with all components creating EmpathyTpChat libempathy/empathy-chatroom-manager.c | 8 ++++++++ src/empathy-chat-manager.c | 9 +++++++++ src/empathy-event-manager.c | 8 ++++++++ 3 files changed, 25 insertions(+), 0 deletions(-) commit 21bde4f1a8c82330ccb49eb6bdc00a14de7595aa Author: Guillaume Desmottes Date: Thu Apr 28 14:15:23 2011 +0200 rename message-received signal to message-received-empathy libempathy-gtk/empathy-chat.c | 2 +- libempathy/empathy-tp-chat.c | 2 +- src/empathy-event-manager.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit 935c16f4738604f3738d02b9be7a25cd2b49988a Author: Guillaume Desmottes Date: Fri Nov 12 15:18:06 2010 +0100 tp-chat: rename chat-state-changed to chat-state-changed-empathy chat-state-changed already exists in TpChannel and we can't redefine it. libempathy-gtk/empathy-chat.c | 2 +- libempathy/empathy-tp-chat.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 1a8f17fcac3c6f9bae7c358ab5222c2dabdb31d3 Author: Daniel Mustieles Date: Mon May 23 21:30:03 2011 +0200 Updated Spanish translation po/es.po | 255 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 127 insertions(+), 128 deletions(-) commit d0e556d4cea9f4a12825eada17ab22648ee3fa9c Author: Cosimo Cecchi Date: Thu May 19 10:11:44 2011 -0400 cell-renderer-expander: fix rendering with GTK+3 There are basically three issues here: - the renderer doesn't add the GTK_STYLE_CLASS_EXPANDER style class when rendering, which blocks the theme to apply the intended colors. - the GtkStateFlags that were set on the context were using GTK_STATE_* instead of GTK_STATE_FLAG_* - the flags set on the context were incomplete, as they were just using ACTIVE/NORMAL for expanded/collapsed and not SELECTED/FOCUSED/... https://bugzilla.gnome.org/show_bug.cgi?id=650590 libempathy-gtk/empathy-cell-renderer-expander.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) commit 380911d4b3da972b98e97eeb9935227657b01962 Author: Guillaume Desmottes Date: Mon May 23 14:02:46 2011 +0200 account-widget-yahoo: fix expand/fill settings (#650854) libempathy-gtk/empathy-account-widget-yahoo.ui | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) commit 5b139ea4db4fbae7876b36eeec28ab874569f867 Author: Guillaume Desmottes Date: Mon May 23 14:02:38 2011 +0200 account-widget-sip: fix expand/fill settings (#650854) libempathy-gtk/empathy-account-widget-sip.ui | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commit f3385db2a89b1c14fb43527f99bcac69d34f4a76 Author: Guillaume Desmottes Date: Mon May 23 14:02:29 2011 +0200 account-widget-icq: fix expand/fill settings (#650854) libempathy-gtk/empathy-account-widget-icq.ui | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit 7c7a46d5a421506a61168787e042c57605a5874d Author: Guillaume Desmottes Date: Mon May 23 14:02:11 2011 +0200 account-widget-groupwise: fix expand/fill settings (#650854) libempathy-gtk/empathy-account-widget-groupwise.ui | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commit 460656fc0249390aa280400290efa5bc897d7d98 Author: Guillaume Desmottes Date: Mon May 23 14:01:55 2011 +0200 account-widget-aim: fix expand/fill settings (#650854) libempathy-gtk/empathy-account-widget-aim.ui | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit a5b5353000f407b35b928df6fbef288f5337f547 Author: Guillaume Desmottes Date: Mon May 23 13:38:46 2011 +0200 account-widget-msn: fix expand/fill settings (#650854) libempathy-gtk/empathy-account-widget-msn.ui | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) commit 043fadc328839eb7c4bd893de81b6409509b54b2 Author: Guillaume Desmottes Date: Mon May 23 12:21:13 2011 +0200 empathy_account_widget_setup_widget: unsensitive unsupported param (#650846) libempathy-gtk/empathy-account-widget.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit c4dfdc69a46f64dfc2ca12aea673f98605a3c39d Author: Guillaume Desmottes Date: Mon May 23 12:20:47 2011 +0200 add empathy_account_settings_param_is_supported() libempathy/empathy-account-settings.c | 9 +++++++++ libempathy/empathy-account-settings.h | 4 ++++ 2 files changed, 13 insertions(+), 0 deletions(-) commit 6c9d7372fb7e155be2ca6953db316c1b70744159 Author: Guillaume Desmottes Date: Mon May 23 11:44:43 2011 +0200 account-widget-sip: add ignore-tls-errors param (#650844) libempathy-gtk/empathy-account-widget-sip.c | 1 + libempathy-gtk/empathy-account-widget-sip.ui | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) commit d94c2c708734d6a41cd6d6ad44684a816b66cff8 Author: Guillaume Desmottes Date: Fri May 20 16:02:44 2011 +0200 live-search: fix keyboard navigation using Space (#632787) libempathy-gtk/empathy-live-search.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) commit 50cc20d66183eb0e4a8fd1384dea77fdf3e29cf0 Author: Guillaume Desmottes Date: Fri May 20 15:38:03 2011 +0200 live-search:fix keyboard navigation using PageUp/PageDown (#632787) libempathy-gtk/empathy-live-search.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) commit c105d23a6dc033e281304a0032095f13e7fef63f Author: Guillaume Desmottes Date: Fri May 20 15:32:33 2011 +0200 live-search: fix keyboard navigation using Home/End (#632787) libempathy-gtk/empathy-live-search.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) commit 584931b9c50f9390ba19d8609ac9917b570d6562 Author: Guillaume Desmottes Date: Fri May 20 15:26:50 2011 +0200 factor out fire_key_navigation_sig() libempathy-gtk/empathy-live-search.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) commit 12c7f7de95068377ff60b23bdc5d80367d554c2b Author: Xavier Claessens Date: Fri May 20 15:18:10 2011 +0200 Always forward to the view keynav events, since we get them only if they are useless to the entry anyway libempathy-gtk/empathy-contact-list-view.c | 16 ++++++---------- libempathy-gtk/empathy-individual-view.c | 18 ++++++------------ 2 files changed, 12 insertions(+), 22 deletions(-) commit ee227ec984e99ab5f1046c68b891413ba1b89507 Author: Xavier Claessens Date: Fri May 20 15:17:33 2011 +0200 LiveSearch: we don't want to emit keynav signal on left/right since those are useful to the entry libempathy-gtk/empathy-live-search.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commit af03c9c7c50e68f5b10148e84ff782c94c5c6cd0 Author: Colin Walters Date: Wed May 18 19:52:49 2011 -0400 Squash some set-but-unused variables src/empathy-chat-window.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) commit 93a7de11fb8ec365c6a7f1818b1260e689e0428e Merge: 4a5169b c51c43f Author: Jonny Lamb Date: Wed May 18 15:23:15 2011 +0100 Merge branch 'LOLOOOLOLOLOLLLOLLLOLOLLL' commit c51c43f90643a4a5080ec1412229f0eb56ca9a34 Author: Jonny Lamb Date: Wed May 18 14:50:34 2011 +0100 chat-manager: pass user action time of DBus to show the closed tab This was making undo closing tabs in the background, aww. Signed-off-by: Jonny Lamb extensions/Chat_Manager.xml | 5 +++++ src/empathy-chat-manager.c | 18 +++++++++++------- src/empathy-chat-manager.h | 3 ++- src/empathy-chat-window.c | 3 ++- 4 files changed, 20 insertions(+), 9 deletions(-) commit 4a5169bf01a7a67bfa08b2d596c6d4f5e92a73b6 Author: Guillaume Desmottes Date: Tue May 17 10:12:12 2011 +0200 use g_list_free_full() src/empathy-invite-participant-dialog.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commit 259126957650f1c28abdbc101636fe5cbca03f48 Author: Guillaume Desmottes Date: Tue May 17 10:06:50 2011 +0200 filter_func: don't leak individual src/empathy-invite-participant-dialog.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) commit fa5df0324942721999ae2dd7ad8425379fbc59c9 Author: Guillaume Desmottes Date: Tue May 17 10:03:16 2011 +0200 coding style fixes src/empathy-invite-participant-dialog.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) commit 6dc60aa53c3c458653417ddef1e3e9f3eb4debf2 Author: Guillaume Desmottes Date: Fri May 6 15:45:42 2011 +0200 invite-participant-dialog: set a default height so a few contacts are displayed src/empathy-invite-participant-dialog.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 6b5bea43c508bc26c2ee88edac5d60cf127b175c Author: Guillaume Desmottes Date: Fri May 6 14:55:39 2011 +0200 invite-participant-dialog: add a scrolled window src/empathy-invite-participant-dialog.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) commit a557339964d56290345f5ad2841ef4a127839655 Author: Guillaume Desmottes Date: Fri May 6 14:47:30 2011 +0200 add some padding src/empathy-invite-participant-dialog.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 44162e3ac3604c3e4f14dd01b48fc32cd7fd1007 Author: Guillaume Desmottes Date: Fri May 6 14:37:42 2011 +0200 invite-participant-dialog: filter out contacts already in the chat src/empathy-invite-participant-dialog.c | 33 ++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) commit 9e46660b7f36e1274ca43a47b9a011c056c35746 Author: Guillaume Desmottes Date: Fri May 6 14:14:54 2011 +0200 invite-participant-dialog: display only contacts on the right Connection src/empathy-invite-participant-dialog.c | 91 +++++++++++++++++++++++-------- 1 files changed, 68 insertions(+), 23 deletions(-) commit 3cceb20e7ded94d9a797f53704b53afde9e5176f Author: Guillaume Desmottes Date: Fri May 6 14:09:05 2011 +0200 individual-view: add API to define our own filter function libempathy-gtk/empathy-individual-view.c | 17 +++++++++++++++++ libempathy-gtk/empathy-individual-view.h | 4 ++++ 2 files changed, 21 insertions(+), 0 deletions(-) commit 08ba02749235ae95a586fa930690f921e74bda35 Author: Guillaume Desmottes Date: Fri May 6 12:46:37 2011 +0200 invite-dialog: display a individual view rather than forcing user to type the full ID of the contact (#646705) src/empathy-chat-window.c | 39 ++----- src/empathy-invite-participant-dialog.c | 191 ++++++++++++++++++++++++++++-- src/empathy-invite-participant-dialog.h | 19 +++- 3 files changed, 204 insertions(+), 45 deletions(-) commit 9999bf6834a4c2e592a39dcbc9b8dffc5bee9bd5 Merge: 7b526c2 510edcb Author: Jonny Lamb Date: Wed May 18 14:32:27 2011 +0100 Merge branch 'undo-close-tab' commit 7b526c2d40795fdd97ee63589a14a0a679a00e2a Merge: 2950825 cbbf2cd Author: Jonny Lamb Date: Wed May 18 14:26:08 2011 +0100 Merge branch 'remember-my-message-yo' commit 510edcb3c7e288000544aa12fa4dc708085bfd2f Author: Jonny Lamb Date: Wed May 18 14:25:34 2011 +0100 chat-manager: use EMPATHY_CHAT_BUS_NAME Signed-off-by: Jonny Lamb src/empathy-chat-manager.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 583dbd45639081ea4c760b81a4e2cc5c8137192e Author: Jonny Lamb Date: Wed May 18 14:23:24 2011 +0100 chat-manager: don't leak proxy Signed-off-by: Jonny Lamb src/empathy-chat-manager.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit cbbf2cd51ed0f7bd51c617fe75596511415b076f Author: Jonny Lamb Date: Wed May 18 14:16:54 2011 +0100 chat-manager: clarify ownership of messages hash table Signed-off-by: Jonny Lamb src/empathy-chat-manager.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) commit 48eeafcb8aabeca933067ae45a39a7349dce6083 Author: Jonny Lamb Date: Wed May 18 14:15:58 2011 +0100 chat-manager: s/null/NULL/ Signed-off-by: Jonny Lamb src/empathy-chat-manager.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 8894350602117306df0038ff7cd622b910f70fa5 Author: Jonny Lamb Date: Wed May 18 14:15:09 2011 +0100 chat-manager: add missing free Signed-off-by: Jonny Lamb src/empathy-chat-manager.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit f5d7d6d3a1d7a09e9e3c0cbf013a8456d33537dd Author: Jonny Lamb Date: Wed May 18 14:14:05 2011 +0100 chat: rename get to dup Signed-off-by: Jonny Lamb libempathy-gtk/empathy-chat.c | 2 +- libempathy-gtk/empathy-chat.h | 2 +- src/empathy-chat-manager.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit 2950825a4452bc984c0dd356c5bf17c3a674c451 Merge: 38e5925 9e19149 Author: Jonny Lamb Date: Tue May 17 09:36:33 2011 +0100 Merge branch 'ack' commit 9e1914959b7e26e82ca4042ad5f7f042cb5a34a2 Author: Jonny Lamb Date: Tue May 17 09:33:47 2011 +0100 adium: set has_unread_message to FALSE when we think we've cleared them all Signed-off-by: Jonny Lamb libempathy-gtk/empathy-theme-adium.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 38e5925b90ca5864907aaef09cbaa4c963b1be98 Author: Daniel Mustieles Date: Mon May 16 19:22:43 2011 +0200 Updated Spanish translation po/es.po | 320 +++++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 179 insertions(+), 141 deletions(-) commit 2d5e4f0a14794617d5fe385d4fcea86e4120edf5 Author: Jonny Lamb Date: Mon May 16 15:13:13 2011 +0100 main-window: call the remote UndoClosedTab It will work, unlike this one. Signed-off-by: Jonny Lamb src/empathy-main-window.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) commit 52e1e2fbdafd993933ba7866847ddbbedd7a2748 Author: Jonny Lamb Date: Mon May 16 15:12:59 2011 +0100 chat-manager: expose UndoClosedChat over DBus Signed-off-by: Jonny Lamb src/empathy-chat-manager.c | 72 +++++++++++++++++++++++++++++++++++++++++++- src/empathy-chat-manager.h | 2 + 2 files changed, 73 insertions(+), 1 deletions(-) commit 0261661359b354ee0bbc61898ebec8ede7ac5b2b Author: Jonny Lamb Date: Mon May 16 15:12:31 2011 +0100 extensions: add ChatManager extension Signed-off-by: Jonny Lamb extensions/Chat_Manager.xml | 31 +++++++++++++++++++++++++++++++ extensions/misc.xml | 1 + 2 files changed, 32 insertions(+), 0 deletions(-) commit 45609a2304c805e1c05ba15e0856c9c41f020986 Merge: 383bf53 9c42c7a Author: Will Thompson Date: Mon May 16 14:08:10 2011 +0100 Merge branch 'more-contact-info' commit 383bf53000a686e5d411f48603b506bb64dd0e28 Author: Will Thompson Date: Mon May 16 13:42:55 2011 +0100 Fix call to empathy_chat_window_find_chat in /part command 0fda594 changed empathy_chat_window_find_chat() to take a third parameter indicating whether we're looking for an SMS channel or not, but the /part branch wasn't updated for this change before being merged. I think it's a reasonable assumption that someone will not try to /part an SMS channel. Reviewed-by: Jonny Lamb src/empathy-chat-window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 9c42c7ae5d46bf3bf2aa4aab8e4d615876982eca Author: Will Thompson Date: Thu May 12 13:13:32 2011 +0100 Add a /whois command. https://bugzilla.gnome.org/show_bug.cgi?id=571631 libempathy-gtk/empathy-chat.c | 82 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 82 insertions(+), 0 deletions(-) commit af9646511992294411549884521130056f34f455 Author: Will Thompson Date: Tue May 10 17:44:03 2011 +0100 ContactWidget: expose IRC presence information This is basically just a temporary hack until Idle implements SimplePresence. libempathy-gtk/empathy-contact-widget.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) commit d5ddca2ac157b52b04b418d51530505d378b3dd5 Author: Will Thompson Date: Tue May 10 17:40:25 2011 +0100 ContactWidget: support IRC server and host info libempathy-gtk/empathy-contact-widget.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) commit 5eb74b177084b3cd03e412ea3b7f55b41542a9fe Author: Will Thompson Date: Tue May 10 17:35:20 2011 +0100 ContactWidget: support Idle's x-idle-time field. libempathy-gtk/empathy-contact-widget.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) commit 3e99c2d9e8b4f5a36507722c8bd681086c3220c4 Author: Will Thompson Date: Tue May 10 17:27:04 2011 +0100 ContactWidget: generalize linkifying values Many of the new fields exposed by Idle need more processing than just bunging the first string into a label. Let's start by generalizing linkifying the first string. I speculatively allow the format functions to fail. libempathy-gtk/empathy-contact-widget.c | 40 ++++++++++++++++++++++-------- 1 files changed, 29 insertions(+), 11 deletions(-) commit e92e9e9c411ec02dacc1bb11f15aa4682fd64cdf Author: Will Thompson Date: Tue May 10 17:14:16 2011 +0100 ContactWidget: show IRC channel list. Very recent versions of Idle expose the list of channels provided in WHOIS replies. The data is provided as a bunch of x-irc-channel fields with a single value, namely the name of the channel. Here we expose that data to the user as a comma-separated list of links; clicking a link ensures that channel. https://bugzilla.gnome.org/show_bug.cgi?id=592795 libempathy-gtk/empathy-contact-widget.c | 74 +++++++++++++++++++++++++++++++ 1 files changed, 74 insertions(+), 0 deletions(-) commit 809e62df3bc50be5ee22a7bf5c4e14db94cc12eb Author: Jonny Lamb Date: Mon May 16 10:36:48 2011 +0100 chat-manager: keep a hash table with messages left when the chat closed Signed-off-by: Jonny Lamb src/empathy-chat-manager.c | 59 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) commit add05052afddb11b158dd08075ffbe2c0404692a Author: Jonny Lamb Date: Mon May 16 10:35:56 2011 +0100 chat: add {get,set}_text methods Signed-off-by: Jonny Lamb libempathy-gtk/empathy-chat.c | 23 +++++++++++++++++++++++ libempathy-gtk/empathy-chat.h | 4 ++++ 2 files changed, 27 insertions(+), 0 deletions(-) commit ec997377c0765b3d1619120c501433799740edba Author: Jonny Lamb Date: Mon May 16 10:00:08 2011 +0100 tp-chat: don't assert on not finding message Signed-off-by: Jonny Lamb libempathy/empathy-tp-chat.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) commit e22e3fd06caa9486b9641636c2bbe13cf954cab5 Author: Matej Urbančič Date: Sun May 15 22:07:24 2011 +0200 Updated Slovenian translation po/sl.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) commit 6b9fe24b0b42133b831c0286ad060b776d5de748 Author: Kristjan SCHMIDT Date: Sat May 14 22:26:56 2011 +0200 Updated Esperanto translation po/eo.po | 1739 +++++++++++++++++++++++++++++++++++++------------------------- 1 files changed, 1031 insertions(+), 708 deletions(-) commit e46d39bd0ffad02ae26179e5b63cbe10f5b04d73 Author: Matej Urbančič Date: Sat May 14 21:07:01 2011 +0200 Updated Slovenian translation po/sl.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) commit c8acdd8ec6aa395aa16530fac8cb1cce710bbde7 Author: Matej Urbančič Date: Sat May 14 21:03:16 2011 +0200 Updated Slovenian translation po/sl.po | 775 +++++++++++++++++++++++++++++++++++++------------------------- 1 files changed, 460 insertions(+), 315 deletions(-) commit 1c40d3370a1d2e1e98b1609377e0903a2ca40f6f Author: Jonny Lamb Date: Fri May 13 15:50:38 2011 +0100 adium: add comment explaining why we add x-empathy-mesage-id-* Signed-off-by: Jonny Lamb libempathy-gtk/empathy-theme-adium.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) commit c84e0979d36aa41e7f0d554fbbdad4e82756f8b0 Merge: 2096980 34a7a0b Author: Guillaume Desmottes Date: Fri May 13 16:27:21 2011 +0200 Merge remote-tracking branch 'glassrose/moving-part-functionality-to-empathy-chat-window-643295' commit 46c85cbe83e943ce5b45fa8b66e19fe583f7d0ca Author: Jonny Lamb Date: Fri May 13 15:23:07 2011 +0100 tp-chat: call acknowledge_message(s) directly Signed-off-by: Jonny Lamb libempathy/empathy-tp-chat.c | 23 ++++++----------------- 1 files changed, 6 insertions(+), 17 deletions(-) commit 4d140c3a4e3c4629a72c3bf0ea7ca8b8ee48fb72 Author: Jonny Lamb Date: Fri May 13 15:18:57 2011 +0100 tp-chat: rename signal to message-acknowledged Signed-off-by: Jonny Lamb libempathy-gtk/empathy-chat.c | 12 ++++++------ libempathy/empathy-tp-chat.c | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) commit d44680728465f8bb4da6f6dd50694d04aadd1745 Author: Jonny Lamb Date: Fri May 13 15:16:25 2011 +0100 chat: ::notify for all changes to unread messages Signed-off-by: Jonny Lamb libempathy-gtk/empathy-chat.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 5af3e568a7048f1de84d9c5372973aeee87aff60 Author: Jonny Lamb Date: Fri May 13 15:15:13 2011 +0100 chat: call acknowledge_message on the chat view when it happens Signed-off-by: Jonny Lamb libempathy-gtk/empathy-chat.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit bd1d3bc265f617b0aa86bd80da28d64b50dcbbfb Author: Jonny Lamb Date: Fri May 13 15:14:54 2011 +0100 adium: implement acknowledge_message to remove unread marker Signed-off-by: Jonny Lamb libempathy-gtk/empathy-theme-adium.c | 88 +++++++++++++++++++++++++++++++++- 1 files changed, 86 insertions(+), 2 deletions(-) commit c68050906fb6a3017ed9162fb14b4dcca78eba0a Author: Jonny Lamb Date: Fri May 13 15:12:54 2011 +0100 chat: don't toggle visibility of the chat view on marking messages read It doesn't make sense, and it's a lie. It will also break showing unread message markers in the adium chat view. Signed-off-by: Jonny Lamb libempathy-gtk/empathy-chat.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) commit 3329e947496629d8275ad68791d73c49d9fc820f Author: Jonny Lamb Date: Fri May 13 11:35:42 2011 +0100 chat-view: add message_acknowledged vfunc Signed-off-by: Jonny Lamb libempathy-gtk/empathy-chat-view.c | 11 +++++++++++ libempathy-gtk/empathy-chat-view.h | 4 ++++ 2 files changed, 15 insertions(+), 0 deletions(-) commit 96345c97d9c3fc52b45ef5ce522ef2e4c94bca63 Author: Jonny Lamb Date: Fri May 13 11:35:09 2011 +0100 tp-chat: give ::pending-message-removed the message Signed-off-by: Jonny Lamb libempathy-gtk/empathy-chat.c | 1 + libempathy/empathy-tp-chat.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) commit 5080aa2351deb6abe0aa1cc442fd1175f2eaa70e Author: Jonny Lamb Date: Fri May 13 11:25:06 2011 +0100 adium: split removing unread markers into two functions Signed-off-by: Jonny Lamb libempathy-gtk/empathy-theme-adium.c | 60 +++++++++++++++++++-------------- 1 files changed, 34 insertions(+), 26 deletions(-) commit bd0755be84f285e48272fb0b7ac154bad4be0902 Author: Jonny Lamb Date: Fri May 13 11:22:22 2011 +0100 adium: set x-empathy-message-id class in messageStyles Signed-off-by: Jonny Lamb libempathy-gtk/empathy-theme-adium.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) commit 2096980125f9a556b5d92e541927e9cf9b213e20 Author: Yaron Shahrabani Date: Fri May 13 08:35:48 2011 +0300 Updated Hebrew translation. po/he.po | 176 +++++++++++++++++++++++++++++++------------------------------ 1 files changed, 89 insertions(+), 87 deletions(-) commit e7afbce3f6925af7f3d43a443304f566a02d4942 Author: Jonny Lamb Date: Thu May 12 16:49:37 2011 +0100 chat-window: also update chat window title when the chat updates Signed-off-by: Jonny Lamb src/empathy-chat-window.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commit 4fd01bccdea76bdb929bae14a31d16327cd0a5aa Author: Jonny Lamb Date: Thu May 12 16:49:24 2011 +0100 chat-window: update tab when nb-unread-messages changes Signed-off-by: Jonny Lamb src/empathy-chat-window.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit d36a313b26e957452fde60cac897791b0f6e4990 Author: Jonny Lamb Date: Thu May 12 16:47:59 2011 +0100 chat: make nb_unread_messages incoming only and add a property so it can have change notification. Signed-off-by: Jonny Lamb libempathy-gtk/empathy-chat.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) commit 7412b7e93ee7106dc139365fb391e2f613c294ef Author: Jonny Lamb Date: Thu May 12 16:24:43 2011 +0100 tp-chat: add pending-message-removed signal Signed-off-by: Jonny Lamb libempathy/empathy-tp-chat.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) commit 7740933e258c4afe279d08599232e057e1c2d338 Author: Jonny Lamb Date: Thu May 12 14:56:32 2011 +0100 tp-chat: use ::pending-message-removed to update our pending queue Signed-off-by: Jonny Lamb libempathy/empathy-tp-chat.c | 54 ++++++++++++++++++++++++++--------------- 1 files changed, 34 insertions(+), 20 deletions(-) commit 11120f662d911b9a50aff7ba46804bcc7c587492 Author: Jonny Lamb Date: Thu May 12 14:33:16 2011 +0100 message: stop storing pending-message-id We're storing the TpSignalledMessage for that nowadays. Signed-off-by: Jonny Lamb libempathy/empathy-message.c | 21 --------------------- libempathy/empathy-message.h | 2 -- 2 files changed, 0 insertions(+), 23 deletions(-) commit cc5faf8b763d3b1ee5eb4a13525875707bb71217 Author: Jonny Lamb Date: Thu May 12 14:32:18 2011 +0100 tp-chat: acknowledge messages using TpTextChannel API Signed-off-by: Jonny Lamb libempathy/empathy-tp-chat.c | 43 +++++++++++++++++------------------------ 1 files changed, 18 insertions(+), 25 deletions(-) commit ccc394aa7971cac1530931357dae7aaf14299ef2 Author: Jonny Lamb Date: Thu May 12 14:29:23 2011 +0100 message: store the TpMessage when created with one Signed-off-by: Jonny Lamb libempathy/empathy-message.c | 34 ++++++++++++++++++++++++++++++++++ libempathy/empathy-message.h | 2 ++ 2 files changed, 36 insertions(+), 0 deletions(-) commit e98c7a31f74356590b5093d2108f100a661cfda1 Author: Will Thompson Date: Tue May 10 16:36:00 2011 +0100 Add empathy_duration_to_string() This is based on the body of empathy_time_to_string_relative(); it takes a duration in seconds, rather than a timestamp. libempathy/empathy-time.c | 64 ++++++++++++++++++++++++-------------------- libempathy/empathy-time.h | 1 + 2 files changed, 36 insertions(+), 29 deletions(-) commit a89cddec3e5faee08f61c1fc9ee67ccf243a0e1c Author: Guillaume Desmottes Date: Thu May 12 11:09:37 2011 +0200 Properly convert timestamps received from X11 (#650015) X11 timestamps are guint32 while Telepathy uses gint64 timestamps. We should always use tp_user_action_time_from_x11() to do the conversion. libempathy-gtk/empathy-chat.c | 4 ++-- libempathy-gtk/empathy-contact-list-view.c | 2 +- libempathy-gtk/empathy-contact-menu.c | 7 +++---- libempathy-gtk/empathy-individual-menu.c | 8 ++++---- libempathy-gtk/empathy-new-call-dialog.c | 3 ++- libempathy-gtk/empathy-new-message-dialog.c | 4 ++-- src/empathy-chat-window.c | 2 +- src/empathy-event-manager.c | 3 ++- src/empathy-main-window.c | 4 ++-- src/empathy-new-chatroom-dialog.c | 4 ++-- src/empathy-streamed-media-window.c | 2 +- 11 files changed, 22 insertions(+), 21 deletions(-) commit f312b6f85b4128dffd08a5afc7797b7c204c7887 Author: Guillaume Desmottes Date: Thu May 12 11:55:50 2011 +0200 add empathy_get_current_action_time() libempathy-gtk/empathy-ui-utils.c | 6 ++++++ libempathy-gtk/empathy-ui-utils.h | 2 ++ 2 files changed, 8 insertions(+), 0 deletions(-) commit d1bc3524be5909a9287b12b309f2dd2e97fc5778 Author: Guillaume Desmottes Date: Thu May 12 10:56:29 2011 +0200 empathy_chat_window_present_chat: always show newly created windows We just create so we should at least show it. src/empathy-chat-window.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) commit 0a6ce2b0c136c05fa5395d51517208c041bc392d Author: Guillaume Desmottes Date: Wed May 11 12:14:53 2011 +0200 theme_adium_remove_focus_marks: early return if there is no unread message libempathy-gtk/empathy-theme-adium.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) commit b850f8c1c6106ac50b26e090c11bd1c7ae8c0f9d Author: Guillaume Desmottes Date: Wed May 11 11:57:13 2011 +0200 theme-adium: remove unread marks when sending a message libempathy-gtk/empathy-theme-adium.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit ca3669ada0014c82b11a89921a4c38dee9296f13 Author: Guillaume Desmottes Date: Wed May 11 11:47:56 2011 +0200 theme-adium: remove focus marks as soon as the chat is not focused (#649890) libempathy-gtk/empathy-theme-adium.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit acde6c67cdd3c3684d564bb65f2628fdf1bec27a Author: Jonny Lamb Date: Wed May 11 10:39:36 2011 +0100 contact: fix typo when creating new contact from logger entity Signed-off-by: Jonny Lamb libempathy/empathy-contact.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 34a7a0b348e1cdd3cfc184f135a8371d79741272 Author: Chandni Verma Date: Mon May 9 04:52:16 2011 +0530 Password infobar amendments Destroy password infobar on parting password protected chatrooms and insensitivate input-text-view when displaying a new infobar libempathy-gtk/empathy-chat.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) commit 0c9a992db9d0f8426264b097f0aa0cfaca860509 Author: Chandni Verma Date: Mon May 9 16:26:30 2011 +0530 Leave chatroom only if tp_chat exists src/empathy-chat-window.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) commit 50daa9eb6a529ad3d78448b134e4a76438124696 Author: Guillaume Desmottes Date: Wed May 11 11:14:43 2011 +0200 create_text_channel: pass Empathy.Chat as preferred handler Seem I forgot it when adding preferred handler in 52eb24e6e7b012856525f6f09d3c1a941375d383. libempathy/empathy-request-util.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 07af036a20d37c11360add196bdbc9c7b841dc07 Author: Daniel Korostil Date: Tue May 10 00:30:10 2011 +0300 Uploaded Ukranian po/uk.po | 985 +++++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 564 insertions(+), 421 deletions(-) commit 2478a51afb098292194aa3825132c5ad52c211e7 Author: Jorge González Date: Mon May 9 19:31:49 2011 +0200 Updated Spanish translation po/es.po | 92 +++++++++++++++++++++++++++++++------------------------------ 1 files changed, 47 insertions(+), 45 deletions(-) commit ae98a6de35c6fc05895d2be17c3f3a047f803f56 Author: Guillaume Desmottes Date: Mon May 9 16:55:40 2011 +0200 remove released flag configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)