commit 3a336862a3ea92f19bfc92d7cebe4787044980cd
Author: Guillaume Desmottes <[email protected]>
Date:   Tue Jun 5 15:49:53 2012 +0200

   add css_DATA to EXTRA_DIST and DISTCLEANFILES

data/Makefile.am |    2 ++
1 file changed, 2 insertions(+)

commit c221197779fdaa77d2b0546702f02c7be6719a95
Author: Guillaume Desmottes <[email protected]>
Date:   Tue Jun 5 15:41:49 2012 +0200

   prepare 3.5.2

NEWS         |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
configure.ac |    4 ++--
2 files changed, 55 insertions(+), 2 deletions(-)

commit 9a95d0dc9227b76dba0c9a0c52ee80e4a70ab213
Author: Bruno Brouard <[email protected]>
Date:   Tue Jun 5 11:48:00 2012 +0200

   Updated French translation

po/fr.po | 2058
+++++++++++++++++++++++++++++---------------------------------
1 file changed, 959 insertions(+), 1099 deletions(-)

commit 213c011e801827daefab7bef64e0e70ba7f1d78e
Merge: c217f84 047c6ff
Author: Guillaume Desmottes <[email protected]>
Date:   Tue Jun 5 09:31:04 2012 +0200

   Merge branch 'gnome-3-4'

commit 047c6ffac32caebc3d4929ecd2fec8a55da6796a
Author: Guillaume Desmottes <[email protected]>
Date:   Tue Jun 5 09:30:23 2012 +0200

   tls_dialog_response_cb: say if we are supposed to remember the cert
   or not

   Will make debugging easier.

src/empathy-auth-client.c |    4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

commit c217f84732cad84541389dc2d317992cf0199d18
Author: Yuri Myasoedov <[email protected]>
Date:   Mon Jun 4 17:27:14 2012 +0400

   Updated Russian translation

po/ru.po |  174
+++++++++++++++++++++++---------------------------------------
1 file changed, 64 insertions(+), 110 deletions(-)

commit 2c6a500a9187f5d80de4b9c5d320ecc171658da7
Author: Guillaume Desmottes <[email protected]>
Date:   Mon Jun 4 14:17:59 2012 +0200

   live-search: handle the 'Menu' key as a navigation one

   Fix opening the popup menu from the 'Menu' key in the treeview.

libempathy-gtk/empathy-live-search.c |    6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

commit a474d3e479596d21dc685354d62c90e0adc6dd83
Author: Yuri Myasoedov <[email protected]>
Date:   Mon Jun 4 16:13:28 2012 +0400

   Updated Russian translation

po/ru.po | 2789
++++++++++++++++++++++++++++++++++----------------------------
1 file changed, 1550 insertions(+), 1239 deletions(-)

commit e1f08e59638e1df92cf55cb83cc5009d6c4f2587
Author: Chandni Verma <[email protected]>
Date:   Sun Jun 3 05:45:20 2012 +0530

   Remove unused field hash from EmpathyContact

libempathy/empathy-contact.c |    1 -
1 file changed, 1 deletion(-)

commit 1453386a3b3766aa7a781b05b8416ee3791dbc89
Author: Yaron Shahrabani <[email protected]>
Date:   Sat Jun 2 12:55:13 2012 +0300

   Updated Hebrew translation.

po/he.po |  437
++++++++++++++++++++++++++++++++------------------------------
1 file changed, 228 insertions(+), 209 deletions(-)

commit a034ef0b4160ddaecafcf341e8c6dba9c59fcf13
Author: Danielle Madeley <[email protected]>
Date:   Fri Jun 1 17:23:04 2012 +1000

   Don't erase schema in DISTCLEAN

   Oops

data/Makefile.am |    1 -
1 file changed, 1 deletion(-)

commit a402dd47a9f68e483806981b0b8feeb0cec44951
Author: Cosimo Cecchi <[email protected]>
Date:   Fri May 25 13:31:29 2012 -0400

   call-window: use a linked style for the OSD toolbar buttons

   Pack the camera/volume/mic buttons in a GtkBox, so they get linked
   together by the theme.
   Also, use symbolic icons for the buttons in the toolbar, in GNOME 3
   style.

   https://bugzilla.gnome.org/show_bug.cgi?id=676569

src/empathy-call-window.c  |   24 ++++++++---------
src/empathy-call-window.ui |   63
++++++++++++++++++++++++++++----------------
2 files changed, 53 insertions(+), 34 deletions(-)

commit a018456af6a36b1cb2b8b7b66825f40ac200dcd3
Author: Cosimo Cecchi <[email protected]>
Date:   Fri May 25 13:29:42 2012 -0400

   call-window: use GTK_STYLE_CLASS_OSD for the floating toolbar

   https://bugzilla.gnome.org/show_bug.cgi?id=676569

src/empathy-call-window.c |   23 ++++-------------------
1 file changed, 4 insertions(+), 19 deletions(-)

commit 56f4a515192564db4d06bbea8b724e530c8f2ab9
Author: Daniel Mustieles <[email protected]>
Date:   Wed May 30 17:48:17 2012 +0200

   Updated Spanish translation

po/es.po |  585
+++++++++++++++++++++++++++++++++-----------------------------
1 file changed, 311 insertions(+), 274 deletions(-)

commit 484d44c5dba8b7f4ca17e34e622e066475aafed7
Author: Fran Diéguez <[email protected]>
Date:   Wed May 30 16:40:15 2012 +0200

   Updated Galician translations

po/gl.po |  497
++++++++++++++++++++++++++++++++------------------------------
1 file changed, 259 insertions(+), 238 deletions(-)

commit 7fcbe6b44035e505941e3ee3db5cfc7cadf8748a
Author: Kjartan Maraas <[email protected]>
Date:   Wed May 30 13:09:21 2012 +0200

   Updated Norwegian bokmål translation

po/nb.po |  527
++++++++++++++++++++++++++++++++------------------------------
1 file changed, 270 insertions(+), 257 deletions(-)

commit 9eceb4013b4c2d799c876f1efc043ab462538258
Merge: 43383be b7a0aba
Author: Danielle Madeley <[email protected]>
Date:   Wed May 30 10:52:10 2012 +1000

   Merge branch 'ui-work-672043'

commit 43383bec9be58220863824f14f35dea72922b0f1
Author: Chandni Verma <[email protected]>
Date:   Tue May 29 17:00:29 2012 +0530

   Disconnect all aggregator signal handlers on disposing
   EmpathyIndividualManager

libempathy/empathy-individual-manager.c |   12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)

commit 6722d80f683accae86977fc538069889f6f1918a
Author: Chandni Verma <[email protected]>
Date:   Tue May 29 13:22:16 2012 +0530

   The comment should have been removed with the contact manager

src/empathy-roster-window.c |    4 ----
1 file changed, 4 deletions(-)

commit b7a0aba3e792edcbd753b721aa9600f56b95a754
Author: Danielle Madeley <[email protected]>
Date:   Tue May 29 17:21:33 2012 +1000

   account-widget: support for account widget generic

libempathy-gtk/empathy-account-widget-generic.ui |   74
++++++++++++++++++++--
libempathy-gtk/empathy-account-widget.c          |    6 +-
2 files changed, 71 insertions(+), 9 deletions(-)

commit 767d3af6d44bf7264ac47b4e7a6353733226e939
Author: Danielle Madeley <[email protected]>
Date:   Fri May 25 14:28:16 2012 +1000

   account-widget: msn, icq, groupwise

libempathy-gtk/empathy-account-widget-groupwise.ui |   28
+++++++++++-----
libempathy-gtk/empathy-account-widget-icq.ui       |   35
++++++++++++++------
libempathy-gtk/empathy-account-widget-msn.ui       |   28
+++++++++++-----
3 files changed, 65 insertions(+), 26 deletions(-)

commit 7c6f5992f1f5c2b9b1c97a48870d28c7a770a42d
Author: Danielle Madeley <[email protected]>
Date:   Fri May 25 13:32:45 2012 +1000

   account-widget-aim: remove colons, dim labels, fix packing

libempathy-gtk/empathy-account-widget-aim.ui |   34
++++++++++++++++++++------
1 file changed, 26 insertions(+), 8 deletions(-)

commit 8554ba733582072359ad14ab543b7f9db256b973
Author: Danielle Madeley <[email protected]>
Date:   Fri May 25 13:06:08 2012 +1000

   account-widget-local-xmpp: remove colons, dim labels

.../empathy-account-widget-local-xmpp.ui           |   42
++++++++++++++------
1 file changed, 30 insertions(+), 12 deletions(-)

commit 3f5dd97736c34c40cbb1cf762869aa3901dc24a1
Author: Danielle Madeley <[email protected]>
Date:   Wed May 23 17:11:05 2012 +1000

   account-widget-irc: remove colons

   The advanced settings for IRC look different to XMPP/SIP. They should
   probably be changed to be contained within a scrolled window/viewport
   for consistency.

libempathy-gtk/empathy-account-widget-irc.ui |   61
++++++++++++++++++--------
1 file changed, 43 insertions(+), 18 deletions(-)

commit ae0e6127a2844bbac26f7b229f93ce702cb7e6fc
Author: Danielle Madeley <[email protected]>
Date:   Wed May 23 16:23:35 2012 +1000

   account-widget-sip: remove colons, clean up padding

libempathy-gtk/empathy-account-widget-sip.ui |   38
+++++++++++++++-----------
1 file changed, 22 insertions(+), 16 deletions(-)

commit eb1d26c374afade8d4e7065a70d81dc6ff0a410d
Author: Danielle Madeley <[email protected]>
Date:   Wed May 23 16:06:32 2012 +1000

   account-widget-jabber: remove colons, clean up advanced section

   Don't dim labels in viewport, grey on white looks wrong.

libempathy-gtk/empathy-account-widget-jabber.ui |  407
+++++++++++++----------
1 file changed, 223 insertions(+), 184 deletions(-)

commit 75c7d2ee8af7ba6e301286d09b3b4a2255cdaf21
Author: Danielle Madeley <[email protected]>
Date:   Wed May 23 14:04:13 2012 +1000

   accounts-dialog: tweak padding

src/empathy-accounts-dialog.ui |   10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)

commit c3bc27cdb1d299bef40b22d5b741e8fdc862eb41
Author: Danielle Madeley <[email protected]>
Date:   Tue May 22 15:28:20 2012 +1000

   contact-widget: remove colons and dim labels, move avatar to LHS

   Make widget look like mockup.

   Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=672043

configure.ac                               |    2 +-
libempathy-gtk/empathy-contact-widget.c    |  116 +++++------
libempathy-gtk/empathy-contact-widget.ui   |  313
++++++++++++++++++----------
libempathy-gtk/empathy-contactinfo-utils.c |    4 +-
4 files changed, 262 insertions(+), 173 deletions(-)

commit 5c5aed18fd1d54352fb835b10693bc69b0a13d5c
Author: Cheng-Chia Tseng <[email protected]>
Date:   Mon May 28 18:14:04 2012 +0800

   Updated Traditional Chinese translation(Hong Kong and Taiwan)

po/zh_HK.po | 2657
++++++++++++++++++++++++++++------------------------------
po/zh_TW.po | 2668
++++++++++++++++++++++++++++-------------------------------
2 files changed, 2523 insertions(+), 2802 deletions(-)

commit b014019bb9303a17c5ca4d10ef25f3d60f71dab2
Author: Guillaume Desmottes <[email protected]>
Date:   Tue May 22 14:54:56 2012 +0200

   factor out empathy_individual_get_client_types()

libempathy-gtk/empathy-individual-store.c |   46
++---------------------------
libempathy/empathy-utils.c                |   42
++++++++++++++++++++++++++
libempathy/empathy-utils.h                |    3 ++
3 files changed, 47 insertions(+), 44 deletions(-)

commit 7e5f89c6fb56ee812d4b90f02c0289b9e77bd0ae
Author: Yaron Shahrabani <[email protected]>
Date:   Fri May 25 10:48:44 2012 +0300

   Updated Hebrew translation.

po/he.po | 2978
++++++++++++++++++++++++++++++--------------------------------
1 file changed, 1462 insertions(+), 1516 deletions(-)

commit 0ae70fecdc9cb69219ebafe6983bdddc14967569
Author: Guillaume Desmottes <[email protected]>
Date:   Fri May 25 09:34:42 2012 +0200

   use the symbolic close icon in the tab close button

src/empathy-chat-window.c |    4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

commit 92114b41642489ed58079ba0fe0cbb456f5e6e38
Author: Guillaume Desmottes <[email protected]>
Date:   Fri May 25 09:32:32 2012 +0200

   Define a style class for the tab close button

   Seems that's the proper way to do it.

data/empathy.css          |    2 +-
src/empathy-chat-window.c |    4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)

commit a8587cf10bf7004c97fa2f7143c191e67b4eaf08
Author: Guillaume Desmottes <[email protected]>
Date:   Thu May 24 12:39:35 2012 +0200

   remove GeditCloseButton

src/Makefile.am          |    2 --
src/gedit-close-button.c |   61
----------------------------------------------
src/gedit-close-button.h |   60
---------------------------------------------
3 files changed, 123 deletions(-)

commit 7a0d00bb00ead77b5d932ac0bdbdd6d5851f293f
Author: Guillaume Desmottes <[email protected]>
Date:   Thu May 24 12:38:31 2012 +0200

   chat-window: stop using GeditCloseButton

   The CSS magic is done automatically now.

src/empathy-chat-window.c |   36 ++++++++++++++++++++++++++++--------
1 file changed, 28 insertions(+), 8 deletions(-)

commit b428a3009df0ea065b26991e87eb5759499c85a0
Author: Guillaume Desmottes <[email protected]>
Date:   Thu May 24 12:19:12 2012 +0200

   gedit-close-button: move CSS bits to empathy.css

   https://bugzilla.gnome.org/show_bug.cgi?id=669473

data/empathy.css            |    8 ++++++++
src/empathy-auth-client.c   |    2 +-
src/empathy-call-window.c   |    2 +-
src/empathy-chat-window.c   |    2 +-
src/empathy-debug-window.c  |    2 +-
src/empathy-roster-window.c |    2 +-
src/gedit-close-button.c    |   21 +--------------------
7 files changed, 14 insertions(+), 25 deletions(-)

commit bf821168dfb8c2e835cdf57a1c313841ee0dd763
Author: Guillaume Desmottes <[email protected]>
Date:   Thu May 24 12:06:36 2012 +0200

   Load the CSS in all empathy-* binaries

   https://bugzilla.gnome.org/show_bug.cgi?id=669473

src/empathy-auth-client.c   |    3 +++
src/empathy-call-window.c   |    2 ++
src/empathy-chat-window.c   |    2 ++
src/empathy-debug-window.c  |    2 ++
src/empathy-roster-window.c |    2 ++
5 files changed, 11 insertions(+)

commit d62ff957e10bdfb92b99608310ae9b96676ea4fa
Author: Guillaume Desmottes <[email protected]>
Date:   Thu May 24 11:47:02 2012 +0200

   Add empathy.css and helper code to use it

   https://bugzilla.gnome.org/show_bug.cgi?id=669473

data/Makefile.am                  |    5 +++++
libempathy-gtk/empathy-ui-utils.c |   33
+++++++++++++++++++++++++++++++++
libempathy-gtk/empathy-ui-utils.h |    2 ++
3 files changed, 40 insertions(+)

commit dd56cdf3f64b50ada5db0ef6960519bc19815327
Author: Guillaume Desmottes <[email protected]>
Date:   Wed May 23 15:33:30 2012 +0200

   accounts-dialog: don't crash if the account is connecting

   https://bugzilla.gnome.org/show_bug.cgi?id=676637

src/empathy-accounts-dialog.c |   13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)

commit 2ddd3df3a2764f78874d67f6a0ccc023a3c004de
Author: Guillaume Desmottes <[email protected]>
Date:   Wed May 23 14:07:24 2012 +0200

   roster-window: re-hook the show-groups gsettings key

   It has been accidentally removed during the recent settings clean up.

src/empathy-roster-window.c |    3 +++
1 file changed, 3 insertions(+)

commit beeae4882070a075750b11b378d9c81e04adc86f
Author: Guillaume Desmottes <[email protected]>
Date:   Mon May 21 15:41:44 2012 +0200

   audio-src: mutex is now on the stack

src/empathy-audio-src.c |    4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

commit 05649508bf21c519402a049ba5be367430eb58d5
Merge: 26b9e04 bf32eb7
Author: Guillaume Desmottes <[email protected]>
Date:   Mon May 21 15:24:26 2012 +0200

   Merge branch 'gnome-3-4'

   Conflicts:
       NEWS
       configure.ac
       src/empathy-audio-src.c

commit bf32eb7eb97820578b4f878e57ca9105fc7f5147
Author: Guillaume Desmottes <[email protected]>
Date:   Mon May 21 14:20:20 2012 +0200

   remove released flag

configure.ac |    2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

commit 71cab9b191860ec1208cc4b144be9409e16f780a
Author: Guillaume Desmottes <[email protected]>
Date:   Mon May 21 14:04:48 2012 +0200

   Prepare 3.4.2.1

NEWS         |   14 ++++++++++++++
configure.ac |    4 ++--
2 files changed, 16 insertions(+), 2 deletions(-)

commit a7feeae6d2028daa75a36e4a0f992877faabf1d9
Author: Sjoerd Simons <[email protected]>
Date:   Mon May 21 13:52:34 2012 +0200

   call: Initialize the timer early

src/empathy-call-window.c |    3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

commit 108b3fa233660bdd0e88ac2d4642a75efa8f1eb7
Author: Sjoerd Simons <[email protected]>
Date:   Mon May 21 13:44:06 2012 +0200

   audiosrc: Don't use stream volumes properties if the src doesn't
   support them

src/empathy-audio-src.c |   14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)

commit d524cc36152688f8475f14eb2bfd17bcb1e34b3f
Author: Sjoerd Simons <[email protected]>
Date:   Mon May 21 12:16:49 2012 +0200

   call: Keep the toolbar around if muted

   It's not uncommon for people to forget that the put a call on mute,
   causing awkward situation while trying to talk while muted. To
   prevent this, keep the toolbar showhing while muted as a reminder.

src/empathy-call-window.c |   28 ++++++++++++++++++++++++++--
1 file changed, 26 insertions(+), 2 deletions(-)

commit 9f1691878cc95951039eb2d7a47b6462569da299
Author: Sjoerd Simons <[email protected]>
Date:   Mon May 21 11:55:25 2012 +0200

   audio input: Switch to stream volumes

   Newer gstreamer & pulseaudio support the stream volume interface for
   input as well. Prefer this over using the mixer interface as it's
   both simpler and actually does as intended. Besides that the
   mixer interface is buggy and seems to not correctly adjust the
   current input device if the source was switch to a non-default input.

   As an extra put in a volume element to locally enforce the current
   mute
   state. This ensure that whatever happens, if the UI says mute, the
   stream is guaranteed to be muted. This prevents awkward situations if
   the source element doesn't support stream volumes or the notification
   is buggy (like with current pulsesrc in releases).

src/empathy-audio-src.c |  214
++++++++++++++++-------------------------------
1 file changed, 72 insertions(+), 142 deletions(-)

commit 246b14f2722e6aac0c9744e49edd70594846f004
Author: Sjoerd Simons <[email protected]>
Date:   Mon May 21 10:48:53 2012 +0200

   call: Adjust the preview rectangle colors

   As our default background is now black the non-highlighted previews
   get hard to see. Change the rectangle colors to white for the
   highlighted version and a darkened white for the non-highlighted.

src/empathy-call-window.c |   31 ++++---------------------------
1 file changed, 4 insertions(+), 27 deletions(-)

commit 4f2d28ecffbd3b5f77b81539fba0f7ce66618ed9
Author: Sjoerd Simons <[email protected]>
Date:   Mon May 21 10:31:57 2012 +0200

   Call: Let the floating toolbar be above the preview

   The call window has previews in the four corners, before the lower
   ones were packed in a way that they would appear above the floating
   toolbar which looks strange when the floating toolbar disappears.

   Instead allow the lower preview to be below the floating toolbar so
   they're evenly spread out.

src/empathy-call-window.c |   39 +++++++++++++++++++--------------------
1 file changed, 19 insertions(+), 20 deletions(-)

commit 0343d38411f58086366190100521c6a847985c13
Author: Sjoerd Simons <[email protected]>
Date:   Mon May 21 10:00:21 2012 +0200

   Keep some margin for the preview and the floating toolbar

   Now that the video box is flush against the sides add some extra
   margin
   for the things floating inside.

src/empathy-call-window.c |    8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)

commit 1fa90edcd725ae7ac78a3caed904b3e382e25560
Author: Sjoerd Simons <[email protected]>
Date:   Sun May 20 21:31:13 2012 +0200

   call: Make the remote video background black

   Mimic totem in making the background for our video output black by
   default and without extra borders. It does look nicer.

src/empathy-call-window.c |   23 +++++------------------
1 file changed, 5 insertions(+), 18 deletions(-)

commit 7e7a60c59f7e07612cdbc5e547dbb9a1151834ab
Author: Sjoerd Simons <[email protected]>
Date:   Sun May 20 19:59:29 2012 +0200

   Call window: Ellipsize alias and status

   If the user alias is too long both the hangup and the dialpad buttons
   get pushed into a drop-down menu. Even worse when the alias doesn't
   fit,
   it just isn't shown at all anymore.

   Given the username is already printed in the title and the user
   tends to
   know who they're calling with, ellipsizing the alias isn't an issue.
   Which has the nice side-effect of keeping the hangup and dialpad
   buttons
   on the toolbar in all cases like they should be.

   Unfortunately as pango doesn't ellipsize if it still has enough height
   left to put more lines in. So put the alias and status in seperate
   labels in a vbox which isn't set to fill.

src/empathy-call-window.c  |   22 ++++++++++++--------
src/empathy-call-window.ui |   48
+++++++++++++++++++++-----------------------
2 files changed, 37 insertions(+), 33 deletions(-)

commit 6b19934b9a237b648f36b0da943bde046b6488c0
Author: Sjoerd Simons <[email protected]>
Date:   Sun May 20 13:07:57 2012 +0200

   Don't put the status in the header if the user has none

src/empathy-call-window.c |    6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

commit 26b9e04f1c40888bba66bcaace30d9f0feac45fc
Merge: 19d2ee5 2b26304
Author: Guillaume Desmottes <[email protected]>
Date:   Mon May 21 11:18:19 2012 +0200

   Merge branch 'gnome-3-4'

   Conflicts:
       NEWS
       configure.ac
       src/empathy-accounts.c

commit 2b263049bd152504227c9ade7e7b6e17cbc95f11
Author: Guillaume Desmottes <[email protected]>
Date:   Mon May 21 10:55:46 2012 +0200

   empathy-accounts: init cheese-gtk if needed

   The avatar chooser, which is not used by empathy-accounts, may use
   Cheese to
   take a photo.

   cheese_gtk_init() has been added during the 3.4 cycle so I bumped
   the dep to
   3.4.0 as that's the version I have tested it with it. It's an
   optionnal dep
   anyway so...

   https://bugzilla.gnome.org/show_bug.cgi?id=674553

configure.ac           |    2 +-
src/Makefile.am        |    5 +++++
src/empathy-accounts.c |   11 +++++++++++
3 files changed, 17 insertions(+), 1 deletion(-)

commit 87524d43add5732091025b0f76661c09a06bb116
Author: Guillaume Desmottes <[email protected]>
Date:   Mon May 21 10:47:00 2012 +0200

   configure.ac: set cheese version in CHEESE_GTK_REQUIRED

   https://bugzilla.gnome.org/show_bug.cgi?id=674553

configure.ac |    3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

commit 19d2ee5fe81b850c8300dca6583e9c49bf6f7afd
Author: Fran Diéguez <[email protected]>
Date:   Sun May 20 18:11:40 2012 +0200

   Updated Galician translations

po/gl.po |  113
+++++++++++++++++++++++++++++++-------------------------------
1 file changed, 56 insertions(+), 57 deletions(-)

commit fc44b9eab9ca84ff24e7129ee29463d005f6b304
Author: Sjoerd Simons <[email protected]>
Date:   Sat May 19 20:30:57 2012 +0200

   Call: Fix floating toolbar

   Empathy needed to mark the toolbar actor as reactive otherwise
   it won't
   be reactive to events (doh)...

   And empathy needed to stop calling
   gdk_disable_multi_device().. Empathy
   used to do this because it has to be called before GTK+ is initialized
   and clutter-gtk only called after GTK+ was initialized by other
   function
   in empathy. Unfortunately since clutter-gtk 1.1.2 instead of ensuring
   event actually work with clutter-gtk calling this function will
   actually
   break event handle (great fun!)..

   Oh and also bump the clutter-gtk requirement to 1.1.2 to ensure we get
   the right behaviour for events..

   https://bugzilla.gnome.org/show_bug.cgi?id=670874

configure.ac              |    2 +-
src/empathy-call-window.c |    1 +
src/empathy-call.c        |    3 ---
3 files changed, 2 insertions(+), 4 deletions(-)

commit 001e077b3575d2525bb7354d78e0e25837db73e7
Author: Sjoerd Simons <[email protected]>
Date:   Sat May 19 20:30:57 2012 +0200

   Call: Fix floating toolbar

   Empathy needed to mark the toolbar actor as reactive otherwise
   it won't
   be reactive to events (doh)...

   And empathy needed to stop calling
   gdk_disable_multi_device().. Empathy
   used to do this because it has to be called before GTK+ is initialized
   and clutter-gtk only called after GTK+ was initialized by other
   function
   in empathy. Unfortunately since clutter-gtk 1.1.2 instead of ensuring
   event actually work with clutter-gtk calling this function will
   actually
   break event handle (great fun!)..

   Oh and also bump the clutter-gtk requirement to 1.1.2 to ensure we get
   the right behaviour for events..

   https://bugzilla.gnome.org/show_bug.cgi?id=670874

configure.ac              |    2 +-
src/empathy-call-window.c |    1 +
src/empathy-call.c        |    3 ---
3 files changed, 2 insertions(+), 4 deletions(-)

commit 17f2b276376f3de95d90f988d54e815e13b19be1
Author: Guillaume Desmottes <[email protected]>
Date:   Mon May 14 10:55:19 2012 +0200

   individual-store: add missing folks.h include

libempathy-gtk/empathy-individual-store.h |    1 +
1 file changed, 1 insertion(+)

commit 403f2a944834ca65ece0654fd202f78d8feb96cf
Author: Guillaume Desmottes <[email protected]>
Date:   Mon May 14 13:53:57 2012 +0200

   Use the symbolic version of the avatar-default icon

   That's the one used by Contacts so best to stay coherent

libempathy-gtk/empathy-images.h |    2 +-
src/empathy-roster-window.ui    |    2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

commit 7c6776e18861020fb6d4a70ecb61672eaf3904b9
Author: Piotr Drąg <[email protected]>
Date:   Wed May 16 17:39:21 2012 +0200

   Updated POTFILES.in

po/POTFILES.in |    2 --
1 file changed, 2 deletions(-)

commit 83f0c13e333dea2c4e510d9eb2e2befbd5ee0be3
Merge: 28f72e5 0fd15cb
Author: Danielle Madeley <[email protected]>
Date:   Wed May 16 20:51:19 2012 +1000

   Merge branch 'misc'

commit 28f72e5ebeac6cb1a8e1e01f6c7ec3fd641cb6b8
Author: Daniel Mustieles <[email protected]>
Date:   Wed May 16 12:30:48 2012 +0200

   Updated Spanish translation

po/es.po |  741
++++++++++++++++++++++++++++++++------------------------------
1 file changed, 380 insertions(+), 361 deletions(-)

commit 0fd15cbdf2f7c33f4841f8347fbc990a6beb8c36
Author: Danielle Madeley <[email protected]>
Date:   Wed May 16 16:52:12 2012 +1000

   Remove dead map view component

src/Makefile.am             |   14 --
src/empathy-map-view.c      |  556
-------------------------------------------
src/empathy-map-view.h      |   56 -----
src/empathy-map-view.ui     |   89 -------
src/empathy-roster-window.c |   12 -
5 files changed, 727 deletions(-)

commit 72661bb34ca27c9b93ed93a765833cfbd1ee6e23
Author: Danielle Madeley <[email protected]>
Date:   Wed May 16 15:55:07 2012 +1000

   Readd Ctrl-H accelerator

src/empathy-roster-window.c |   17 +++++++++++++++++
src/empathy.c               |    4 ++++
2 files changed, 21 insertions(+)

commit 34c7e098b02a3feaddc3b0fbcf6d23aa05fa4175
Author: Fran Diéguez <[email protected]>
Date:   Tue May 15 23:49:48 2012 +0200

   Updated Galician translations

po/gl.po |  737
++++++++++++++++++++++++++++++++------------------------------
1 file changed, 377 insertions(+), 360 deletions(-)

commit d33ec00def8237991d1f8934fd10a196affc33b1
Author: Kjartan Maraas <[email protected]>
Date:   Tue May 15 16:18:30 2012 +0200

   Updated Norwegian bokmål translation

po/nb.po | 1313
+++++++++++++++++++++++++++-----------------------------------
1 file changed, 576 insertions(+), 737 deletions(-)

commit 3a4b25be8c95f7c609b51606e6fd863184268153
Author: Guillaume Desmottes <[email protected]>
Date:   Tue May 15 13:42:53 2012 +0200

   Authentification → Authentication

   So yeah, Authentification is actually not an English word...

   https://bugzilla.gnome.org/show_bug.cgi?id=676027

libempathy-gtk/empathy-bad-password-dialog.c |    2 +-
src/empathy-auth-client.c                    |    2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

commit fe79be103841148f53994cd5b4c5d2a8cd6322b4
Author: Guillaume Desmottes <[email protected]>
Date:   Fri May 11 10:46:18 2012 +0200

   Warn on tp-glib 0.20 deprecations

   Best to catch them sooner than later.

   https://bugzilla.gnome.org/show_bug.cgi?id=675597

configure.ac |    2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

commit 66aa8b1d3e13799b2644082dc9104774bf5c6710
Author: Guillaume Desmottes <[email protected]>
Date:   Thu May 10 14:05:04 2012 +0200

   remove tp-contact-factory

   https://bugzilla.gnome.org/show_bug.cgi?id=675597

libempathy/Makefile.am                  |    2 -
libempathy/empathy-tp-contact-factory.c |  202
-------------------------------
libempathy/empathy-tp-contact-factory.h |   53 --------
3 files changed, 257 deletions(-)

commit 885ab0e9215ad92067b5a29fe10537c58ef6bdd4
Author: Guillaume Desmottes <[email protected]>
Date:   Thu May 10 12:25:39 2012 +0200

   remove unused tp-contact-factory includes

   https://bugzilla.gnome.org/show_bug.cgi?id=675597

libempathy-gtk/empathy-contact-dialogs.c    |    1 -
libempathy-gtk/empathy-new-call-dialog.c    |    1 -
libempathy-gtk/empathy-new-message-dialog.c |    1 -
libempathy/empathy-ft-handler.c             |    1 -
libempathy/empathy-utils.c                  |    1 -
src/empathy-accounts-dialog.c               |    1 -
src/empathy-call-factory.c                  |    1 -
src/empathy-call-handler.c                  |    1 -
src/empathy-call-window.c                   |    1 -
src/empathy-chat-window.c                   |    1 -
src/empathy-roster-window.c                 |    1 -
11 files changed, 11 deletions(-)

commit 4180f9c6cb1cb97e22e8c5ca54ba1c04111f6198
Author: Guillaume Desmottes <[email protected]>
Date:   Thu May 10 12:25:21 2012 +0200

   contact-widget: use empathy_client_factory_dup_contact_by_id_async()

   https://bugzilla.gnome.org/show_bug.cgi?id=675597

libempathy-gtk/empathy-contact-widget.c |   35
+++++++++++++++++++++----------
1 file changed, 24 insertions(+), 11 deletions(-)

commit 7cd2e3923c1d000a9c88d9951dea9ef5772b6e0c
Author: Danielle Madeley <[email protected]>
Date:   Tue May 15 21:01:40 2012 +1000

   Readd Ctrl-J for Join Room

src/empathy-roster-window-menubar.ui |    1 +
1 file changed, 1 insertion(+)

commit 1a87e45750ec8b6c3c6bc0d61f9103f2717edd03
Author: Danielle Madeley <[email protected]>
Date:   Tue May 15 20:59:19 2012 +1000

   Don't mark actions/accels as translatable

   This is what happens when you convert files with XSLT, kids.

src/empathy-roster-window-menubar.ui |   46
+++++++++++++++++-----------------
1 file changed, 23 insertions(+), 23 deletions(-)

commit e5fdd1857863050f0fc66a6adb29c7e907b3f472
Author: Danielle Madeley <[email protected]>
Date:   Tue May 15 15:22:21 2012 +1000

   Tweak account balance display

src/empathy-roster-window.c |   30 ++++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)

commit d6a77965c34454700cad87a556745f9a2ace7231
Author: Danielle Madeley <[email protected]>
Date:   Tue May 15 14:11:26 2012 +1000

   Use (non-)starred-symbolic for presence chooser

   This makes it look somewhat more visually up to date with Help etc.
   However this makes the use of STOCK_OK out of place (what to replace
   this with?).

libempathy-gtk/empathy-presence-chooser.c |   53
+++--------------------------
1 file changed, 4 insertions(+), 49 deletions(-)

commit f58d68ddddf15dfe4e0d49af86e2add3c606316e
Author: Danielle Madeley <[email protected]>
Date:   Tue May 15 17:14:48 2012 +1000

   Remove contact list size radiobuttons from preferences

src/empathy-preferences.c  |    4 --
src/empathy-preferences.ui |   89
--------------------------------------------
2 files changed, 93 deletions(-)

commit f1225d5e0ca93beef95c12392f1c154499463d9c
Author: Danielle Madeley <[email protected]>
Date:   Tue May 15 13:42:42 2012 +1000

   Add preference to show account balances

   Set this 'true' by default.

data/org.gnome.Empathy.gschema.xml |    2 +-
libempathy/empathy-gsettings.h     |    1 +
src/empathy-preferences.c          |    2 ++
src/empathy-preferences.ui         |   32
++++++++++++++++++++++++--------
4 files changed, 28 insertions(+), 9 deletions(-)

commit 78f9deb1eb4d01a3e320fe5019f6766a0404448c
Author: Danielle Madeley <[email protected]>
Date:   Tue May 15 13:27:29 2012 +1000

   Refactor app menu as per design decision

src/empathy-roster-window-menubar.ui |  107
++++++++++++++++------------------
src/empathy-roster-window.c          |    2 +-
2 files changed, 52 insertions(+), 57 deletions(-)

commit a51af40f723c6929a461b9af26eaa10b4b714c84
Author: Danielle Madeley <[email protected]>
Date:   Tue May 15 12:16:45 2012 +1000

   Remove menu button, have only app menu

src/empathy-roster-window.c |  101
+++++--------------------------------------
src/empathy-roster-window.h |    2 +
src/empathy.c               |   18 ++------
3 files changed, 17 insertions(+), 104 deletions(-)

commit 06d7e54c62318a502d9e726bdbda16caeaf898e6
Author: Danielle Madeley <[email protected]>
Date:   Fri May 11 12:54:04 2012 +1000

   preferences: move some items from Behaviour into Chat

src/empathy-preferences.ui |  158
+++++++++++++++++++++++---------------------
1 file changed, 81 insertions(+), 77 deletions(-)

commit 230d722d4ec8b4bc5e59819a1a6799cc52ec8414
Author: Danielle Madeley <[email protected]>
Date:   Fri May 11 12:50:13 2012 +1000

   preferences: add options removed from View into preferences

src/empathy-preferences.c  |   50 +++++++++
src/empathy-preferences.ui |  239
+++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 284 insertions(+), 5 deletions(-)

commit 36bde0ca705740414897af5f59cc4cc3e4153df3
Author: Danielle Madeley <[email protected]>
Date:   Fri May 11 10:53:57 2012 +1000

   Remove dead object from .ui file

src/empathy-preferences.ui |    5 -----
1 file changed, 5 deletions(-)

commit 253648a448b24997d2e6108a7eb04ae72e89857d
Author: Danielle Madeley <[email protected]>
Date:   Fri May 11 09:29:12 2012 +1000

   preferences: remove a lot of bind-and-forget widgets from priv struct

   Cleans up the code and makes it much less work to add new preferences.

src/empathy-preferences.c |  282
++++++++++++++-------------------------------
1 file changed, 86 insertions(+), 196 deletions(-)

commit ac28a82e406e8e601161c495815b6639bca9bdd7
Author: Danielle Madeley <[email protected]>
Date:   Thu May 10 12:16:27 2012 +1000

   Remove dead code

src/empathy-roster-window.c |   59
+------------------------------------------
1 file changed, 1 insertion(+), 58 deletions(-)

commit 80ff5951e64b49d04e7973c9c5f215a4e213575d
Author: Danielle Madeley <[email protected]>
Date:   Thu May 10 11:41:52 2012 +1000

   Rework balance display to be in-roster only

src/empathy-roster-window.c |  302
+++++--------------------------------------
1 file changed, 33 insertions(+), 269 deletions(-)

commit f0831e149c9ea3727793c0a412f2ca6e8f1b5bba
Author: Danielle Madeley <[email protected]>
Date:   Wed May 9 17:06:41 2012 +1000

   Mark the options for the sort-criterion enum

data/org.gnome.Empathy.gschema.xml |    4 ++++
1 file changed, 4 insertions(+)

commit afdc41ecc17ec2f002ea39527353d528dd41b28b
Author: Danielle Madeley <[email protected]>
Date:   Wed May 9 17:02:46 2012 +1000

   Remove all old view menu handling code with GSettings bindings

src/empathy-roster-window.c |  272
+++----------------------------------------
1 file changed, 15 insertions(+), 257 deletions(-)

commit 7c2acbdf93266e68a9694a54393afabcd534dfaf
Author: Danielle Madeley <[email protected]>
Date:   Wed May 9 16:28:06 2012 +1000

   Add the app menu using the same model as the menu button

src/empathy-roster-window.c |   10 ++++++++++
src/empathy.c               |   15 +++++++++++++++
2 files changed, 25 insertions(+)

commit babfb17b4e9de333ed8ae6378828e7ac0ddbd25c
Author: Danielle Madeley <[email protected]>
Date:   Wed May 9 15:26:00 2012 +1000

   Change the roster menu to a flat menu structure

src/empathy-roster-window-menubar.ui |   91
++++++----------------------------
1 file changed, 14 insertions(+), 77 deletions(-)

commit d16e5a6fad21f5bec939b6d54813da83a42b50fd
Author: Danielle Madeley <[email protected]>
Date:   Wed May 9 15:24:57 2012 +1000

   Move the menu to a button ala Web

src/empathy-roster-window.c  |  214
++++++++++++++++++++++--------------------
src/empathy-roster-window.ui |    8 +-
2 files changed, 115 insertions(+), 107 deletions(-)

commit 5ab040341e11bb1922de57553a94c8d620c768e5
Author: Danielle Madeley <[email protected]>
Date:   Wed May 9 15:18:52 2012 +1000

   Remove view history action

   It doesn't make sense to have this anyway. You can still have
   history even
   though you have no accounts configured.

src/empathy-roster-window.c |   14 --------------
1 file changed, 14 deletions(-)

commit a216699baa8c74eefb17f5e45ba46a94b407bd52
Author: Danielle Madeley <[email protected]>
Date:   Tue May 8 15:08:07 2012 +1000

   Port roster-window-menubar.ui to current GMenu builder XML format

   The docs are wrong, surprise!

src/empathy-roster-window-menubar.ui |  169
+++++++++++++++++++++++++++-------
1 file changed, 135 insertions(+), 34 deletions(-)

commit 8110b2fd8f9cb1375869ad5df5a483d64a4a74dd
Author: Guillaume Desmottes <[email protected]>
Date:   Tue Jan 10 17:17:43 2012 +0100

   roster-window: migrate menu bar to GtkBuilder

   Rebased-by: Danielle Madeley <[email protected]>

src/empathy-roster-window-menubar.ui |  359 +++--------------
src/empathy-roster-window.c          |  706
++++++++++++++++++++++------------
2 files changed, 517 insertions(+), 548 deletions(-)

commit 9ca45ec3003e83b1f054bfc1f1ecf5c820c6eeca
Author: Guillaume Desmottes <[email protected]>
Date:   Tue Jan 10 14:31:33 2012 +0100

   EmpathyMainWindow: inherit from GtkApplicationWindow

   That's recommended for a better GNOME 3 integration.

src/empathy-roster-window.c |    8 +++++---
src/empathy-roster-window.h |    6 +++---
src/empathy.c               |    2 +-
3 files changed, 9 insertions(+), 7 deletions(-)

commit dc9eca230ab16dad1cb3462bebcd23f7101668df
Author: Guillaume Desmottes <[email protected]>
Date:   Tue Jan 10 11:25:44 2012 +0100

   stop passing the main window to empathy_sound_manager_play()

   I'm about to add an extra argument to the main window constructor
   so it's not
   convenient to, in theory, being able to create it from the event
   manager.
   Passing a widget wasn't doing anything anyway and this code is not
   even used
   when running the Shell so...

   Rebased-by: Danielle Madeley <[email protected]>

src/empathy-event-manager.c |   30 ++++++------------------------
1 file changed, 6 insertions(+), 24 deletions(-)

commit 5085baa1cf801e19d9a3425129da754e094eb80c
Author: Guillaume Desmottes <[email protected]>
Date:   Thu May 10 14:55:39 2012 +0200

   turn EmpathyContactWidget to be a proper GtkWidget

   https://bugzilla.gnome.org/show_bug.cgi?id=675803

libempathy-gtk/empathy-contact-widget.c |  808
+++++++++++++++----------------
libempathy-gtk/empathy-contact-widget.h |   41 ++
2 files changed, 443 insertions(+), 406 deletions(-)

commit 90bea18ba8c6b585f483aa902d66d08972d982dd
Author: Guillaume Desmottes <[email protected]>
Date:   Mon May 14 13:40:08 2012 +0200

   remove released flag

configure.ac |    2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

commit 9238d69859b4d56477a898ea966c54d3f388a289
Author: Guillaume Desmottes <[email protected]>
Date:   Mon May 14 13:30:33 2012 +0200

   prepare 3.4.2

NEWS         |   14 ++++++++++++++
configure.ac |    4 ++--
2 files changed, 16 insertions(+), 2 deletions(-)

commit bf6dffc184ccc08ec6bf38c4a59898d137375097
Merge: 9dff9ef 815e572
Author: Guillaume Desmottes <[email protected]>
Date:   Fri May 11 14:06:59 2012 +0200

   Merge branch 'gnome-3-4'

commit 815e5728059c269de3c0a19612a7fc3077957390
Author: Guillaume Desmottes <[email protected]>
Date:   Fri May 11 14:03:43 2012 +0200

   account-widget-irc: Quit label should be in the first column

libempathy-gtk/empathy-account-widget-irc.ui |    2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

commit 9dff9efa4a2d03634a4f2186c05a7e42a886d619
Author: Guillaume Desmottes <[email protected]>
Date:   Fri May 11 13:17:30 2012 +0200

   coding style fix

src/empathy-new-chatroom-dialog.c |    2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

commit ed2c1e4f8ba8918ed147a7933a8fb8205ae8c4d5
Author: Fran Diéguez <[email protected]>
Date:   Fri May 11 11:28:40 2012 +0200

   Updated Galician translations

po/gl.po | 1084
+++++++++++++++++++++++++++++---------------------------------
1 file changed, 513 insertions(+), 571 deletions(-)

commit 58ddad6643cb9995a55f721ccc64c87d01a6f93a
Author: Daniel Mustieles <[email protected]>
Date:   Fri May 11 10:59:02 2012 +0200

   Updated Spanish translation

po/es.po |  142
+++++++++++++++++++++++++++++++-------------------------------
1 file changed, 72 insertions(+), 70 deletions(-)

commit 7b02ae3c3a6aee6c02f050e5fd8a31c0c454a467
Author: Guillaume Desmottes <[email protected]>
Date:   Fri May 11 10:23:25 2012 +0200

   contact-blocking-dialog: use tp_connection_dup_contact_by_id_async()

   https://bugzilla.gnome.org/show_bug.cgi?id=675808

libempathy-gtk/empathy-contact-blocking-dialog.c |   59
+++++++++++-----------
1 file changed, 30 insertions(+), 29 deletions(-)

commit 3f172c2a512373ab479602a833400778ade8d4d7
Author: Guillaume Desmottes <[email protected]>
Date:   Fri May 11 09:57:36 2012 +0200

   contact: use tp_connection_dup_contact_by_id_async()

   https://bugzilla.gnome.org/show_bug.cgi?id=675808

libempathy/empathy-contact.c |   43
+++++++++++++++++++++++-------------------
1 file changed, 24 insertions(+), 19 deletions(-)

commit 439ca2f1853454d22ac54eac4c56ac3ee1740f79
Author: Guillaume Desmottes <[email protected]>
Date:   Fri May 11 09:50:24 2012 +0200

   contact-chooser: use empathy_client_factory_dup_contact_by_id_async()

   https://bugzilla.gnome.org/show_bug.cgi?id=675808

libempathy-gtk/empathy-contact-chooser.c |   62
++++++++++++++++++------------
1 file changed, 37 insertions(+), 25 deletions(-)

commit ca8b366a8c48cd74aa7b39ff6f58c08ba0f9aacd
Author: Guillaume Desmottes <[email protected]>
Date:   Thu May 10 16:23:51 2012 +0200

   chat: use empathy_client_factory_dup_contact_by_id_async()

   https://bugzilla.gnome.org/show_bug.cgi?id=675808

libempathy-gtk/empathy-chat.c |   95
++++++++++++++---------------------------
1 file changed, 33 insertions(+), 62 deletions(-)

commit 27be4b94abb1b2c9311f54d3f4daff88bc07ca08
Author: Guillaume Desmottes <[email protected]>
Date:   Thu May 10 15:47:30 2012 +0200

   tp-chat: use tp_text_channel_get_chat_state()

   https://bugzilla.gnome.org/show_bug.cgi?id=675807

libempathy/empathy-tp-chat.c |    4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

commit 9c18d540a2361801b32d67d5afa9c150f376148d
Author: Guillaume Desmottes <[email protected]>
Date:   Thu May 10 15:47:03 2012 +0200

   client-factory: request TP_TEXT_CHANNEL_FEATURE_CHAT_STATES

   TP_CHANNEL_FEATURE_CHAT_STATES has been deprecated.

   https://bugzilla.gnome.org/show_bug.cgi?id=675807

libempathy/empathy-client-factory.c |    2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

commit 3632d3913eaf533f9100f7d02b1d2068f00d1b63
Author: Guillaume Desmottes <[email protected]>
Date:   Thu May 10 12:00:08 2012 +0200

   tp-chat: remove chat-state-changed-empathy signal

   https://bugzilla.gnome.org/show_bug.cgi?id=675807

libempathy/empathy-tp-chat.c |   58
------------------------------------------
1 file changed, 58 deletions(-)

commit 2d4e2fbb72426b3e9c542e67da8fb0bba0d31435
Author: Guillaume Desmottes <[email protected]>
Date:   Thu May 10 11:59:17 2012 +0200

   chat: use contact-chat-state-changed signal

   Now that we have a signal giving us a prepared TpContact there is
   no need to
   use the empathy variant as we can easily create the EmpathyContact
   directly.

   https://bugzilla.gnome.org/show_bug.cgi?id=675807

libempathy-gtk/empathy-chat.c |   14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)

commit d6cf60f939a2d40eb5eeb0aba65588f9e444b838
Author: Daniel Mustieles <[email protected]>
Date:   Thu May 10 14:24:41 2012 +0200

   Updated Spanish translation

po/es.po |   61
+++++++++++++++++++++++++++++--------------------------------
1 file changed, 29 insertions(+), 32 deletions(-)

commit 2c899b3453accca2dfedcd900cd76e7ac4255b17
Author: Guillaume Desmottes <[email protected]>
Date:   Thu May 10 10:41:00 2012 +0200

   remove empathy-tp-roomlist

   https://bugzilla.gnome.org/show_bug.cgi?id=673989

libempathy/Makefile.am           |    2 -
libempathy/empathy-tp-roomlist.c |  524
--------------------------------------
libempathy/empathy-tp-roomlist.h |   59 -----
3 files changed, 585 deletions(-)

commit daad3ffce158a58f2c53e2502bb179b30392b7ec
Author: Guillaume Desmottes <[email protected]>
Date:   Thu Apr 26 14:54:44 2012 +0200

   new-chatroom-dialog: use TpRoomList

   https://bugzilla.gnome.org/show_bug.cgi?id=673989

src/empathy-new-chatroom-dialog.c |  179
++++++++++++++++---------------------
1 file changed, 76 insertions(+), 103 deletions(-)

commit 4934dd5eeaa4c130350dd4dbb84859d09a27246b
Author: Daniel Mustieles <[email protected]>
Date:   Thu May 10 11:59:17 2012 +0200

   Updated Spanish translation

po/es.po |  912
+++++++++++++++++++++++++++++---------------------------------
1 file changed, 427 insertions(+), 485 deletions(-)

commit cf9caca6cbd7ccdfbbe3cfd94c66adc40d4fd342
Author: Guillaume Desmottes <[email protected]>
Date:   Thu May 10 11:36:27 2012 +0200

   contact-search-dialog: use
   empathy_client_factory_dup_contact_by_id_async()

   https://bugzilla.gnome.org/show_bug.cgi?id=675597

libempathy-gtk/empathy-contact-search-dialog.c |   79
+++++++++++++++---------
1 file changed, 50 insertions(+), 29 deletions(-)

commit 1b678e4f3f233e852dded51c069e8859e16aa3d5
Author: Guillaume Desmottes <[email protected]>
Date:   Thu May 10 11:31:14 2012 +0200

   add empathy_client_factory_dup_contact_by_id_async()

   https://bugzilla.gnome.org/show_bug.cgi?id=675597

libempathy/empathy-client-factory.c |   64
+++++++++++++++++++++++++++++++++++
libempathy/empathy-client-factory.h |   15 ++++++++
2 files changed, 79 insertions(+)

commit 746b5f4f72a6b9403ea7bd2e71a6b6cf815efc8a
Author: Guillaume Desmottes <[email protected]>
Date:   Thu May 10 10:33:20 2012 +0200

   remove invisible_char from ui files

   We should use Gtk+'s default and those widgets don't use it any way.

libempathy-gtk/empathy-account-widget-irc.ui      |    6 ------
libempathy-gtk/empathy-contact-blocking-dialog.ui |    1 -
src/empathy-new-chatroom-dialog.ui                |    2 --
3 files changed, 9 deletions(-)

commit 7842711bccaa0952eb11f13b9078f26260c5e8c0
Author: Guillaume Desmottes <[email protected]>
Date:   Thu Apr 26 12:08:38 2012 +0200

   Turn EmpathyNewChatroomDialog to a GtkDialog sub-class

   https://bugzilla.gnome.org/show_bug.cgi?id=674860

src/empathy-new-chatroom-dialog.c  |  476
++++++++++++++++++++----------------
src/empathy-new-chatroom-dialog.h  |   51 +++-
src/empathy-new-chatroom-dialog.ui |  422
+++++++++++++-------------------
3 files changed, 491 insertions(+), 458 deletions(-)

commit 98c9a19291744ca7e62ad470ef1f012761b58830
Author: Guillaume Desmottes <[email protected]>
Date:   Thu Apr 26 11:19:27 2012 +0200

   chatroom-dialog: re-order some functions

   Let's just get rid of all these stupid prototypes.

   https://bugzilla.gnome.org/show_bug.cgi?id=674860

src/empathy-new-chatroom-dialog.c |  656
+++++++++++++++++--------------------
1 file changed, 300 insertions(+), 356 deletions(-)

commit 3d4484b2968f1ed4e16b763b6ccda97636f10ab8
Author: Guillaume Desmottes <[email protected]>
Date:   Thu Apr 26 11:08:49 2012 +0200

   new-chatroom-dialog: port to TP coding style

   https://bugzilla.gnome.org/show_bug.cgi?id=674860

src/empathy-new-chatroom-dialog.c | 1279
+++++++++++++++++++------------------
src/empathy-new-chatroom-dialog.h |    3 +-
2 files changed, 642 insertions(+), 640 deletions(-)

commit 1b585fb209271d89f192d4a4adbef66c9ff19b95
Author: Guillaume Desmottes <[email protected]>
Date:   Wed Apr 25 11:16:52 2012 +0200

   Use tp_capabilities_get_channel_classes_variant()

   https://bugzilla.gnome.org/show_bug.cgi?id=674774

libempathy/empathy-tp-chat.c |   44
+++++++++++++++++++++++++++++++-----------
1 file changed, 33 insertions(+), 11 deletions(-)

commit 095cb1798bd4214653a85133de8fc577d23c268b
Author: Guillaume Desmottes <[email protected]>
Date:   Wed Apr 18 15:39:45 2012 +0200

   Stop generating Certificate API

   https://bugzilla.gnome.org/show_bug.cgi?id=674318

extensions/Authentication_TLS_Certificate.xml |  305
-------------------------
extensions/Makefile.am                        |    1 -
extensions/misc.xml                           |    1 -
3 files changed, 307 deletions(-)

commit ae1fc6a29df872a65e293a17d821124e69f0985e
Author: Guillaume Desmottes <[email protected]>
Date:   Wed Apr 18 15:04:14 2012 +0200

   remove empathy-tls-certificate

   https://bugzilla.gnome.org/show_bug.cgi?id=674318

libempathy/Makefile.am               |    2 -
libempathy/empathy-tls-certificate.c |  432
----------------------------------
libempathy/empathy-tls-certificate.h |   93 --------
3 files changed, 527 deletions(-)

commit 00cc78476a3926f64b531be08ff96dc817e63367
Author: Guillaume Desmottes <[email protected]>
Date:   Wed Apr 18 15:25:27 2012 +0200

   Use TpTpTLSCertificate

   https://bugzilla.gnome.org/show_bug.cgi?id=674318

libempathy-gtk/empathy-tls-dialog.c     |   46 +++++++++++------------
libempathy-gtk/empathy-tls-dialog.h     |    8 ++--
libempathy/empathy-server-tls-handler.c |   31 ++++++----------
libempathy/empathy-server-tls-handler.h |    6 +--
libempathy/empathy-tls-verifier.c       |   61
+++++++++++++++----------------
libempathy/empathy-tls-verifier.h       |    8 ++--
src/empathy-auth-client.c               |   24 ++++++------
tests/empathy-tls-test.c                |   57
+++++++++++++++--------------
8 files changed, 114 insertions(+), 127 deletions(-)

commit 049ba20e4c1579faaf999089a4a97674e3816a50
Author: Guillaume Desmottes <[email protected]>
Date:   Tue Apr 10 17:04:45 2012 +0200

   use tp_capabilities_supports_sms()

   https://bugzilla.gnome.org/show_bug.cgi?id=673846

libempathy/empathy-contact.c |   34 ++--------------------------------
1 file changed, 2 insertions(+), 32 deletions(-)

commit a9e5357278f2320098e07dd97bcbffd192e83a38
Author: Guillaume Desmottes <[email protected]>
Date:   Mon Apr 16 13:37:59 2012 +0200

   Stop generating Debug API

   https://bugzilla.gnome.org/show_bug.cgi?id=674182

extensions/Debug.xml   |  165
------------------------------------------------
extensions/Makefile.am |    1 -
extensions/misc.xml    |    1 -
3 files changed, 167 deletions(-)

commit 08ab2c822a8e732206f6c5579f9f6b51ce217567
Author: Guillaume Desmottes <[email protected]>
Date:   Mon Apr 16 11:34:06 2012 +0200

   Store the TpDebugMessage in the model

   Makes things easier and saves us from dupping the info.

   https://bugzilla.gnome.org/show_bug.cgi?id=674182

src/empathy-debug-window.c |  265
++++++++++++++++++++++----------------------
1 file changed, 131 insertions(+), 134 deletions(-)

commit 60e7f9f68bbcb287e8df3aac35a0ee5b5cf01b94
Author: Guillaume Desmottes <[email protected]>
Date:   Mon Apr 16 11:56:45 2012 +0200

   merge store_filter_foreach () and copy_model_foreach ()

   They were basically the same function. The only difference was that
   one was
   assuming to receive an empty string during the first iteration while
   the other
   was coping with it being NULL.

   https://bugzilla.gnome.org/show_bug.cgi?id=674182

src/empathy-debug-window.c |   75
+++++++++-----------------------------------
1 file changed, 14 insertions(+), 61 deletions(-)

commit bb58c649539336ca1081ffff0fef14f3b632be36
Author: Guillaume Desmottes <[email protected]>
Date:   Mon Apr 16 10:44:36 2012 +0200

   debug-window: use TpDebugClient

   https://bugzilla.gnome.org/show_bug.cgi?id=674182

src/empathy-debug-window.c |  159
+++++++++++++++++++++++++-------------------
1 file changed, 89 insertions(+), 70 deletions(-)

commit cad76982e06dff27a7f19840384061e3e92b70be
Author: Guillaume Desmottes <[email protected]>
Date:   Mon Apr 16 10:10:14 2012 +0200

   empathy-debugger: use self->priv pattern

   https://bugzilla.gnome.org/show_bug.cgi?id=674182

src/empathy-debug-window.c |  542
++++++++++++++++++++++----------------------
src/empathy-debug-window.h |    3 +-
2 files changed, 267 insertions(+), 278 deletions(-)

commit 77e0eed9fb363177cbd54a2659105c4e6a288c8d
Author: Guillaume Desmottes <[email protected]>
Date:   Mon Apr 16 09:39:42 2012 +0200

   debug_window_dispose: use g_clear_object()

   https://bugzilla.gnome.org/show_bug.cgi?id=674182

src/empathy-debug-window.c |   24 ++++--------------------
1 file changed, 4 insertions(+), 20 deletions(-)

commit 6e1feb9fafe3f46f8a0a5c0ffa11dea0a4a07d15
Author: Guillaume Desmottes <[email protected]>
Date:   Thu May 10 09:46:15 2012 +0200

   Depend on tp-glib 0.19.0

   We are going to use its new API (TpDebugClient, TpTLSCertificate,
   etc).

configure.ac |    4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

commit 3e8ad073e4434f8dea27c29def12f1548d5d7b86
Merge: 085365f aa2c67b
Author: Guillaume Desmottes <[email protected]>
Date:   Wed May 9 14:02:13 2012 +0200

   Merge branch 'gnome-3-4'

   Conflicts:
       configure.ac
       libempathy/empathy-tp-chat.c
       src/empathy-event-manager.c
       src/empathy-streamed-media-window.c
       src/empathy-video-widget.c

commit aa2c67bebc8dee3d6f53abf8267090d1b68cd098
Author: Guillaume Desmottes <[email protected]>
Date:   Wed May 9 13:58:26 2012 +0200

   Use tp-glib version checking macros

   Will make sure we don't accidentally use new API in stable branch.

   Depend on tp-glib 0.18.0 while we are on it as any distro shipping
   3.4 should
   use this version any way.

configure.ac |    5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

commit 5cdb08a0601008eb6fa3402d7a34406e358ccdf7
Author: Guillaume Desmottes <[email protected]>
Date:   Mon May 7 11:10:17 2012 +0200

   Use TP_ERROR instead of TP_ERRORS

   The latter has been deprecated in tp-glib master.

libempathy-gtk/empathy-chat.c                    |    4 ++--
libempathy-gtk/empathy-contact-blocking-dialog.c |    2 +-
libempathy/empathy-tp-chat.c                     |    2 +-
libempathy/empathy-tp-contact-factory.c          |    2 +-
src/empathy-call-factory.c                       |    2 +-
src/empathy-call-observer.c                      |    2 +-
src/empathy-event-manager.c                      |    8 ++++----
7 files changed, 11 insertions(+), 11 deletions(-)

commit 085365f20953fae1fb95d0272677273e3840e98f
Author: Guillaume Desmottes <[email protected]>
Date:   Tue May 8 13:50:03 2012 +0200

   new-account-dialog: rely on the EmpathyAccountWidget::close signal

   User of the dialog should wait for the widget to be completely
   done before
   destroying it.

   Change the 'success' dialog response to GTK_RESPONSE_APPLY to stay
   coherent
   with the response type received from EmpathyAccountWidget.

   https://bugzilla.gnome.org/show_bug.cgi?id=675667

libempathy-gtk/empathy-new-account-dialog.c |   23
++++++-----------------
src/empathy-accounts-dialog.c               |    2 +-
2 files changed, 7 insertions(+), 18 deletions(-)

commit 852af596dcc11e104a5565e953240af2f83b4cc2
Author: Guillaume Desmottes <[email protected]>
Date:   Tue May 8 13:46:48 2012 +0200

   account-widget: delay 'close' signal if enabling the account

   The whole point of this signal is to tell to user when it can be
   destroyed, so
   we shouldn't fire it if we are still pending on an async call.

   https://bugzilla.gnome.org/show_bug.cgi?id=675667

libempathy-gtk/empathy-account-widget.c |   13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)

commit d3e20304bf68216c268e2c7db0a2a081b8d3a197
Author: Olivier Crête <[email protected]>
Date:   Mon May 7 18:52:42 2012 -0400

   video-widget: Remove as it is now unused

   It was only used by empathy-av. Move the #defines to call-window where
   they are used.

   https://bugzilla.gnome.org/show_bug.cgi?id=675647

src/Makefile.am            |    2 -
src/empathy-call-window.c  |   11 +-
src/empathy-video-widget.c |  513
--------------------------------------------
src/empathy-video-widget.h |   72 -------
4 files changed, 6 insertions(+), 592 deletions(-)

commit 4723b7016072a1cd4f41dfddcf990d97d68def36
Author: Guillaume Desmottes <[email protected]>
Date:   Tue May 8 10:37:34 2012 +0200

   call-observer: use tp_channel_get_target_contact()

src/empathy-call-observer.c |   36 ++++--------------------------------
1 file changed, 4 insertions(+), 32 deletions(-)

commit d86e51de57197b0f0ce77fac46fc113713aa9033
Author: Guillaume Desmottes <[email protected]>
Date:   Fri May 4 14:53:34 2012 +0200

   Turn EmpathyAccountWidget to a proper GtkWidget

   https://bugzilla.gnome.org/show_bug.cgi?id=640417

libempathy-gtk/empathy-account-widget-irc.c        |   10 +-
libempathy-gtk/empathy-account-widget-irc.h        |    6 +-
libempathy-gtk/empathy-account-widget-private.h    |    2 -
libempathy-gtk/empathy-account-widget-sip.c        |    4 +-
libempathy-gtk/empathy-account-widget-sip.h        |    2 +-
libempathy-gtk/empathy-account-widget.c            |  156
++++++++++----------
libempathy-gtk/empathy-account-widget.h            |    6 +-
.../empathy-local-xmpp-assistant-widget.c          |   17 +--
libempathy-gtk/empathy-new-account-dialog.c        |   30 ++--
src/empathy-accounts-dialog.c                      |   52 +++----
10 files changed, 139 insertions(+), 146 deletions(-)

commit 09ac300a093ffe494cbea40bd5c3e2bca74aee4f
Author: Guillaume Desmottes <[email protected]>
Date:   Mon May 7 13:56:40 2012 +0200

   approve_ft_channel: stop using the contact factory

   https://bugzilla.gnome.org/show_bug.cgi?id=675597

src/empathy-event-manager.c |   57
+++++++++++++++----------------------------
1 file changed, 20 insertions(+), 37 deletions(-)

commit 89c1b2f6eae4b0a01debe8096140f55c7836df70
Author: Guillaume Desmottes <[email protected]>
Date:   Mon May 7 13:56:40 2012 +0200

   approve_call_channel: stop using the contact factory

   https://bugzilla.gnome.org/show_bug.cgi?id=675597

src/empathy-event-manager.c |  112
++++++++++++++++++-------------------------
1 file changed, 47 insertions(+), 65 deletions(-)

commit aaf3c94bd09a836df63b01054b41bd3e09982439
Author: Guillaume Desmottes <[email protected]>
Date:   Mon May 7 12:18:31 2012 +0200

   event-manager: factor out approve_channel_*() functions

   This approve function is way to big, let's split it.

   https://bugzilla.gnome.org/show_bug.cgi?id=675597

src/empathy-event-manager.c |  235
++++++++++++++++++++++++++-----------------
1 file changed, 141 insertions(+), 94 deletions(-)

commit 50241f767ad46c4433864205a67410452a092c0b
Author: Guillaume Desmottes <[email protected]>
Date:   Mon May 7 13:39:21 2012 +0200

   tp-chat: stop using the contact factory when building message

   Messages are now synchronously proccessed so we don't have to keep
   an internal
   queue of messages being prepared.
   We also need to complete the preparation of the EmpathyTpChat feature
   in idle
   as it's now prepared synchronously as well.

   https://bugzilla.gnome.org/show_bug.cgi?id=675597

libempathy/empathy-tp-chat.c |   75
+++++++-----------------------------------
1 file changed, 12 insertions(+), 63 deletions(-)

commit 5673bdb1c772ec6bb3b8c1257afbca0d06762681
Author: Guillaume Desmottes <[email protected]>
Date:   Mon May 7 12:00:27 2012 +0200

   ft-handler: create EmpathyContact from TpContact

   https://bugzilla.gnome.org/show_bug.cgi?id=675597

libempathy/empathy-ft-handler.c |   37
+++++--------------------------------
1 file changed, 5 insertions(+), 32 deletions(-)

commit c33d6ea84ba4a11c63f840b659d0568b3a0331d8
Author: Guillaume Desmottes <[email protected]>
Date:   Mon May 7 11:54:54 2012 +0200

   tp-contact-factory: remove unused methods

   https://bugzilla.gnome.org/show_bug.cgi?id=675597

libempathy/empathy-tp-contact-factory.c |  145
-------------------------------
libempathy/empathy-tp-contact-factory.h |   32 -------
2 files changed, 177 deletions(-)

commit 689ad874fb13b6485e7f7c3a1c93bfb8e50b34e9
Author: Xavier Claessens <[email protected]>
Date:   Mon May 7 22:31:44 2012 +0200

   Add fallback server for WLM

goa-mc-plugin/mcp-account-manager-goa.c |    1 +
1 file changed, 1 insertion(+)

commit 9b8c6a150ac947fed91166505d6b198b0a073f77
Author: Xavier Claessens <[email protected]>
Date:   Mon May 7 22:31:44 2012 +0200

   Add fallback server for WLM

goa-mc-plugin/mcp-account-manager-goa.c |    1 +
1 file changed, 1 insertion(+)

commit 4a1c6a72d6899c5af90a51fb8d6ae27298d7742e
Author: Javier Jardón <[email protected]>
Date:   Tue May 8 14:57:08 2012 +0900

   Use gst_object_ref_sink()

   Instead call both gst_object_ref() and gst_object_sink()

   https://bugzilla.gnome.org/show_bug.cgi?id=675590

src/empathy-call-window.c  |    9 +++------
src/empathy-video-widget.c |    2 +-
2 files changed, 4 insertions(+), 7 deletions(-)

commit 9bc69fec76fb62000791b0b383ba15b508a7d7b6
Author: Debarshi Ray <[email protected]>
Date:   Sat Mar 31 23:37:53 2012 +0200

   goa-mc-plugin: support enabling or disabling accounts

   Bumped the required version of GOA to 3.5.0.

   Fixes: https://bugzilla.gnome.org/673263

configure.ac                            |    2 +-
goa-mc-plugin/mcp-account-manager-goa.c |   34
++++++++++++++++++++++---------
2 files changed, 25 insertions(+), 11 deletions(-)

commit d0193ecc58b6eab69b4c4d3c9667c50bfc033b49
Author: Guillaume Desmottes <[email protected]>
Date:   Mon May 7 11:10:17 2012 +0200

   Use TP_ERROR instead of TP_ERRORS

   The latter has been deprecated in tp-glib master.

libempathy-gtk/empathy-chat.c                    |    4 ++--
libempathy-gtk/empathy-contact-blocking-dialog.c |    2 +-
libempathy/empathy-tp-chat.c                     |    2 +-
libempathy/empathy-tp-contact-factory.c          |    2 +-
src/empathy-call-factory.c                       |    2 +-
src/empathy-call-observer.c                      |    2 +-
src/empathy-event-manager.c                      |    8 ++++----
7 files changed, 11 insertions(+), 11 deletions(-)

commit 69f31706a888ba65374c15c61489a3d6db0b0752
Author: Javier Jardón <[email protected]>
Date:   Mon May 7 17:11:29 2012 +0900

   Use gst_object_ref_sink()

   Instead call both gst_object_ref() and gst_object_sink()

   https://bugzilla.gnome.org/show_bug.cgi?id=675590

src/empathy-call-window.c           |    9 +++------
src/empathy-streamed-media-window.c |    9 +++------
src/empathy-video-widget.c          |    3 +--
3 files changed, 7 insertions(+), 14 deletions(-)

commit 9923159863e58051f64cc7a60b3fa16184526db8
Author: Gabor Kelemen <[email protected]>
Date:   Wed May 2 22:31:41 2012 +0300

   Fix localization of --help outputs and application names

   https://bugzilla.gnome.org/show_bug.cgi?id=675246

src/empathy-accounts.c |    3 ++-
src/empathy-call.c     |    3 ++-
src/empathy-chat.c     |    1 +
src/empathy-debugger.c |    4 ++--
src/empathy.c          |    3 ++-
5 files changed, 9 insertions(+), 5 deletions(-)

commit 5deac54272ed93cf9811af2dc79658b21bb8c705
Author: Guillaume Desmottes <[email protected]>
Date:   Thu May 3 11:30:49 2012 +0200

   accounts-dialog: stop using tp_connection_get_self_handle()

   https://bugzilla.gnome.org/show_bug.cgi?id=675229

src/empathy-accounts-dialog.c |   25 ++++++++-----------------
1 file changed, 8 insertions(+), 17 deletions(-)

commit e73848da5a3c8c3ab71aab36c0fbb9d7f20141d7
Author: Guillaume Desmottes <[email protected]>
Date:   Thu May 3 11:30:49 2012 +0200

   contact-widget: stop using tp_connection_get_self_handle()

   https://bugzilla.gnome.org/show_bug.cgi?id=675229

libempathy-gtk/empathy-contact-widget.c |   11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)

commit 51bea3323498986ac13df3d99157c2b8db83484a
Author: Guillaume Desmottes <[email protected]>
Date:   Thu May 3 11:21:11 2012 +0200

   contact: compare TpContact objects rather than handles

   https://bugzilla.gnome.org/show_bug.cgi?id=675229

libempathy/empathy-contact.c |    8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)

commit 12c633ddc23c83b660b33b841c420d410e580a59
Author: Guillaume Desmottes <[email protected]>
Date:   Thu May 3 11:21:11 2012 +0200

   invite-participant-dialog: compare TpContact objects rather than
   handles

   https://bugzilla.gnome.org/show_bug.cgi?id=675229

src/empathy-invite-participant-dialog.c |   10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)

commit 6fa54e003930d9c0f3fe64a5e799b2f2c55c0fef
Author: Guillaume Desmottes <[email protected]>
Date:   Thu May 3 11:14:45 2012 +0200

   tp-chat:stop using the handle of members

   https://bugzilla.gnome.org/show_bug.cgi?id=675229

libempathy/empathy-tp-chat.c |   36 ++++++++++++++----------------------
1 file changed, 14 insertions(+), 22 deletions(-)

commit a296925676f10385929fee162610d49f1caff373
Author: Guillaume Desmottes <[email protected]>
Date:   Thu May 3 11:02:39 2012 +0200

   empathy_tp_chat_is_invited: return a TpContact for the inviter

   https://bugzilla.gnome.org/show_bug.cgi?id=675229

libempathy/empathy-tp-chat.c |   14 ++++----------
libempathy/empathy-tp-chat.h |    2 +-
src/empathy-event-manager.c  |   35 +++++------------------------------
3 files changed, 10 insertions(+), 41 deletions(-)

commit 7faf1b0fef56fd7a22af9ce4216f0eeedfffac26
Author: Guillaume Desmottes <[email protected]>
Date:   Wed May 2 11:42:59 2012 +0200

   event-manager: use new channel group API

   https://bugzilla.gnome.org/show_bug.cgi?id=675229

src/empathy-event-manager.c |    8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

commit eaaad920b112ab16d445ac8c2ef29c5d742a5809
Author: Guillaume Desmottes <[email protected]>
Date:   Wed May 2 15:45:44 2012 +0200

   invite-participant-dialog: stop using
   tp_channel_group_get_handle_owner()

   https://bugzilla.gnome.org/show_bug.cgi?id=675229

src/empathy-invite-participant-dialog.c |    7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)

commit 5d02797e83cfe2779b2c9ddb25b63131cb9b281b
Author: Guillaume Desmottes <[email protected]>
Date:   Wed May 2 11:42:59 2012 +0200

   tp-chat: use new channel group API to track members

   https://bugzilla.gnome.org/show_bug.cgi?id=675229

libempathy/empathy-tp-chat.c |  191
++++++++++++------------------------------
1 file changed, 55 insertions(+), 136 deletions(-)

commit 9173fd2111ceb3ed736515396398c64aa64deee9
Author: Guillaume Desmottes <[email protected]>
Date:   Wed May 2 11:42:59 2012 +0200

   tp_chat_prepare_ready_async: use new channel group API

   https://bugzilla.gnome.org/show_bug.cgi?id=675229

libempathy/empathy-tp-chat.c |   62
+++++++++++-------------------------------
1 file changed, 16 insertions(+), 46 deletions(-)

commit 73b1e75262d87d78602b6c8cc6c9bec8aa875f0b
Author: Guillaume Desmottes <[email protected]>
Date:   Wed May 2 11:28:43 2012 +0200

   empathy_tp_chat_is_invited: use new channel group API

   https://bugzilla.gnome.org/show_bug.cgi?id=675229

libempathy/empathy-tp-chat.c |   17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)

commit f6cca8274e3cce4821d93b9bbdb456a864a7b7dc
Author: Guillaume Desmottes <[email protected]>
Date:   Wed May 2 10:52:06 2012 +0200

   individual-store-channel: stop preparing TP_CHANNEL_FEATURE_CONTACTS

   The factory does it for us now.

   https://bugzilla.gnome.org/show_bug.cgi?id=675229

libempathy-gtk/empathy-individual-store-channel.c |   31
++++-----------------
1 file changed, 5 insertions(+), 26 deletions(-)

commit b7f5aed23c4253145811b7759f8ea8ed120903a1
Author: Guillaume Desmottes <[email protected]>
Date:   Wed May 2 10:50:14 2012 +0200

   client-factory: prepare TP_CHANNEL_FEATURE_CONTACTS

   We are about to use the channel-contacts API so best to make sure
   they will
   work.

   https://bugzilla.gnome.org/show_bug.cgi?id=675229

libempathy/empathy-client-factory.c |    3 +++
1 file changed, 3 insertions(+)

commit 4e5ccb224018c01ba381259cbfe9c54e78082d3f
Author: Guillaume Desmottes <[email protected]>
Date:   Tue May 1 12:58:52 2012 +0200

   remove empathy_tp_chat_join()

   https://bugzilla.gnome.org/show_bug.cgi?id=675229

libempathy/empathy-tp-chat.c |   32 --------------------------------
libempathy/empathy-tp-chat.h |    1 -
2 files changed, 33 deletions(-)

commit ce0e19ff736d76b8064a006f8b8bf4c1baabda1b
Author: Guillaume Desmottes <[email protected]>
Date:   Tue May 1 12:55:49 2012 +0200

   chat-manager: use tp_channel_join_async()

   It's basically the same as empathy_tp_chat_join()

   https://bugzilla.gnome.org/show_bug.cgi?id=675229

src/empathy-chat-manager.c |   18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)

commit af568dcb51fab67c77f5540cc8351be3fe9809cc
Author: Guillaume Desmottes <[email protected]>
Date:   Wed May 2 16:03:32 2012 +0200

   Revert "Revert "remove EMPATHY_AV_BUS_NAME*""

   This reverts commit afb9276b8a497e7b9275fb53abafd0cdb18d55fc.

   https://bugzilla.gnome.org/show_bug.cgi?id=675296

libempathy/empathy-request-util.h |    3 ---
1 file changed, 3 deletions(-)

commit 59ec941bf710736869384acf3cfe137a6d1180a9
Author: Guillaume Desmottes <[email protected]>
Date:   Wed May 2 16:03:11 2012 +0200

   Revert "Revert "Stop requesting StreamedMedia channels""

   This reverts commit 758b4250e767d9e952b8c0ea4db7d93df192a0c0.

   https://bugzilla.gnome.org/show_bug.cgi?id=675296

libempathy-gtk/empathy-call-utils.c |   74
+++--------------------------------
libempathy-gtk/empathy-call-utils.h |    4 --
2 files changed, 5 insertions(+), 73 deletions(-)

commit 2d19fc2f3bc163cf742469185d61e667b2dcd084
Author: Guillaume Desmottes <[email protected]>
Date:   Wed May 2 16:01:24 2012 +0200

   remove empathy-av

   https://bugzilla.gnome.org/show_bug.cgi?id=675296

configure.ac                                   |   19 -
data/Makefile.am                               |   13 -
libempathy-gtk/empathy-call-utils.c            |   31 +-
libempathy/Makefile.am                         |    2 -
libempathy/empathy-tp-streamed-media.c         |  856 -------
libempathy/empathy-tp-streamed-media.h         |  113 -
po/POTFILES.in                                 |    4 -
src/Makefile.am                                |   33 -
src/empathy-av.c                               |  169 --
src/empathy-streamed-media-factory.c           |  270 --
src/empathy-streamed-media-factory.h           |   69 -
src/empathy-streamed-media-handler.c           |  921 -------
src/empathy-streamed-media-handler.h           |  106 -
src/empathy-streamed-media-window-fullscreen.c |  309 ---
src/empathy-streamed-media-window-fullscreen.h |   77 -
src/empathy-streamed-media-window.c            | 3203
------------------------
src/empathy-streamed-media-window.h            |   65 -
src/empathy-streamed-media-window.ui           |  861 -------
src/ev-sidebar.c                               |  351 ---
src/ev-sidebar.h                               |   76 -
20 files changed, 14 insertions(+), 7534 deletions(-)

commit 5a6db15dbaaa9f3aa902d5ae2299bdb5ee83a9d8
Author: Guillaume Desmottes <[email protected]>
Date:   Wed May 2 16:18:18 2012 +0200

   Stop approving StreamedMedia channels

   https://bugzilla.gnome.org/show_bug.cgi?id=675296

src/empathy-event-manager.c          |   86
+---------------------------------
src/empathy-event-manager.h          |    1 -
src/empathy-notifications-approver.c |    9 ----
3 files changed, 2 insertions(+), 94 deletions(-)

commit d3ea58c51fd403f0d5e4913193095f3890423fb9
Author: Guillaume Desmottes <[email protected]>
Date:   Wed May 2 15:59:25 2012 +0200

   Revert "DISTCHECK_CONFIGURE_FLAGS add --enable-empathy-av"

   This reverts commit bd55c7dec76d6c95d294ee60da616b7fe51d181a.

   https://bugzilla.gnome.org/show_bug.cgi?id=675296

Makefile.am |    1 -
1 file changed, 1 deletion(-)

commit 55b19d4afad4a05e4e90ab4e4a57bbb1e2734d21
Author: Guillaume Desmottes <[email protected]>
Date:   Thu Apr 26 13:42:03 2012 +0200

   tp-chat: add the 'members-changed' signal

   It uses to be implemented by the EmpathyContactList interface which
   has been
   removed.

   https://bugzilla.gnome.org/show_bug.cgi?id=674864

libempathy/empathy-tp-chat.c |   16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)

commit e889f1ac2825527fdc80cf22926817e3992d7421
Author: Guillaume Desmottes <[email protected]>
Date:   Thu Apr 26 13:42:03 2012 +0200

   tp-chat: add the 'member-renamed' signal

   It uses to be implemented by the EmpathyContactList interface which
   has been
   removed.

   https://bugzilla.gnome.org/show_bug.cgi?id=674864

libempathy/empathy-tp-chat.c |   14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)

commit 01dbc394d6249e2517850e38fdc805d1a8eddaa8
Author: Guillaume Desmottes <[email protected]>
Date:   Mon Apr 30 17:37:06 2012 +0200

   remove released flag and update release.py

configure.ac |    2 +-
release.py   |    2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

You are viewing proxied material from ftp.icm.edu.pl. The copyright of proxied material belongs to its original authors. Any comments or complaints in relation to proxied material should be directed to the original authors of the content concerned. Please see the disclaimer for more details.