[Pkg-telepathy-commits] [empathy] 07/08: Merge tag 'upstream/3.12.0+64+gc963117' into debian
Simon McVittie
smcv at debian.org
Thu Mar 27 20:12:08 UTC 2014
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch telepathy1
in repository empathy.
commit 4e415ba375d8f3b335e16a8e77c620566275faca
Merge: 9033c7d ac1f04c
Author: Simon McVittie <smcv at debian.org>
Date: Thu Mar 27 19:12:58 2014 +0000
Merge tag 'upstream/3.12.0+64+gc963117' into debian
Upstream version 3.12.0+64+gc963117
ChangeLog | 110979 ------------------
INSTALL | 4 +-
Makefile.am | 2 +-
Makefile.in | 21 +-
aclocal.m4 | 3501 +-
compile | 347 +
config.guess | 151 +-
config.h.in | 6 +-
config.sub | 43 +-
configure | 318 +-
configure.ac | 28 +-
data/Empathy.Auth.client | 24 +-
data/Empathy.Call.client | 38 +-
data/Empathy.Chat.client | 22 +-
data/Empathy.FileTransfer.client | 12 +-
data/Makefile.am | 18 +-
data/Makefile.in | 20 +-
data/empathy.desktop | 2 +-
data/empathy.desktop.in | 2 +-
data/icons/Makefile.in | 2 +-
.../im.telepathy.v1.Client.Empathy.Auth.service.in | 3 +
.../im.telepathy.v1.Client.Empathy.Call.service.in | 3 +
.../im.telepathy.v1.Client.Empathy.Chat.service.in | 3 +
...pathy.v1.Client.Empathy.FileTransfer.service.in | 3 +
...esktop.Telepathy.Client.Empathy.Auth.service.in | 3 -
...esktop.Telepathy.Client.Empathy.Call.service.in | 3 -
...esktop.Telepathy.Client.Empathy.Chat.service.in | 3 -
...elepathy.Client.Empathy.FileTransfer.service.in | 3 -
data/themes/Makefile.in | 2 +-
.../Channel_Interface_Credentials_Storage.xml | 59 -
extensions/Logger.xml | 159 -
extensions/Makefile.am | 128 -
extensions/Makefile.in | 798 -
extensions/all.xml | 22 -
extensions/extensions-cli.c | 32 -
extensions/extensions.c | 7 -
extensions/extensions.h | 19 -
extensions/generic-types.xml | 108 -
extensions/misc.xml | 10 -
goa-mc-plugin/Makefile.in | 6 +-
goa-mc-plugin/mcp-account-manager-goa.c | 239 +-
help/Makefile.in | 2 +-
help/ca/audio-video.page | 16 -
help/ca/prob-conn-neterror.page | 6 -
help/ca/salut-protocol.page | 5 -
help/cs/account-irc.page | 133 +-
help/cs/account-jabber.page | 74 +-
help/cs/accounts-window.page | 37 +-
help/cs/add-account.page | 62 +-
help/cs/add-contact.page | 50 +-
help/cs/audio-call.page | 71 +-
help/cs/audio-video.page | 162 +-
help/cs/change-status.page | 49 +-
help/cs/create-account.page | 98 +-
help/cs/disable-account.page | 46 +-
help/cs/favorite-rooms.page | 106 +-
help/cs/geolocation-not-showing.page | 51 +-
help/cs/geolocation-privacy.page | 88 +-
help/cs/geolocation-supported.page | 49 +-
help/cs/geolocation-turn.page | 57 +-
help/cs/geolocation-what-is.page | 55 +-
help/cs/geolocation.page | 34 +-
help/cs/group-conversations.page | 115 +-
help/cs/hide-contacts.page | 45 +-
help/cs/import-account.page | 45 +-
help/cs/index.page | 43 +-
help/cs/introduction.page | 51 +-
help/cs/irc-commands.page | 37 +-
help/cs/irc-join-pwd.page | 42 +-
help/cs/irc-join-room.page | 55 +-
help/cs/irc-manage.page | 40 +-
help/cs/irc-nick-password.page | 57 +-
help/cs/irc-send-file.page | 30 +-
help/cs/irc-start-conversation.page | 47 +-
help/cs/license.page | 75 +-
help/cs/link-contacts.page | 117 +-
help/cs/overview.page | 56 +-
help/cs/prev-conv.page | 86 +-
help/cs/prob-conn-acctdisabled.page | 59 +-
help/cs/prob-conn-auth.page | 58 +-
help/cs/prob-conn-name.page | 56 +-
help/cs/prob-conn-neterror.page | 71 +-
help/cs/prob-conn.page | 30 +-
help/cs/remove-account.page | 47 +-
help/cs/salut-protocol.page | 57 +-
help/cs/send-file.page | 75 +-
help/cs/send-message.page | 56 +-
help/cs/set-custom-status.page | 111 +-
help/cs/share-desktop.page | 84 +-
help/cs/status-icons.page | 64 +-
help/cs/video-call.page | 65 +-
help/de/audio-video.page | 16 -
help/de/prob-conn-neterror.page | 6 -
help/de/salut-protocol.page | 5 -
help/el/audio-video.page | 16 -
help/el/prob-conn-neterror.page | 6 -
help/el/salut-protocol.page | 5 -
help/en_GB/audio-video.page | 16 -
help/en_GB/prob-conn-neterror.page | 6 -
help/en_GB/salut-protocol.page | 5 -
help/es/audio-video.page | 16 -
help/es/prob-conn-neterror.page | 6 -
help/es/salut-protocol.page | 5 -
help/eu/audio-video.page | 16 -
help/eu/prob-conn-neterror.page | 6 -
help/eu/salut-protocol.page | 5 -
help/fi/audio-video.page | 16 -
help/fi/prob-conn-neterror.page | 6 -
help/fi/salut-protocol.page | 5 -
help/fr/audio-video.page | 16 -
help/fr/prob-conn-neterror.page | 6 -
help/fr/salut-protocol.page | 5 -
help/gl/audio-video.page | 16 -
help/gl/prob-conn-neterror.page | 6 -
help/gl/salut-protocol.page | 5 -
help/hu/audio-video.page | 16 -
help/hu/prob-conn-neterror.page | 6 -
help/hu/salut-protocol.page | 5 -
help/it/audio-video.page | 16 -
help/it/prob-conn-neterror.page | 6 -
help/it/salut-protocol.page | 5 -
help/ja/audio-video.page | 16 -
help/ja/prob-conn-neterror.page | 6 -
help/ja/salut-protocol.page | 5 -
help/lv/audio-video.page | 16 -
help/lv/prob-conn-neterror.page | 6 -
help/lv/salut-protocol.page | 5 -
help/pl/audio-video.page | 16 -
help/pl/prob-conn-neterror.page | 6 -
help/pl/salut-protocol.page | 5 -
help/pt_BR/audio-video.page | 16 -
help/pt_BR/prob-conn-neterror.page | 6 -
help/pt_BR/salut-protocol.page | 5 -
help/ru/audio-video.page | 16 -
help/ru/prob-conn-neterror.page | 6 -
help/ru/salut-protocol.page | 5 -
help/sl/audio-video.page | 16 -
help/sl/prob-conn-neterror.page | 6 -
help/sl/salut-protocol.page | 5 -
help/sv/audio-video.page | 16 -
help/sv/prob-conn-neterror.page | 6 -
help/sv/salut-protocol.page | 5 -
help/te/audio-video.page | 16 -
help/te/prob-conn-neterror.page | 6 -
help/te/salut-protocol.page | 5 -
help/zh_CN/audio-video.page | 16 -
help/zh_CN/prob-conn-neterror.page | 6 -
help/zh_CN/salut-protocol.page | 5 -
libempathy-gtk/Makefile.am | 2 +-
libempathy-gtk/Makefile.in | 11 +-
libempathy-gtk/empathy-account-chooser.c | 22 +-
libempathy-gtk/empathy-call-utils.c | 2 +-
libempathy-gtk/empathy-chat.c | 42 +-
libempathy-gtk/empathy-contact-blocking-dialog.c | 12 +-
libempathy-gtk/empathy-contact-chooser.c | 2 +-
libempathy-gtk/empathy-individual-dialogs.c | 2 +-
libempathy-gtk/empathy-individual-menu.c | 4 +-
libempathy-gtk/empathy-individual-store-channel.c | 18 +-
libempathy-gtk/empathy-individual-store.c | 2 +-
libempathy-gtk/empathy-individual-widget.c | 2 +-
.../empathy-local-xmpp-assistant-widget.c | 6 +-
libempathy-gtk/empathy-location-manager.c | 6 +-
libempathy-gtk/empathy-log-window.c | 149 +-
libempathy-gtk/empathy-presence-chooser.c | 10 +-
libempathy-gtk/empathy-protocol-chooser.c | 2 +-
libempathy-gtk/empathy-roster-model-manager.c | 2 +-
libempathy-gtk/empathy-sound-manager.c | 2 +-
libempathy-gtk/empathy-subscription-dialog.c | 2 +-
libempathy/Makefile.am | 3 +-
libempathy/Makefile.in | 12 +-
libempathy/empathy-auth-factory.c | 137 +-
libempathy/empathy-auth-factory.h | 2 +-
libempathy/empathy-chatroom-manager.c | 75 +-
libempathy/empathy-client-factory.c | 77 +-
libempathy/empathy-connection-aggregator.c | 12 +-
libempathy/empathy-contact.c | 54 +-
libempathy/empathy-ft-factory.c | 44 +-
libempathy/empathy-ft-handler.c | 14 +-
libempathy/empathy-goa-auth-handler.c | 7 +-
libempathy/empathy-gsettings.h | 2 +-
libempathy/empathy-individual-manager.c | 4 +-
libempathy/empathy-message.c | 23 +-
libempathy/empathy-presence-manager.c | 61 +-
libempathy/empathy-request-util.c | 10 +-
libempathy/empathy-sasl-mechanisms.c | 20 +-
libempathy/empathy-server-sasl-handler.c | 31 +-
libempathy/empathy-server-tls-handler.c | 13 +-
libempathy/empathy-tp-chat.c | 116 +-
libempathy/empathy-tp-chat.h | 2 +-
libempathy/empathy-utils.c | 25 +-
ltmain.sh | 32 +-
m4/libtool.m4 | 81 +-
missing | 4 +-
src/Makefile.am | 5 +-
src/Makefile.in | 41 +-
src/chat-manager-interface.c | 2 +-
src/chat-manager-interface.h | 2 +-
src/empathy-accounts-common.c | 6 +-
src/empathy-accounts-dialog.c | 14 +-
src/empathy-accounts.c | 2 +-
src/empathy-auth-client.c | 6 +-
src/empathy-call-factory.c | 163 +-
src/empathy-call-observer.c | 67 +-
src/empathy-call-window.c | 4 +-
src/empathy-chat-manager.c | 54 +-
src/empathy-chat-window.c | 4 +-
src/empathy-debug-window.c | 40 +-
src/empathy-debug-window.h | 2 +-
src/empathy-event-manager.c | 109 +-
src/empathy-import-pidgin.c | 11 +-
src/empathy-import-widget.c | 30 +-
src/empathy-invite-participant-dialog.c | 2 +-
src/empathy-new-chatroom-dialog.c | 6 +-
src/empathy-preferences.c | 4 +-
src/empathy-roster-window.c | 30 +-
src/empathy-sanity-cleaning.c | 47 +-
src/empathy-status-icon.c | 2 +-
src/empathy.c | 47 +-
telepathy-account-widgets/INSTALL | 4 +-
telepathy-account-widgets/Makefile.in | 18 +-
telepathy-account-widgets/aclocal.m4 | 1623 +-
telepathy-account-widgets/compile | 347 +
telepathy-account-widgets/config.guess | 151 +-
telepathy-account-widgets/config.h.in | 4 +-
telepathy-account-widgets/config.sub | 43 +-
telepathy-account-widgets/configure | 205 +-
telepathy-account-widgets/configure.ac | 9 +-
telepathy-account-widgets/data/Makefile.in | 2 +-
telepathy-account-widgets/data/icons/Makefile.in | 2 +-
telepathy-account-widgets/ltmain.sh | 32 +-
telepathy-account-widgets/m4/libtool.m4 | 81 +-
telepathy-account-widgets/missing | 4 +-
.../telepathy-account-widgets-uninstalled.pc.in | 2 +-
telepathy-account-widgets/tools/Makefile.in | 2 +-
.../tp-account-widgets/Makefile.in | 6 +-
.../tp-account-widgets/tpaw-account-settings.c | 25 +-
.../tp-account-widgets/tpaw-account-widget.c | 2 +-
.../tp-account-widgets/tpaw-avatar-chooser.c | 2 +-
.../tp-account-widgets/tpaw-protocol.c | 2 +-
.../tp-account-widgets/tpaw-user-info.c | 2 +-
.../tp-account-widgets/tpaw-utils.c | 5 +-
test-driver | 20 +-
tests/Makefile.in | 6 +-
tests/certificates/Makefile.in | 2 +-
tests/empathy-tls-test.c | 4 +-
tests/interactive/Makefile.in | 6 +-
.../test-empathy-contact-blocking-dialog.c | 4 +-
tests/xml/Makefile.in | 2 +-
tools/Makefile.am | 15 +-
tools/Makefile.in | 98 +-
tools/c-constants-gen.py | 8 -
tools/check-whitespace.sh | 11 +-
tools/empathy-env.in | 12 -
tools/glib-client-gen.py | 580 +-
tools/glib-ginterface-gen.py | 31 +-
tools/glib-interfaces-gen.py | 26 +-
tools/manager-file.py | 4 +-
tools/telepathy-glib.supp | 2 +-
tools/with-session-bus.sh | 100 -
ubuntu-online-accounts/Makefile.in | 2 +-
ubuntu-online-accounts/cc-plugins/Makefile.in | 2 +-
.../cc-plugins/account-plugins/Makefile.in | 6 +-
.../cc-plugins/app-plugin/Makefile.in | 6 +-
.../cc-plugins/providers/Makefile.in | 2 +-
.../cc-plugins/services/Makefile.in | 2 +-
ubuntu-online-accounts/mc-plugin/Makefile.in | 6 +-
266 files changed, 7127 insertions(+), 118955 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