[Pkg-telepathy-commits] [empathy] 02/08: Merge tag 'upstream/3.12.0' into debian-experimental
Laurent Bigonville
bigon at moszumanska.debian.org
Mon Mar 24 17:17:39 UTC 2014
This is an automated email from the git hooks/post-receive script.
bigon pushed a commit to branch debian-experimental
in repository empathy.
commit 3c5bd1bfe38a7afee4615afbb24934b6822197f3
Merge: 1d9436f 74d91eb
Author: Laurent Bigonville <bigon at bigon.be>
Date: Mon Mar 24 18:00:06 2014 +0100
Merge tag 'upstream/3.12.0' into debian-experimental
Upstream version 3.12.0
ChangeLog | 2593 ++-
INSTALL | 372 +-
Makefile.am | 7 +-
Makefile.in | 13 +-
NEWS | 119 +-
aclocal.m4 | 459 +-
config.h.in | 5 +-
configure | 538 +-
configure.ac | 105 +-
data/Makefile.in | 2 -
data/empathy.desktop | 12 +-
data/empathy.desktop.in | 2 +-
data/icons/Makefile.am | 124 -
data/icons/Makefile.in | 126 -
data/icons/hicolor_apps_16x16_im-aim.png | Bin 795 -> 0 bytes
data/icons/hicolor_apps_16x16_im-ekiga.png | Bin 844 -> 0 bytes
data/icons/hicolor_apps_16x16_im-facebook.png | Bin 552 -> 0 bytes
data/icons/hicolor_apps_16x16_im-gadugadu.png | Bin 775 -> 0 bytes
data/icons/hicolor_apps_16x16_im-gizmo.png | Bin 861 -> 0 bytes
data/icons/hicolor_apps_16x16_im-google-talk.png | Bin 828 -> 0 bytes
data/icons/hicolor_apps_16x16_im-groupwise.png | Bin 865 -> 0 bytes
data/icons/hicolor_apps_16x16_im-icq.png | Bin 936 -> 0 bytes
data/icons/hicolor_apps_16x16_im-irc.png | Bin 848 -> 0 bytes
data/icons/hicolor_apps_16x16_im-jabber.png | Bin 663 -> 0 bytes
data/icons/hicolor_apps_16x16_im-local-xmpp.png | Bin 891 -> 0 bytes
data/icons/hicolor_apps_16x16_im-meanwhile.png | Bin 938 -> 0 bytes
data/icons/hicolor_apps_16x16_im-msn.png | Bin 835 -> 0 bytes
data/icons/hicolor_apps_16x16_im-mxit.png | Bin 560 -> 0 bytes
data/icons/hicolor_apps_16x16_im-myspace.png | Bin 624 -> 0 bytes
data/icons/hicolor_apps_16x16_im-qq.png | Bin 823 -> 0 bytes
data/icons/hicolor_apps_16x16_im-sametime.png | Bin 817 -> 0 bytes
data/icons/hicolor_apps_16x16_im-silc.png | Bin 359 -> 0 bytes
data/icons/hicolor_apps_16x16_im-sip.png | Bin 630 -> 0 bytes
data/icons/hicolor_apps_16x16_im-yahoo.png | Bin 906 -> 0 bytes
data/icons/hicolor_apps_16x16_im-zephyr.png | Bin 695 -> 0 bytes
data/icons/hicolor_apps_22x22_im-aim.png | Bin 1134 -> 0 bytes
data/icons/hicolor_apps_22x22_im-ekiga.png | Bin 1299 -> 0 bytes
data/icons/hicolor_apps_22x22_im-facebook.png | Bin 731 -> 0 bytes
data/icons/hicolor_apps_22x22_im-gadugadu.png | Bin 1207 -> 0 bytes
data/icons/hicolor_apps_22x22_im-gizmo.png | Bin 1301 -> 0 bytes
data/icons/hicolor_apps_22x22_im-google-talk.png | Bin 1252 -> 0 bytes
data/icons/hicolor_apps_22x22_im-groupwise.png | Bin 1330 -> 0 bytes
data/icons/hicolor_apps_22x22_im-icq.png | Bin 1359 -> 0 bytes
data/icons/hicolor_apps_22x22_im-irc.png | Bin 1218 -> 0 bytes
data/icons/hicolor_apps_22x22_im-jabber.png | Bin 953 -> 0 bytes
data/icons/hicolor_apps_22x22_im-local-xmpp.png | Bin 1293 -> 0 bytes
data/icons/hicolor_apps_22x22_im-meanwhile.png | Bin 1538 -> 0 bytes
data/icons/hicolor_apps_22x22_im-msn.png | Bin 1281 -> 0 bytes
data/icons/hicolor_apps_22x22_im-mxit.png | Bin 828 -> 0 bytes
data/icons/hicolor_apps_22x22_im-myspace.png | Bin 884 -> 0 bytes
data/icons/hicolor_apps_22x22_im-qq.png | Bin 1264 -> 0 bytes
data/icons/hicolor_apps_22x22_im-sametime.png | Bin 1225 -> 0 bytes
data/icons/hicolor_apps_22x22_im-silc.png | Bin 510 -> 0 bytes
data/icons/hicolor_apps_22x22_im-sip.png | Bin 824 -> 0 bytes
data/icons/hicolor_apps_22x22_im-yahoo.png | Bin 1261 -> 0 bytes
data/icons/hicolor_apps_22x22_im-zephyr.png | Bin 995 -> 0 bytes
data/icons/hicolor_apps_24x24_im-aim.png | Bin 1218 -> 0 bytes
data/icons/hicolor_apps_24x24_im-ekiga.png | Bin 1431 -> 0 bytes
data/icons/hicolor_apps_24x24_im-gadugadu.png | Bin 1338 -> 0 bytes
data/icons/hicolor_apps_24x24_im-gizmo.png | Bin 1437 -> 0 bytes
data/icons/hicolor_apps_24x24_im-google-talk.png | Bin 1363 -> 0 bytes
data/icons/hicolor_apps_24x24_im-groupwise.png | Bin 1494 -> 0 bytes
data/icons/hicolor_apps_24x24_im-icq.png | Bin 1512 -> 0 bytes
data/icons/hicolor_apps_24x24_im-irc.png | Bin 1308 -> 0 bytes
data/icons/hicolor_apps_24x24_im-jabber.png | Bin 1013 -> 0 bytes
data/icons/hicolor_apps_24x24_im-local-xmpp.png | Bin 1562 -> 0 bytes
data/icons/hicolor_apps_24x24_im-meanwhile.png | Bin 1423 -> 0 bytes
data/icons/hicolor_apps_24x24_im-msn.png | Bin 1407 -> 0 bytes
data/icons/hicolor_apps_24x24_im-mxit.png | Bin 767 -> 0 bytes
data/icons/hicolor_apps_24x24_im-myspace.png | Bin 799 -> 0 bytes
data/icons/hicolor_apps_24x24_im-qq.png | Bin 1421 -> 0 bytes
data/icons/hicolor_apps_24x24_im-sametime.png | Bin 1398 -> 0 bytes
data/icons/hicolor_apps_24x24_im-silc.png | Bin 476 -> 0 bytes
data/icons/hicolor_apps_24x24_im-sip.png | Bin 816 -> 0 bytes
data/icons/hicolor_apps_24x24_im-yahoo.png | Bin 1411 -> 0 bytes
data/icons/hicolor_apps_24x24_im-zephyr.png | Bin 1049 -> 0 bytes
data/icons/hicolor_apps_32x32_im-aim.png | Bin 1777 -> 0 bytes
data/icons/hicolor_apps_32x32_im-ekiga.png | Bin 2118 -> 0 bytes
data/icons/hicolor_apps_32x32_im-gadugadu.png | Bin 1986 -> 0 bytes
data/icons/hicolor_apps_32x32_im-gizmo.png | Bin 2061 -> 0 bytes
data/icons/hicolor_apps_32x32_im-google-talk.png | Bin 1893 -> 0 bytes
data/icons/hicolor_apps_32x32_im-groupwise.png | Bin 2164 -> 0 bytes
data/icons/hicolor_apps_32x32_im-icq.png | Bin 2121 -> 0 bytes
data/icons/hicolor_apps_32x32_im-irc.png | Bin 1695 -> 0 bytes
data/icons/hicolor_apps_32x32_im-jabber.png | Bin 1492 -> 0 bytes
data/icons/hicolor_apps_32x32_im-local-xmpp.png | Bin 2355 -> 0 bytes
data/icons/hicolor_apps_32x32_im-meanwhile.png | Bin 2086 -> 0 bytes
data/icons/hicolor_apps_32x32_im-msn.png | Bin 1660 -> 0 bytes
data/icons/hicolor_apps_32x32_im-mxit.png | Bin 998 -> 0 bytes
data/icons/hicolor_apps_32x32_im-myspace.png | Bin 1174 -> 0 bytes
data/icons/hicolor_apps_32x32_im-qq.png | Bin 2105 -> 0 bytes
data/icons/hicolor_apps_32x32_im-sametime.png | Bin 1994 -> 0 bytes
data/icons/hicolor_apps_32x32_im-silc.png | Bin 547 -> 0 bytes
data/icons/hicolor_apps_32x32_im-sip.png | Bin 1151 -> 0 bytes
data/icons/hicolor_apps_32x32_im-yahoo.png | Bin 1955 -> 0 bytes
data/icons/hicolor_apps_32x32_im-zephyr.png | Bin 1500 -> 0 bytes
data/icons/hicolor_apps_48x48_im-aim.png | Bin 2953 -> 0 bytes
data/icons/hicolor_apps_48x48_im-ekiga.png | Bin 3706 -> 0 bytes
data/icons/hicolor_apps_48x48_im-facebook.png | Bin 1521 -> 0 bytes
data/icons/hicolor_apps_48x48_im-gadugadu.png | Bin 3210 -> 0 bytes
data/icons/hicolor_apps_48x48_im-gizmo.png | Bin 3284 -> 0 bytes
data/icons/hicolor_apps_48x48_im-google-talk.png | Bin 3043 -> 0 bytes
data/icons/hicolor_apps_48x48_im-groupwise.png | Bin 3817 -> 0 bytes
data/icons/hicolor_apps_48x48_im-icq.png | Bin 3418 -> 0 bytes
data/icons/hicolor_apps_48x48_im-irc.png | Bin 2428 -> 0 bytes
data/icons/hicolor_apps_48x48_im-jabber.png | Bin 2413 -> 0 bytes
data/icons/hicolor_apps_48x48_im-local-xmpp.png | Bin 4188 -> 0 bytes
data/icons/hicolor_apps_48x48_im-meanwhile.png | Bin 3647 -> 0 bytes
data/icons/hicolor_apps_48x48_im-msn.png | Bin 2778 -> 0 bytes
data/icons/hicolor_apps_48x48_im-mxit.png | Bin 1306 -> 0 bytes
data/icons/hicolor_apps_48x48_im-myspace.png | Bin 1619 -> 0 bytes
data/icons/hicolor_apps_48x48_im-qq.png | Bin 3653 -> 0 bytes
data/icons/hicolor_apps_48x48_im-sametime.png | Bin 3417 -> 0 bytes
data/icons/hicolor_apps_48x48_im-silc.png | Bin 749 -> 0 bytes
data/icons/hicolor_apps_48x48_im-sip.png | Bin 1405 -> 0 bytes
data/icons/hicolor_apps_48x48_im-yahoo.png | Bin 3211 -> 0 bytes
data/icons/hicolor_apps_48x48_im-zephyr.png | Bin 2303 -> 0 bytes
data/icons/hicolor_apps_scalable_im-aim.svg | 183 -
data/icons/hicolor_apps_scalable_im-ekiga.svg | 441 -
data/icons/hicolor_apps_scalable_im-gadugadu.svg | 225 -
data/icons/hicolor_apps_scalable_im-gizmo.svg | 269 -
.../icons/hicolor_apps_scalable_im-google-talk.svg | 301 -
data/icons/hicolor_apps_scalable_im-groupwise.svg | 215 -
data/icons/hicolor_apps_scalable_im-icq.svg | 200 -
data/icons/hicolor_apps_scalable_im-irc.svg | 785 -
data/icons/hicolor_apps_scalable_im-jabber.svg | 632 -
data/icons/hicolor_apps_scalable_im-local-xmpp.svg | 13059 ---------------
data/icons/hicolor_apps_scalable_im-meanwhile.svg | 174 -
data/icons/hicolor_apps_scalable_im-msn.svg | 174 -
data/icons/hicolor_apps_scalable_im-mxit.svg | 106 -
data/icons/hicolor_apps_scalable_im-myspace.svg | 109 -
data/icons/hicolor_apps_scalable_im-qq.svg | 290 -
data/icons/hicolor_apps_scalable_im-sametime.svg | 127 -
data/icons/hicolor_apps_scalable_im-silc.svg | 103 -
data/icons/hicolor_apps_scalable_im-sip.svg | 251 -
data/icons/hicolor_apps_scalable_im-yahoo.svg | 266 -
data/icons/hicolor_apps_scalable_im-zephyr.svg | 182 -
data/icons/local-xmpp.svg | 16338 -------------------
data/themes/Makefile.in | 2 -
extensions/Channel_Type_Server_TLS_Connection.xml | 69 -
extensions/Connection_Interface_Renaming.xml | 98 -
extensions/Makefile.am | 7 +-
extensions/Makefile.in | 9 +-
extensions/misc.xml | 3 -
goa-mc-plugin/Makefile.in | 2 -
goa-mc-plugin/mcp-account-manager-goa.c | 411 +-
help/Makefile.in | 2 -
help/cs/cs.po | 4396 +++--
help/el/account-irc.page | 2 +-
help/el/audio-call.page | 2 +-
help/el/el.po | 1899 ++-
help/el/link-contacts.page | 2 +-
libempathy-gtk/Makefile.am | 1 -
libempathy-gtk/Makefile.in | 3 -
libempathy-gtk/empathy-call-utils.c | 64 +-
libempathy-gtk/empathy-call-utils.h | 8 +-
libempathy-gtk/empathy-chat.c | 41 +-
libempathy-gtk/empathy-chat.h | 3 +
libempathy-gtk/empathy-individual-menu.c | 8 +-
libempathy-gtk/empathy-location-manager.c | 2 +
libempathy-gtk/empathy-log-window.c | 13 +-
libempathy-gtk/empathy-new-call-dialog.c | 2 +-
libempathy-gtk/empathy-notify-manager.c | 2 +-
libempathy-gtk/empathy-share-my-desktop.c | 17 +-
libempathy/Makefile.am | 1 +
libempathy/Makefile.in | 13 +-
libempathy/empathy-auth-factory.c | 8 +-
libempathy/empathy-bus-names.h | 29 +
libempathy/empathy-ft-factory.c | 2 +-
libempathy/empathy-ft-handler.c | 61 +-
libempathy/empathy-request-util.c | 22 +-
libempathy/empathy-request-util.h | 12 +-
libempathy/empathy-server-tls-handler.c | 3 +-
libempathy/empathy-tp-chat.c | 33 +-
libempathy/empathy-utils.c | 2 +-
m4/libtool.m4 | 4 +-
nautilus-sendto-plugin/Makefile.am | 23 -
nautilus-sendto-plugin/Makefile.in | 743 -
nautilus-sendto-plugin/empathy-nautilus-sendto.c | 306 -
po/POTFILES.in | 2 -
po/an.po | 3454 ++--
po/as.po | 783 +-
po/ca.po | 956 +-
po/cs.po | 432 +-
po/da.po | 949 +-
po/el.po | 410 +-
po/es.po | 375 +-
po/eu.po | 951 +-
po/fi.po | 969 +-
po/fr.po | 951 +-
po/gl.po | 367 +-
po/he.po | 855 +-
po/hu.po | 542 +-
po/id.po | 392 +-
po/it.po | 394 +-
po/kn.po | 2283 +--
po/ko.po | 897 +-
po/lt.po | 496 +-
po/lv.po | 617 +-
po/nb.po | 573 +-
po/pa.po | 597 +-
po/pl.po | 575 +-
po/pt.po | 577 +-
po/pt_BR.po | 407 +-
po/ru.po | 577 +-
po/sk.po | 2 +-
po/sl.po | 241 +-
po/sr.po | 575 +-
po/sr at latin.po | 575 +-
po/ta.po | 339 +-
po/te.po | 338 +-
po/tg.po | 4334 +++--
po/tr.po | 2 +-
po/uk.po | 957 +-
po/zh_CN.po | 352 +-
po/zh_HK.po | 727 +-
po/zh_TW.po | 734 +-
{extensions => src}/Chat_Manager.xml | 0
src/Makefile.am | 15 +-
src/Makefile.in | 25 +-
src/chat-manager-interface.c | 1037 ++
src/chat-manager-interface.h | 170 +
src/empathy-about-dialog.c | 29 +-
src/empathy-accounts-dialog.c | 6 +-
src/empathy-accounts.c | 5 +-
src/empathy-audio-sink.c | 23 -
src/empathy-audio-src.c | 10 +-
src/empathy-call-factory.c | 2 +-
src/empathy-call-handler.c | 23 +-
src/empathy-call-observer.c | 14 +-
src/empathy-call-window.c | 47 +-
src/empathy-call.c | 5 +-
src/empathy-chat-manager.c | 121 +-
src/empathy-chat-manager.h | 5 +-
src/empathy-chat-window.c | 7 +-
src/empathy-chat.c | 5 +-
src/empathy-debug-window.c | 52 +-
src/empathy-debugger.c | 5 +-
src/empathy-event-manager.c | 43 +-
src/empathy-roster-window-menubar.ui | 2 +-
src/empathy-roster-window.c | 2 +-
src/empathy-video-src.c | 26 -
src/empathy.c | 5 +-
telepathy-account-widgets/Makefile.in | 2 +
telepathy-account-widgets/aclocal.m4 | 2713 ++-
telepathy-account-widgets/config.h.in | 4 +-
telepathy-account-widgets/configure | 37 +-
telepathy-account-widgets/configure.ac | 22 +-
telepathy-account-widgets/data/Makefile.in | 2 +
telepathy-account-widgets/data/icons/Makefile.in | 2 +
telepathy-account-widgets/m4/libtool.m4 | 4 +-
telepathy-account-widgets/po/ca.po | 212 +-
telepathy-account-widgets/po/ca at valencia.po | 211 +-
telepathy-account-widgets/po/el.po | 220 +-
telepathy-account-widgets/po/he.po | 262 +-
telepathy-account-widgets/po/zh_CN.po | 214 +-
.../telepathy-account-widgets-uninstalled.pc.in | 2 +-
telepathy-account-widgets/tools/Makefile.in | 2 +
telepathy-account-widgets/tools/lcov.am | 2 +-
.../tp-account-widgets/Makefile.in | 2 +
.../tp-account-widgets/tpaw-account-settings.c | 4 +-
.../tp-account-widgets/tpaw-account-widget-aim.ui | 2 +-
.../tpaw-account-widget-groupwise.ui | 2 +-
.../tp-account-widgets/tpaw-account-widget-icq.ui | 2 +-
.../tpaw-account-widget-jabber.ui | 6 +-
.../tp-account-widgets/tpaw-account-widget-msn.ui | 2 +-
.../tp-account-widgets/tpaw-account-widget-sip.ui | 2 +-
.../tp-account-widgets/tpaw-account-widget.c | 22 +-
.../tp-account-widgets/tpaw-avatar-chooser.c | 1 +
.../tp-account-widgets/tpaw-keyring.c | 1 +
.../tp-account-widgets/tpaw-protocol.c | 5 +
.../tp-account-widgets/tpaw-user-info.c | 1 +
.../tp-account-widgets/tpaw-utils.c | 18 +-
.../tp-account-widgets/tpaw-utils.h | 2 -
tests/Makefile.am | 16 +-
tests/Makefile.in | 72 +-
tests/certificates/Makefile.in | 2 -
tests/empathy-tls-test.c | 7 +-
tests/interactive/Makefile.am | 14 +
tests/interactive/Makefile.in | 49 +-
tests/interactive/test-empathy-calendar-button.c | 7 +-
.../test-empathy-contact-blocking-dialog.c | 7 +-
tests/interactive/test-empathy-presence-chooser.c | 7 +-
.../test-empathy-status-preset-dialog.c | 7 +-
tests/mock-pkcs11.c | 13 +-
tests/mock-pkcs11.h | 3 +-
tests/test.manager | 5 -
tests/test.profile | 4 -
tests/xml/Makefile.in | 2 -
tools/Makefile.in | 2 -
tools/lcov.am | 2 +-
ubuntu-online-accounts/Makefile.in | 2 -
ubuntu-online-accounts/cc-plugins/Makefile.in | 2 -
.../cc-plugins/account-plugins/Makefile.am | 2 +-
.../cc-plugins/account-plugins/Makefile.in | 4 +-
.../cc-plugins/app-plugin/Makefile.am | 2 +-
.../cc-plugins/app-plugin/Makefile.in | 4 +-
.../cc-plugins/providers/Makefile.in | 2 -
.../cc-plugins/services/Makefile.in | 2 -
ubuntu-online-accounts/mc-plugin/Makefile.in | 2 -
300 files changed, 26619 insertions(+), 56083 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/empathy.git
More information about the Pkg-telepathy-commits
mailing list