commit 71b003449ed9203ca6e12df0d80c2e5efdfe8d3b Author: Guillaume Desmottes Date: Fri Mar 2 12:11:41 2012 +0100 prepare 3.3.90.2 NEWS | 32 ++++++++++++++++++++++++++++++++ configure.ac | 4 ++-- 2 files changed, 34 insertions(+), 2 deletions(-) commit 29973effee9abb05f78b8da5e3258194abc2c461 Author: Guillaume Desmottes Date: Fri Mar 2 11:44:19 2012 +0100 add some info to HACKING HACKING | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) commit 2ba0e02b8c7a180b1785ef85baab66b0f16db964 Merge: fe6c1d0 c144943 Author: Guillaume Desmottes Date: Fri Mar 2 11:34:47 2012 +0100 Merge branch 'empathy-av-ocrete' commit fe6c1d00ad01701353fd1f5a85ade27ace898b53 Author: Guillaume Desmottes Date: Fri Mar 2 11:34:29 2012 +0100 git ignore help/*/*.stamp help/.gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit c144943be6f1e0255a6309d6559183a9101e10cd Author: Guillaume Desmottes Date: Fri Mar 2 10:59:59 2012 +0100 empathy-call doesn't need ev-sidebar src/Makefile.am | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit 9c5568e53b09615bee4d516fd8ea29341383fbf7 Author: Guillaume Desmottes Date: Fri Mar 2 10:50:09 2012 +0100 Revert "Stop approve StreamedMedia channels" This reverts commit c7dd14aef20e429135fba7c7a53a8d507b9579a3. src/empathy-event-manager.c | 86 +++++++++++++++++++++++++++++++++- src/empathy-event-manager.h | 1 + src/empathy-notifications-approver.c | 9 ++++ 3 files changed, 94 insertions(+), 2 deletions(-) commit 634c2e8376910b96e584159da43a9e708d3a9573 Author: Guillaume Desmottes Date: Fri Mar 2 10:41:16 2012 +0100 remove FIXME regarding empathy_tp_streamed_media_accept_incoming_call() It early returns if the channel is an outgoing one. And it's called as a result of empathy_streamed_media_handler_start_call() so it's not accepted automatically. We just keep the existing behaviour. src/empathy-streamed-media-handler.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit d22ead6ae9fd3d168a49ad6d66acf20f9d27fd4c Author: Guillaume Desmottes Date: Fri Mar 2 10:30:38 2012 +0100 fix signature of empathy_streamed_media_handler_tf_content_src_pad_added_cb src/empathy-streamed-media-handler.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) commit cad6634c35d1ab43f5e547dcf135fb793336e1e9 Author: Ibrahim Saed Date: Fri Mar 2 09:06:18 2012 +0100 Updated Arabic translation po/ar.po | 3260 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 1604 insertions(+), 1656 deletions(-) commit 6d7cb3b034a5098cc294262d4338a78b3aeee483 Author: Matej Urbančič Date: Thu Mar 1 21:35:36 2012 +0100 Updated Slovenian translation po/sl.po | 52 ++++++++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 26 deletions(-) commit 886773a371ac59f3fd039270a90b3e813d02d7cd Author: Olivier Crête Date: Thu Mar 1 11:58:23 2012 -0500 Farstream port of tp-av oops src/empathy-streamed-media-handler.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) commit e35c34e3935d055c6cd5db1c0808f9906488627b Author: Olivier Crête Date: Thu Mar 1 11:52:56 2012 -0500 Port Empathy-av to Telepathy Farstream configure.ac | 3 +- src/empathy-streamed-media-handler.c | 135 +++++++++++++++++----------------- src/empathy-streamed-media-window.c | 17 ++--- 3 files changed, 77 insertions(+), 78 deletions(-) commit 57a7b1ba43133f3f3097d00b89a8d8f7f246ccdb Author: Guillaume Desmottes Date: Tue Feb 28 13:05:43 2012 +0100 Allow to build with empathy-av configure.ac | 19 +++++++++++++++++++ data/Makefile.am | 12 ++++++++++-- libempathy-gtk/empathy-call-utils.c | 31 +++++++++++++++++-------------- src/Makefile.am | 9 ++++++--- src/empathy-streamed-media-handler.c | 6 +++--- src/empathy-streamed-media-handler.h | 2 +- src/empathy-streamed-media-window.c | 8 ++++---- 7 files changed, 60 insertions(+), 27 deletions(-) commit 758b4250e767d9e952b8c0ea4db7d93df192a0c0 Author: Guillaume Desmottes Date: Tue Feb 28 13:03:26 2012 +0100 Revert "Stop requesting StreamedMedia channels" This reverts commit b7f1fab64f9a59221b4d666cd788db4efe855b13. libempathy-gtk/empathy-call-utils.c | 74 ++++++++++++++++++++++++++++++++-- 1 files changed, 69 insertions(+), 5 deletions(-) commit 4110a4bc8b8c2a63e94615594eba3b109dcf97e4 Author: Guillaume Desmottes Date: Tue Feb 28 12:07:03 2012 +0100 Revert "Drop empathy-av" This reverts commit ba0a893b1d31cdb234bae72845e840a895b9d62a. Conflicts: src/Makefile.am data/Empathy.AudioVideo.client | 21 + data/Makefile.am | 5 + ....Telepathy.Client.Empathy.AudioVideo.service.in | 3 + 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 | 29 + src/empathy-av.c | 172 ++ src/empathy-streamed-media-factory.c | 269 ++ src/empathy-streamed-media-factory.h | 69 + src/empathy-streamed-media-handler.c | 903 ++++++ 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 | 3202 ++++++++++++++++++++ src/empathy-streamed-media-window.h | 65 + src/empathy-streamed-media-window.ui | 861 ++++++ 18 files changed, 7066 insertions(+), 0 deletions(-) commit afb9276b8a497e7b9275fb53abafd0cdb18d55fc Author: Guillaume Desmottes Date: Wed Feb 29 13:21:48 2012 +0100 Revert "remove EMPATHY_AV_BUS_NAME*" This reverts commit f90421fd29108507c722c03e28bc16e4b5baf7c0. libempathy/empathy-request-util.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 07a964820bf33babbf9345313599b3fcb9d1e97f Author: Jonh Wendell Date: Thu Mar 1 10:10:55 2012 -0300 Updated Brazilian Portuguese translation po/pt_BR.po | 2982 +++++++++++++++++++++++++++++++---------------------------- 1 files changed, 1571 insertions(+), 1411 deletions(-) commit 2a3d601d7a180e6f039d0c21a69ca38029984c93 Author: Guillaume Desmottes Date: Tue Feb 28 12:04:07 2012 +0100 Revert "remove ev-sidebar" This reverts commit 8499da09a2cd61da8c02b34f00112672007d13c8. Need for empathy-av src/Makefile.am | 2 + src/ev-sidebar.c | 352 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/ev-sidebar.h | 76 ++++++++++++ 3 files changed, 430 insertions(+), 0 deletions(-) commit e2df2195fbfdf96425e71f0c6bc006d56797879a Author: Chandni Verma Date: Wed Feb 29 18:58:54 2012 +0530 Make clear work on All's buffer Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=671061 src/empathy-debug-window.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) commit cdc76639a2c2141c0eb1794fe93b787332ef50fb Author: Matej Urbančič Date: Wed Feb 29 20:52:34 2012 +0100 Updated Slovenian translation po/sl.po | 3075 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 1529 insertions(+), 1546 deletions(-) commit 8b11603943c0613cde51e7a27b05e75d2addca98 Author: Guillaume Desmottes Date: Tue Feb 28 16:50:05 2012 +0100 audio-sink: don't unref subpad Part of my commit ed191caba6658b580db78a1802f2c8293e4564fb was wrong. subpad is added to the bin so gst_element_add_pad() takes its reference. https://bugzilla.gnome.org/show_bug.cgi?id=670745 src/empathy-audio-sink.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) commit d9f6aebd81c43e6c09376899ed926a94d1cdd5b5 Author: Mattias Põldaru Date: Mon Feb 27 12:27:32 2012 +0200 [l10n] Updated Estonian translation po/et.po | 471 +++++++++++++++++++++---------------------------------------- 1 files changed, 162 insertions(+), 309 deletions(-) commit c9e47d4bd51b0c79917db7e1539b452766ab300c Author: Guillaume Desmottes Date: Fri Feb 24 15:03:38 2012 +0100 empathy_call_window_content_added_cb: fix pad leak https://bugzilla.gnome.org/show_bug.cgi?id=670745 src/empathy-call-window.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit ed191caba6658b580db78a1802f2c8293e4564fb Author: Guillaume Desmottes Date: Fri Feb 24 14:55:04 2012 +0100 audio-sink: fix GstPad leaks gst_ghost_pad_new() doesn't take ownership of the target pad so we have to unref it ourself. https://bugzilla.gnome.org/show_bug.cgi?id=670745 src/empathy-audio-sink.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) commit e790a2faa4d607cd812d6babe22b0078ba5906d4 Author: Ihar Hrachyshka Date: Sun Feb 26 12:55:37 2012 +0300 Updated Belarusian translation. po/be.po | 664 ++++++++++++++++++++++++++------------------------------------ 1 files changed, 280 insertions(+), 384 deletions(-) commit 7c8694cf4282d1eb0b17d417be5015b2285e49f5 Author: Yuri Myasoedov Date: Sun Feb 26 13:12:22 2012 +0400 Updated Russian translation po/ru.po | 71 +++++++++++++++++++++++++------------------------------------ 1 files changed, 29 insertions(+), 42 deletions(-) commit 9d5be9ef43c91fcc9a0c0c38e3db62cb4cf61020 Author: Yuri Myasoedov Date: Sun Feb 26 13:06:05 2012 +0400 Updated Russian translation po/ru.po | 1137 ++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 546 insertions(+), 591 deletions(-) commit 115155b5e31390e153f4ff276e3bb2e3176684cd Author: Dr.T.Vasudevan Date: Sun Feb 26 12:37:00 2012 +0530 updated Tamil translation po/ta.po | 64 ++++++++++++++++++++++--------------------------------------- 1 files changed, 23 insertions(+), 41 deletions(-) commit 13c9f09f14948594ed6d5a97cd581ceb88115345 Author: Dr.T.Vasudevan Date: Sun Feb 26 12:32:40 2012 +0530 updated Tamil translation po/ta.po | 121 +++++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 69 insertions(+), 52 deletions(-) commit 1cb86d9e288078fffd26eec8f4d32c77128e07de Author: Gheyret Kenji Date: Sun Feb 26 11:36:28 2012 +0900 Updated uyghur translation po/ug.po | 4553 +++++++++++++++++++++++++++++++++----------------------------- 1 files changed, 2440 insertions(+), 2113 deletions(-) commit 8e4e6f8612326e0d2b49857afbaeb85454101569 Author: Dr.T.Vasudevan Date: Sat Feb 25 21:10:58 2012 +0530 updated Tamil translation po/ta.po | 2911 +++++++++++++++++++++++++++++++++----------------------------- 1 files changed, 1535 insertions(+), 1376 deletions(-) commit 7214e2d95cc4e8bfd728261d6d83ff432317b5c2 Author: Fran Diéguez Date: Sat Feb 25 15:54:49 2012 +0100 Updated galician translations for doc Signed-off-by: Fran Diéguez help/gl/gl.po | 5216 ++++++++++++++++++++++++++++++--------------------------- 1 files changed, 2713 insertions(+), 2503 deletions(-) commit a01b16704901431f67a840ce7286d39f3c91ec57 Author: Guillaume Desmottes Date: Fri Feb 24 10:09:25 2012 +0100 remove released flag configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)