[empathy: 277/277] Merge branch 'mc5', fixes bug #590165
- From: Sjoerd Simons <sjoerds src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [empathy: 277/277] Merge branch 'mc5', fixes bug #590165
- Date: Tue, 25 Aug 2009 10:36:40 +0000 (UTC)
commit 2e6d8132394680ea42a3ebdc1daad33ff5e07b86
Merge: 7cfb268... d7f82b0...
Author: Sjoerd Simons <sjoerd simons collabora co uk>
Date: Tue Aug 25 11:18:05 2009 +0100
Merge branch 'mc5', fixes bug #590165
configure.ac | 12 +-
data/Makefile.am | 21 -
data/aim.profile | 10 -
data/ekiga.profile | 14 -
data/empathy.schemas.in | 14 +
data/fwd.profile | 15 -
data/gadugadu.profile | 11 -
data/groupwise.profile | 11 -
data/gtalk.profile | 16 -
data/icq.profile | 11 -
data/irc.profile | 9 -
data/jabber.profile | 12 -
data/msn-haze.profile | 13 -
data/msn.profile | 13 -
data/qq.profile | 11 -
data/salut.profile | 9 -
data/sametime.profile | 11 -
data/sipphone.profile | 16 -
data/sofiasip.profile | 10 -
data/yahoo.profile | 11 -
docs/libempathy-gtk/libempathy-gtk.types | 2 +-
libempathy-gtk/Makefile.am | 7 +-
libempathy-gtk/empathy-account-chooser.c | 14 +-
libempathy-gtk/empathy-account-widget-aim.ui | 121 +-
libempathy-gtk/empathy-account-widget-generic.ui | 2 +-
libempathy-gtk/empathy-account-widget-groupwise.ui | 116 +-
libempathy-gtk/empathy-account-widget-icq.ui | 121 +-
libempathy-gtk/empathy-account-widget-irc.c | 110 +-
libempathy-gtk/empathy-account-widget-irc.h | 6 +-
libempathy-gtk/empathy-account-widget-irc.ui | 339 ++--
libempathy-gtk/empathy-account-widget-jabber.ui | 148 ++-
...lut.ui => empathy-account-widget-local-xmpp.ui} | 0
libempathy-gtk/empathy-account-widget-msn.ui | 116 +-
libempathy-gtk/empathy-account-widget-private.h | 47 +
libempathy-gtk/empathy-account-widget-sip.c | 115 +-
libempathy-gtk/empathy-account-widget-sip.h | 6 +-
libempathy-gtk/empathy-account-widget-sip.ui | 118 +-
libempathy-gtk/empathy-account-widget-yahoo.ui | 121 +-
libempathy-gtk/empathy-account-widget.c | 1834 +++++++++++------
libempathy-gtk/empathy-account-widget.h | 62 +-
libempathy-gtk/empathy-chat.c | 8 +-
libempathy-gtk/empathy-contact-dialogs.c | 2 -
libempathy-gtk/empathy-contact-list-view.c | 2 +-
libempathy-gtk/empathy-irc-network-dialog.c | 2 -
libempathy-gtk/empathy-log-window.c | 4 +-
libempathy-gtk/empathy-new-message-dialog.c | 2 -
libempathy-gtk/empathy-profile-chooser.c | 324 ---
libempathy-gtk/empathy-profile-chooser.h | 69 -
libempathy-gtk/empathy-protocol-chooser.c | 425 ++++
libempathy-gtk/empathy-protocol-chooser.h | 77 +
libempathy-gtk/empathy-share-my-desktop.c | 2 +
libempathy-gtk/empathy-theme-adium.c | 6 +-
libempathy-gtk/empathy-ui-utils.c | 12 -
libempathy-gtk/empathy-ui-utils.h | 3 -
libempathy/Makefile.am | 5 +-
libempathy/empathy-account-manager.c | 759 +++++---
libempathy/empathy-account-manager.h | 55 +-
libempathy/empathy-account-priv.h | 44 -
libempathy/empathy-account-settings.c | 1179 +++++++++++
libempathy/empathy-account-settings.h | 163 ++
libempathy/empathy-account.c | 920 +++++++--
libempathy/empathy-account.h | 59 +-
libempathy/empathy-call-handler.c | 1 +
libempathy/empathy-chatroom-manager.c | 21 +-
libempathy/empathy-chatroom.c | 3 +-
libempathy/empathy-connection-managers.c | 293 +++
libempathy/empathy-connection-managers.h | 77 +
libempathy/empathy-contact.c | 13 +-
libempathy/empathy-debug.c | 1 +
libempathy/empathy-debug.h | 1 +
libempathy/empathy-dispatcher.c | 349 ++--
libempathy/empathy-dispatcher.h | 2 +
libempathy/empathy-ft-handler.c | 1 +
libempathy/empathy-idle.c | 124 +-
libempathy/empathy-idle.h | 2 +-
libempathy/empathy-log-manager.c | 1 +
libempathy/empathy-log-manager.h | 2 -
libempathy/empathy-log-store-empathy.c | 65 +-
libempathy/empathy-tp-chat.c | 1 +
libempathy/empathy-tp-contact-factory.c | 2 +
libempathy/empathy-tp-contact-list.c | 1 +
libempathy/empathy-tp-file.c | 1 +
libempathy/empathy-tp-roomlist.c | 5 +
libempathy/empathy-utils.c | 46 +-
libempathy/empathy-utils.h | 11 +-
megaphone/src/megaphone-applet.c | 7 +-
nothere/src/nothere-applet.c | 1 -
po/POTFILES.in | 7 +-
po/hr.po | 3 +-
python/pyempathy/pyempathy.defs | 108 +-
python/pyempathygtk/pyempathygtk.defs | 162 +-
python/pyempathygtk/pyempathygtk.override | 3 +-
python/update-binding.sh | 2 +-
src/Makefile.am | 5 +-
src/bacon-message-connection.c | 412 ----
src/bacon-message-connection.h | 51 -
src/empathy-account-assistant.c | 941 +++++++++
src/empathy-account-assistant.h | 63 +
src/empathy-accounts-dialog.c | 2176 +++++++++++---------
src/empathy-accounts-dialog.h | 27 +-
src/empathy-accounts-dialog.ui | 165 +-
src/empathy-chat-window.c | 7 +-
src/empathy-chatrooms-window.c | 2 +-
src/empathy-debug-dialog.c | 4 -
src/empathy-event-manager.c | 1 +
src/empathy-import-dialog.c | 480 ++---
src/empathy-import-dialog.h | 48 +-
src/empathy-import-dialog.ui | 78 +-
src/empathy-import-mc4-accounts.c | 531 +++++
src/empathy-import-mc4-accounts.h | 34 +
src/empathy-import-pidgin.c | 31 +-
src/empathy-import-utils.c | 76 +
src/empathy-import-utils.h | 56 +
src/empathy-import-widget.c | 516 +++++
src/empathy-import-widget.h | 70 +
src/empathy-main-window.c | 11 +-
src/empathy-new-chatroom-dialog.c | 12 +-
src/empathy-status-icon.c | 17 -
src/empathy-tube-dispatch.c | 1 +
src/empathy.c | 1201 ++++++------
tests/.gitignore | 3 +-
tests/Makefile.am | 14 +-
tests/check-empathy-chatroom-manager.c | 4 +
tests/check-empathy-chatroom.c | 4 +
tests/check-empathy-helpers.c | 5 +-
tests/test-empathy-account-assistant.c | 25 +
...e-chooser.c => test-empathy-protocol-chooser.c} | 10 +-
127 files changed, 11059 insertions(+), 5115 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
