commit b392129bc131bf4da447fa03c2a37b6be9d9240b Author: Guillaume Desmottes Date: Mon May 23 16:19:57 2011 +0200 prepare 3.0.2 NEWS | 18 ++++++++++++++++++ configure.ac | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) commit c4e0a0ba7f6181186702f59251764827dfd28fc6 Merge: 6e919ea 7003614 Author: Guillaume Desmottes Date: Mon May 23 14:10:12 2011 +0200 Merge branch 'account-widgets-650854-3.0' into gnome-3-0 commit 70036145575c3958eb7a4163253bb293f5c4dfd2 Author: Guillaume Desmottes Date: Mon May 23 14:02:46 2011 +0200 account-widget-yahoo: fix expand/fill settings (#650854) libempathy-gtk/empathy-account-widget-yahoo.ui | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) commit fddb36899ae818cc56f5359b7d32e5acab14028d Author: Guillaume Desmottes Date: Mon May 23 14:02:38 2011 +0200 account-widget-sip: fix expand/fill settings (#650854) libempathy-gtk/empathy-account-widget-sip.ui | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commit 0ba5850feb110e7dfc39cf50b738baa1b081dc2b Author: Guillaume Desmottes Date: Mon May 23 14:02:29 2011 +0200 account-widget-icq: fix expand/fill settings (#650854) libempathy-gtk/empathy-account-widget-icq.ui | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit b87e8f0bef8d9803934d394848a6aef3f579deb5 Author: Guillaume Desmottes Date: Mon May 23 14:02:11 2011 +0200 account-widget-groupwise: fix expand/fill settings (#650854) libempathy-gtk/empathy-account-widget-groupwise.ui | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commit d85577a952be339094f3177bdcd3abcdc1e8c66d Author: Guillaume Desmottes Date: Mon May 23 14:01:55 2011 +0200 account-widget-aim: fix expand/fill settings (#650854) libempathy-gtk/empathy-account-widget-aim.ui | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit e51a6ef3f3282736eb04eb5e170b3f451b14f578 Author: Guillaume Desmottes Date: Mon May 23 13:38:46 2011 +0200 account-widget-msn: fix expand/fill settings (#650854) libempathy-gtk/empathy-account-widget-msn.ui | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) commit 6e919eac73cf67a1d13578961f792600ba76be6c Author: Bruno Brouard Date: Sat May 14 12:16:11 2011 +0200 Updated French translation po/fr.po | 456 +++++++++++++++++++++++++++++++------------------------------ 1 files changed, 232 insertions(+), 224 deletions(-) commit 839dbb282cfa395be8d144eb8d433e9fb5fdef08 Author: Guillaume Desmottes Date: Thu May 12 11:09:37 2011 +0200 Properly convert timestamps received from X11 (#650015) X11 timestamps are guint32 while Telepathy uses gint64 timestamps. We should always use tp_user_action_time_from_x11() to do the conversion. libempathy-gtk/empathy-chat.c | 4 ++-- libempathy-gtk/empathy-contact-list-view.c | 2 +- libempathy-gtk/empathy-contact-menu.c | 7 +++---- libempathy-gtk/empathy-individual-menu.c | 6 +++--- libempathy-gtk/empathy-new-call-dialog.c | 3 ++- libempathy-gtk/empathy-new-message-dialog.c | 2 +- src/empathy-chat-window.c | 2 +- src/empathy-event-manager.c | 3 ++- src/empathy-main-window.c | 4 ++-- src/empathy-new-chatroom-dialog.c | 4 ++-- src/empathy-streamed-media-window.c | 2 +- 11 files changed, 20 insertions(+), 19 deletions(-) commit 74ce4ee413292d40eaab8671ef1933ba9560722f Author: Guillaume Desmottes Date: Thu May 12 11:55:50 2011 +0200 add empathy_get_current_action_time() libempathy-gtk/empathy-ui-utils.c | 6 ++++++ libempathy-gtk/empathy-ui-utils.h | 2 ++ 2 files changed, 8 insertions(+), 0 deletions(-) commit 6d87a8e79f33fbd5adcc8df2646823d5acfd63e6 Author: Guillaume Desmottes Date: Thu May 12 10:56:29 2011 +0200 empathy_chat_window_present_chat: always show newly created windows We just create so we should at least show it. src/empathy-chat-window.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) commit a58c4edf9f5bc021c8bacc714057a6c9ae0dd8bf Author: Jonny Lamb Date: Wed May 11 10:39:36 2011 +0100 contact: fix typo when creating new contact from logger entity Signed-off-by: Jonny Lamb libempathy/empathy-contact.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 725cbffd7a371c01dbf93f56adc41bab6edd5c14 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 7454d321ebacdcd7a5484a2926cafe8a664cca95 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 c68ac963ba6f1fbe1b45ce2c39b7cf90966c2c70 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 f20d42d874bb6fdc3bd0b714112c2e9d70df974e 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 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 8ef049e020bd40c14e6a104576f116b391c6a18b 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 d3c9c1d52480ac251d06419bdf144b02c7bacd60 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 8562c5e1f120d2ef33406d527ecb5599be01be20 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 2101aab8df151497bfa3bea4b1a2f0ec64f02005 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 af228b37f7cb273cf8f133999718e2d1035e4667 Author: Guillaume Desmottes Date: Mon Apr 25 17:43:04 2011 +0200 remove released flag configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)