commit cedddaf2017b184abd2146f7cdb46c285ef5ee0c Author: Guillaume Desmottes Date: Mon May 9 16:40:08 2011 +0200 prepare 3.1.1 NEWS | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 6 ++-- 2 files changed, 91 insertions(+), 3 deletions(-) commit ab93e6903be924419add3dc703bf5da9bfca63b3 Merge: 0b5aebd 72785d7 Author: Guillaume Desmottes Date: Mon May 9 16:21:38 2011 +0200 Merge remote-tracking branch 'glassrose/save-chatrooms.xml-only-when-needed' commit 72785d7ab576618ccc2847b8d51d1f4c9ff19241 Author: Chandni Verma Date: Sun May 8 00:44:43 2011 +0530 Save changes to chatrooms.xml configuration file only when needed. Changes will be written to the file only when changes are made to a chatroom property that is listed in the file. Fixes room-list flicker: https://bugzilla.gnome.org/show_bug.cgi?id=642087 libempathy/empathy-chatroom-manager.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) commit 0b5aebd734f0a4759d2c8c5438830c372638fb70 Author: Fran Diéguez Date: Mon May 9 12:59:27 2011 +0200 Updated Galician translations po/gl.po | 698 ++++++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 408 insertions(+), 290 deletions(-) commit 514c6109204c180fa7fc79581058f6dc8156a99e Author: Guillaume Desmottes Date: Mon May 9 10:18:41 2011 +0200 add translators comment explaining the insufficient balance error (#649735) libempathy-gtk/empathy-chat.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 7f6a15ff9f7eff608e4208ff99725eb8cd543d66 Author: Guillaume Desmottes Date: Mon May 9 10:11:18 2011 +0200 org.gnome.Empathy.gschema.xml: update summary and description of show-balance-in-roster We are generally using "contact list" instead of "roster". (#649734) data/org.gnome.Empathy.gschema.xml.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 7f4901b8677aeb0235b99acf2130eb5407f93b4d Author: Guillaume Desmottes Date: Fri May 6 10:38:23 2011 +0200 add a translation comment explaining the 'Provide' string (#649492) src/empathy-notifications-approver.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 9cd96631aadd370af208741905d7b90eac93907c Author: Yaron Shahrabani Date: Mon May 9 09:21:42 2011 +0300 Updated Hebrew translation. po/he.po | 873 +++++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 500 insertions(+), 373 deletions(-) commit ebd45e55f663e1c1e7bbadce2c910c0a8063e622 Author: Jorge González Date: Sun May 8 17:08:55 2011 +0200 Updated Spanish translation po/es.po | 569 +++++++++++++++++++++++++++++++++----------------------------- 1 files changed, 304 insertions(+), 265 deletions(-) commit 05715d914645b0415c77812b94f7a1b123857c8c Author: Daniel Mustieles Date: Thu May 5 19:43:18 2011 +0200 Updated Spanish translation po/es.po | 167 ++++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 92 insertions(+), 75 deletions(-) commit 3aca984088136430b8f54b16e5f1bed1e891c6d1 Author: Gabor Kelemen Date: Wed May 4 16:35:32 2011 +0200 Include gi18n-lib.h in library sources, not gi18n.h. Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=649379 libempathy-gtk/empathy-contact-blocking-dialog.c | 3 ++- libempathy-gtk/empathy-contact-search-dialog.c | 3 ++- libempathy-gtk/empathy-contact-selector.c | 2 +- libempathy-gtk/empathy-location-manager.c | 2 +- libempathy-gtk/empathy-theme-adium.c | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) commit 9a17d44fc225a0e4a26d702366236622830c301a Author: Guillaume Desmottes Date: Thu May 5 11:27:28 2011 +0200 ignore return value of main_window_setup_balance_create_widget() fix unused-but-set-variable warnings with gcc 4.6. Thanks to Marc Plano-Lesay for reporting. src/empathy-main-window.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commit 05c9e6264afc59d72d824f19ca18f902dbd61cae Author: Xavier Claessens Date: Wed May 4 18:31:53 2011 +0200 Adium: Fix wrong html fallbacks Fallbacks are actually more complex than I though. This is exactly how adium does the fallbacks libempathy-gtk/empathy-theme-adium.c | 339 +++++++++++++--------------------- 1 files changed, 131 insertions(+), 208 deletions(-) commit cf10975ad04b36d408ae1615de570b5b0df52cf9 Author: Guillaume Desmottes Date: Thu May 5 10:31:04 2011 +0200 Depends on tp-glib 0.14.3 We need it for TP_ERROR_STR_INSUFFICIENT_BALANCE. configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 822b3b6e0a5d781cbe0ff024eed6c8b8dace6526 Merge: c698741 90d1301 Author: Danielle Madeley Date: Thu May 5 18:30:33 2011 +1000 Merge branch 'balance-rebase' commit c698741b1825e306de447fa09624f4a93f067374 Merge: 981d175 0d44943 Author: Danielle Madeley Date: Thu May 5 18:22:31 2011 +1000 Merge branch 'delivery-reports-rebase' commit 981d17576bb3451bd4ac79cbd2de079fb64d260b Author: Marc Plano-Lesay Date: Wed May 4 14:35:07 2011 +0200 fix unused-but-set-variable warnings libempathy-gtk/empathy-account-widget.c | 3 --- libempathy-gtk/empathy-contact-widget.c | 14 ++------------ src/empathy-accounts-dialog.c | 20 -------------------- src/empathy-auth-client.c | 3 +-- src/empathy-chat-window.c | 9 --------- src/empathy-event-manager.c | 10 ---------- src/empathy-ft-manager.c | 3 --- src/empathy-new-chatroom-dialog.c | 7 ------- src/empathy-preferences.c | 6 +----- src/ev-sidebar.c | 2 -- tests/interactive/contact-manager.c | 3 +-- 11 files changed, 5 insertions(+), 75 deletions(-) commit 9a1a49ed9ddf5a3d1da99eabca27882705688545 Merge: 77fab8e 0fda594 Author: Danielle Madeley Date: Thu May 5 17:37:40 2011 +1000 Merge branch 'sms-support-rebase' commit 0d44943efc4f3f727861387ba89f57238aa92577 Author: Danielle Madeley Date: Wed May 4 10:05:16 2011 +1000 Add a tooltip to the sending message spinner src/empathy-chat-window.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) commit 24e6b10a9c1795964f0e6e80e074eff24344f64b Author: Danielle Madeley Date: Wed May 4 09:58:18 2011 +1000 Fix broken logic that caused delivery report spinner to spin forever libempathy/empathy-tp-chat.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) commit 3e22736f0211a0bb668218243bc4764435f62a58 Author: Danielle Madeley Date: Thu Apr 28 15:28:35 2011 +1000 [chat-window] add a spinner to the window tab for when messages are being sent src/empathy-chat-window.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) commit 4f37d474725cd006eb627e10349e0361ce9a7b29 Author: Danielle Madeley Date: Thu Apr 28 15:28:08 2011 +1000 [chat] expose this property in EmpathyChat libempathy-gtk/empathy-chat.c | 44 +++++++++++++++++++++++++++++++++++++++++ libempathy-gtk/empathy-chat.h | 2 + 2 files changed, 46 insertions(+), 0 deletions(-) commit 1f46d6c5aa319ea7b81c29dcd08a0c7eb40d5789 Author: Danielle Madeley Date: Wed Apr 27 14:10:50 2011 +1000 [tp-chat] add a counter for the number of pending messages Requires delivery reports to include delivery-token. libempathy/empathy-tp-chat.c | 81 ++++++++++++++++++++++++++++++++++++++++-- libempathy/empathy-tp-chat.h | 6 +++ 2 files changed, 84 insertions(+), 3 deletions(-) commit b0aaacf05d0b46ca53f3b6b9f2dd0565cea0f5d0 Author: Danielle Madeley Date: Thu Apr 21 15:03:52 2011 +1000 Use dbus-error from delivery report for better errors libempathy-gtk/empathy-chat.c | 52 ++++++++++++++++++++++++---------------- libempathy/empathy-tp-chat.c | 12 ++++++--- 2 files changed, 39 insertions(+), 25 deletions(-) commit 90d1301153a574f9d3ac986783efa6b96ebb2f57 Author: Danielle Madeley Date: Tue May 3 17:36:12 2011 +1000 Change the menu to say "Credit Balance" src/empathy-main-window.ui | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 8b7ca3f8fc98f353c439841efbf6951e86ad45a7 Author: Danielle Madeley Date: Tue May 3 17:33:34 2011 +1000 Update balance view in roster per feedback src/empathy-main-window.c | 39 +++++++++++++++++++++++++-------------- 1 files changed, 25 insertions(+), 14 deletions(-) commit 49af530a5bfa17173e28a7b706c5e68117c2cd21 Author: Danielle Madeley Date: Tue May 3 17:22:30 2011 +1000 Change menu string to "Top up My Account ($1.23)..." src/empathy-main-window.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) commit ceeeac4a2c95f89e4ed4042e9e0795786c94fb82 Author: Danielle Madeley Date: Thu Apr 21 13:12:15 2011 +1000 Update formatting for NOK libempathy/empathy-utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 0ba165de9aecc194985de7c6c938b69360e9c3a3 Author: Danielle Madeley Date: Tue Apr 19 08:32:31 2011 +1000 The icon needs to be set as "icon-name" not "stock-id" src/empathy-main-window.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) commit a3efb63e796880a945daa81be60c77df8a610f95 Author: Danielle Madeley Date: Mon Apr 18 13:09:19 2011 +1000 Fill out empathy_format_currency() with more currencies libempathy/empathy-utils.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) commit f8c157d0188f3c8244b74d4d07fc4f85b7ef1079 Author: Danielle Madeley Date: Mon Apr 18 11:12:47 2011 +1000 Use pointless g* types for consistency libempathy/empathy-utils.c | 8 ++++---- libempathy/empathy-utils.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) commit d4597e973a5eef6389f0900c3cea91d73e7c9873 Author: Danielle Madeley Date: Mon Apr 18 10:51:34 2011 +1000 'spacing' is an object property, not a child property of the packing src/empathy-main-window.ui | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 4786fdc5f4424c88c7fcaad5357f42a27c4e24ad Author: Danielle Madeley Date: Fri Apr 15 16:39:40 2011 +1000 Add a menu item to choose whether to show account balances in the roster data/org.gnome.Empathy.gschema.xml.in | 5 +++++ src/empathy-main-window.c | 30 +++++++++++++++++++++++++----- src/empathy-main-window.ui | 8 ++++++++ 3 files changed, 38 insertions(+), 5 deletions(-) commit 1038e0350d5cbe5b70f8d618b1a13d6717da8d7c Author: Danielle Madeley Date: Fri Apr 15 16:18:33 2011 +1000 Create balance widget, tie it to the action TODO: - show and hide balance widgets in response to a toggleaction src/empathy-main-window.c | 53 +++++++++++++++++++++++++++++++++++++++++++- src/empathy-main-window.ui | 19 +++++++++++++-- 2 files changed, 68 insertions(+), 4 deletions(-) commit 4f128d19a94c2315db1bab800be93d97e6033b72 Author: Danielle Madeley Date: Fri Apr 15 15:47:50 2011 +1000 Factor out main_window_setup_balance_create_action() src/empathy-main-window.c | 66 +++++++++++++++++++++++++++----------------- 1 files changed, 40 insertions(+), 26 deletions(-) commit c26345ba2beb3957327810e201a9f71097910738 Author: Danielle Madeley Date: Fri Apr 15 15:24:23 2011 +1000 Support Conn.I.Balance.ManageCreditURI src/empathy-main-window.c | 43 +++++++++++++++++++++++++++++-------------- 1 files changed, 29 insertions(+), 14 deletions(-) commit 0892b114ee4fd20559fb0c613c7c145c8bedbc9d Author: Danielle Madeley Date: Fri Apr 15 14:33:20 2011 +1000 Remove balance from menu when account is disconnected src/empathy-main-window.c | 36 ++++++++++++++++++++++++++++++++---- 1 files changed, 32 insertions(+), 4 deletions(-) commit 416da629fa9a0e9293b811d36547b0b189b6e13d Author: Danielle Madeley Date: Fri Apr 15 14:20:31 2011 +1000 Add a menuitem to report the account balance for each account Adds a menu item for each connection that supports Conn.I.Balance, requests the current balance and then tracks further updates to the balance. TODO: - remove the menu item when the account is disconnected - implement the activated signal src/empathy-main-window.c | 197 ++++++++++++++++++++++++++++++++++++++++++++ src/empathy-main-window.ui | 2 + 2 files changed, 199 insertions(+), 0 deletions(-) commit 1cc68d03a0339cf5f31fabb308b3f1cd9bdb9272 Author: Danielle Madeley Date: Fri Apr 15 14:15:47 2011 +1000 Add method empathy_format_currency() This method takes a Telepathy Currency_Amount and attempts to format it using currency rules appropriate for that amount. Unfortunately I haven't yet found a good summary of currency rules, so I've mostly been guessing. The currencies structure needs completing and checking. libempathy/empathy-utils.c | 74 ++++++++++++++++++++++++++++++++++++++++++++ libempathy/empathy-utils.h | 2 + 2 files changed, 76 insertions(+), 0 deletions(-) commit 0fda59487b536e49bfcec7ab1ee6e9c6d7b6f306 Author: Danielle Madeley Date: Thu May 5 16:22:23 2011 +1000 Include SMSChannel property in empathy_chat_window_find_chat() The approach in https://bugzilla.gnome.org/show_bug.cgi?id=644085 was wrong because channel paths can change across reconnects. This would cause new chat windows to be created when they were rerequested. A more future-proof solution would be to keep a white/black list of comparable properties, but I think this is overengineering the problem for the time being. Instead we'll just include the SMSChannel property in the comparison. src/empathy-chat-manager.c | 3 ++- src/empathy-chat-window.c | 8 +++++--- src/empathy-chat-window.h | 3 ++- 3 files changed, 9 insertions(+), 5 deletions(-) commit 11e8ca993282f16043b821f00e55f5ebd03fb089 Author: Danielle Madeley Date: Wed Apr 13 16:24:21 2011 +1000 Only set the SMS button sensitive if we have SMS capability libempathy-gtk/empathy-new-message-dialog.c | 65 ++++++++++++++++++++++++++- 1 files changed, 63 insertions(+), 2 deletions(-) commit 73220cb660bf75ac0c57f46ca514146cfa091e4f Author: Danielle Madeley Date: Wed Apr 13 16:23:41 2011 +1000 contact-selector-dialog: add a selected-account property libempathy-gtk/empathy-contact-selector-dialog.c | 25 +++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) commit 537eb8711fdac7dc78c047b390fc65ab424bd0d3 Author: Danielle Madeley Date: Tue Apr 12 16:23:49 2011 +1000 Add an SMS button to the new-message dialog libempathy-gtk/empathy-new-message-dialog.c | 43 ++++++++++++++++++++++++-- 1 files changed, 39 insertions(+), 4 deletions(-) commit 2411c0bc8accdfe6ff38cca5510c79f0f56abd8f Author: Danielle Madeley Date: Tue Apr 12 09:43:36 2011 +1000 Don't wait for SMS properties when there is no SMS support on the channel libempathy/empathy-tp-chat.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 8d16f171e0e256e0d8c954c7deb7c410e8e66465 Author: Danielle Madeley Date: Thu Apr 7 11:54:32 2011 +1000 Add "(SMS)" to the tab name for SMS channels libempathy-gtk/empathy-chat.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) commit 385dc5af3c16b6de75d92b989585e44f953967f6 Author: Danielle Madeley Date: Thu Apr 7 11:48:56 2011 +1000 Change empathy_chat_get_name() from const char * -> char * Change the name to empathy_chat_dup_name() to reflect this change. Note to reviewer: I think I've updated all the callers, but this is the commit to check carefully for new leaks :) libempathy-gtk/empathy-chat.c | 8 +++--- libempathy-gtk/empathy-chat.h | 2 +- src/empathy-chat-window.c | 42 +++++++++++++++++++++++++++------------- 3 files changed, 33 insertions(+), 19 deletions(-) commit 19ff66754d0afc6ef10fffba319c781dfc9d0ec9 Author: Danielle Madeley Date: Thu Apr 7 11:43:07 2011 +1000 Add "SMS:" to the tooltip src/empathy-chat-window.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit a0069b64b55bd239eb7d4678fb9792b1359210dc Author: Danielle Madeley Date: Thu Apr 7 11:42:12 2011 +1000 Set EMPATHY_IMAGE_SMS on sms channels src/empathy-chat-window.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commit 6a5fd794b64d48898c3b941b64c6431f55419939 Author: Danielle Madeley Date: Thu Apr 7 11:41:54 2011 +1000 Add sms-channel property to empathy-chat libempathy-gtk/empathy-chat.c | 46 +++++++++++++++++++++++++++++++++++++++- libempathy-gtk/empathy-chat.h | 2 + 2 files changed, 46 insertions(+), 2 deletions(-) commit 8af3231ae3260e40bc327567540a0a3a76dce5b1 Author: Danielle Madeley Date: Wed Apr 6 17:13:33 2011 +1000 Add sms-channel property to empathy-tp-chat libempathy/empathy-tp-chat.c | 77 ++++++++++++++++++++++++++++++++++++++++++ libempathy/empathy-tp-chat.h | 2 + 2 files changed, 79 insertions(+), 0 deletions(-) commit b41c1f0e4b8277feee45703d283591adaed6305b Author: Chandni Verma Date: Wed May 4 00:59:12 2011 +0530 Move the code ensuring a requested sms channel to empathy-request-util as empathy-dispatcher has been deleted in master libempathy-gtk/empathy-individual-menu.c | 2 +- libempathy/empathy-request-util.c | 55 +++++++++++++++++------------ libempathy/empathy-request-util.h | 5 +++ 3 files changed, 38 insertions(+), 24 deletions(-) commit ce8a8930c60b7dbb45f14ed49e8473c4f78e9686 Author: Danielle Madeley Date: Wed Apr 6 16:34:43 2011 +1000 Add SMS entry to empathy-individual-menu libempathy-gtk/empathy-images.h | 1 + libempathy-gtk/empathy-individual-menu.c | 65 ++++++++++++++++++++++++++++++ libempathy-gtk/empathy-individual-menu.h | 5 ++- libempathy/empathy-contact.c | 21 ++++++++++ libempathy/empathy-contact.h | 3 + 5 files changed, 94 insertions(+), 1 deletions(-) commit 77fab8ebc60ce2625c4f449cde6296b25b10b05d Author: Daniel Mustieles Date: Wed May 4 22:39:50 2011 +0200 Updated Spanish translation po/es.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit e589a87b20c200748226195090d4b0a89ae631eb Author: Daniel Mustieles Date: Wed May 4 22:38:14 2011 +0200 Updated Spanish translation po/es.po | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) commit f758b26e3d8bbc6ca348ce4de99b95547745a374 Author: Daniel Mustieles Date: Wed May 4 22:36:44 2011 +0200 Updated Spanish translation po/es.po | 100 +++++++++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 73 insertions(+), 27 deletions(-) commit 3eef7be07ed7873e1f95571082eb6c2319e0b9b3 Author: Xavier Claessens Date: Wed May 4 14:30:02 2011 +0200 Adium: Correctly support action messages (/me) Fixes bug #649367 libempathy-gtk/empathy-theme-adium.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) commit d26565223775beb169f46c315f8c09d1de0b85da Author: Xavier Claessens Date: Tue May 3 23:39:38 2011 +0200 Adium: Fix selection of default variant For theme version >= 3, a variant CSS is mandatory. If none are set inf DefaultVariant, the first one from Variant/ should be used. For theme version <= 2, a variant CSS is optional, and by default they should not have one. If no variant is selected, fallback to main.css. This also prepare needed API to select other variants libempathy-gtk/empathy-theme-adium.c | 216 +++++++++++++++++++++++++-------- libempathy-gtk/empathy-theme-adium.h | 3 + 2 files changed, 166 insertions(+), 53 deletions(-) commit f4d37063650dd562b21ff722700fff573ca5e6b6 Author: Kjartan Maraas Date: Wed May 4 11:14:27 2011 +0200 Updated Norwegian bokmål translation po/nb.po | 623 +++++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 348 insertions(+), 275 deletions(-) commit 06abfe6cfc83b0355403ee7d5ccc45afc2d3b43d Author: Daniel Mustieles Date: Tue May 3 23:11:22 2011 +0200 Updated Spanish translation po/es.po | 113 ++++++++++++++++++++++++++++++------------------------------- 1 files changed, 56 insertions(+), 57 deletions(-) commit a4c37d0cbf7030206a31a9eee838ae8b0d3f13d3 Author: Guillaume Desmottes Date: Tue May 3 14:43:34 2011 +0200 empathy-chat: track chat displayed instead of channels being handled (#649273) src/empathy-chat-manager.c | 71 ++++++++++++++++++++------------------------ src/empathy-chat.c | 6 ++-- 2 files changed, 35 insertions(+), 42 deletions(-) commit 454bb79700b86511e3b0b03c7aab0d498e6a7258 Author: Guillaume Desmottes Date: Tue May 3 14:29:26 2011 +0200 remove unused empathy_chat_manager_get_num_handled_chats() src/empathy-chat-manager.c | 8 -------- src/empathy-chat-manager.h | 2 -- 2 files changed, 0 insertions(+), 10 deletions(-) commit 74c8015453317b0084bdac8a22e6974e2af0865d Author: Xavier Claessens Date: Tue May 3 16:21:54 2011 +0200 Preferences: Show chat theme preview Fixes bug #541438 src/empathy-preferences.c | 250 ++++++--- src/empathy-preferences.ui | 1427 ++++++++++++++++++++++++-------------------- 2 files changed, 965 insertions(+), 712 deletions(-) commit 752ff0ce87069fad6eaea4d9e6dff84d8a2cf55d Author: Xavier Claessens Date: Tue May 3 16:20:29 2011 +0200 ThemeManager: Make sure to emit theme-changed only once when the theme changed Also avoid emiting the signal if it is just a variant change that can be applied on view. libempathy-gtk/empathy-theme-manager.c | 89 ++++++++++++++++++++++++++++---- 1 files changed, 79 insertions(+), 10 deletions(-) commit af9137e60f178bcc5fe039c64ea5e7a762ffcc62 Author: Xavier Claessens Date: Tue May 3 14:23:25 2011 +0200 Adium: Also queue events when loading the page libempathy-gtk/empathy-theme-adium.c | 32 +++++++++++++++++++++----------- 1 files changed, 21 insertions(+), 11 deletions(-) commit 9c9775421d361b2f615bb06a7e9286bfeb912da0 Author: Xavier Claessens Date: Tue May 3 11:11:43 2011 +0200 Adium: Events must be queued until the Template.html loaded libempathy-gtk/empathy-theme-adium.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) commit 7aa2b0f9959c05bd4c361cd582438fd92e9229e4 Author: Xavier Claessens Date: Mon May 2 22:18:53 2011 +0200 Adium: Mark autoreply message libempathy-gtk/empathy-theme-adium.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) commit 1a3795ae51d0d0539a8a4ab267e743811d9ce75c Author: Xavier Claessens Date: Mon May 2 22:14:15 2011 +0200 Adium: highlight messages starting with our name libempathy-gtk/empathy-theme-adium.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 0a23e2154b658e2093980e299045fdcc92feabd2 Author: Muhammet Kara Date: Tue May 3 11:23:24 2011 +0300 Updated Turkish translation po/tr.po | 112 ++++++++++++++++++++++++++++++------------------------------- 1 files changed, 55 insertions(+), 57 deletions(-) commit b71596cf3baf4852ec2bae3ce0fdab236e98d3cc Author: Xavier Claessens Date: Mon May 2 21:26:09 2011 +0200 Depend on stable release of glib 2.28.0 configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit e3a4b93a1e7ec0fd3aa87818189bd87710645257 Author: Xavier Claessens Date: Mon May 2 20:27:13 2011 +0200 Fix crash if contact_id is NULL when selecting its color libempathy-gtk/empathy-theme-adium.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) commit e9ef0cff07611187f2230b08e396fc1637e14ec8 Author: Xavier Claessens Date: Mon May 2 15:42:24 2011 +0200 Adium: Temporally disable scrolling when appending backlog libempathy-gtk/empathy-theme-adium.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) commit 28e020cf508280879d2a7b8ea3ceec878f5c381b Author: Xavier Claessens Date: Mon May 2 15:10:39 2011 +0200 Update Template.html from newest adium data/Template.html | 354 +++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 269 insertions(+), 85 deletions(-) commit 9c19838a24ca1085a5b77f40eb29bcd1b6597221 Author: Guillaume Desmottes Date: Mon May 2 14:55:55 2011 +0200 coding style fix libempathy-gtk/empathy-theme-adium.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit d4250dd038f2c7f5556c7b564f011de8e210e1c3 Author: Guillaume Desmottes Date: Mon May 2 14:42:00 2011 +0200 POTFILES.in: add libempathy-gtk/empathy-search-bar.c po/POTFILES.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 715bb21b4598091c2dac0ebf94b3d744056d01e6 Author: Guillaume Desmottes Date: Mon May 2 13:36:42 2011 +0200 theme-adium: implement %senderColor% (#541632) libempathy-gtk/empathy-theme-adium.c | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) commit fdae42d539623655e9e496c80392164bc3c0f263 Author: Xavier Claessens Date: Mon May 2 13:54:17 2011 +0200 Support new themes that have only Resources/Content.html Still fallback to legacy html files if global one is missing. libempathy-gtk/empathy-theme-adium.c | 120 +++++++++++++++++++++++----------- 1 files changed, 81 insertions(+), 39 deletions(-) commit bc609ea14a874a1ef9c66747ce118228c9fb0a65 Author: Xavier Claessens Date: Mon May 2 13:52:06 2011 +0200 Fix a crash if replacement is NULL libempathy-gtk/empathy-theme-adium.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 4b846aa7efc67f6e01f2e4344d8da0a298d172b8 Author: Guillaume Desmottes Date: Mon May 2 10:10:17 2011 +0200 individual_store_get_individual_status_icon_with_icon_name: look in the cache before creating new pixbuf libempathy-gtk/empathy-individual-store.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) commit ee02e3e2da01c356c6883fa51b2d5cf1cac7318c Author: Guillaume Desmottes Date: Mon May 2 10:04:22 2011 +0200 main_window_flash_foreach: don't leak the pixbuf returned by empathy_pixbuf_from_icon_name src/empathy-main-window.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 7078e93bbcd562175248a8fdf752f2fa92f1171c Author: Guillaume Desmottes Date: Fri Apr 29 17:53:17 2011 +0200 set a not empty string when setting EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_APPEND libnotify now filters out empty string so the hint was not set (#648842). src/empathy-chat-window.c | 3 ++- src/empathy-notifications-approver.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) commit 85058e4e3f88412683771172f7dace66366ad069 Author: Guillaume Desmottes Date: Fri Apr 29 15:47:50 2011 +0200 Display favorite offline contacts only in the Favorite group (#648914) libempathy-gtk/empathy-individual-view.c | 53 +++++++++++++++++++++++++++--- 1 files changed, 48 insertions(+), 5 deletions(-) commit 5ead12fb5b53cea0c8a97e8f101e2d729ca47282 Author: Fran Diéguez Date: Sat Apr 30 23:09:26 2011 +0200 Updated galician translations po/gl.po | 593 ++++++++++++++++++++++++++++++++----------------------------- 1 files changed, 311 insertions(+), 282 deletions(-) commit d8f9882180f0b1b8579a88e0c96a9b52895ab1a0 Author: Marek Černocký Date: Sat Apr 30 13:07:04 2011 +0200 Updated Czech translation po/cs.po | 661 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 342 insertions(+), 319 deletions(-) commit c85766cdb415b34c85f292573b46000d6f592487 Author: Matej Urbančič Date: Thu Apr 28 21:25:18 2011 +0200 Updated Slovenian translation po/sl.po | 605 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 316 insertions(+), 289 deletions(-) commit 6f6b46ec60bd4492024c38a0e7a6301ccb880e2a Author: Daniel Mustieles Date: Wed Apr 27 20:12:22 2011 +0200 Updated Spanish translation po/es.po | 364 +++++++++++++++++++++++++++++++++----------------------------- 1 files changed, 193 insertions(+), 171 deletions(-) commit 5360a078c1b0d1e80a031fab38b865144447080d Author: Xavier Claessens Date: Tue Apr 26 11:52:33 2011 +0200 Use focus feature of adium themes libempathy-gtk/empathy-chat-view.c | 11 ++++ libempathy-gtk/empathy-chat-view.h | 4 ++ libempathy-gtk/empathy-chat.c | 16 +++++- libempathy-gtk/empathy-theme-adium.c | 93 ++++++++++++++++++++++++++++++++-- 4 files changed, 118 insertions(+), 6 deletions(-) commit e4e176e847974f11e5155f434c1620c042dacd69 Author: Xavier Claessens Date: Tue Apr 26 14:31:50 2011 +0200 Add FIXMEs for things we don't implement yet from adium theme spec This also replaces well known keywords that we don't implement yet by "", otherwise the html is broken and webkit does not render it correctly. libempathy-gtk/empathy-theme-adium.c | 162 ++++++++++++++++++++++++++-------- 1 files changed, 123 insertions(+), 39 deletions(-) commit 898327a20db060ddcedde2e85757c952c08dbef3 Author: Guillaume Desmottes Date: Wed Apr 27 12:04:06 2011 +0200 chat_window_page_switched_cb: get the child from the GTK+ signal We don't care about GTK+2 compatibility any more. src/empathy-chat-window.c | 15 +++------------ 1 files changed, 3 insertions(+), 12 deletions(-) commit bc3746dd1bb352d54542d662846273491fa869e2 Author: Muhammet Kara Date: Tue Apr 26 15:21:12 2011 +0300 Updated Turkish translation po/tr.po | 400 +++++++++++++++++++++++++++++++++----------------------------- 1 files changed, 214 insertions(+), 186 deletions(-) commit 3e34b40f5a2ce026187c2e9c8316f1b255c193e9 Author: Will Thompson Date: Fri Apr 15 19:31:28 2011 +0100 contact_list_store_chat_state_changed_cb(): tidy This doesn't fix bgo#647891, but I think it makes the loop clearer. Reviewed-by: Guillaume Desmottes libempathy-gtk/empathy-contact-list-store.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) commit 4b33bdcdb42169a0e38c4a21b07deb6a4d8dcc93