commit fe6a8678e1885b38ad7437436a1e5983aea2a8c7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Aug 29 16:37:22 2011 +0200
coding style fix
libempathy-gtk/empathy-contact-list-store.c | 2 +-
libempathy-gtk/empathy-individual-store.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
commit 3101d1f584d3e26eaeb4e75b973010f92cea3823
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Aug 29 16:19:45 2011 +0200
prepare 3.1.90
NEWS | 39 +++++++++++++++++++++++++++++++++++++++
configure.ac | 6 +++---
2 files changed, 42 insertions(+), 3 deletions(-)
commit 980148c26a52fb352ee165d7a46280172b49de96
Merge: d2d6157 be8a050
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Aug 29 15:49:12 2011 +0200
Merge branch 'account-widget-657616'
commit d2d6157547f7d386fea7721b4391b4d0c2b0d79b
Author: Alban Crequy <alban.crequy@collabora.co.uk>
Date: Thu Aug 25 16:46:25 2011 +0100
contact list: optimize loading contacts
The previous algorithm was O(n^2) with the number of contacts. Each
contact can
be in several groups, so when a contact is added or updated, we
iterated over
all the contact list to find the rows representing the contact. When
connecting
to an account and getting all the contacts, this was too slow.
The groups are stored in the GtkTreeStore and suffer from the same
problem: to
look for a group, it needed to iterate on all contacts.
The new algorithm maintains a hash from the contact to the list
of rows
representing it, and another hash from the group to the row
representing it.
On Empathy 2.30.2 when tested on MeeGo with 300 contacts, loading
the contacts
is faster: roughly 9 seconds before the patch, 3 seconds after.
On Empathy 3.1.5, it seems to load in background so I don't know
how to measure
the time lost in GtkTreeStore. But before the patch, GProf says 23%
is lost in
individual_store_find_contact_foreach(), and after the patch it is
not visible
anymore. And "time" says we win 5s of CPU when starting+quitting
Empathy:
Before the patch: After the patch:
real 0m23.485s real 0m23.460s
user 0m13.805s user 0m8.305s
sys 0m0.308s sys 0m0.316s
https://bugzilla.gnome.org/show_bug.cgi?id=657086
libempathy-gtk/empathy-contact-list-store.c | 213
++++++++++++++-------------
libempathy-gtk/empathy-individual-store.c | 201
++++++++++++++-----------
2 files changed, 220 insertions(+), 194 deletions(-)
commit be8a050de04263d2a042c3ba00e5021570b7fcf0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Aug 29 15:00:01 2011 +0200
account-widget-local-xmpp: put all the labels in a GtkSizeGroup
https://bugzilla.gnome.org/show_bug.cgi?id=657616
.../empathy-account-widget-local-xmpp.ui | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
commit 6a818ee5aced7076786ba0a48a8f32b800b9a676
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date: Mon Aug 29 19:11:50 2011 +0800
Updated Traditional Chinese translation(Hong Kong and Taiwan)
po/zh_HK.po | 1174
++++++++++++++++++++++++++++++++---------------------------
po/zh_TW.po | 1174
++++++++++++++++++++++++++++++++---------------------------
2 files changed, 1258 insertions(+), 1090 deletions(-)
commit 82b0217429316a92c4550d467ebf95d87c88fd7c
Author: Jorge González <jorgegonz@svn.gnome.org>
Date: Mon Aug 29 13:04:22 2011 +0200
Updated Spanish translation
po/es.po | 83
++++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 49 insertions(+), 34 deletions(-)
commit 302ef589503e23da0b38a7c394884ea04d37979b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Aug 29 10:29:18 2011 +0200
contact-widget: use the day-selected sig to update birthday
Having to double click on a day to update it was really confusing
and most
people (including me!) were just thinking that was not working.
libempathy-gtk/empathy-contact-widget.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 2df03efb4efc73eb7e4209f9eadb10ff6d646a4b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Aug 26 10:59:14 2011 +0200
Allow to call phone number of contacts
https://bugzilla.gnome.org/show_bug.cgi?id=650112
libempathy-gtk/empathy-individual-menu.c | 207
++++++++++++++++++++++++++++++
libempathy-gtk/empathy-individual-menu.h | 3 +-
libempathy/empathy-client-factory.c | 3 +
3 files changed, 212 insertions(+), 1 deletions(-)
commit 41515259986697a443e892ad31043d2275915eea
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Aug 26 14:53:01 2011 +0200
add EmpathyAccountSelectorDialog
Dialog asking user to pick an account from a pre-defined list.
https://bugzilla.gnome.org/show_bug.cgi?id=650112
libempathy-gtk/Makefile.am | 2 +
libempathy-gtk/empathy-account-selector-dialog.c | 198
++++++++++++++++++++++
libempathy-gtk/empathy-account-selector-dialog.h | 68 ++++++++
3 files changed, 268 insertions(+), 0 deletions(-)
commit 04f88a3959838b95972664ce99cf24f94be06457
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Aug 26 11:15:11 2011 +0200
export empathy_account_has_uri_scheme_tel()
https://bugzilla.gnome.org/show_bug.cgi?id=650112
libempathy/empathy-account-settings.c | 26 ++++----------------------
libempathy/empathy-utils.c | 19 +++++++++++++++++++
libempathy/empathy-utils.h | 2 ++
3 files changed, 25 insertions(+), 22 deletions(-)
commit 6dfd7204baa89c6eb3903753f45b7d416a93b112
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Aug 29 11:32:36 2011 +0200
chatroom_manager_parse_chatroom: check account path is valid
https://bugzilla.gnome.org/show_bug.cgi?id=657362
libempathy/empathy-chatroom-manager.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
commit 46369eff9ef4bded8b8215c5900b10cc2fb0069a
Author: Fran Dieguez <fran@openhost.es>
Date: Sun Aug 28 17:52:27 2011 +0200
Updated galician translations
po/gl.po | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
commit 6e133dea9be47cbd49eaee291bfd41419e431f43
Author: Mario Blättermann <mariobl@gnome.org>
Date: Sun Aug 28 13:52:41 2011 +0200
[l10n] Updated German translation
po/de.po | 1628
++++++++++++++++++++++++++++++++++----------------------------
1 files changed, 882 insertions(+), 746 deletions(-)
commit a3d613974a9d702452f3e563b24405c219d22006
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date: Fri Aug 26 23:51:38 2011 +0400
Updated Russian translation
po/ru.po | 2260
+++++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 1427 insertions(+), 833 deletions(-)
commit abd933af3052cb371414fa640b3175a2720af91d
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date: Fri Aug 26 21:24:31 2011 +0200
Updated Spanish translation
po/es.po | 112
++++++++++++++++++++++++++++++++-----------------------------
1 files changed, 59 insertions(+), 53 deletions(-)
commit 3000a3d49b6f0f8e1f2e364a780b75f01e0d8e6b
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Fri Aug 26 13:48:57 2011 +0100
Don't leak FDs when loading avatars.
Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
libempathy-gtk/empathy-ui-utils.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
commit 7bae092e57e57103fa543d66c0bb11ac3ba4d43d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Aug 26 12:19:08 2011 +0200
Move the 'Show previous conversation' menu entry
It used to be right in the middle of actions on the contact.
libempathy-gtk/empathy-contact-menu.c | 14 +++++++-------
libempathy-gtk/empathy-individual-menu.c | 16 ++++++++--------
2 files changed, 15 insertions(+), 15 deletions(-)
commit 3e1f9c3f49a1b6b3e317d23958b5eaaf77c0b097
Author: Kjartan Maraas <kmaraas@gnome.org>
Date: Fri Aug 26 12:07:16 2011 +0200
Updated Norwegian bokmål translation
po/nb.po | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
commit 61b4787cb8b7037d7fe918bb6f8c231cf362273b
Author: Milo Casagrande <milo@ubuntu.com>
Date: Thu Aug 25 22:11:40 2011 +0200
Fix unclear string in avatar chooser
* Fix an unclear error string in the avatar chooser
when saving camera taken image to file.
Fixes bug #657166
libempathy-gtk/empathy-avatar-chooser.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit fba9b2278337d7fc24446d1e3fb8d580891d9e35
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Thu Aug 25 19:14:14 2011 +0300
Updated Belarusian translation.
po/be.po | 4874
+++++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 3211 insertions(+), 1663 deletions(-)
commit 9dbb101d0ca44d6bff1bee75009fc14e0615aa1a
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Thu Aug 25 16:26:30 2011 +0100
Configure: produce useful dependency errors
I discovered that PKG_CHECK_MODULES sets a variable if the
dependencies
aren't found containing the message it would have died with if you
hadn't specified ACTION-IF-NOT-FOUND. So this gives us better output,
without breaking opportunistically adding Call (etc.) support (as I
did).
configure.ac | 48 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 36 insertions(+), 12 deletions(-)
commit f3c4f721b13f08c81ff2c9efe5b0f91c07df6903
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Thu Aug 25 16:17:11 2011 +0100
Revert "configure: simplify error path in --enable-call"
This reverts commit a7c8e72c9c4daa5a4830bad4ab6baa500106b3b4. It
accidentally made not specifying an option equivalent to
--enable-call.
configure.ac | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
commit a7c8e72c9c4daa5a4830bad4ab6baa500106b3b4
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Thu Aug 25 15:20:58 2011 +0100
configure: simplify error path in --enable-call
PKG_CHECK_MODULES raises a fatal error if you don't specify an
ACTION-IF-NOT-FOUND, telling the developer which modules are
missing. So
we can simplify the configure script *and* give a more helpful error
message.
configure.ac | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
commit ec7580263da08c3301d44335f001d4914d6854e7
Author: Og B. Maciel <ogmaciel@gnome.org>
Date: Thu Aug 25 09:13:53 2011 -0400
Updated Brazilian Portuguese translation.
po/pt_BR.po | 1124
+++++++++++++++++++++++++++++++----------------------------
1 files changed, 597 insertions(+), 527 deletions(-)
commit 05175cbebfb7d4dee0b55d24ed46e921b8256e0c
Author: Raluca Elena Podiuc <ralucaelena1985@gmail.com>
Date: Thu Aug 25 13:02:12 2011 +0300
src: install empathy-main-window-menubar.ui
empathy-main-window-menubar.ui was added in this commit:
1ad15d157971b6550cb11787a03463e891d29364 is the first bad commit
commit 1ad15d157971b6550cb11787a03463e891d29364
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Aug 23 14:08:18 2011 +0200
Move main window's UI manager to its own UI file
Glade doesn't support GtkUIManager so it was impossible to edit
the main window at all because of that.
But was not marked to be installed.
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=657271
src/Makefile.am | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit 4cdd02a73bd9f10d6427afc6979371f2207e9073
Author: Fran Dieguez <fran@openhost.es>
Date: Wed Aug 24 21:18:03 2011 +0200
Updated Galician translations
po/gl.po | 709
++++++++++++++++++++++++++++++++------------------------------
1 files changed, 365 insertions(+), 344 deletions(-)
commit 7bc4d0c51423617ef6b41e81ced8471c464d6456
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date: Wed Aug 24 19:51:34 2011 +0200
Updated Spanish translation
po/es.po | 646
+++++++++++++++++++++++++++++++------------------------------
1 files changed, 328 insertions(+), 318 deletions(-)
commit 84e5d3835a98335372a6c058103f8e7d8b46519a
Author: Kjartan Maraas <kmaraas@gnome.org>
Date: Wed Aug 24 18:52:00 2011 +0200
Updated Norwegian bokmål translation
po/nb.po | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
commit 34444b9a90be269af9d7af39ca064741de2123a5
Author: Xavier Claessens <xclaesse@gmail.com>
Date: Wed Aug 24 11:25:11 2011 +0200
Do not auto-accept publish requests if contact is not subscribed
Fixes bug #657173
libempathy/empathy-tp-contact-list.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
commit 96d638486a06118b91086f00d3a6b9d89eb8d445
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Aug 24 13:53:05 2011 +0200
account-widget-sip: add option to mark account as being able to
call phones
https://bugzilla.gnome.org/show_bug.cgi?id=657220
libempathy-gtk/empathy-account-widget-sip.c | 22
++++++++++++++++++++++
libempathy-gtk/empathy-account-widget-sip.ui | 19 ++++++++++++++++++-
2 files changed, 40 insertions(+), 1 deletions(-)
commit 1363e49db79f64f85b7cdd4fe273896a9228c619
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Aug 24 10:34:56 2011 +0200
widget-sip: load/save file in Glade
No change has been done, this is just to keep commits simpler.
https://bugzilla.gnome.org/show_bug.cgi?id=657220
libempathy-gtk/empathy-account-widget-sip.ui | 91
+++++++++++++++++++++-----
1 files changed, 73 insertions(+), 18 deletions(-)
commit fe4fd76aebe8faea1e7f16215cac005e5017a155
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Aug 24 13:52:23 2011 +0200
account-widget: add empathy_account_widget_get_settings()
https://bugzilla.gnome.org/show_bug.cgi?id=657220
libempathy-gtk/empathy-account-widget.c | 8 ++++++++
libempathy-gtk/empathy-account-widget.h | 3 +++
2 files changed, 11 insertions(+), 0 deletions(-)
commit 1ef053f46e31460f8f128621690a967e2ca08fc6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Aug 24 13:51:12 2011 +0200
account-settings: add API to set 'tel' in the URISchemes property
of the account
https://bugzilla.gnome.org/show_bug.cgi?id=657220
libempathy/empathy-account-settings.c | 65
+++++++++++++++++++++++++++++++++
libempathy/empathy-account-settings.h | 6 +++
2 files changed, 71 insertions(+), 0 deletions(-)
commit ff4c2d1b2504826b405d2c6846c0a6087320380d
Author: Kjartan Maraas <kmaraas@gnome.org>
Date: Wed Aug 24 16:13:21 2011 +0200
Updated Norwegian bokmål translation
po/nb.po | 673
+++++++++++++++++++++++++++++++-------------------------------
1 files changed, 340 insertions(+), 333 deletions(-)
commit 4b2400798cf3468196fdc1680d37a8474129df13
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Wed Aug 24 12:12:33 2011 +0300
Updated Hebrew translation.
po/he.po | 405
++++++++++++++++++++++++++++++++------------------------------
1 files changed, 211 insertions(+), 194 deletions(-)
commit 0b92f77d8d32ddb96515abe5a1619acb9f55db11
Author: Daniel Nylander <po@danielnylander.se>
Date: Wed Aug 24 09:15:00 2011 +0200
Updated Swedish translation
po/sv.po | 1215
++++++++++++++++++++++++++------------------------------------
1 files changed, 515 insertions(+), 700 deletions(-)
commit 57075092737c287010e1a2435bf1b1c1839101a5
Author: Philip Withnall <philip@tecnocode.co.uk>
Date: Tue Aug 23 23:42:52 2011 +0100
libempathy-gtk: Explicitly close the input stream used for reading
avatars
Due to a missing unref in GIO, the input stream is leaked by
GFileIcon, so
if we rely on its FD being implicitly closed when the stream is
finalised,
we'll end up leaking (lots of) file descriptors.
As well as fixing the unref in GIO (see: bgo#657206), we now
explicitly
close the input stream so that even if the stream object is leaked,
the FD
isn't.
Closes: bgo#656682
libempathy-gtk/empathy-ui-utils.c | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
commit 4fd99e6dc16c26656d43296f2b3104dac3f9e45b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Aug 23 15:01:45 2011 +0200
main-window.ui: load and save the file in Glade
No change has been made, this is just to reduce the size of diff
in future
commits.
src/empathy-main-window.ui | 164
++++++++++++++++++++++----------------------
1 files changed, 83 insertions(+), 81 deletions(-)
commit 1ad15d157971b6550cb11787a03463e891d29364
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Aug 23 14:08:18 2011 +0200
Move main window's UI manager to its own UI file
Glade doesn't support GtkUIManager so it was impossible to edit the
main window at all
because of that.
po/POTFILES.in | 1 +
src/empathy-main-window-menubar.ui | 307
+++++++++++++++++++++++++++++++++++
src/empathy-main-window.c | 31 +++-
src/empathy-main-window.ui | 309
------------------------------------
4 files changed, 331 insertions(+), 317 deletions(-)
commit a54170335d7c6246f1606347ed109e682c883927
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Aug 23 15:59:08 2011 +0200
main-window: remove the throbber tooltip
Clicking on it doesn't open the accounts dialog any more.
https://bugzilla.gnome.org/show_bug.cgi?id=657105
src/empathy-main-window.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
commit d74b1775e5f237869bdc2177064ea82aa370ac42
Author: Alban Crequy <alban.crequy@collabora.co.uk>
Date: Tue Aug 23 13:58:21 2011 +0100
geocode: fix uninitialized variable (-Werror=uninitialized)
libempathy/empathy-contact.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit ec1594416d7fc29c7baeeb10f7645934a9679bb5
Author: Alban Crequy <alban.crequy@collabora.co.uk>
Date: Mon Aug 22 16:57:52 2011 +0100
Add a configure option for GProf
It should help to investigate
https://bugzilla.gnome.org/show_bug.cgi?id=657086
configure.ac | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
commit 20a005394616e171ab3c7a974122bfa01df426a2
Merge: 2c55a1a 8854564
Author: Jonny Lamb <jonnylamb@gnome.org>
Date: Tue Aug 23 09:31:28 2011 +0100
Merge branch 'search-bar'
commit 2c55a1ac6432591d45dc396e8353b6840eedb5b8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Aug 23 10:13:53 2011 +0200
widget-irc: quit message entry shouldn't be invisible
https://bugzilla.gnome.org/show_bug.cgi?id=657104
libempathy-gtk/empathy-account-widget-irc.ui | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
commit 266c56fd9d092259c0c58fa9c23afce841bd6779
Author: Wouter Bolsterlee <wbolster@gnome.org>
Date: Mon Aug 22 22:15:14 2011 +0200
Updated Dutch translation by Wouter Bolsterlee
po/nl.po | 305
++++++++++++++++++++++++++++++++------------------------------
1 files changed, 159 insertions(+), 146 deletions(-)
commit 885456479f37aa5aa500361bef33ac3dd746428a
Author: Jonny Lamb <jonnylamb@gnome.org>
Date: Mon Aug 22 16:51:01 2011 +0100
search-bar: shorten labels to just Next & Previous
The verb, "Find", is already present on the left of the entry.
Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
libempathy-gtk/empathy-search-bar.ui | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
commit 6df8cf14b3b25782ce5437ae0e26e0726da1daa2
Author: Jonny Lamb <jonnylamb@gnome.org>
Date: Mon Aug 22 16:50:51 2011 +0100
search-bar: use smaller icons
Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
libempathy-gtk/empathy-search-bar.ui | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 64e2c818c7faead9671d959a87d60ce92c082ab1
Author: Jonny Lamb <jonnylamb@gnome.org>
Date: Mon Aug 22 16:25:49 2011 +0100
search-bar: make close button non-important stock gtk-close
This has the much nicer side-effect that if it gets thrown off the
side because it doesn't have enough room, the icon and label will be
shown in the expander.
Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
libempathy-gtk/empathy-search-bar.ui | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
commit 78265c9fd2f7526876c1418b80dda44d96f6c644
Author: Jonny Lamb <jonnylamb@gnome.org>
Date: Mon Aug 22 16:25:02 2011 +0100
search-bar: move close button to RHS
Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
libempathy-gtk/empathy-search-bar.ui | 33
+++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
commit 3be11adb859eb5ec1a2f2a850e8277c73e5aa814
Author: Xavier Claessens <xclaesse@gmail.com>
Date: Mon Aug 22 16:16:20 2011 +0200
EmpathyChatWindow: Set "im.received" on notification so gnome-shell
can ignore it
src/empathy-chat-window.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
commit f60338e75ad72300e1f93ea38ce17284d50d698c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Aug 22 15:11:22 2011 +0200
contact_set_avatar_from_tp_contact: don't crash if we failed to load
the avatar
https://bugzilla.gnome.org/show_bug.cgi?id=656829
libempathy/empathy-contact.c | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
commit 4c534b01f55b25442d8399db4a610a3e1982daa9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Aug 22 13:02:42 2011 +0200
Move live search to top of Contact list
https://bugzilla.gnome.org/show_bug.cgi?id=656999
src/empathy-main-window.c | 5 ++++-
src/empathy-main-window.ui | 15 ++++++++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
commit 0e13467ea1c89322c2eab94c230193d5163a4856
Author: Debarshi Ray <debarshir@src.gnome.org>
Date: Tue Feb 15 17:28:09 2011 +0200
Freenode has added 6697 to the list of SSL ports
The list of servers and port numbers for Freenode are given at:
http://freenode.net/irc_servers.shtml
Fixes: https://bugzilla.gnome.org/642385
libempathy/irc-networks.xml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit d1efd59bfbb620fa7531726f6b473880a3c485a7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Aug 22 12:09:19 2011 +0200
remove released flag
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 9a70028671636681ff16ccb288e3d02fb90b807b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Aug 22 12:04:27 2011 +0200
add empathy-webkit-utils.c to POTFILES.in
po/POTFILES.in | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)