commit e2138716de168a43abe43608417720fc1d7dc138 Author: Guillaume Desmottes Date: Wed Jan 16 09:02:38 2013 +0100 prepare 3.7.4 NEWS | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 4 ++-- 2 files changed, 50 insertions(+), 2 deletions(-) commit b5be743912a828d44439693a7c5da2d8fafba7ca Merge: e08ec07 c3716f8 Author: Guillaume Desmottes Date: Wed Jan 16 09:03:28 2013 +0100 Merge branch 'gnome-3-6' Conflicts: NEWS configure.ac commit e08ec076dbf22f4f4bcdaf4ec11ccb4debc2c713 Author: Gheyret Kenji Date: Sun Jan 13 16:59:15 2013 +0900 Updated Uyghur translation Signed-off-by: Gheyret Kenji po/ug.po | 478 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 241 insertions(+), 237 deletions(-) commit f1a50a0892369873ab466387b51682e7ff703b03 Author: Matej Urbančič Date: Sat Jan 12 21:32:41 2013 +0100 Updated Slovenian translation po/sl.po | 854 +++++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 533 insertions(+), 321 deletions(-) commit 02db084adde59fc94129ebd7ea5c2c24fad7c07a Author: Alberto Mardegan Date: Thu Jan 10 12:20:12 2013 +0100 UOA: Use the new libaccounts-glib APIs The APIs based on GValue are now deprecated. https://bugzilla.gnome.org/show_bug.cgi?id=691469 configure.ac | 2 +- .../empathy-accounts-plugin-widget.c | 22 ++++---- .../mc-plugin/mcp-account-manager-uoa.c | 59 ++++++++++------------ 3 files changed, 39 insertions(+), 44 deletions(-) commit cfef33e79d3d01b5a407381267bd5f481ceca340 Author: Alberto Mardegan Date: Wed Jan 9 12:42:41 2013 +0100 UOA: share a common configuration plugin The latest libaccounts-glib and libaccount-plugin libraries add support for using the same binary plugin for different providers. This means that bug 683415 is no longer valid, and that all the provider-specific plugins can now be removed. Fixes bug #691418 .../cc-plugins/account-plugins/Makefile.am | 171 +--------------- .../account-plugins/empathy-accounts-plugin-aim.c | 46 ----- .../account-plugins/empathy-accounts-plugin-aim.h | 75 ------- .../empathy-accounts-plugin-gadugadu.c | 46 ----- .../empathy-accounts-plugin-gadugadu.h | 75 ------- .../empathy-accounts-plugin-groupwise.c | 46 ----- .../empathy-accounts-plugin-groupwise.h | 75 ------- .../account-plugins/empathy-accounts-plugin-icq.c | 46 ----- .../account-plugins/empathy-accounts-plugin-icq.h | 75 ------- .../account-plugins/empathy-accounts-plugin-irc.c | 46 ----- .../account-plugins/empathy-accounts-plugin-irc.h | 75 ------- .../empathy-accounts-plugin-jabber.c | 46 ----- .../empathy-accounts-plugin-jabber.h | 75 ------- .../empathy-accounts-plugin-local-xmpp.c | 46 ----- .../empathy-accounts-plugin-local-xmpp.h | 75 ------- .../account-plugins/empathy-accounts-plugin-mxit.c | 46 ----- .../account-plugins/empathy-accounts-plugin-mxit.h | 75 ------- .../empathy-accounts-plugin-myspace.c | 46 ----- .../empathy-accounts-plugin-myspace.h | 75 ------- .../empathy-accounts-plugin-sametime.c | 46 ----- .../empathy-accounts-plugin-sametime.h | 75 ------- .../account-plugins/empathy-accounts-plugin-sip.c | 46 ----- .../account-plugins/empathy-accounts-plugin-sip.h | 75 ------- .../empathy-accounts-plugin-yahoo.c | 46 ----- .../empathy-accounts-plugin-yahoo.h | 75 ------- .../empathy-accounts-plugin-yahoojp.c | 46 ----- .../empathy-accounts-plugin-yahoojp.h | 75 ------- .../empathy-accounts-plugin-zephyr.c | 46 ----- .../empathy-accounts-plugin-zephyr.h | 75 ------- .../account-plugins/empathy-accounts-plugin.c | 6 + .../account-plugins/empathy-accounts-plugin.h | 2 + .../cc-plugins/generate-plugins.py | 224 +-------------------- .../cc-plugins/providers/aim.provider | 1 + .../cc-plugins/providers/gadugadu.provider | 1 + .../cc-plugins/providers/groupwise.provider | 1 + .../cc-plugins/providers/icq.provider | 1 + .../cc-plugins/providers/irc.provider | 1 + .../cc-plugins/providers/jabber.provider | 1 + .../cc-plugins/providers/local-xmpp.provider | 1 + .../cc-plugins/providers/mxit.provider | 1 + .../cc-plugins/providers/myspace.provider | 1 + .../cc-plugins/providers/sametime.provider | 1 + .../cc-plugins/providers/sip.provider | 1 + .../cc-plugins/providers/yahoo.provider | 1 + .../cc-plugins/providers/yahoojp.provider | 1 + .../cc-plugins/providers/zephyr.provider | 1 + 46 files changed, 29 insertions(+), 2082 deletions(-) commit 7035c0ab139dcabac395fc2798af04db4d89f884 Author: Guillaume Desmottes Date: Wed Dec 26 15:49:45 2012 +0100 call-window: use the 'emblem-system-symbolic' icon for the camera popup button https://bugzilla.gnome.org/show_bug.cgi?id=657634 src/empathy-call-window.c | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) commit c3716f8a8add2a6fbebef81b05281d777c8369ba Author: Guillaume Desmottes Date: Wed Jan 9 12:09:13 2013 +0100 remove released flag configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9d54c02581f1b01d7dc90156b68dc6704c6258f8 Author: Guillaume Desmottes Date: Wed Jan 9 11:13:37 2013 +0100 prepare 3.6.3 NEWS | 22 ++++++++++++++++++++++