commit a1ce2e226d0d78f2e94ee3f6588341c3db6b6793 Author: Guillaume Desmottes Date: Tue Feb 1 10:26:08 2011 +0100 prepare 2.91.6 NEWS | 39 +++++++++++++++++++++++++++++++++++++++ configure.ac | 6 +++--- 2 files changed, 42 insertions(+), 3 deletions(-) commit 6085b66ce169a5b7a9b6df6afac9a07290c733d3 Author: Guillaume Desmottes Date: Tue Feb 1 10:18:06 2011 +0100 coding style fix libempathy-gtk/empathy-chat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 88c215486143dc4887b1016540d090c78027ddfa Author: Guillaume Desmottes Date: Tue Feb 1 10:18:00 2011 +0100 add empathy-contact-search-dialog.c to POTFILES.in po/POTFILES.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 38a7c551fb07d72dd7b6744a8d1a345466b011d2 Merge: 7f5c02a b03dfef Author: Jonny Lamb Date: Tue Feb 1 08:50:22 2011 +0000 Merge branch 'muc-password' commit b03dfefd8103ea41f61407df122021a6d14d5a19 Author: Jonny Lamb Date: Tue Feb 1 08:41:39 2011 +0000 keyring: use the recently added finish macros Signed-off-by: Jonny Lamb libempathy/empathy-keyring.c | 79 +++++------------------------------------- 1 files changed, 9 insertions(+), 70 deletions(-) commit 267fb729f0536843bcb7c42858bd3d6a6d029411 Author: Jonny Lamb Date: Tue Feb 1 08:41:24 2011 +0000 utils: add the _finish macros from wocky Signed-off-by: Jonny Lamb libempathy/empathy-utils.h | 45 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) commit 7f5c02a63be19988ab199e497e22cd93880ae0bd Author: Travis Reitter Date: Mon Jan 31 20:58:37 2011 -0800 Bump the Folks requirement to match reality. configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 19bfb625b0301e6412c77aaccc2faf471d4fbff6 Author: Fran Diéguez Date: Tue Feb 1 02:29:26 2011 +0100 Updating Galician translations po/gl.po | 322 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 163 insertions(+), 159 deletions(-) commit 41f5717611c6bb3236ae78a187fd5753bbd9ccf3 Author: Travis Reitter Date: Wed Dec 22 17:22:59 2010 -0800 Adjust for FolksHasPresence -> FolksPresenceOwner Fixes bgo#637847. libempathy-gtk/empathy-individual-store.c | 31 +++++++++++++++------------ libempathy-gtk/empathy-individual-view.c | 2 +- libempathy-gtk/empathy-individual-widget.c | 24 ++++++++++---------- libempathy-gtk/empathy-persona-store.c | 16 ++++++++------ libempathy-gtk/empathy-ui-utils.c | 4 +- libempathy/empathy-contact.c | 20 +++++++++--------- 6 files changed, 51 insertions(+), 46 deletions(-) commit dfffa71d1d33714b331faaac367110716d56c72c Author: Travis Reitter Date: Wed Dec 22 17:46:06 2010 -0800 Adjust for FolksHasAvatar -> FolksAvatarOwner Helps bgo#637847. libempathy-gtk/empathy-ui-utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 8643ff0acdf20596dd233e93db6c83c6ba598d07 Author: Yaron Shahrabani Date: Sun Jan 30 23:19:45 2011 +0200 Updated Hebrew translation. po/he.po | 480 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 240 insertions(+), 240 deletions(-) commit 25a552a5eda176c376ec3cce7ab85aaa1eda2f82 Author: Ivar Smolin Date: Sat Jan 29 23:01:41 2011 +0200 [l10n] Updated Estonian translation po/et.po | 41 +++++++++++++++++++++-------------------- 1 files changed, 21 insertions(+), 20 deletions(-) commit 498a3e516c4ca9b8e02b283e81050d4cc8a6f04c Author: Daniel Mustieles Date: Fri Jan 28 19:38:23 2011 +0100 Updated Spanish translation po/es.po | 487 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 243 insertions(+), 244 deletions(-) commit 935d2f62ebc72edfe86ccf4449b7d95ef758bb74 Author: Jonny Lamb Date: Fri Jan 28 16:44:56 2011 +0000 chat: save room passwords in the keyring if requested Signed-off-by: Jonny Lamb libempathy-gtk/empathy-chat.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) commit 2e70e2fef401bcbe38d9caf8281992be7d0f6413 Author: Jonny Lamb Date: Fri Jan 28 16:44:44 2011 +0000 keyring: add set_room_password functions Signed-off-by: Jonny Lamb libempathy/empathy-keyring.c | 62 ++++++++++++++++++++++++++++++++++++++++++ libempathy/empathy-keyring.h | 7 +++++ 2 files changed, 69 insertions(+), 0 deletions(-) commit cfab69400457247ece6cd9baf1d49e70d7d9ce9b Author: Jonny Lamb Date: Fri Jan 28 16:44:35 2011 +0000 keyring: fix typo Signed-off-by: Jonny Lamb libempathy/empathy-keyring.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 4da8f83072b0a08d892a093bfab836bda29e1266 Author: Jonny Lamb Date: Fri Jan 28 16:29:31 2011 +0000 chat: try to use a room password from the keyring or offer to save the password Signed-off-by: Jonny Lamb libempathy-gtk/empathy-chat.c | 167 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 159 insertions(+), 8 deletions(-) commit 0bc660b874d8c04e22f7601dc5a3de428253d9c3 Author: Jonny Lamb Date: Fri Jan 28 16:29:12 2011 +0000 keyring: add get_room_password_{async,finish} functions Signed-off-by: Jonny Lamb libempathy/empathy-keyring.c | 55 ++++++++++++++++++++++++++++++++++++++++++ libempathy/empathy-keyring.h | 7 +++++ 2 files changed, 62 insertions(+), 0 deletions(-) commit 1cbcfd3eda00fa93d081ef37c609103d84663941 Author: Jonny Lamb Date: Fri Jan 28 16:28:58 2011 +0000 keyring: add is_available function Signed-off-by: Jonny Lamb libempathy/empathy-keyring.c | 6 ++++++ libempathy/empathy-keyring.h | 2 ++ 2 files changed, 8 insertions(+), 0 deletions(-) commit f829b8e42bd93a53067c06d8ea52de2ba2632938 Author: Marek Černocký Date: Fri Jan 28 16:24:42 2011 +0100 Updated Czech translation po/cs.po | 307 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 155 insertions(+), 152 deletions(-) commit a8e29279f323a5a1f4fc66a450a633b3415bea4d Author: Jonny Lamb Date: Fri Jan 28 13:52:26 2011 +0000 keyring: rename current functions to be more specifically about account passwords Signed-off-by: Jonny Lamb libempathy/empathy-account-settings.c | 16 +++++++------- libempathy/empathy-auth-factory.c | 4 +- libempathy/empathy-keyring.c | 34 +++++++++++++++++------------ libempathy/empathy-keyring.h | 12 +++++----- libempathy/empathy-server-sasl-handler.c | 8 +++--- 5 files changed, 40 insertions(+), 34 deletions(-) commit fe7c6ed34c96c0b57b0294ccebdab20dd0b702ba Author: Jonny Lamb Date: Fri Jan 28 13:18:59 2011 +0000 chat: add clear secondary icon to password entry Signed-off-by: Jonny Lamb libempathy-gtk/empathy-chat.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) commit 703d75010df79a51d0781fec8b30cd8588769c10 Author: Jonny Lamb Date: Fri Jan 28 13:13:04 2011 +0000 chat: make the password entry grow Signed-off-by: Jonny Lamb libempathy-gtk/empathy-chat.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit f195c0248cff2258fadca246d94f114c0fa2d685 Author: Jonny Lamb Date: Fri Jan 28 11:31:38 2011 +0000 chat: display a spinner when attempting a MUC password Signed-off-by: Jonny Lamb libempathy-gtk/empathy-chat.c | 130 ++++++++++++++++++++++++++-------------- 1 files changed, 84 insertions(+), 46 deletions(-) commit f8f82f5ce0aa87ac4bbde36ece2fb4d8fa2559eb Author: Will Thompson Date: Thu Jan 27 19:04:55 2011 +0000 Main window: mark Edit→Context as untranslatable. The label of this menu item is changed to either _("Contact") or _("Group"), depending on what's currently selected in the tree view. If neither a contact nor a group is selected, the item is hidden entirely. Thus, it should be safe not to translate this string. I haven't tested this. I just came across this when mpt pointed it out on the Twitter: . His tweets suggest that he's found a way to make it show up in the UI, but I can't find any way to do that (either reading the code, or playing with the actual UI). https://bugzilla.gnome.org/show_bug.cgi?id=640751 src/empathy-main-window.ui | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 598dd64034b56c84463580f248f5b54dcda361f2 Author: Emilio Pozuelo Monfort Date: Thu Jan 27 23:37:46 2011 +0000 Add Contact Search support https://bugzilla.gnome.org/show_bug.cgi?id=606947 configure.ac | 2 +- libempathy-gtk/Makefile.am | 2 + libempathy-gtk/empathy-account-chooser.h | 1 + libempathy-gtk/empathy-contact-search-dialog.c | 572 ++++++++++++++++++++++++ libempathy-gtk/empathy-contact-search-dialog.h | 58 +++ src/empathy-main-window.c | 11 + src/empathy-main-window.ui | 8 + 7 files changed, 653 insertions(+), 1 deletions(-) commit e1f1a8556be4ec33ec496c58f9d466026641133f Author: Yanko Kaneti Date: Fri Jan 28 00:58:32 2011 +0200 Remove EMPATHY_PREFS_ACCOUNTS_SCHEMA leftovers data/org.gnome.Empathy.gschema.xml.in | 1 - libempathy/empathy-gsettings.h | 2 -- 2 files changed, 0 insertions(+), 3 deletions(-) commit 716d990b17c0d74ec255a2f5bfa258df3caca128 Author: Khaled Hosny Date: Thu Jan 27 10:40:25 2011 +0200 Updated Arabic translation po/ar.po | 1767 ++++++++++++++++++++++++++------------------------------------ 1 files changed, 742 insertions(+), 1025 deletions(-) commit d87e605b55a9c1f70c30b8a47d9ffd301364842a Author: Fran Diéguez Date: Thu Jan 27 00:00:53 2011 +0100 QA of Galician translations po/gl.po | 214 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 106 insertions(+), 108 deletions(-) commit 71e8203ac15682c88cd2313c16a2e793d90312ce Merge: 1570d9b 08d9529 Author: Guillaume Desmottes Date: Wed Jan 26 09:30:07 2011 +0100 Merge branch 'presence-manager-640532' commit 08d9529b553d70b3fb4b422f2453fc2247a15f20 Author: Guillaume Desmottes Date: Tue Jan 25 12:25:12 2011 +0100 use tp_g_signal_connect_object() libempathy/empathy-presence-manager.c | 28 ++++++---------------------- 1 files changed, 6 insertions(+), 22 deletions(-) commit 273fee5fe68846380765235aae3d9761c349f50c Author: Guillaume Desmottes Date: Tue Jan 25 12:21:48 2011 +0100 presence-manager: add a dispose function and use tp_clear_* libempathy/empathy-presence-manager.c | 37 ++++++++++++++++++++------------ 1 files changed, 23 insertions(+), 14 deletions(-) commit 1c3a8da098c9efdd7ece9c8375473f584a374aae Author: Guillaume Desmottes Date: Tue Jan 25 12:17:40 2011 +0100 presence_manager_finalize: chain up libempathy/empathy-presence-manager.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 7e877988467139f1d2bee59a68f28436620d0a0f Author: Guillaume Desmottes Date: Tue Jan 25 12:16:28 2011 +0100 use the self->priv pattern rather than GET_PRIV() libempathy/empathy-presence-manager.c | 279 +++++++++++++-------------------- libempathy/empathy-presence-manager.h | 3 +- 2 files changed, 111 insertions(+), 171 deletions(-) commit 4c2cba97c84799564a7b0efb14bbff1f75b5c427 Author: Guillaume Desmottes Date: Tue Jan 25 11:50:35 2011 +0100 presence-manager: port to new coding style libempathy/empathy-presence-manager.c | 1048 +++++++++++++++++---------------- libempathy/empathy-presence-manager.h | 62 ++- 2 files changed, 570 insertions(+), 540 deletions(-) commit c9f2cd4f71e619f5a418090981afebbef43226c1 Author: Guillaume Desmottes Date: Tue Jan 25 11:13:51 2011 +0100 rename EmpathyIdle to EmpathyPresenceManager (#640532) It's doing more than idle management now. libempathy-gtk/empathy-presence-chooser.c | 22 +- libempathy-gtk/empathy-ui-utils.c | 1 - libempathy/Makefile.am | 4 +- libempathy/empathy-account-settings.c | 11 +- libempathy/empathy-idle.c | 732 ---------------------------- libempathy/empathy-idle.h | 74 --- libempathy/empathy-presence-manager.c | 733 +++++++++++++++++++++++++++++ libempathy/empathy-presence-manager.h | 74 +++ libempathy/empathy-utils.c | 10 +- src/empathy-chat.c | 8 +- src/empathy-event-manager.c | 10 +- src/empathy-main-window.c | 1 - src/empathy.c | 26 +- 13 files changed, 854 insertions(+), 852 deletions(-) commit 1570d9b4827b5e24540960564bb1c487d3f062ae Author: Guillaume Desmottes Date: Tue Jan 25 10:04:38 2011 +0100 empathy-chat: disable file transfer for now It's broken so better disabling it than crashing (#637322). libempathy-gtk/empathy-chat.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit cfaa4c875c382545b06162854c286d1b5b3f0497 Author: Guillaume Desmottes Date: Tue Jan 25 10:03:33 2011 +0100 add EMPATHY_CONTACT_FEATURE_FT libempathy-gtk/empathy-chat.c | 1 + libempathy-gtk/empathy-contact-menu.c | 8 +++++--- libempathy-gtk/empathy-contact-menu.h | 3 ++- src/empathy-map-view.c | 1 + 4 files changed, 9 insertions(+), 4 deletions(-) commit 8b4a09ed7450b0b3d806d0996d174f911e4c3352 Author: Diego Escalante Urrelo Date: Sat Jan 22 17:44:55 2011 -0500 main-window: use line-wrap for "no match" label On narrow contact lists, the ellipsizing makes the "No match" message disappear, users are forced to resize the window to know what's hidden beyond the …. Wrapping takes advantage of all the vertical space available. Bug #640295 src/empathy-main-window.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit e64970236bda77f049d23c890a590bdab8414705 Author: Inaki Larranaga Murgoitio Date: Mon Jan 24 18:38:54 2011 +0100 Updated Basque language po/eu.po | 208 ++++++++++++++++++++++++++------------------------------------ 1 files changed, 88 insertions(+), 120 deletions(-) commit a95eadd6866a511e5a8e2574156bf767a4361918 Author: Guillaume Desmottes Date: Mon Jan 24 16:44:00 2011 +0100 use action_camera_on when using the camera action items We just need one item of the action group to interact with the whole group, so best to use the one we already have. src/empathy-call-window.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) commit f18f2746690b0ceae80c3b362529decc112ca77f Author: Guillaume Desmottes Date: Mon Jan 24 16:41:11 2011 +0100 call-window: sync the sensitivity of the button and "send video" menu (#637839) src/empathy-call-window.c | 5 +++++ src/empathy-call-window.ui | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) commit 1cb2462f5793d99ad42decfbcc34bc22474ccbdc Author: Guillaume Desmottes Date: Mon Jan 24 16:32:55 2011 +0100 call-window: remove unused priv->action_camera_preview src/empathy-call-window.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit 6924c640f01c5ca55d1001ddc5c44a46d7baf948 Author: Guillaume Desmottes Date: Wed Jan 12 13:09:28 2011 +0100 chat-window: don't play sound for pending messages (#639302) They have already be notified by the Approver. src/empathy-chat-window.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) commit f8d4856794d8bf6ba951586fe2e196a00743c764 Merge: ce51e07 aade7b7 Author: Guillaume Desmottes Date: Mon Jan 24 15:35:50 2011 +0100 Merge remote branch 'glassrose/remove-typing-icon-in-muc-tabs-609420' commit aade7b7e2006666d2af51016e1090bce5855edaf Author: Chandni Verma Date: Mon Jan 24 19:41:43 2011 +0530 Do not display typing icon in MUC tabs Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=609420 src/empathy-chat-window.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit ce51e074a4b2bf286980cad803239bd5e96e749b Author: Guillaume Desmottes Date: Mon Jan 24 13:39:15 2011 +0100 account-widget-yahoo: remove server field (#634853) libempathy-gtk/empathy-account-widget-yahoo.ui | 36 ++--------------------- libempathy-gtk/empathy-account-widget.c | 1 - 2 files changed, 4 insertions(+), 33 deletions(-) commit c06e987f5bccc63f2cf54567850d36f59a51a5f6 Author: Guillaume Desmottes Date: Mon Jan 24 14:11:01 2011 +0100 account-dialog: keep a proper weak ref on setting_widget_object This prevent us of trying to use it after it has been disposed. For example, when switching to an Haze account, we have to wait that the EmpathyAccountSettings is ready before getting the new setting_widget_object but we can't try using the old one while waiting (#640411). src/empathy-accounts-dialog.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) commit 760fc904f7b1cb1df34bcee3cfbb57291ccc811c Author: Vitaly Minko Date: Tue Nov 2 21:51:28 2010 +0300 Add calendar to the contact widget in order to simplify birthday selection (#631101). libempathy-gtk/empathy-contact-widget.c | 72 +++++++++++++++++++++++++++---- 1 files changed, 63 insertions(+), 9 deletions(-) commit 97b44882aafe0b900433cce84b72eea2d542e875 Author: Mario Blättermann Date: Fri Jan 21 10:14:30 2011 +0100 [l10n] Updated German translation po/de.po | 1372 ++++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 755 insertions(+), 617 deletions(-) commit e7500dd3bb047233c7a66523f16330e9279ee9ce Author: Inaki Larranaga Murgoitio Date: Thu Jan 20 23:58:26 2011 +0100 Updated Basque language po/eu.po | 1536 ++++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 838 insertions(+), 698 deletions(-) commit 1c78ba6bdffcf3ad90ac7c634b2ac62c2a275f92 Author: Yuri Myasoedov Date: Thu Jan 20 23:27:41 2011 +0300 Updated Russian translation po/ru.po | 1442 ++++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 790 insertions(+), 652 deletions(-) commit 73215d93ed358d8aa257efb9822dafe9f82e0f3e Author: Marek Černocký Date: Wed Jan 19 20:28:58 2011 +0100 Updated Czech translation po/cs.po | 1383 +++++++++++++++++++++++++++++++++----------------------------- 1 files changed, 746 insertions(+), 637 deletions(-) commit dbb95ed92ec1acc6d6bbf7b4a1dbcaf931070e4f Merge: 8eb3671 1acf899 Author: Guillaume Desmottes Date: Tue Jan 18 16:12:40 2011 +0100 Merge remote branch 'glassrose/Display-typing-icon-in-muc-contacts-list-609419' commit 8eb3671bdebf2b31323d8ad26a0e89f9907cb828 Author: Guillaume Desmottes Date: Tue Jan 18 16:09:53 2011 +0100 remove released flag configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)