commit 1f2b473a0f60b29356bef593a80fb7658481bbf1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Jul 4 16:35:52 2011 +0200
prepare 3.1.3
NEWS | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 6 +++---
2 files changed, 56 insertions(+), 3 deletions(-)
commit d5af4f045f07eb5990ed233548fba50ae7edd98a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Jul 4 16:18:11 2011 +0200
release.py: update last_tag_pattern
release.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit ea501264c4f45e6870bb4e7c2eecd6e95357ec3d
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date: Fri Jul 1 17:38:23 2011 +0100
LogWindow: refresh the logs when new events happen
If they would be displayed for the current selection.
https://bugzilla.gnome.org/show_bug.cgi?id=653760
libempathy-gtk/empathy-log-window.c | 263
++++++++++++++++++++++++++++++++++-
1 files changed, 260 insertions(+), 3 deletions(-)
commit abbbbdaed8530a61d99ca49ca8a33878dd24eda2
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date: Fri Jul 1 17:17:53 2011 +0100
LogWindow: make it a proper GtkWindow subclass
And a proper singleton while at it.
https://bugzilla.gnome.org/show_bug.cgi?id=653803
libempathy-gtk/empathy-log-window.c | 666
++++++++++++++++++----------------
libempathy-gtk/empathy-log-window.h | 25 ++
libempathy-gtk/empathy-log-window.ui | 528 +++++++++++++--------------
3 files changed, 645 insertions(+), 574 deletions(-)
commit 3b221ab08d6798c6d91d48332921fab8c3e7790e
Author: Matej Urbančič <mateju@svn.gnome.org>
Date: Sat Jul 2 20:18:23 2011 +0200
Updated Slovenian translation
po/sl.po | 324
++++++++++++++++++++++++++++++++++----------------------------
1 files changed, 178 insertions(+), 146 deletions(-)
commit 95ff75f0dc6b402d2ef3c10704a9d1bc5606ea3e
Author: Kjartan Maraas <kmaraas@gnome.org>
Date: Sat Jul 2 01:37:42 2011 +0200
Updated Norwegian bokmål translation
po/nb.po | 216
++++++++++++++++++++++++++++++++------------------------------
1 files changed, 112 insertions(+), 104 deletions(-)
commit f529880740cfc4563b4983490bb077ca87757721
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date: Sat Jul 2 06:36:21 2011 +0800
Updated Traditional Chinese translation(Hong Kong and Taiwan)
po/zh_HK.po | 1805
+++++++++++++++++++++++++++++++++++++----------------------
po/zh_TW.po | 1805
+++++++++++++++++++++++++++++++++++++----------------------
2 files changed, 2256 insertions(+), 1354 deletions(-)
commit f58332c44d0f258956b5530d4bace77a0ca4176b
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Fri Jul 1 20:03:03 2011 +0300
Updated Hebrew translation.
po/he.po | 459
++++++++++++++++++++++++++++++++++----------------------------
1 files changed, 252 insertions(+), 207 deletions(-)
commit 93ca914aaa7ca852fd1ce8bef0f6bb7568fb257f
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date: Fri Jul 1 14:30:50 2011 +0200
Updated Hungarian docs translation, lots of fixes
help/hu/hu.po | 242
++++++++++++++++++++++++++-------------------------------
1 files changed, 109 insertions(+), 133 deletions(-)
commit c011e6ce9d6d67d9d80ebfd871d96d87a43491ae
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date: Fri Jul 1 10:40:34 2011 +0200
Updated Spanish translation
po/es.po | 420
+++++++++++++++++++++++++++++++++-----------------------------
1 files changed, 226 insertions(+), 194 deletions(-)
commit d38c606c7f36ae1306bcf622cbc5e21b3609b746
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date: Thu Jun 30 20:12:42 2011 +0200
Mark untranslated strings for translation. Fixes:
https://bugzilla.gnome.org/show_bug.cgi?id=653767
libempathy-gtk/empathy-contact-blocking-dialog.ui | 2 +-
libempathy-gtk/empathy-log-window.ui | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit f345b6d298fd7a92372c3d0d4e2d2ad306003737
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date: Thu Jun 30 20:21:21 2011 +0200
Updated Hungarian translation
po/hu.po | 1877
+++++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 1133 insertions(+), 744 deletions(-)
commit 00b7ca3a4147cffe757d0fa59bab4c597f2a6991
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Jun 30 14:58:35 2011 +0200
Stop using deprecated API from libnotify (#653739)
src/empathy-notifications-approver.c | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
commit c1909f3c881ae35e1e1a4f40fe28d628088c22ec
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Jun 30 14:14:35 2011 +0200
Use our own notification categories if there is no official one
src/empathy-notifications-approver.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
commit e1db5549ea2349d0d17509171ffe7f977676acb7
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date: Thu Jun 30 11:29:35 2011 +0100
Revert "Don't look for Call channels"
Since we support Call in master nowadays.
This reverts commit 5b894aa5ad8702279c0458b890025a22172bfdd1.
https://bugzilla.gnome.org/show_bug.cgi?id=653730
src/empathy-call-observer.c | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
commit 19cbd39e5eb916ecc4dc2f0705a204d0c7ca6e3a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Apr 4 10:23:53 2011 +0200
event_manager_add: don't crash if approval is NULL (#646555)
When adding a "subscription request" event there is no
EventManagerApproval
associated with the event.
src/empathy-event-manager.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
commit 1b79d18321b2d1bcbc8da81f5572de90c851a87e
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date: Wed Jun 29 15:47:58 2011 +0100
Autocomplete contacts when blocking by alias
https://bugzilla.gnome.org/show_bug.cgi?id=653650
libempathy-gtk/empathy-contact-blocking-dialog.c | 83
+++++++++++++++++++++-
1 files changed, 81 insertions(+), 2 deletions(-)
commit 6ba4cf17919cf343a000c3025d3e45bbe55b8188
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date: Wed Jun 29 11:23:12 2011 +0100
LogWindow: keep the selected dates when changing Who or What
If the same dates are present for the new selection.
https://bugzilla.gnome.org/show_bug.cgi?id=653635
libempathy-gtk/empathy-log-window.c | 83
++++++++++++++++++++++++++++++++--
1 files changed, 78 insertions(+), 5 deletions(-)
commit db0fd2e3da0b075282169e2a220a1c4051c4309d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Jun 29 11:48:20 2011 +0200
remove unused string util functions
libempathy/empathy-utils.c | 33 ---------------------------------
libempathy/empathy-utils.h | 10 ----------
tests/Makefile.am | 4 ----
tests/empathy-utils-test.c | 33 ---------------------------------
4 files changed, 0 insertions(+), 80 deletions(-)
commit 442e6acd522cfaaeae71b8ebde6031de0a3cc44e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Jun 29 11:44:57 2011 +0200
empathy-utils: port to new coding style
Most of this file was already using it so best to stay consistent.
libempathy/empathy-utils.c | 711
++++++++++++++++++++++----------------------
libempathy/empathy-utils.h | 82 +++---
2 files changed, 402 insertions(+), 391 deletions(-)
commit da1da170a1365d12a5eeaee5c2b0e3285f268038
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jun 28 16:49:47 2011 +0200
add client and service file announcing the FileTransfer handler
(#653575)
data/.gitignore | 1 +
data/Empathy.FileTransfer.client | 7 +++++++
data/Makefile.am | 9 +++++++--
...elepathy.Client.Empathy.FileTransfer.service.in | 3 +++
4 files changed, 18 insertions(+), 2 deletions(-)
commit b112f5c4f17f24b4654ead7a0525230a45f7e536
Author: Kjartan Maraas <kmaraas@gnome.org>
Date: Tue Jun 28 22:57:29 2011 +0200
Updated Norwegian bokmål translation
po/nb.po | 338
+++++++++++++++++++++++++++++++++-----------------------------
1 files changed, 181 insertions(+), 157 deletions(-)
commit cdbf7eab0ce5505998466349fed5b22b0d44342d
Author: Aurimas Černius <aurisc4@gmail.com>
Date: Tue Jun 28 22:55:03 2011 +0300
Updated Lithuanian translation.
po/lt.po | 2261
+++++++++++++++++++++++++++++++++++---------------------------
1 files changed, 1283 insertions(+), 978 deletions(-)
commit c257cb2ca71d2b3eb48d2ba5b8311d9582019ad9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jun 28 11:14:01 2011 +0200
Display the time when messages have been sent, not received (#653551)
Much more useful when receiving offline messages.
libempathy/empathy-message.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
commit a7757678bf287ad748b097f9362f52d248afc6ca
Merge: 5bba4dd 53a110f
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Tue Jun 28 09:11:45 2011 +0100
Merge branch 'account-parameters'
commit 5bba4ddbda12fa41f68889a737a7ceaa17496f34
Merge: adfe48f 0f19e7e
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Tue Jun 28 09:11:42 2011 +0100
Merge branch 'bigger-favourite-chatrooms'
commit adfe48fe482e2aa966e7793652d3234685d07362
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Jun 22 14:17:05 2011 +0200
account-widget: hide advanced section for GTalk accounts
Our fallback path is now robust enough, users shouldn't have to change
advanced parameters.
libempathy-gtk/empathy-account-widget.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 53a110fcf6a8b697f8d27a8c34b0cccf4db04b24
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Mon Jun 27 17:14:09 2011 +0100
Set require-encryption for Facebook and Google Talk
Future versions of Gabble will do this too, but Empathy can make sure
it's set too.
libempathy-gtk/empathy-protocol-chooser.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
commit 60d6f85f560b4c958085c8f759f519363a05e779
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Mon Jun 27 17:03:50 2011 +0100
Set 'server' parameter on GTalk accounts.
This stops us depending on properly-configured SRV records.
'fallback-servers' is not good enough in this situation:
• foo.com's XMPP stuff is served by Google Apps;
• your router breaks SRV requests;
• foo.com resolves to 1.2.3.4 which has a (different) XMPP server
listening on port 5222.
This may seem far-fetched, but this happened to two completely
different
people, both hosted with Dreamhost.
https://bugzilla.gnome.org/show_bug.cgi?id=653510
libempathy-gtk/empathy-protocol-chooser.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
commit 9d13e5abfc9802832cc0e81cfa96663ffdd4744d
Merge: d191659 0f19e7e
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Mon Jun 27 14:02:48 2011 +0100
Merge branch 'bigger-favourite-chatrooms'
commit d191659f11e5fcdcc4277c2c30295e2f5f099335
Author: Aron Xu <aronxu@gnome.org>
Date: Sun Jun 26 09:47:51 2011 +0000
Update Simplified Chinese translation.
po/zh_CN.po | 1821
+++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 1144 insertions(+), 677 deletions(-)
commit 26259ee3b6fce128a175f71b65dbcd523d56cbb8
Author: Mario Blättermann <mariobl@gnome.org>
Date: Sat Jun 25 22:00:52 2011 +0200
[l10n] Updated German translation
po/de.po | 1769
+++++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 1106 insertions(+), 663 deletions(-)
commit 81090144f9100924c0f45b003faf27efd7aeb3b5
Author: Mario Blättermann <mariobl@gnome.org>
Date: Fri Jun 24 22:20:32 2011 +0200
[i18n] Added missing file to POTFILES.in
po/POTFILES.in | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit f7365ba52c11988ba7fa058cbf35de31da7326b2
Author: Hannie Dumoleyn <hannie@ubuntu-nl.org>
Date: Fri Jun 24 22:16:41 2011 +0200
[l10n] Updated Dutch translation
po/nl.po | 1795
++++++++++++++++++++++++++++++++++++++------------------------
1 files changed, 1104 insertions(+), 691 deletions(-)
commit 0f19e7e7b63a2c457a498bf84d4928db59fb56e4
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Fri Jun 24 15:03:48 2011 +0100
ChatroomsWindow: make the minimum size a bit bigger
This patch makes the scrolled window's minimum size request the
same as
the new size for the status editor's scrolled window.
https://bugzilla.gnome.org/show_bug.cgi?id=630943
src/empathy-chatrooms-window.ui | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
commit 9f79b7c5d74f1a82387881121403e755757f8cb3
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Fri Jun 24 15:02:58 2011 +0100
ChatroomsWindow: GNOME 3-ify the Remove button
src/empathy-chatrooms-window.c | 10 +++++
src/empathy-chatrooms-window.ui | 70
++++++++++++++++++++++++--------------
2 files changed, 54 insertions(+), 26 deletions(-)
commit 3e22c794dd4568a69c08ce80cc12e03eb27f836c
Merge: ea70cf0 896aa85
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Fri Jun 24 14:28:23 2011 +0100
Merge branch 'status-dialog'
Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
commit 896aa85c871372227e96906420659e38d091f2ac
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Fri Jun 24 11:56:34 2011 +0100
PresetDialog: remove support for adding statuses entirely
We already have a way to do this, namely on the contact list
itself. So
this dialog now becomes just a way to edit/remove the existing
statuses.
The margins on the VBox are chosen to make its right-hand edge line up
exactly with the right-hand edge of the Close button in the dialog.
libempathy-gtk/empathy-status-preset-dialog.c | 258
+-----------------------
libempathy-gtk/empathy-status-preset-dialog.ui | 81 +-------
2 files changed, 4 insertions(+), 335 deletions(-)
commit 712f9da4f80e0426ca449431ffbe6cd3373adf12
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Fri Jun 24 11:44:35 2011 +0100
PresetDialog: make status icon in entry non-activatable
It's not meaningfully activatable; this has the effect of making
it not
glow on mouse-over, and preventing the cursor from changing from
a caret
back to a pointer.
libempathy-gtk/empathy-status-preset-dialog.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
commit fb207a362a266da923f6f87c91c0dd649cfa9183
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Fri Jun 24 11:09:28 2011 +0100
PresetDialog: GNOME 3-ify the remove button
Yum yum joined-toolbar!
libempathy-gtk/empathy-status-preset-dialog.c | 12 ++++-
libempathy-gtk/empathy-status-preset-dialog.ui | 70
+++++++++++++++---------
2 files changed, 54 insertions(+), 28 deletions(-)
commit 05fb4bd53ec98426d0880b0557031b2579ec96de
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Fri Jun 10 21:15:35 2011 +0100
PresetDialog: Don't leak path when focusing freshly-created status
(This was not introduced by my changes.)
libempathy-gtk/empathy-status-preset-dialog.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit 901256e30ba93abc86dfd3826ee28f322251c673
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Fri Jun 10 21:09:33 2011 +0100
PresetDialog: Select text cell of freshly-added status
This means you can just mash Enter to edit your mistake. It's more
useful than leaving the text entry focused. It also helps hide a bug
where the entry doesn't get cleared if you just start typing another
message. So previously, typing:
Hello<Enter>Miaow<Enter>
would give you two statuses, "Hello" and "MiaowEnter Custom Message".
It didn't seem worth fixing this much more since Gtk+ 3.2 will
probably
grow native support for placeholder text:
<https://bugzilla.gnome.org/show_bug.cgi?id=440963>
libempathy-gtk/empathy-status-preset-dialog.c | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
commit 096e82cbc6e05aa693991d215cefe0ace429d497
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Fri Jun 10 20:56:35 2011 +0100
PresetDialog: Allow >1 status to be removed at a time.
This is pretty niche but we may as well. I want it sometimes. There's
no
reason to disallow it, and it's not like it adds any significant
complexity.
libempathy-gtk/empathy-status-preset-dialog.c | 38
++++++++++++++----------
1 files changed, 22 insertions(+), 16 deletions(-)
commit 01de3488d0287dc430582faab72932f846ec09dc
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Fri Jun 10 20:51:20 2011 +0100
PresetDialog: Don't allow resizing status preset dialog
It's big enough.
libempathy-gtk/empathy-status-preset-dialog.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit 49887f9ba8d3442b193759806f0371b07428718b
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Fri Jun 10 20:18:59 2011 +0100
PresetDialog: make Add button less huge.
I tried and failed to make it the same size as the other two
buttons, so
this will have to do.
libempathy-gtk/empathy-status-preset-dialog.ui | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit 6e61e4ff4b72e31a1f31205c9db3dc6cea8e64a1
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Fri Jun 10 20:07:35 2011 +0100
PresetDialog: make the window taller
The element we really care about the size of is the list of statuses
past. So I moved the horizontal size request to that—the window
has 6px
of padding or so, so this makes it pretty much exactly the same
width—and made the height request be in the golden ratio to it.
I'm probably unusual in having enough statuses to fill my laptop
screen
vertically, but, subjectively, this makes the dialog look less stubby
even now I've removed them all to test.
https://bugzilla.gnome.org/show_bug.cgi?id=630943
libempathy-gtk/empathy-status-preset-dialog.ui | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit 8f42bd47699c9453aae13f9169a27a4d9bb80bb2
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Fri Jun 10 20:02:28 2011 +0100
PresetDialog test: quit cleanly
Previously one had to kill the process, but by just switching to
gtk_dialog_run() we get more functionality for less code. :D
.../test-empathy-status-preset-dialog.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
commit bf6f2b56d3a8a03cde5cee2469057d5e44933eed
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Fri Jun 10 14:20:14 2011 +0100
PresenceChooser: remove unused #define FLASH_TIMEOUT
libempathy-gtk/empathy-presence-chooser.c | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
commit ea70cf03674e4c844e27062b4b13c306aae39d40
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date: Thu Jun 23 12:27:53 2011 +0100
Add a empathy-streamed-media-window.ui file
EmpathyCallWindow and EmpathyStreamedMediaWindow were sharing
the same .ui file, but they weren't both implementing everything
(right now StreamedMedia didn't handle the Dialpad menu item).
So add a empathy-streamed-media-window.ui from before new stuff
was added to empathy-call-window.ui.
src/Makefile.am | 1 +
src/empathy-streamed-media-window.c | 2 +-
src/empathy-streamed-media-window.ui | 947
++++++++++++++++++++++++++++++++++
3 files changed, 949 insertions(+), 1 deletions(-)
commit a41f7343a478a81ca0f61fb84a80904001a67800
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date: Thu Jun 23 11:16:51 2011 +0200
Updated Spanish translation
po/es.po | 124
+++++++++++++++++++++++++++++++-------------------------------
1 files changed, 62 insertions(+), 62 deletions(-)
commit 5e4bdbca5400a13e65e8b821562e3f8538516272
Author: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Date: Wed Jun 22 21:08:48 2011 +0200
Don't try to access empathy_adium_info_* stuff when webkit support
is disabled
empathy-preferences.c:(.text+0x5dc): undefined reference to
`empathy_adium_info_get_available_variants'
empathy-preferences.c:(.text+0x5e9): undefined reference to
`empathy_adium_info_get_default_variant'
src/empathy-preferences.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
commit 6b79054213ba3dd70298aa75e17c234aef2f09af
Author: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Date: Wed Jun 22 20:56:04 2011 +0200
Don't try to access adium theme when webkit support is disabled
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
libempathy-gtk/empathy-theme-manager.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
commit 955bea1f3654668ae91eed4aa2f32d79a87189cf
Merge: 3c17630 2b92c53
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date: Thu Jun 23 09:02:03 2011 +0100
Merge branch 'history-misc'
commit 2b92c53540d0a3f7570f06850ad01e611c1704b6
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date: Wed Jun 22 16:05:40 2011 +0100
LogWindow: display the user id in a tooltip in the Who pane
https://bugzilla.gnome.org/show_bug.cgi?id=573652
libempathy-gtk/empathy-log-window.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
commit 3c17630fc5ba3cf2cf35decf428b1075ec4a7e12
Author: Matej Urbančič <mateju@svn.gnome.org>
Date: Wed Jun 22 21:13:25 2011 +0200
Updated Slovenian translation
po/sl.po | 202
+++++++++++++++++++++++++++++++------------------------------
1 files changed, 103 insertions(+), 99 deletions(-)
commit a2060ed1cebe60f382383178c7fd10c9ad8ffba4
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date: Wed Jun 22 15:30:55 2011 +0100
LogWindow: show "Chat with <MUC>" for MUCs
Instead of "Chat with <someone>", which is confusing as there
may be (and most likely there are) many people in the room.
https://bugzilla.gnome.org/show_bug.cgi?id=653175
libempathy-gtk/empathy-log-window.c | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
commit 24e45ffb59d929e39d8ceea3ef04c73a5bcfc912
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed May 25 14:23:50 2011 +0200
Use tp-glib password API (#651055)
libempathy-gtk/empathy-chat.c | 10 ++--
libempathy/empathy-tp-chat.c | 136
+----------------------------------------
libempathy/empathy-tp-chat.h | 10 ---
3 files changed, 8 insertions(+), 148 deletions(-)
commit 4f7fbd7ee74147e1f4897ca25d140da02ddceb93
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon May 30 15:36:36 2011 +0200
use tp_channel_dispatch_operation_close_channels_async() when
rejecting server auth channels
We can't use it for other channel types as the EmpathyTp* object is
doing some
extra work.
src/empathy-event-manager.c | 25 ++-----------------------
1 files changed, 2 insertions(+), 23 deletions(-)
commit a997201320e14d4bdca30391bd3c8d29224d0b26
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon May 30 15:25:36 2011 +0200
call-observer: use
tp_channel_dispatch_operation_leave_channels_async() (#651473)
We now return from Observe() right after having called Claim(). That's
what
the spec suggests and not doing so would break Claim() which can't
return
while Observer didn't return from Observe.
src/empathy-call-observer.c | 98
++++++++++++-------------------------------
1 files changed, 27 insertions(+), 71 deletions(-)
commit 9cfab15b0c15b23d59d01e88c9efac0d0cf27433
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Jun 22 09:10:58 2011 +0200
depend on tp-glib 0.15.2
We need it for the high level password API and
tp_channel_dispatch_operation_close_channels_async().
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 19da124b23d0ab1f315b2461b9889bcd9b76869e
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date: Tue Jun 21 14:02:04 2011 +0200
Updated Galician translations
po/gl.po | 255
++++++++++++++++++++++++++++++++------------------------------
1 files changed, 133 insertions(+), 122 deletions(-)
commit 3db97d5b3ec2854c522b9d2b378f2a65620a783d
Merge: b6984f0 005e206
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jun 21 13:55:54 2011 +0200
Merge branch 'unread-653090'
commit b6984f0d3afa9241ede62496d6a65e0d86fd0f8b
Merge: b95223f 3caeda4
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date: Tue Jun 21 12:52:47 2011 +0100
Merge branch 'history-ui'
commit 005e206844be26a15012cc235927531bd3e38420
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jun 21 13:45:14 2011 +0200
empathy-chat: properly count unread messages when the connection
goes away (#653090)
libempathy-gtk/empathy-chat.c | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
commit 3caeda43f0b6cda2ff6687db5eebaf86b103dbaa
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date: Tue Jun 21 12:27:58 2011 +0100
LogWindow: also show the spinner and expand the chats for searches
libempathy-gtk/empathy-log-window.c | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
commit f8ca62c8d1ec38fb1e4e6ad975e1a1d40452d600
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date: Tue Jun 21 10:47:41 2011 +0100
LogWindow: allow to start actions from an event row
If we don't know the contact by looking at the 'Who' pane (because
e.g. there are many selected or it has 'Anyone'), look at the
selected row (if any) in the events pane to determine the contact.
https://bugzilla.gnome.org/show_bug.cgi?id=652278
libempathy-gtk/empathy-log-window.c | 188
++++++++++++++---------------------
1 files changed, 76 insertions(+), 112 deletions(-)
commit b3c999b6507650423c026cceb641a1a16bbb552f
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date: Mon Jun 20 18:44:18 2011 +0100
LogWindow: expand the events when there's only one
https://bugzilla.gnome.org/show_bug.cgi?id=652265
libempathy-gtk/empathy-log-window.c | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
commit 2117ad312759f5bd1190d20dffb714a34444adb1
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date: Mon Jun 20 18:34:46 2011 +0100
LogWindow: improve loading spinner
https://bugzilla.gnome.org/show_bug.cgi?id=652279
libempathy-gtk/empathy-log-window.ui | 31
++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
commit 5faa536ed6fc6ce21421900d4ddea64c61f5182a
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date: Mon Jun 20 17:38:32 2011 +0100
LogWindow: highlight the searched text
https://bugzilla.gnome.org/show_bug.cgi?id=652522
libempathy-gtk/empathy-log-window.c | 57
++++++++++++++++++++++++++++++----
1 files changed, 50 insertions(+), 7 deletions(-)
commit b95223f0d32b6c8424341bf0c406e4422c831de6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jun 21 12:01:47 2011 +0200
EmpathySearchBar: inherit from a GtkBox instead of a GtkBin
libempathy-gtk/empathy-search-bar.c | 48
+---------------------------------
libempathy-gtk/empathy-search-bar.h | 4 +-
2 files changed, 4 insertions(+), 48 deletions(-)
commit aafefb7b6c4a17715e181bb2263423d950dca369
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jun 21 11:50:34 2011 +0200
EmpathyIndividualLinker: inherit from a GtkBox instead of a GtkBin
libempathy-gtk/empathy-individual-linker.c | 34
+--------------------------
libempathy-gtk/empathy-individual-linker.h | 4 +-
2 files changed, 4 insertions(+), 34 deletions(-)
commit 9f03fdbe713fb5664626e19fa1b58e7eb4ca7e50
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jun 21 11:19:00 2011 +0200
EmpathyChat: inherit from a GtkBox instead of a GtkBin
This allows us to get rid of the size_allocate method.
libempathy-gtk/empathy-chat.c | 30 ++----------------------------
libempathy-gtk/empathy-chat.h | 4 ++--
2 files changed, 4 insertions(+), 30 deletions(-)
commit 946db1000fbbf2c04174bbbd2d84a1288ec4fe2d
Author: Matej Urbančič <mateju@svn.gnome.org>
Date: Mon Jun 20 20:22:57 2011 +0200
Updated Slovenian translation
po/sl.po | 189
++++++++++++++++++++++++++++++++------------------------------
1 files changed, 97 insertions(+), 92 deletions(-)
commit 508639fd1bdf942f6a9fef1e501a1977d3451c21
Author: Jorge González <jorgegonz@svn.gnome.org>
Date: Mon Jun 20 19:43:45 2011 +0200
Updated Spanish translation
po/es.po | 202
+++++++++++++++++++++++++++++++------------------------------
1 files changed, 103 insertions(+), 99 deletions(-)
commit 04ab5d6190a94bcf5db98ff8f857fd20d61ef332
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date: Mon Jun 20 16:13:26 2011 +0100
LogWindow: Add a border between the three search panes
libempathy-gtk/empathy-log-window.ui | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
commit 255c0f9f01429eef62c54efd7731af5cc3a9b90b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Jun 20 15:38:38 2011 +0200
individual-widget: use tp_g_signal_connect_object to connect the
notify::contact-info signal (#652496)
libempathy-gtk/empathy-individual-widget.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit 5f6f70aa1e354af05675aa601ec168a879a1b8d2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Jun 20 13:26:55 2011 +0200
chatroom: don't leak the subject
libempathy/empathy-chatroom.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit 6e05d6a2c75fe87e76c509ba3bf73b4ab44e8a12
Merge: 1b47c6c 4f4c33a
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date: Mon Jun 20 11:06:48 2011 +0100
Merge branch 'message-editing-rebase'
commit 1b47c6c449aa0b884a1029871278396f1d6d6406
Author: Kjartan Maraas <kmaraas@gnome.org>
Date: Sun Jun 19 17:37:19 2011 +0200
Updated Norwegian bokmål translation.
po/nb.po | 247
+++++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 182 insertions(+), 65 deletions(-)
commit d7c1b76be146ae5ffa9a713c75351c3237227786
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date: Sun Jun 19 11:50:41 2011 +0200
Updated Spanish translation
po/es.po | 118
+++++++++++++++++++++++++++----------------------------------
1 files changed, 52 insertions(+), 66 deletions(-)
commit 217a9035dfe207ee243bb47bfa65dfa631c1660c
Author: Matej Urbančič <mateju@svn.gnome.org>
Date: Thu Jun 16 18:06:26 2011 +0200
Updated Slovenian translation
po/sl.po | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
commit e4195fde9427f63205b4cbb71641f599b2476bcf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Jun 16 12:57:38 2011 +0100
geocode_cb: actually destroy the resolved hash table, not the
GAsyncResult result...
libempathy/empathy-contact.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 5aa6b7a616bbdb3a8f826831259f5d23a622d8d4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Jun 16 12:45:35 2011 +0100
cope with geocode_object_new_for_params returning NULL
libempathy/empathy-contact.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
commit 6e163c9e8f82c6f1943e2a361d8d941a824cd105
Author: krishnababu k <kkrothap@redhat.ocm>
Date: Wed Jun 15 20:30:34 2011 +0530
Corrections in Telugu file
po/te.po | 1498
+++++++++++++++++++++++++++++++-------------------------------
1 files changed, 746 insertions(+), 752 deletions(-)
commit 3a1ca5a962eef416f19f7082246a7b2249fe7121
Merge: eacf74c c22df19
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date: Wed Jun 15 11:00:33 2011 +0100
Merge branch 'accounts-dialog-attractive'
commit c22df1977b4c9cc7c8b33e24b4f76f8a62310567
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date: Wed Jun 15 10:25:42 2011 +0100
Make the accounts-dialog attractive and GNOME3ish
src/empathy-accounts-dialog.c | 11 ++++
src/empathy-accounts-dialog.ui | 99
+++++++++++++++++++--------------------
2 files changed, 59 insertions(+), 51 deletions(-)
commit eacf74cb753138246a59d4e911adf190bb717b0b
Author: krishnababu k <kkrothap@redhat.ocm>
Date: Wed Jun 15 15:22:09 2011 +0530
Updated Telugu Translations done by Praveen Illa
po/te.po | 4701
+++++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 3263 insertions(+), 1438 deletions(-)
commit cf1e01a88cfee6c092c8f3bec8d5c0efad8c5ce2
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date: Wed Jun 15 09:30:59 2011 +0100
Update telepathy-yell submodule
telepathy-yell | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit a4479888dbe3805bd988845517937a8d391234de
Author: Matej Urbančič <mateju@svn.gnome.org>
Date: Tue Jun 14 18:35:05 2011 +0200
Updated Slovenian translation
po/sl.po | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 42ff9c946b756603b789a18a31a08d60aeddb6a5
Author: Matej Urbančič <mateju@svn.gnome.org>
Date: Tue Jun 14 18:21:34 2011 +0200
Updated Slovenian translation
po/sl.po | 83
++++++++++++++++++++++++--------------------------------------
1 files changed, 32 insertions(+), 51 deletions(-)
commit 4cb792eb96fc4d38aa49614fc378e70d2dfc508a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jun 14 10:39:30 2011 +0100
remove released flag
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)