commit 19089099870f5bfe681aa18b90136906025caab7 Author: Guillaume Desmottes Date: Mon Aug 2 17:35:17 2010 +0200 prepare 2.31.6 NEWS | 40 ++++++++++++++++++++++++++++++++++++++++ configure.ac | 6 +++--- 2 files changed, 43 insertions(+), 3 deletions(-) commit dd0384472ded465c5124700accba8f4b786c51d1 Author: Philip Withnall Date: Mon Aug 2 16:55:42 2010 +0100 Don't warn when adding an existing contact Closes: bgo#625830 libempathy/empathy-individual-manager.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) commit 25c5ac2188cde02fe35d9d29eccb11adb6950a8b Author: Guillaume Desmottes Date: Mon Aug 2 16:40:31 2010 +0200 map-view: be a proper GtkWindow (#625826) src/empathy-map-view.c | 228 +++++++++++++++++++++++++++++------------------ src/empathy-map-view.h | 24 +++++ src/empathy-map-view.ui | 123 ++++++++++++-------------- 3 files changed, 221 insertions(+), 154 deletions(-) commit f0f07ffc65b2b8f353262ee8e0f5e4cc535a9772 Author: Guillaume Desmottes Date: Mon Aug 2 14:56:06 2010 +0200 free the list returned by clutter_container_get_children() src/empathy-map-view.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) commit bf773817f5ea14ac8566171153e2df793aeb03aa Author: Nicolò Chieffo Date: Mon Aug 2 12:40:52 2010 +0200 show the date in messages coming from history (#624599) libempathy-gtk/empathy-log-window.c | 2 +- libempathy-gtk/empathy-theme-adium.c | 16 +++++++++++----- libempathy/empathy-time.h | 3 ++- 3 files changed, 14 insertions(+), 7 deletions(-) commit f8f4c3a9dc1e21df9e78dafb259112a9a5ac4b46 Author: Guillaume Desmottes Date: Mon Aug 2 10:40:51 2010 +0200 Check for the right version of CC depending on GTK+ gnome-control-center has been ported to GTK+3 in 2.31.4 configure.ac | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) commit f77a8afd5d85a230b743d97e12ed069a0309b660 Author: Xavier Claessens Date: Fri Jul 23 14:41:32 2010 +0200 Group all matching functions together This is only code move, no change libempathy-gtk/empathy-live-search.c | 138 +++++++++++++++++----------------- 1 files changed, 69 insertions(+), 69 deletions(-) commit 6f3136b0a2168dee114dae4381f9e5c0b9d0ba0d Author: Xavier Claessens Date: Fri Jul 23 14:40:10 2010 +0200 Abort directly if a test failed tests/empathy-live-search-test.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) commit 3251e70779cb69865797a32da731194eaa89f882 Author: Xavier Claessens Date: Fri Jul 23 14:39:39 2010 +0200 Simplify code: Avoid nested loops libempathy-gtk/empathy-live-search.c | 124 +++++++++++++++++----------------- 1 files changed, 63 insertions(+), 61 deletions(-) commit fa60b75334999bedb28dfacdbb5a73f1cc62193a Author: Xavier Claessens Date: Thu Jul 22 15:02:06 2010 +0200 Make livesearch work if accentued letters are pre-decomposed libempathy-gtk/empathy-live-search.c | 12 ++++++------ tests/empathy-live-search-test.c | 7 ++++++- 2 files changed, 12 insertions(+), 7 deletions(-) commit 9ab5da340ffe6f13afc5b3e32682635980b96ad5 Author: Xavier Claessens Date: Tue Jun 22 13:04:05 2010 +0200 Add unit tests for the multi-word searching tests/empathy-live-search-test.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commit 0cdeb7e2b28f91b84cefb15d72eaa21af8a5be99 Author: Xavier Claessens Date: Tue Jun 22 13:03:36 2010 +0200 Make EmpathyLiveSearch's match algo smarter with words Fixes bug #622376 libempathy-gtk/empathy-live-search.c | 101 +++++++++++++++++++++++++--------- 1 files changed, 74 insertions(+), 27 deletions(-) commit 09224fdb009abd2cc54ff4c3b6c64b47970f47d3 Author: Xavier Claessens Date: Thu Jul 22 12:43:10 2010 +0200 Add GTK_LIBS to build tests tests/Makefile.am | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) commit 9f98cdc5cb1e709fbe150bb98b94e49e165e6d12 Author: Felix Kaser Date: Thu Jul 29 17:02:01 2010 +0200 backport the last commit to contact-list-view libempathy-gtk/empathy-contact-list-view.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) commit df5cfb43b2c1bb9d0cd5f55b7397cfd327aedd34 Author: Felix Kaser Date: Thu Jul 29 16:53:28 2010 +0200 added return value for the keynav signal now the hook widget can decide if it wants to handle the event or not. in case of the treeview this allows us to navigate in the search entry with left and right and navigate in the treeview with up and down since those are catched by the treeview libempathy-gtk/empathy-individual-view.c | 8 ++++++-- libempathy-gtk/empathy-live-search.c | 12 +++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) commit f42a546df394424e9ca71e123e2482bcc021ed82 Author: Felix Kaser Date: Thu Jul 29 16:07:34 2010 +0200 changed the type of keynav signal now VOID__BOXED is used instead of VOID__POINTER libempathy-gtk/empathy-individual-view.c | 8 ++++---- libempathy-gtk/empathy-live-search.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) commit 8b6f735f75f51774bce12eb64ad1ed4712289bbb Author: Felix Kaser Date: Wed Jul 28 17:49:44 2010 +0200 added check for null before scroll to cell libempathy-gtk/empathy-individual-view.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) commit 673b6d90189c65ef4d859e2a3139ce7c0cea1e49 Author: Felix Kaser Date: Wed Jul 28 14:59:06 2010 +0200 add key navigation possibilities to search one result of this patch is that key navigation in the search-entry will not be possible any more, in order to allow the hook widget to react to key navigation. libempathy-gtk/empathy-individual-view.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) commit f49028633f80ab1c641f29f85ae39e2184894f93 Author: Felix Kaser Date: Wed Jul 28 14:43:05 2010 +0200 keep the selected contact visible after search empathy will scroll automatically to the cell which is selected, when the search is hidden. libempathy-gtk/empathy-individual-view.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) commit 6568f7b78787cd1c6dbf7a447b71865986b12bc6 Author: Felix Kaser Date: Tue Jul 27 16:59:58 2010 +0200 enable keynavigation during search in contact-list libempathy-gtk/empathy-contact-list-view.c | 24 ++++++++++++++++++++++++ libempathy-gtk/empathy-live-search.c | 28 ++++++++++++++++++++++++---- 2 files changed, 48 insertions(+), 4 deletions(-) commit 2e4f5741143341616ed2cca3bf27a0204483d4ff Author: Felix Kaser Date: Tue Jun 15 15:04:52 2010 +0200 dont catch key up and down from the treeview it is needed for the navigation. current implementation did catch it from the treeview and propagate it to the live search entry. libempathy-gtk/empathy-live-search.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) commit 4ac906564f1cfc4991f7482a8469881ef79639e8 Author: Felix Kaser Date: Wed Jul 28 17:55:27 2010 +0200 fixed a critical when quiting while searching libempathy-gtk/empathy-live-search.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 85e71e2cfadaceab73addb357c04557652d0cee9 Author: Felix Kaser Date: Wed Jul 28 16:55:44 2010 +0200 added zh_CN to help/.gitignore help/.gitignore | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 423f378b511ca9e15b2e476d0c453b087470bc1a Author: Felix Kaser Date: Wed Jul 28 16:42:32 2010 +0200 fix small regression with expanding groups libempathy-gtk/empathy-individual-view.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit c5634d7706322a4c86bef37b0c59740bd4f3ec0e Author: Mario Blättermann Date: Tue Jul 27 23:02:12 2010 +0200 [i18n] Updated German translation po/de.po | 242 ++++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 132 insertions(+), 110 deletions(-) commit f84aee88c44c0b9f58709e95675c7b3fd6547428 Author: Fran Diéguez Date: Tue Jul 27 17:50:55 2010 +0200 Updated Galician translations po/gl.po | 208 ++++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 115 insertions(+), 93 deletions(-) commit 34e8fc1344c5433be1a9d8f8614cdb84933a84fb Merge: 4ca3b29 a976f81 Author: Travis Reitter Date: Tue Jul 27 12:54:06 2010 +0200 Merge branch 'folks-async-and-prepare' commit a976f8193404e5c89d0a9a9051f629057e200f9b Author: Travis Reitter Date: Mon Jul 26 18:49:35 2010 +0200 Adjust for signature change in folks_groups_change_group() libempathy-gtk/empathy-individual-view.c | 22 ++++++++++++++++++++-- libempathy/empathy-contact.c | 19 ++++++++++++++++++- libempathy/empathy-individual-manager.c | 19 ++++++++++++++++++- 3 files changed, 56 insertions(+), 4 deletions(-) commit e854ea2dad6350cc1787f9ac9ee1012c7c2ebd77 Author: Travis Reitter Date: Mon Jul 26 18:24:51 2010 +0200 Adjust for signature change in folks_individual_aggregator_remove_individual() libempathy/empathy-individual-manager.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) commit da3c11790a80db7fce92778352481bafd95bf939 Author: Philip Withnall Date: Wed Jun 30 14:52:27 2010 +0100 Use the new IndividualAggregator.prepare() method This avoids races when connecting to signals from the IndividualAggregator. configure.ac | 2 +- libempathy/empathy-individual-manager.c | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) commit 4ca3b29b70ca4f624153783c26f0d746f58003a8 Author: Aron Xu Date: Tue Jul 27 15:28:19 2010 +0800 Add Simplified Chinese help translation. help/Makefile.am | 2 +- help/zh_CN/zh_CN.po | 2711 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 2712 insertions(+), 1 deletions(-) commit d3edbb376910878781d5a326c52cb9885d9b15d2 Author: Fran Diéguez Date: Tue Jul 27 01:09:27 2010 +0200 Updated Galician translations help/gl/gl.po | 2653 ++++++++++++++++++++++++++++----------------------------- 1 files changed, 1324 insertions(+), 1329 deletions(-) commit 8f1e4293a4d4410c48ca3572c71c3a2eb9509d71 Author: Jorge González Date: Mon Jul 26 20:58:43 2010 +0200 Updated Spanish translation po/es.po | 250 +++++++++++++++++++++++++++++++++----------------------------- 1 files changed, 134 insertions(+), 116 deletions(-) commit fc4697f53ca3bde0ec9cb911587806d2245a536e Author: Sjoerd Simons Date: Mon Jul 26 20:11:04 2010 +0200 Committed version of x264enc needs profile=1 for baseline data/element-properties | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 8c67868e68f97c9822f9f66ad2de0554a16f9882 Author: Torstein Adolf Winterseth Date: Mon Jul 26 18:02:00 2010 +0200 Updated Norwegian Nynorsk translation po/nn.po | 1147 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 584 insertions(+), 563 deletions(-) commit 27b984d49c08f1504da5dda6f449a759795721bd Author: Torstein Adolf Winterseth Date: Mon Jul 26 17:58:29 2010 +0200 Added Norwegian Nynorsk translation po/LINGUAS | 1 + po/nn.po | 3335 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 3336 insertions(+), 0 deletions(-) commit fa64735c16e43857bdcee54b55b4911766731f3b Author: Andrej Žnidaršič Date: Sun Jul 25 20:55:40 2010 +0200 Updated Slovenian translation po/sl.po | 352 ++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 172 insertions(+), 180 deletions(-) commit 2c0802e450f955c5688babc552d6af029267a5d8 Author: Fran Diéguez Date: Sun Jul 25 16:25:19 2010 +0200 Updated Galician translations help/gl/gl.po | 210 +++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 138 insertions(+), 72 deletions(-) commit e5fbae9a9796477e1373098e036b6247d1aa0b6b Author: Cheng-Chia Tseng Date: Sat Jul 24 20:00:22 2010 +0800 Updated Traditional Chinese translation(Hong Kong and Taiwan) po/zh_HK.po | 204 +++++++++++++++++++++++++++++++++-------------------------- po/zh_TW.po | 204 +++++++++++++++++++++++++++++++++-------------------------- 2 files changed, 226 insertions(+), 182 deletions(-) commit 4d97eef1d2c42553d41ff5a24bac1c835c4afe37 Author: Yaron Shahrabani Date: Sat Jul 24 13:27:38 2010 +0300 Updated Hebrew translation. po/he.po | 252 ++++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 137 insertions(+), 115 deletions(-) commit aa08e47f9ae2bcbb7aeeeabb5bd30d7c09cc9aaa Author: Xavier Claessens Date: Fri Jul 23 10:44:15 2010 +0200 Add help/gl/ in gitignore help/.gitignore | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit f82c41d6384f727fec1f2937714f831d84e20dfd Author: Xavier Claessens Date: Fri Jul 23 10:42:53 2010 +0200 Remove cc-empathy-accounts-page.c from POTFILE.in po/POTFILES.in | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commit ffe01c047fd5fcc7f6443c2bd2bf01a91882c6e8 Author: Yunqiang Su Date: Fri Jul 23 13:21:35 2010 +0800 Update Simplified Chinese translations. po/zh_CN.po | 164 +++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 92 insertions(+), 72 deletions(-) commit e3955eea9b1a64b4252226936c985f4eae8db5aa Author: Fran Diéguez Date: Thu Jul 22 16:32:15 2010 +0200 Updated Galician translations po/gl.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit d79516d0ed6831314ff73a2f0563c39c20e9c462 Author: Philip Withnall Date: Fri Jul 9 14:53:37 2010 +0100 Use presence message from FolksPersona rather than TpContact libempathy/empathy-contact.c | 40 +++++++++++++++++++++++++--------------- 1 files changed, 25 insertions(+), 15 deletions(-) commit 0c9907c6a704bed65db982ac9ae5fe83912c647d Author: Philip Withnall Date: Fri Jul 9 14:22:54 2010 +0100 Enforce use only of TpfPersonas If we only allow EmpathyContacts to be linked to TpfPersonas, we can make some assumptions about which interfaces are available on the personas for efficiency purposes. libempathy/empathy-contact.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) commit e922ae799989e073cb6649578555ad686bcb0fc8 Author: Philip Withnall Date: Wed Jul 7 17:01:59 2010 +0100 Re-enable setting of groups for newly-added contacts Changes to groups made while adding a contact need to be cached up until the contact's FolksPersona is set, when they can be flushed to the libfolks backend. libempathy-gtk/empathy-contact-widget.c | 13 +------- libempathy/empathy-contact.c | 47 +++++++++++++++++++++++++++++++ libempathy/empathy-contact.h | 2 + 3 files changed, 51 insertions(+), 11 deletions(-) commit d64a31579c0cdaa7013f5165f5111d57feb9b92e Author: Philip Withnall Date: Wed Jul 7 16:25:53 2010 +0100 Update FolksPersona:alias when updating EmpathyContact:alias libempathy/empathy-contact.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) commit b6568db4f81cf4e78e96aa5fe23f020de5ff6557 Author: Philip Withnall Date: Wed Jul 7 16:21:43 2010 +0100 Merge EmpathyContact:name and *_set_alias() to EmpathyContact:alias The "name" API was a relic of Gossip. libempathy-gtk/empathy-chat.c | 18 +++--- libempathy-gtk/empathy-contact-dialogs.c | 2 +- libempathy-gtk/empathy-contact-list-store.c | 26 ++++---- libempathy-gtk/empathy-contact-list-view.c | 4 +- libempathy-gtk/empathy-contact-selector-dialog.c | 6 +- libempathy-gtk/empathy-contact-widget.c | 6 +- libempathy-gtk/empathy-theme-adium.c | 2 +- libempathy-gtk/empathy-theme-boxes.c | 4 +- libempathy-gtk/empathy-theme-irc.c | 4 +- libempathy-gtk/empathy-ui-utils.c | 2 +- libempathy/empathy-contact.c | 71 +++++++++------------- libempathy/empathy-contact.h | 5 +- libempathy/empathy-individual-manager.c | 2 +- libempathy/empathy-message.c | 2 +- libempathy/empathy-tp-chat.c | 2 +- src/empathy-call-window.c | 8 +- src/empathy-chat-window.c | 2 +- src/empathy-event-manager.c | 20 +++--- src/empathy-ft-manager.c | 10 ++-- src/empathy-map-view.c | 2 +- 20 files changed, 91 insertions(+), 107 deletions(-) commit a244924636a2a0cde9da06909ac2b1b141ce3b9e Author: Philip Withnall Date: Wed Jul 7 13:26:19 2010 +0100 Remove folks_individual_dup_from_empathy_contact() As EmpathyContact is now a wrapper around FolksPersona, we can mutate the persona instead of acquiring an individual and mutating that instead. libempathy-gtk/empathy-contact-widget.c | 48 +++++++++--------------------- libempathy/empathy-contact.c | 36 +++++------------------ libempathy/empathy-utils.c | 32 -------------------- libempathy/empathy-utils.h | 1 - 4 files changed, 23 insertions(+), 94 deletions(-) commit 7e4dfd33eb0fe4e87aef3a0b6c8dbc94c540e7b0 Author: Philip Withnall Date: Wed Jul 7 11:17:14 2010 +0100 Add a link between EmpathyContact and FolksPersona EmpathyContact should eventually just be a thin wrapper over FolksPersona. libempathy/empathy-contact.c | 95 +++++++++++++++++++++++++++++++ libempathy/empathy-contact.h | 4 + libempathy/empathy-individual-manager.c | 3 + 3 files changed, 102 insertions(+), 0 deletions(-) commit da5ec3c2bf5f816cff03932d23aec183beb18ee5 Author: Travis Reitter Date: Wed Jul 14 13:55:07 2010 -0700 Merge remote branch 'pwith/folks-integ-rebase1-fixes-rebase1' into folks-fixes libempathy-gtk/empathy-contact-widget.c | 4 ++-- libempathy-gtk/empathy-individual-menu.c | 6 ++---- libempathy-gtk/empathy-individual-store.c | 27 +++++++++++++++++++-------- libempathy/empathy-individual-manager.c | 1 + po/POTFILES.in | 1 + src/empathy-main-window.c | 2 ++ 6 files changed, 27 insertions(+), 14 deletions(-) commit 5ee7ffd39ff228c35d0fb85aa7d55bbfe044e73f Author: Philip Withnall Date: Wed Jul 21 11:57:08 2010 +0100 Re-add support for the "People Nearby" group libempathy-gtk/empathy-individual-store.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) commit 5f58a8e1491eb0a2c44bbcd73674cf88877500e3 Author: Khaled Hosny Date: Wed Jul 21 13:40:07 2010 +0300 Typos po/ar.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit e2af25ce63ffd32d5bc3d411a3e57462d14a48f4 Author: Danielle Madeley Date: Wed Jul 21 10:14:06 2010 +0100 Add authors and fix copyrights for empathy-accounts-module src/cc-empathy-accounts-panel.c | 4 +++- src/cc-empathy-accounts-panel.h | 3 ++- src/empathy-accounts-module.c | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) commit 8d37c869f388f81adccd057042cc520fdeb8f02e Author: Danielle Madeley Date: Fri Jul 16 11:55:46 2010 +1000 Remove unneccesary signal disconnection in EmpathyAccountsDialog Generated critical warnings under GTK+ 3 src/empathy-accounts-dialog.c | 44 ++++++++-------------------------------- 1 files changed, 9 insertions(+), 35 deletions(-) commit de35a9afcc8b6c6273ae01876919a14c6179c5a5 Author: Danielle Madeley Date: Fri Jul 16 11:55:21 2010 +1000 Update cc-empathy-accounts-panel for latest gnome-control-center data/empathy-accounts.desktop.in.in | 1 + src/Makefile.am | 2 - src/cc-empathy-accounts-page.c | 264 ----------------------------------- src/cc-empathy-accounts-page.h | 55 ------- src/cc-empathy-accounts-panel.c | 171 +++++++++++++++++------ src/cc-empathy-accounts-panel.h | 2 +- 6 files changed, 130 insertions(+), 365 deletions(-) commit 4d850fee976c589164ab5b6355afbda8db75efe2 Author: Danielle Madeley Date: Thu Jul 15 17:15:48 2010 +1000 Update gnome-control-center dependency configure.ac | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) commit 033b4fe0ddcf1827b4b3f6a617c47978e7edfde7 Author: Danielle Madeley Date: Thu Jul 15 17:14:52 2010 +1000 Remove apostrophes from configure.ac because they break vim's highlighting configure.ac | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) commit f3e4307c1cfda8b363ac516e789a3b9668df23b3 Author: Travis Reitter Date: Wed Jul 14 10:01:43 2010 -0700 Take advantage of tp_asv_new(). libempathy/empathy-individual-manager.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) commit 83b905bd5e671421b6346b328461017927440211 Author: Travis Reitter Date: Wed Jul 14 09:55:27 2010 -0700 Use the proper source_tag in empathy_pixbuf_avatar_from_individual_scaled_*(). libempathy-gtk/empathy-ui-utils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 7beead812ce0f9cf5b96233505f28ca479d58fd1 Author: Travis Reitter Date: Mon Jul 12 23:23:24 2010 -0700 Adjust to the new add_persona_from_details() API. configure.ac | 2 +- libempathy/empathy-individual-manager.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) commit e135f5a5112058e61bb20357f34f69e63a4cc942 Author: Travis Reitter Date: Mon Jul 12 17:12:14 2010 -0700 Update to the FolksIndividualAggregator:individuals-changed signal. configure.ac | 2 +- libempathy/empathy-individual-manager.c | 37 +++++++++++------------------- libempathy/empathy-utils.c | 7 ++++++ libempathy/empathy-utils.h | 1 + 4 files changed, 23 insertions(+), 24 deletions(-) commit faa4b2c9106b84c7c083c9ef2763dbd0e6892998 Author: Travis Reitter Date: Mon Jul 12 12:13:02 2010 -0700 Don't depend on Folks capabilities in the IndividualView libempathy-gtk/empathy-individual-view.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) commit 9d7bdfa085b50a7c96082ffeebd5489c7192f4e2 Author: Travis Reitter Date: Mon Jul 12 10:08:05 2010 -0700 Calculate contact capabilities ourselves. The libfolks Capabilities interface will be removed temporarily, so we can't rely upon it for now. libempathy-gtk/empathy-individual-store.c | 45 +++++++++++++++++++++-------- 1 files changed, 33 insertions(+), 12 deletions(-) commit 61814a215542bfe7353679affcc1d5dfaf1db094 Author: Travis Reitter Date: Fri Jul 9 18:26:48 2010 -0700 Only have one parameter per function definition line. libempathy/empathy-individual-manager.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 4be5fe61180e2c211114435b6490f820fd04d18c Author: Travis Reitter Date: Fri Jul 9 18:20:11 2010 -0700 Cut excessive G_STRLOC in DEBUG statements. libempathy/empathy-individual-manager.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit e17c5b6110887b9fa038d174f9deb203d2e8259c Author: Travis Reitter Date: Fri Jul 9 18:18:04 2010 -0700 Chain up IndividualManager's dispose() to call its parent's dispose(). libempathy/empathy-individual-manager.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit eee71e1200b22c9d168db3b111075f88595e5130 Author: Travis Reitter Date: Fri Jul 9 18:16:00 2010 -0700 Perform the IndividualManager dispose work in a dispose() function, not finalize. libempathy/empathy-individual-manager.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 57ad2410667935dfdab6d58fb09594ae94f83e05 Author: Travis Reitter Date: Fri Jul 9 18:07:13 2010 -0700 Add a comment about the IndividualManager's general memory management policy. libempathy/empathy-individual-manager.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commit 75d01286920321fd40c5cfbe3d040789359e8a5e Author: Travis Reitter Date: Fri Jul 9 17:58:59 2010 -0700 Use the more-conventional approach to signal emission in IndividualManager. libempathy/empathy-individual-manager.c | 76 ++++++++++++++++++------------- 1 files changed, 44 insertions(+), 32 deletions(-) commit 784be67cd65bcf43252d1d48067ca909add9b26e Author: Travis Reitter Date: Fri Jul 9 17:41:51 2010 -0700 Take advantage of tp_clear_object(). libempathy-gtk/empathy-individual-view.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commit 16b9e5e98e4e57896751ee1d37012cd30a8d508a Author: Travis Reitter Date: Fri Jul 9 17:39:56 2010 -0700 Minimize the scope of some variables and avoid risk of double-freeing a string. libempathy-gtk/empathy-individual-view.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) commit 4705170690b772c5c4ee375926272fd178a2fd19 Author: Travis Reitter Date: Fri Jul 9 17:08:04 2010 -0700 Enclose a non-trivial expression in () in an assignment. libempathy-gtk/empathy-individual-store.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit b2dd6cd0f905bc78c678ea1206de81193fcadebc Author: Travis Reitter Date: Fri Jul 9 17:06:57 2010 -0700 Also sort the IndividualStore by underlying protocol and account ID. libempathy-gtk/empathy-individual-store.c | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) commit 3f4a0ae03c0eee55bf84f413214f5c834308011b Author: Travis Reitter Date: Fri Jul 9 14:25:14 2010 -0700 Don't enclose trivial blocks in {}. libempathy-gtk/empathy-individual-store.c | 44 ++++----------- libempathy-gtk/empathy-individual-view.c | 85 ++++++++--------------------- 2 files changed, 33 insertions(+), 96 deletions(-) commit b22ad13080a14191a8e33c92bc8332b40674824c Author: Travis Reitter Date: Fri Jul 9 14:17:15 2010 -0700 Use explicit '!= NULL' for pointer boolean expressions. libempathy-gtk/empathy-individual-store.c | 4 ++-- libempathy-gtk/empathy-individual-view.c | 21 +++++++++++---------- 2 files changed, 13 insertions(+), 12 deletions(-) commit adf158ac3343088b4553b192b55ad0da5c629b71 Author: Travis Reitter Date: Fri Jul 9 13:55:46 2010 -0700 Cut obsolete comment. libempathy-gtk/empathy-individual-menu.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 325dee46c2ea53bdc24802fa264b632b8b704e5b Author: Travis Reitter Date: Fri Jul 9 13:55:23 2010 -0700 Simplify validation. libempathy-gtk/empathy-individual-menu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 22c93bf49f6a3fdf31496d2c2fd7b7553ee351f1 Author: Travis Reitter Date: Fri Jul 9 13:54:16 2010 -0700 Take advantage of tp_clear_object(). libempathy-gtk/empathy-individual-menu.c | 3 +-- src/empathy-main-window.c | 11 ++++------- 2 files changed, 5 insertions(+), 9 deletions(-) commit d392ae0a2fd82c9ae39a0f9594f7cdd8ed3b4411 Author: Travis Reitter Date: Fri Jul 9 13:34:20 2010 -0700 We already know that this contact is a FolksIndividual if it isn't NULL, so simplify the conditional. libempathy-gtk/empathy-individual-dialogs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit b94698cb3423f9852dbf2347773ab22598df1136 Author: Travis Reitter Date: Fri Jul 9 13:21:29 2010 -0700 Stick with the term 'contact' instead of adding 'individual'. libempathy-gtk/empathy-individual-dialogs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit cf0b25a06daab8458f4a469b7e81ccb5a5775096 Author: Travis Reitter Date: Fri Jul 9 13:17:32 2010 -0700 Update copyright notice. libempathy-gtk/empathy-individual-dialogs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 171cc611ef2f74bbd51196c56a2eedef342f8c28 Author: Travis Reitter Date: Thu Jul 8 11:51:53 2010 -0700 Fix alignment. src/empathy-main-window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit a4421e0ebac291f3cb897f1ea0ff2839ec50d014 Author: Travis Reitter Date: Thu Jul 8 11:46:00 2010 -0700 Don't leak references to the contacts returned from empathy_contact_dup_from_folks_individual(). libempathy-gtk/empathy-individual-dialogs.c | 3 +++ libempathy-gtk/empathy-individual-menu.c | 6 ++++++ libempathy-gtk/empathy-individual-store.c | 4 ++++ libempathy-gtk/empathy-individual-view.c | 3 ++- 4 files changed, 15 insertions(+), 1 deletions(-) commit fef2dec3ea6216921b297c7edbb3665e6c222ef5 Author: Travis Reitter Date: Thu Jul 8 11:34:35 2010 -0700 Add 'dup' to the names of empathy_contact_from_folks_individual() and folks_individual_from_empathy_contact() to make it clear that the return value has been referenced. libempathy-gtk/empathy-contact-widget.c | 14 +++++----- libempathy-gtk/empathy-individual-dialogs.c | 2 +- libempathy-gtk/empathy-individual-menu.c | 34 +++++++++++++------------- libempathy-gtk/empathy-individual-store.c | 4 +- libempathy-gtk/empathy-individual-view.c | 6 ++-- libempathy/empathy-utils.c | 6 ++-- libempathy/empathy-utils.h | 4 +- src/empathy-main-window.c | 4 +- 8 files changed, 37 insertions(+), 37 deletions(-) commit 571d3f81c92099c569c061f38c1ac3b923c04637 Author: Travis Reitter Date: Thu Jul 8 11:18:20 2010 -0700 Simplify empathy_folks_individual_contains_contact(). libempathy/empathy-utils.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) commit 151eb2b90cb579c7d538d0e3735e2d6157c57839 Author: Travis Reitter Date: Thu Jul 8 11:11:55 2010 -0700 Add comments for the new Individual/Contact utility functions. libempathy/empathy-utils.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) commit ebea339331d9c7a8eb69c125bd261ab60b3781eb Author: Travis Reitter Date: Thu Jul 8 11:01:02 2010 -0700 Use the gio async pattern for fetching Individuals' avatars libempathy-gtk/empathy-individual-store.c | 37 ++++++++++---- libempathy-gtk/empathy-ui-utils.c | 80 ++++++++++++++++++++--------- libempathy-gtk/empathy-ui-utils.h | 14 +++-- 3 files changed, 92 insertions(+), 39 deletions(-) commit c922fe784e177fa328f987e0a8cd84b0de10f019 Author: Travis Reitter Date: Wed Jul 7 20:19:48 2010 -0700 Reduce line length. libempathy-gtk/empathy-ui-utils.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) commit cb703ba93de027d1b62b1a9716ca7d9c0d90133b Author: Travis Reitter Date: Wed Jul 7 20:16:46 2010 -0700 Take advantage of the tp_clear_* utility functions. libempathy-gtk/empathy-individual-store.c | 28 ++++------------------ libempathy-gtk/empathy-individual-view.c | 37 +++++----------------------- libempathy-gtk/empathy-ui-utils.c | 4 +- libempathy/empathy-individual-manager.c | 7 +---- 4 files changed, 16 insertions(+), 60 deletions(-) commit df6ea1a0a3bdef9fc134bfaaa02ca3614398ca16 Author: Travis Reitter Date: Wed Jul 7 19:54:58 2010 -0700 Cut misinformed comment about a potential race condition. libempathy-gtk/empathy-ui-utils.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 980fc7fda64a1c2e5a9de44858362e7211aa7a32 Author: Travis Reitter Date: Wed Jul 7 19:46:05 2010 -0700 Create a constructor for PixbufAvatarFromIndividualClosure. libempathy-gtk/empathy-ui-utils.c | 37 ++++++++++++++++++++++++++----------- 1 files changed, 26 insertions(+), 11 deletions(-) commit bd01a33901d5b12a07630e2b3e862838baa0369c Author: Travis Reitter Date: Wed Jul 7 19:28:27 2010 -0700 Clarify that toggling a group in the EmpathyContactWidget actually toggles it. libempathy-gtk/empathy-contact-widget.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) commit 7473d7a97d02be9aeefa271269184485ddf460a4 Author: Travis Reitter Date: Wed Jul 7 19:22:15 2010 -0700 Use explicit boolean expressions for if-conditionals, according to Telepathy style. libempathy-gtk/empathy-contact-widget.c | 12 ++++++------ libempathy-gtk/empathy-individual-store.c | 2 +- libempathy-gtk/empathy-individual-view.c | 6 +++--- src/empathy-main-window.c | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) commit a854cb126541cda286f4f48d2962c43e3be8a4f5 Author: Travis Reitter Date: Wed Jul 7 08:10:12 2010 -0700 Add the empathy-individual-* files to POTFILES.in po/POTFILES.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit e25fa2252ec8b46a9584f294d8604dee86ff7a38 Author: Philip Withnall Date: Tue Jul 6 14:40:35 2010 +0100 Hold a reference to the contact we're adding as an individual In empathy_individual_manager_add_from_contact(), we must hold a reference to the contact we're adding throughout the entire async process, or the TpHandle which represents the contact could get unreffed and destroyed. This causes the new contact to get lost. libempathy/empathy-individual-manager.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) commit 1acf1e0f3b5686b95f1b0787a5308e0a6298eb08 Author: Travis Reitter Date: Tue Jul 6 12:23:13 2010 -0700 Add some more validation when sorting the contact list. libempathy-gtk/empathy-individual-store.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) commit c9602a81b0f64f20c1927947c8e456929c521119 Author: Philip Withnall Date: Fri Jul 2 12:11:06 2010 +0100 Fix setting favourites from the contact editing dialogue libempathy-gtk/empathy-contact-widget.c | 33 +++++++++++++++---------------- 1 files changed, 16 insertions(+), 17 deletions(-) commit ac58a4101765c64d94c18d10c59fde7fa67ea4ae Author: Philip Withnall Date: Fri Jul 2 12:00:55 2010 +0100 Allow changing of individuals' aliases libempathy-gtk/empathy-contact-widget.c | 9 ++++++++- libempathy-gtk/empathy-individual-store.c | 4 +--- 2 files changed, 9 insertions(+), 4 deletions(-) commit 265ea7ef4abb3df7cf6d8e1c9f4c5bfe68763179 Author: Philip Withnall Date: Fri Jul 2 11:29:05 2010 +0100 Re-enable changing individuals' groups This introduces a hacky function to return the individual for a given EmpathyContact, which should go away once we break the assumption that individuals are 1:1 with contacts. libempathy-gtk/empathy-contact-widget.c | 28 +++++++++++++++------------- libempathy/empathy-utils.c | 29 +++++++++++++++++++++++++++++ libempathy/empathy-utils.h | 1 + 3 files changed, 45 insertions(+), 13 deletions(-) commit 0919a8a5cc60ddda3a6d727533c926fa691617d2 Author: Travis Reitter Date: Thu Jul 1 10:23:37 2010 -0700 Bump libfolks requirement. configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit e557b1763dc2f454695bceeb84db3d8931dde759 Author: Travis Reitter Date: Thu Jul 1 10:23:25 2010 -0700 Fix trivial casting error. libempathy/empathy-individual-manager.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 2fcee569ba4bf86f78b6b5d6c12bfeeecbb1c47e Author: Philip Withnall Date: Thu Jul 1 17:03:59 2010 +0100 Support removing groups libempathy-gtk/empathy-individual-view.c | 6 ++++-- libempathy/empathy-individual-manager.c | 26 ++++++++++++++++++++++++++ libempathy/empathy-individual-manager.h | 3 +++ 3 files changed, 33 insertions(+), 2 deletions(-) commit 2999dda22d4d80df40420334273fcbb7aadac091 Author: Philip Withnall Date: Thu Jul 1 14:26:04 2010 +0100 Fix some referencing bugs with the IndividualStore and IndividualView libempathy-gtk/empathy-individual-store.c | 7 ++----- libempathy-gtk/empathy-individual-view.c | 19 +++++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) commit 336c38712dde2938b1ead01f05e1cd01f96c888d Author: Philip Withnall Date: Wed Jun 30 15:37:33 2010 +0100 Re-implement file sending with drag and drop libempathy-gtk/empathy-individual-view.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) commit 6d9c8a607e2b44d20d54a11e917d0723da81078d Author: Philip Withnall Date: Wed Jun 30 15:26:03 2010 +0100 Remove unused EmpathyIndividualManager instances from the individual menu libempathy-gtk/empathy-individual-menu.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) commit ce240862c8f53b1bf62b80bba5f1fcdca07393d6 Author: Philip Withnall Date: Wed Jun 30 14:53:49 2010 +0100 Remove an unused connection to the telepathy-logger service libempathy/empathy-individual-manager.c | 24 ------------------------ 1 files changed, 0 insertions(+), 24 deletions(-) commit 88e3360d3ac088cd67e0ca36710d84d63eca4d91 Author: Travis Reitter Date: Tue Jun 29 15:22:48 2010 -0700 Bump required version of libfolks for API change. configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 71d1825aac6609bb478c40e87c53fb50a1234d98 Author: Travis Reitter Date: Mon Jun 28 15:56:44 2010 -0700 Sync up with the libfolks replacement of folks_individual_aggregator_get_members(). configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit f3a1bdae4d3e5a93c5803dda1e46ee36f5851c35 Author: Travis Reitter Date: Mon Jun 28 14:57:39 2010 -0700 Cut outdated comment. libempathy/empathy-individual-manager.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit 5c2858c57a9718f9d78b1a7440e82ebf17bf31f4 Author: Travis Reitter Date: Sat Jun 26 11:56:13 2010 -0700 Take advantage of favourites being a hard requirement and add stubs for adding/removing individuals as favourites. libempathy-gtk/empathy-individual-menu.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) commit c41d778c8d76d17289f37909c0e7535603010b1a Author: Travis Reitter Date: Sat Jun 26 11:43:42 2010 -0700 Hide/show groups as necessary when their members change. libempathy-gtk/empathy-individual-view.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) commit e0aec0ced01a21901075e046e39a343c7f6e5cc6 Author: Travis Reitter Date: Sat Jun 26 11:33:44 2010 -0700 Replace the IndividualView's setup function with a more-conventional constructed function. libempathy-gtk/empathy-individual-view.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 268c9c8237b3948d3613233dc0a6615b5ea191a2 Author: Travis Reitter Date: Sat Jun 26 11:25:31 2010 -0700 Catch up with convention for getting the view's model. libempathy-gtk/empathy-individual-view.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit d714360e053a1e2c75d63cbc8497453a689cfd39 Author: Travis Reitter Date: Sat Jun 26 11:22:05 2010 -0700 Follow the new tree store insertion convention used by the contact list store in the individual store. libempathy-gtk/empathy-individual-store.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) commit 0dea2287893dc5cf657bb48c2707e30139118cb4 Author: Philip Withnall Date: Fri Jun 25 13:48:43 2010 +0100 Finish adding favourites support libempathy-gtk/empathy-individual-store.c | 41 +++++++++++++++-------------- libempathy-gtk/empathy-individual-view.c | 7 ----- libempathy/empathy-individual-manager.c | 22 +++++++++++++++ 3 files changed, 43 insertions(+), 27 deletions(-) commit e54fe4814b321be3e32e99f7dfd49b93e392bded Author: Travis Reitter Date: Wed Jun 23 20:12:42 2010 -0700 Support contact removal configure.ac | 2 +- libempathy-gtk/empathy-individual-store.c | 10 ++++++++-- libempathy/empathy-individual-manager.c | 18 ++++++++++++++++-- 3 files changed, 25 insertions(+), 5 deletions(-) commit ae79986102a22b65a3f9f4eb2328971272eec204 Author: Travis Reitter Date: Tue Jun 22 08:43:18 2010 -0700 Support contact adding libempathy-gtk/Makefile.am | 2 + libempathy-gtk/empathy-individual-dialogs.c | 152 +++++++++++++++++++++++++++ libempathy-gtk/empathy-individual-dialogs.h | 38 +++++++ libempathy-gtk/empathy-individual-menu.c | 10 +-- libempathy/empathy-individual-manager.c | 50 +++++++++ libempathy/empathy-individual-manager.h | 4 + src/empathy-main-window.c | 3 +- 7 files changed, 251 insertions(+), 8 deletions(-) commit 315a71325f98d86722d7c313d726828f767cef82 Author: Philip Withnall Date: Wed Jun 23 16:46:38 2010 +0100 Use the new FolksFavourite interface for favourites support libempathy-gtk/empathy-individual-menu.c | 9 +++------ libempathy-gtk/empathy-individual-store.c | 4 +--- libempathy-gtk/empathy-individual-view.c | 2 ++ libempathy/empathy-individual-manager.c | 28 ++++------------------------ libempathy/empathy-individual-manager.h | 4 ---- 5 files changed, 10 insertions(+), 37 deletions(-) commit e53b7431a34c09ceed319a1680cde1e44a50dab2 Author: Philip Withnall Date: Wed Jun 23 16:46:26 2010 +0100 Fixes from merging master src/empathy-main-window.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 6bf4569e50d1df275281b790adcae934b8a53ce7 Author: Travis Reitter Date: Tue Jun 22 08:43:53 2010 -0700 Avoid potential segfaults if there are no contacts on the first pass. configure.ac | 25 ------------------------- libempathy-gtk/empathy-individual-menu.c | 23 +++++------------------ libempathy-gtk/empathy-individual-store.c | 13 ++++++++----- 3 files changed, 13 insertions(+), 48 deletions(-) commit 10ee532d6097cac699ad317d296d4126079b772f Author: Travis Reitter Date: Tue Jun 15 17:23:01 2010 -0700 Add a note about future work to be done after we break the 1:1 FolksIndividual:TpContact relationship. libempathy/empathy-utils.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 9be29ffebe4166ab6e985d64efa2ea3a51d2e6b8 Author: Travis Reitter Date: Tue Jun 15 16:42:29 2010 -0700 Re-add the audio and video call menu items in the call-activated handler. libempathy-gtk/empathy-individual-view.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) commit 3e573e124347366975ae1effd18d7127e5fd9397 Author: Travis Reitter Date: Tue Jun 15 16:39:10 2010 -0700 Support the contact list tooltip libempathy-gtk/empathy-individual-view.c | 49 +++++++++++++++++++++++++++++- 1 files changed, 48 insertions(+), 1 deletions(-) commit c75319eb432d4d815bf07ee30396f958b021abed Author: Travis Reitter Date: Tue Jun 15 18:29:03 2010 -0700 Re-implement the context menu for Individuals libempathy-gtk/Makefile.am | 1 + libempathy-gtk/empathy-individual-menu.c | 769 +++++++++++++++++++++++++++++ libempathy-gtk/empathy-individual-menu.h | 20 + libempathy-gtk/empathy-individual-store.c | 41 +- libempathy-gtk/empathy-individual-view.c | 22 +- libempathy/empathy-individual-manager.c | 30 ++ libempathy/empathy-individual-manager.h | 6 + libempathy/empathy-utils.c | 24 + libempathy/empathy-utils.h | 1 + src/empathy-main-window.c | 3 + 10 files changed, 881 insertions(+), 36 deletions(-) commit cdd2409d9048d1ffc7794713de52810ef0d18ebb Author: Travis Reitter Date: Mon Jun 14 09:37:49 2010 -0700 Don't crash if a row gets deleted before being expanded. libempathy-gtk/empathy-individual-view.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit c05d4cda33e0f10ce58a8afeaea0bad28af4b254 Author: Travis Reitter Date: Sat Jun 12 16:20:24 2010 -0700 Fix the formatting of some calls to g_object_set() libempathy-gtk/empathy-individual-view.c | 32 ++++++++++++++++++++++++----- 1 files changed, 26 insertions(+), 6 deletions(-) commit 08a9285fea7fbe9e4ff25394b72c7852a77ea750 Author: Travis Reitter Date: Sat Jun 12 16:08:57 2010 -0700 Back-port better solution for incorrect-groups-expanded problem. libempathy-gtk/empathy-individual-view.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 48a9944fd9f3b4461a239d2da490fba24874df80 Author: Travis Reitter Date: Fri Jun 11 13:22:38 2010 -0700 Implement avatar support. configure.ac | 2 +- libempathy-gtk/empathy-individual-store.c | 33 ++++-- libempathy-gtk/empathy-ui-utils.c | 159 +++++++++++++++++++++++++---- libempathy-gtk/empathy-ui-utils.h | 9 ++ 4 files changed, 171 insertions(+), 32 deletions(-) commit d6aa2f99e3e626f81b455c0fa1ff4817a4e4f2f6 Author: Travis Reitter Date: Fri May 28 16:13:51 2010 -0700 Base the contact list around libfolks metacontacts. Not yet to feature-parity with mainline Empathy. configure.ac | 28 + libempathy-gtk/Makefile.am | 5 + libempathy-gtk/empathy-individual-menu.h | 44 + libempathy-gtk/empathy-individual-store.c | 1830 +++++++++++++++++++++++++ libempathy-gtk/empathy-individual-store.h | 148 ++ libempathy-gtk/empathy-individual-view.c | 2125 +++++++++++++++++++++++++++++ libempathy-gtk/empathy-individual-view.h | 99 ++ libempathy-gtk/empathy-ui-utils.c | 20 +- libempathy-gtk/empathy-ui-utils.h | 6 +- libempathy/Makefile.am | 2 + libempathy/empathy-individual-manager.c | 290 ++++ libempathy/empathy-individual-manager.h | 82 ++ libempathy/empathy-utils.c | 35 + libempathy/empathy-utils.h | 4 + src/empathy-main-window.c | 122 +- 15 files changed, 4788 insertions(+), 52 deletions(-) commit 57a1f36eaec69df0195e90d8a4b050574a19d6b3 Author: Cheng-Chia Tseng Date: Tue Jul 20 19:37:13 2010 +0800 Updated Traditional Chinese translation(Hong Kong and Taiwan) po/zh_HK.po | 58 ++++++++++++++++++++++++++-------------------------------- po/zh_TW.po | 58 ++++++++++++++++++++++++++-------------------------------- 2 files changed, 52 insertions(+), 64 deletions(-) commit 69ff2159a6ed984c212cf2054931e5ae1ee742ff Author: Danielle Madeley Date: Thu Jul 15 17:34:20 2010 +1000 GtkNotebookPage no longer exists in GTK+ 3 src/empathy-chat-window.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) commit 004fb69b847bbf1ffbd28ed22e307e1b3a859da8 Author: Fran Diéguez Date: Sun Jul 18 18:18:55 2010 +0200 Fixed headers in galician translation file po/gl.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 1c4aae4eae9646b25aba931798f9af157f8296af Author: Fran Diéguez Date: Sun Jul 18 18:18:08 2010 +0200 Fixed headers in galician translation file po/gl.po | 282 ++++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 155 insertions(+), 127 deletions(-) commit 100f0a02a14a8c5594ab334e12c5ff3c543a2309 Author: Mattias Põldaru Date: Sun Jul 18 15:16:44 2010 +0300 [l10n] Updated Estonian translation po/et.po | 301 +++++++++++++++---------------------------------------------- 1 files changed, 74 insertions(+), 227 deletions(-) commit 95ecb356a80e7a112b064ff24e91fd780337101e Author: Jorge González Date: Sun Jul 18 12:51:32 2010 +0200 Updated Spanish translation po/es.po | 218 +++++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 125 insertions(+), 93 deletions(-) commit 0f533ff1229e8b3c6f0940ae85810f7f80b6c8b5 Author: Aron Xu Date: Sat Jul 17 15:37:54 2010 +0800 Update Simplified Chinese translation. po/zh_CN.po | 1434 +++++++++++++++++++++++++++++++---------------------------- 1 files changed, 758 insertions(+), 676 deletions(-) commit 5d145f0e4c4ddf32e5339acd928fef583993cd0a Author: Yaron Shahrabani Date: Fri Jul 16 15:49:11 2010 +0300 Updated Hebrew translation. po/he.po | 240 ++++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 131 insertions(+), 109 deletions(-) commit 90d81c0c42cdc99642e7191be01a907cc1b2c852 Author: Marc-Antoine Perennou Date: Thu Jul 15 19:32:10 2010 +0200 avoid segfault in event_manager_add (#624462) Check if approval is not NULL before trying to modify it src/empathy-event-manager.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) commit 447bd35e4e5ff25cdbeda0d5273e11606d7f45c1 Author: Mario Blättermann Date: Thu Jul 15 21:41:58 2010 +0200 [i18n] Updated German translation po/de.po | 1309 +++++++++++++++++++++++++++++--------------------------------- 1 files changed, 618 insertions(+), 691 deletions(-) commit c79d81eff8d5894ac8cc92112ecce18ccc89f1dd Author: Sjoerd Simons Date: Fri Jul 9 18:35:05 2010 +0100 Tune settings for the updated x264enc element data/element-properties | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit de9d358969dd483611cacf8c9b150a6932207d35 Author: Fran Diéguez Date: Wed Jul 14 21:02:19 2010 +0200 Added gl to DOC_LINGUAS help/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit c4c9150ec2d9133dcce5bde09305c7192c21bc67 Author: Fran Diéguez Date: Wed Jul 14 20:58:53 2010 +0200 Updated Galician translations for docs help/gl/gl.po | 2963 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 2963 insertions(+), 0 deletions(-) commit ee6cdcf63e498ba848813e930d1b1544973ad98d Author: Cheng-Chia Tseng Date: Wed Jul 14 20:05:15 2010 +0800 Updated Traditional Chinese translation(Hong Kong and Taiwan) po/zh_HK.po | 659 +++++++++++++++++++++++++++++++++-------------------------- po/zh_TW.po | 659 +++++++++++++++++++++++++++++++++-------------------------- 2 files changed, 736 insertions(+), 582 deletions(-) commit f28debea9fe92f32a0faa9954af06cab15825df3 Author: Guillaume Desmottes Date: Wed Jul 14 11:32:02 2010 +0200 Disable /query and /msg commands for now (#624268) This avoid to crash while bug 623682 hasn't been fixed. libempathy-gtk/empathy-chat.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) commit ab41c50394233d90650679b9aced9b92f6eb630d Merge: f94f23d 652acf5 Author: Guillaume Desmottes Date: Wed Jul 14 11:21:07 2010 +0200 Merge branch 'debug-av-599166' commit f94f23d8e922713c593e423722ee50517e12cb49 Author: Guillaume Desmottes Date: Tue Jul 13 13:43:50 2010 +0200 remove released flag configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)