Presenting GNOME 2.28.1 for FreeBSD. The official release notes for this

release can be found at http://library.gnome.org/misc/release-notes/2.28/ .
Officially, this is mostly a polishing release in preparation for GNOME 3.0
due in about a year.

On the FreeBSD front, though, a lot went into this release.  Major thanks
goes to kwm and avl who did a lot of the porting work for this release.
In particular, kwm brought in Evolution MAPI support for better Microsoft
Exchange integration.  Avl made sure that the new gobject introspection
repository ports were nicely compartmentalized so that large dependencies
aren't brought in wholesale.

But, every GNOME team member (ahze, avl, bland, kwm, mezz, and myself)
contributed to this release.

Other major improvements include an updated HAL with better volume
probing code, ufsid integration, and support for volume names containing
spaces (big thanks to J.R. Oldroyd); a new WebKit; updated AbiWord;
an updated Gimp; and a preview of the new GNOME Shell project (thanks to
Pawel Worach).

The FreeBSD GNOME Team would like to that the following additional
contributors to this release whose patches and testing really helped
make it a success:

Andrius Morkunas
Dominique Goncalves
Eric L. Chen
J.R. Oldroyd
Joseph S. Atkinson
Li
Pawel Worach
Romain Tartière
Thomas Vogt
Yasuda Keisuke
Rui Paulo
Martin Wilke
(and an extra shout out to miwi and pav for pointyhat runs)

We would like to send this release out to Alexander Loginov (avl) in
hopes that he feels better soon.

PR:		136676
		136967
		138872 (obsolete with new epiphany-webkit)
		139160
		134737
		139941
		140097
		140838
		140929

4 files changed, 770 insertions, 99 deletions

diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile
index 1d250a460ce..f36468b1e43 100644
--- a/net-im/empathy/Makefile
+++ b/net-im/empathy/Makefile
@@ -3,25 +3,26 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports-stable/net-im/empathy/Makefile,v 1.3 2009/04/15 11:41:56 kwm Exp $
+#    $MCom: ports/net-im/empathy/Makefile,v 1.49 2009/11/18 18:26:02 kwm Exp $
 
 PORTNAME=	empathy
-PORTVERSION=	2.26.2
-PORTREVISION=	1
+PORTVERSION=	2.28.1.2
 CATEGORIES=	net-im gnome
 MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME IM client based around telepathy
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS=	missioncontrol-server.1:${PORTSDIR}/net-im/telepathy-mission-control \
-    		aspell.16:${PORTSDIR}/textproc/aspell \
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
+    		${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control
+LIB_DEPENDS=	aspell.16:${PORTSDIR}/textproc/aspell \
 		telepathy.2:${PORTSDIR}/net-im/libtelepathy \
 		telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \
 		telepathy-farsight.0:${PORTSDIR}/net-im/telepathy-farsight \
+		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
 		canberra-gtk.0:${PORTSDIR}/audio/libcanberra
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
+    		${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control
 
 USE_GMAKE=	yes
 USE_BZIP2=	yes
@@ -45,7 +46,9 @@ OPTIONS=	JABBER	"Enable jabber (XMPP) client support" on \
 		MSN	"Enable MSN client support" on \
 		IRC	"Enable IRC client support" on \
 		SALUT	"Enable link-local (serverless) XMPP support" off \
-		HAZE	"Enable libpurple protocol integration" off
+		HAZE	"Enable libpurple protocol integration" off \
+		WEBKIT	"Enable Adium Message Style themes" on \
+		MAP	"Enable graphical map support" on
 
 .include <bsd.port.pre.mk>
 
@@ -69,6 +72,24 @@ RUN_DEPENDS+=	${LOCALBASE}/libexec/telepathy-salut:${PORTSDIR}/net-im/telepathy-
 RUN_DEPENDS+=	${LOCALBASE}/libexec/telepathy-haze:${PORTSDIR}/net-im/telepathy-haze
 .endif
 
+.if defined(WITH_WEBKIT)
+LIB_DEPENDS+=	webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
+CONFIGURE_ARGS+=--enable-webkit
+PLIST_SUB+=	ADIUM=""
+.else
+CONFIGURE_ARGS+=--disable-webkit
+PLIST_SUB+=	ADIUM="@comment "
+.endif
+
+.if !defined(WITHOUT_MAP)
+LIB_DEPENDS+=	champlain-0.4.1:${PORTSDIR}/graphics/libchamplain
+CONFIGURE_ARGS+=--enable-map
+PLIST_SUB+=	MAP=""
+.else
+CONFIGURE_ARGS+=--disable-map
+PLIST_SUB+=	MAP="@comment "
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|$${datadir}/gtk-doc/html|${DOCSDIR}|g ; \
 		s|-Werror||g' ${WRKSRC}/configure
diff --git a/net-im/empathy/distinfo b/net-im/empathy/distinfo
index aa523af3508..84ee9a08ec6 100644
--- a/net-im/empathy/distinfo
+++ b/net-im/empathy/distinfo
@@ -1,3 +1,3 @@
-MD5 (empathy-2.26.2.tar.bz2) = 7d42b4c54373c3706a3da301cd616329
-SHA256 (empathy-2.26.2.tar.bz2) = 2790502f62056926feeab71681033e5787856f7b56ae0beaa49f89b4763f1b9a
-SIZE (empathy-2.26.2.tar.bz2) = 2021659
+MD5 (empathy-2.28.1.2.tar.bz2) = 4852ca8423896b6ccb5f7de4d6064607
+SHA256 (empathy-2.28.1.2.tar.bz2) = 7af58b5d6c315dd08f7ad519d1aeed545a6c2c99ff1275ad3a442bcf513b7a0d
+SIZE (empathy-2.28.1.2.tar.bz2) = 2432256
diff --git a/net-im/empathy/files/patch-libempathy_emapth-tp-file.c b/net-im/empathy/files/patch-libempathy_emapth-tp-file.c
new file mode 100644
index 00000000000..58ac2a65b19
--- /dev/null
+++ b/net-im/empathy/files/patch-libempathy_emapth-tp-file.c
@@ -0,0 +1,10 @@
+--- libempathy/empathy-tp-file.c.orig	2009-06-15 18:52:39.000000000 +0200
++++ libempathy/empathy-tp-file.c	2009-06-15 18:53:45.000000000 +0200
+@@ -29,6 +29,7 @@
+ #include <arpa/inet.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <sys/un.h>
+ 
+ #include <glib/gi18n-lib.h>
diff --git a/net-im/empathy/pkg-plist b/net-im/empathy/pkg-plist
index 7dca126190c..9860d5b38ad 100644
--- a/net-im/empathy/pkg-plist
+++ b/net-im/empathy/pkg-plist
@@ -25,38 +25,51 @@ include/libempathy-gtk/empathy-geometry.h
 include/libempathy-gtk/empathy-gtk-enum-types.h
 include/libempathy-gtk/empathy-images.h
 include/libempathy-gtk/empathy-irc-network-dialog.h
+include/libempathy-gtk/empathy-kludge-label.h
 include/libempathy-gtk/empathy-log-window.h
 include/libempathy-gtk/empathy-new-message-dialog.h
+include/libempathy-gtk/empathy-plist.h
 include/libempathy-gtk/empathy-presence-chooser.h
-include/libempathy-gtk/empathy-profile-chooser.h
+include/libempathy-gtk/empathy-protocol-chooser.h
+include/libempathy-gtk/empathy-share-my-desktop.h
 include/libempathy-gtk/empathy-smiley-manager.h
-include/libempathy-gtk/empathy-spell-dialog.h
+include/libempathy-gtk/empathy-sound.h
 include/libempathy-gtk/empathy-spell.h
+include/libempathy-gtk/empathy-status-preset-dialog.h
+%%ADIUM%%include/libempathy-gtk/empathy-theme-adium.h
 include/libempathy-gtk/empathy-theme-boxes.h
 include/libempathy-gtk/empathy-theme-irc.h
 include/libempathy-gtk/empathy-theme-manager.h
 include/libempathy-gtk/empathy-ui-utils.h
 include/libempathy-gtk/empathy-video-src.h
 include/libempathy-gtk/empathy-video-widget.h
+include/libempathy/empathy-account.h
 include/libempathy/empathy-account-manager.h
+include/libempathy/empathy-account-settings.h
 include/libempathy/empathy-call-factory.h
 include/libempathy/empathy-call-handler.h
 include/libempathy/empathy-chatroom-manager.h
 include/libempathy/empathy-chatroom.h
-include/libempathy/empathy-contact-factory.h
+include/libempathy/empathy-connection-managers.h
+include/libempathy/empathy-connectivity.h
 include/libempathy/empathy-contact-groups.h
 include/libempathy/empathy-contact-list.h
 include/libempathy/empathy-contact-manager.h
 include/libempathy/empathy-contact-monitor.h
 include/libempathy/empathy-contact.h
 include/libempathy/empathy-debug.h
+include/libempathy/empathy-debugger.h
 include/libempathy/empathy-dispatch-operation.h
 include/libempathy/empathy-dispatcher.h
 include/libempathy/empathy-enum-types.h
+include/libempathy/empathy-ft-factory.h
+include/libempathy/empathy-ft-handler.h
+include/libempathy/empathy-handler.h
 include/libempathy/empathy-idle.h
 include/libempathy/empathy-irc-network-manager.h
 include/libempathy/empathy-irc-network.h
 include/libempathy/empathy-irc-server.h
+include/libempathy/empathy-location.h
 include/libempathy/empathy-log-manager.h
 include/libempathy/empathy-log-store-empathy.h
 include/libempathy/empathy-log-store.h
@@ -68,20 +81,18 @@ include/libempathy/empathy-tp-chat.h
 include/libempathy/empathy-tp-contact-factory.h
 include/libempathy/empathy-tp-contact-list.h
 include/libempathy/empathy-tp-file.h
-include/libempathy/empathy-tp-group.h
 include/libempathy/empathy-tp-roomlist.h
-include/libempathy/empathy-tp-tube.h
 include/libempathy/empathy-tube-handler.h
 include/libempathy/empathy-types.h
 include/libempathy/empathy-utils.h
 lib/libempathy-gtk.a
 lib/libempathy-gtk.la
 lib/libempathy-gtk.so
-lib/libempathy-gtk.so.19
+lib/libempathy-gtk.so.28
 lib/libempathy.a
 lib/libempathy.la
 lib/libempathy.so
-lib/libempathy.so.23
+lib/libempathy.so.30
 %%PYTHON_SITELIBDIR%%/empathy.a
 %%PYTHON_SITELIBDIR%%/empathy.la
 %%PYTHON_SITELIBDIR%%/empathy.so
@@ -95,7 +106,9 @@ libdata/pkgconfig/libempathy.pc
 libexec/megaphone-applet
 libexec/nothere-applet
 share/applications/empathy.desktop
+share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service
 share/doc/libempathy-gtk/EmpathyAccountChooser.html
+share/doc/libempathy-gtk/EmpathyAccountWidget.html
 share/doc/libempathy-gtk/EmpathyAvatarChooser.html
 share/doc/libempathy-gtk/EmpathyAvatarImage.html
 share/doc/libempathy-gtk/EmpathyCellRendererActivatable.html
@@ -110,8 +123,13 @@ share/doc/libempathy-gtk/EmpathyContactSelector.html
 share/doc/libempathy-gtk/EmpathyGstAudioSink.html
 share/doc/libempathy-gtk/EmpathyGstAudioSrc.html
 share/doc/libempathy-gtk/EmpathyGstVideoSrc.html
+share/doc/libempathy-gtk/EmpathyKludgeLabel.html
+share/doc/libempathy-gtk/EmpathyLocationManager.html
 share/doc/libempathy-gtk/EmpathyPresenceChooser.html
+share/doc/libempathy-gtk/EmpathyProtocolChooser.html
 share/doc/libempathy-gtk/EmpathySmileyManager.html
+share/doc/libempathy-gtk/EmpathyStatusPresetDialog.html
+share/doc/libempathy-gtk/EmpathyThemeAdium.html
 share/doc/libempathy-gtk/EmpathyThemeBoxes.html
 share/doc/libempathy-gtk/EmpathyThemeIrc.html
 share/doc/libempathy-gtk/EmpathyThemeManager.html
@@ -122,8 +140,8 @@ share/doc/libempathy-gtk/index.sgml
 share/doc/libempathy-gtk/ix01.html
 share/doc/libempathy-gtk/left.png
 share/doc/libempathy-gtk/libempathy-gtk-empathy-account-widget-irc.html
+share/doc/libempathy-gtk/libempathy-gtk-empathy-account-widget-private.html
 share/doc/libempathy-gtk/libempathy-gtk-empathy-account-widget-sip.html
-share/doc/libempathy-gtk/libempathy-gtk-empathy-account-widget.html
 share/doc/libempathy-gtk/libempathy-gtk-empathy-chat-view.html
 share/doc/libempathy-gtk/libempathy-gtk-empathy-contact-dialogs.html
 share/doc/libempathy-gtk/libempathy-gtk-empathy-contact-menu.html
@@ -133,8 +151,9 @@ share/doc/libempathy-gtk/libempathy-gtk-empathy-images.html
 share/doc/libempathy-gtk/libempathy-gtk-empathy-irc-network-dialog.html
 share/doc/libempathy-gtk/libempathy-gtk-empathy-log-window.html
 share/doc/libempathy-gtk/libempathy-gtk-empathy-new-message-dialog.html
-share/doc/libempathy-gtk/libempathy-gtk-empathy-profile-chooser.html
-share/doc/libempathy-gtk/libempathy-gtk-empathy-spell-dialog.html
+share/doc/libempathy-gtk/libempathy-gtk-empathy-plist.html
+share/doc/libempathy-gtk/libempathy-gtk-empathy-share-my-desktop.html
+share/doc/libempathy-gtk/libempathy-gtk-empathy-sound.html
 share/doc/libempathy-gtk/libempathy-gtk-empathy-spell.html
 share/doc/libempathy-gtk/libempathy-gtk-empathy-ui-utils.html
 share/doc/libempathy-gtk/libempathy-gtk-hierarchy.html
@@ -146,17 +165,23 @@ share/doc/libempathy-gtk/pt02.html
 share/doc/libempathy-gtk/right.png
 share/doc/libempathy-gtk/style.css
 share/doc/libempathy-gtk/up.png
+share/doc/libempathy/EmpathyAccount.html
 share/doc/libempathy/EmpathyAccountManager.html
+share/doc/libempathy/EmpathyAccountSettings.html
 share/doc/libempathy/EmpathyCallFactory.html
 share/doc/libempathy/EmpathyCallHandler.html
 share/doc/libempathy/EmpathyChatroom.html
 share/doc/libempathy/EmpathyChatroomManager.html
 share/doc/libempathy/EmpathyContact.html
-share/doc/libempathy/EmpathyContactFactory.html
 share/doc/libempathy/EmpathyContactManager.html
+share/doc/libempathy/EmpathyConnectionManagers.html
+share/doc/libempathy/EmpathyConnectivity.html
 share/doc/libempathy/EmpathyContactMonitor.html
+share/doc/libempathy/EmpathyDebugger.html
 share/doc/libempathy/EmpathyDispatcher.html
 share/doc/libempathy/EmpathyDispatchOperation.html
+share/doc/libempathy/EmpathyFTFactory.html
+share/doc/libempathy/EmpathyFTHandler.html
 share/doc/libempathy/EmpathyIdle.html
 share/doc/libempathy/EmpathyIrcNetwork.html
 share/doc/libempathy/EmpathyIrcNetworkManager.html
@@ -169,9 +194,7 @@ share/doc/libempathy/EmpathyTpChat.html
 share/doc/libempathy/EmpathyTpContactFactory.html
 share/doc/libempathy/EmpathyTpContactList.html
 share/doc/libempathy/EmpathyTpFile.html
-share/doc/libempathy/EmpathyTpGroup.html
 share/doc/libempathy/EmpathyTpRoomlist.html
-share/doc/libempathy/EmpathyTpTube.html
 share/doc/libempathy/EmpathyTubeHandler.html
 share/doc/libempathy/home.png
 share/doc/libempathy/index.html
@@ -181,6 +204,7 @@ share/doc/libempathy/left.png
 share/doc/libempathy/libempathy-empathy-contact-groups.html
 share/doc/libempathy/libempathy-empathy-contact-list.html
 share/doc/libempathy/libempathy-empathy-enum-types.html
+share/doc/libempathy/libempathy-empathy-location.html
 share/doc/libempathy/libempathy-empathy-log-store.html
 share/doc/libempathy/libempathy-empathy-status-presets.html
 share/doc/libempathy/libempathy-empathy-time.html
@@ -197,45 +221,53 @@ share/doc/libempathy/style.css
 share/doc/libempathy/up.png
 %%DATADIR%%/GNOME_Megaphone_Applet.xml
 %%DATADIR%%/GNOME_NotHere_Applet.xml
-%%DATADIR%%/empathy-account-widget-aim.glade
-%%DATADIR%%/empathy-account-widget-generic.glade
-%%DATADIR%%/empathy-account-widget-groupwise.glade
-%%DATADIR%%/empathy-account-widget-icq.glade
-%%DATADIR%%/empathy-account-widget-irc.glade
-%%DATADIR%%/empathy-account-widget-jabber.glade
-%%DATADIR%%/empathy-account-widget-msn.glade
-%%DATADIR%%/empathy-account-widget-salut.glade
-%%DATADIR%%/empathy-account-widget-sip.glade
-%%DATADIR%%/empathy-account-widget-yahoo.glade
-%%DATADIR%%/empathy-accounts-dialog.glade
-%%DATADIR%%/empathy-call-window.glade
-%%DATADIR%%/empathy-chat-window.glade
-%%DATADIR%%/empathy-chat.glade
+%%DATADIR%%/Template.html
+%%DATADIR%%/codec-preferences
+%%DATADIR%%/element-properties
+%%DATADIR%%/empathy-account-widget-local-xmpp.ui
+%%MAP%%%%DATADIR%%/empathy-map-view.ui
+%%DATADIR%%/empathy-account-widget-aim.ui
+%%DATADIR%%/empathy-account-widget-generic.ui
+%%DATADIR%%/empathy-account-widget-groupwise.ui
+%%DATADIR%%/empathy-account-widget-icq.ui
+%%DATADIR%%/empathy-account-widget-irc.ui
+%%DATADIR%%/empathy-account-widget-jabber.ui
+%%DATADIR%%/empathy-account-widget-msn.ui
+%%DATADIR%%/empathy-account-widget-sip.ui
+%%DATADIR%%/empathy-account-widget-yahoo.ui
+%%DATADIR%%/empathy-accounts-dialog.ui
+%%DATADIR%%/empathy-call-window-fullscreen.ui
+%%DATADIR%%/empathy-call-window.ui
+%%DATADIR%%/empathy-chat-window.ui
+%%DATADIR%%/empathy-chat.ui
 %%DATADIR%%/empathy-chatroom-manager.dtd
-%%DATADIR%%/empathy-chatrooms-window.glade
-%%DATADIR%%/empathy-contact-dialogs.glade
+%%DATADIR%%/empathy-chatrooms-window.ui
+%%DATADIR%%/empathy-contact-dialogs.ui
 %%DATADIR%%/empathy-contact-groups.dtd
-%%DATADIR%%/empathy-contact-widget.glade
-%%DATADIR%%/empathy-ft-manager.glade
+%%DATADIR%%/empathy-contact-widget.ui
+%%DATADIR%%/empathy-ft-manager.ui
+%%DATADIR%%/empathy-import-dialog.ui
 %%DATADIR%%/empathy-irc-networks.dtd
-%%DATADIR%%/empathy-import-dialog.glade
 %%DATADIR%%/empathy-log-manager.xsl
-%%DATADIR%%/empathy-log-window.glade
-%%DATADIR%%/empathy-main-window.glade
-%%DATADIR%%/empathy-new-chatroom-dialog.glade
-%%DATADIR%%/empathy-new-message-dialog.glade
-%%DATADIR%%/empathy-preferences.glade
-%%DATADIR%%/empathy-presence-chooser.glade
-%%DATADIR%%/empathy-spell-dialog.glade
-%%DATADIR%%/empathy-status-icon.glade
+%%DATADIR%%/empathy-log-window.ui
+%%DATADIR%%/empathy-main-window.ui
+%%DATADIR%%/empathy-new-chatroom-dialog.ui
+%%DATADIR%%/empathy-new-message-dialog.ui
+%%DATADIR%%/empathy-preferences.ui
+%%DATADIR%%/empathy-status-icon.ui
 %%DATADIR%%/empathy-status-presets.dtd
+%%DATADIR%%/empathy-status-preset-dialog.ui
 %%DATADIR%%/icons/hicolor/16x16/actions/im-message-new.png
+%%DATADIR%%/icons/hicolor/16x16/apps/empathy-starred.png
+%%DATADIR%%/icons/hicolor/16x16/apps/empathy-unstarred.png
 %%DATADIR%%/icons/hicolor/16x16/apps/im-ekiga.png
+%%DATADIR%%/icons/hicolor/16x16/apps/im-facebook.png
 %%DATADIR%%/icons/hicolor/16x16/apps/im-gadugadu.png
 %%DATADIR%%/icons/hicolor/16x16/apps/im-gizmo.png
 %%DATADIR%%/icons/hicolor/16x16/apps/im-google-talk.png
 %%DATADIR%%/icons/hicolor/16x16/apps/im-irc.png
 %%DATADIR%%/icons/hicolor/16x16/apps/im-local-xmpp.png
+%%DATADIR%%/icons/hicolor/16x16/apps/im-meanwhile.png
 %%DATADIR%%/icons/hicolor/16x16/apps/im-msn.png
 %%DATADIR%%/icons/hicolor/16x16/apps/im-qq.png
 %%DATADIR%%/icons/hicolor/16x16/apps/im-sip.png
@@ -249,12 +281,16 @@ share/doc/libempathy/up.png
 %%DATADIR%%/icons/hicolor/16x16/status/im-message.png
 %%DATADIR%%/icons/hicolor/16x16/status/user-typing.png
 %%DATADIR%%/icons/hicolor/22x22/actions/im-message-new.png
+%%DATADIR%%/icons/hicolor/22x22/apps/empathy-starred.png
+%%DATADIR%%/icons/hicolor/22x22/apps/empathy-unstarred.png
 %%DATADIR%%/icons/hicolor/22x22/apps/im-ekiga.png
+%%DATADIR%%/icons/hicolor/22x22/apps/im-facebook.png
 %%DATADIR%%/icons/hicolor/22x22/apps/im-gadugadu.png
 %%DATADIR%%/icons/hicolor/22x22/apps/im-gizmo.png
 %%DATADIR%%/icons/hicolor/22x22/apps/im-google-talk.png
 %%DATADIR%%/icons/hicolor/22x22/apps/im-irc.png
 %%DATADIR%%/icons/hicolor/22x22/apps/im-local-xmpp.png
+%%DATADIR%%/icons/hicolor/22x22/apps/im-meanwhile.png
 %%DATADIR%%/icons/hicolor/22x22/apps/im-msn.png
 %%DATADIR%%/icons/hicolor/22x22/apps/im-qq.png
 %%DATADIR%%/icons/hicolor/22x22/apps/im-sip.png
@@ -266,6 +302,8 @@ share/doc/libempathy/up.png
 %%DATADIR%%/icons/hicolor/22x22/status/empathy-offline.png
 %%DATADIR%%/icons/hicolor/22x22/status/empathy-pending.png
 %%DATADIR%%/icons/hicolor/24x24/actions/im-message-new.png
+%%DATADIR%%/icons/hicolor/24x24/apps/empathy-starred.png
+%%DATADIR%%/icons/hicolor/24x24/apps/empathy-unstarred.png
 %%DATADIR%%/icons/hicolor/24x24/apps/im-ekiga.png
 %%DATADIR%%/icons/hicolor/24x24/apps/im-gadugadu.png
 %%DATADIR%%/icons/hicolor/24x24/apps/im-gizmo.png
@@ -282,6 +320,8 @@ share/doc/libempathy/up.png
 %%DATADIR%%/icons/hicolor/24x24/status/empathy-extended-away.png
 %%DATADIR%%/icons/hicolor/24x24/status/empathy-offline.png
 %%DATADIR%%/icons/hicolor/24x24/status/empathy-pending.png
+%%DATADIR%%/icons/hicolor/32x32/apps/empathy-starred.png
+%%DATADIR%%/icons/hicolor/32x32/apps/empathy-unstarred.png
 %%DATADIR%%/icons/hicolor/32x32/apps/im-ekiga.png
 %%DATADIR%%/icons/hicolor/32x32/apps/im-gadugadu.png
 %%DATADIR%%/icons/hicolor/32x32/apps/im-gizmo.png
@@ -298,12 +338,16 @@ share/doc/libempathy/up.png
 %%DATADIR%%/icons/hicolor/32x32/status/empathy-extended-away.png
 %%DATADIR%%/icons/hicolor/32x32/status/empathy-offline.png
 %%DATADIR%%/icons/hicolor/32x32/status/empathy-pending.png
+%%DATADIR%%/icons/hicolor/48x48/apps/empathy-starred.png
+%%DATADIR%%/icons/hicolor/48x48/apps/empathy-unstarred.png
 %%DATADIR%%/icons/hicolor/48x48/apps/im-ekiga.png
+%%DATADIR%%/icons/hicolor/48x48/apps/im-facebook.png
 %%DATADIR%%/icons/hicolor/48x48/apps/im-gadugadu.png
 %%DATADIR%%/icons/hicolor/48x48/apps/im-gizmo.png
 %%DATADIR%%/icons/hicolor/48x48/apps/im-google-talk.png
 %%DATADIR%%/icons/hicolor/48x48/apps/im-irc.png
 %%DATADIR%%/icons/hicolor/48x48/apps/im-local-xmpp.png
+%%DATADIR%%/icons/hicolor/48x48/apps/im-meanwhile.png
 %%DATADIR%%/icons/hicolor/48x48/apps/im-msn.png
 %%DATADIR%%/icons/hicolor/48x48/apps/im-qq.png
 %%DATADIR%%/icons/hicolor/48x48/apps/im-sip.png
@@ -314,13 +358,13 @@ share/doc/libempathy/up.png
 %%DATADIR%%/icons/hicolor/48x48/status/empathy-extended-away.png
 %%DATADIR%%/icons/hicolor/48x48/status/empathy-offline.png
 %%DATADIR%%/icons/hicolor/48x48/status/empathy-pending.png
-%%DATADIR%%/icons/hicolor/icon-theme.cache
 %%DATADIR%%/icons/hicolor/scalable/apps/im-ekiga.svg
 %%DATADIR%%/icons/hicolor/scalable/apps/im-gadugadu.svg
 %%DATADIR%%/icons/hicolor/scalable/apps/im-gizmo.svg
 %%DATADIR%%/icons/hicolor/scalable/apps/im-google-talk.svg
 %%DATADIR%%/icons/hicolor/scalable/apps/im-irc.svg
 %%DATADIR%%/icons/hicolor/scalable/apps/im-local-xmpp.svg
+%%DATADIR%%/icons/hicolor/scalable/apps/im-meanwhile.svg
 %%DATADIR%%/icons/hicolor/scalable/apps/im-msn.svg
 %%DATADIR%%/icons/hicolor/scalable/apps/im-qq.svg
 %%DATADIR%%/icons/hicolor/scalable/apps/im-sip.svg
@@ -331,32 +375,645 @@ share/doc/libempathy/up.png
 %%DATADIR%%/icons/hicolor/scalable/status/empathy-extended-away.svg
 %%DATADIR%%/icons/hicolor/scalable/status/empathy-offline.svg
 %%DATADIR%%/icons/hicolor/scalable/status/empathy-pending.svg
+@exec %%LOCALBASE%%/bin/gtk-update-icon-cache -q -t -f %D/%%DATADIR%%/icons/hicolor 2>/dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/gtk-update-icon-cache -q -t -f %D/%%DATADIR%%/icons/hicolor 2>/dev/null || /usr/bin/true
 %%DATADIR%%/irc-networks.xml
-share/gnome/help/empathy/C/empathy.xml
+share/gnome/help/empathy/C/account-irc.page
+share/gnome/help/empathy/C/account-jabber.page
+share/gnome/help/empathy/C/accounts-window.page
+share/gnome/help/empathy/C/add-account.page
+share/gnome/help/empathy/C/add-contact.page
+share/gnome/help/empathy/C/audio-call.page
+share/gnome/help/empathy/C/audio-video.page
+share/gnome/help/empathy/C/change-status.page
+share/gnome/help/empathy/C/create-account.page
+share/gnome/help/empathy/C/disable-account.page
+share/gnome/help/empathy/C/favorite-rooms.page
+share/gnome/help/empathy/C/figures/audio-input-microphone.png
+share/gnome/help/empathy/C/figures/available.png
+share/gnome/help/empathy/C/figures/away.png
+share/gnome/help/empathy/C/figures/busy.png
+share/gnome/help/empathy/C/figures/camera-web.png
 share/gnome/help/empathy/C/figures/empathy-main-window.png
+share/gnome/help/empathy/C/figures/gtk-add.png
+share/gnome/help/empathy/C/figures/gtk-edit.png
+share/gnome/help/empathy/C/figures/gtk-remove.png
+share/gnome/help/empathy/C/figures/offline.png
+share/gnome/help/empathy/C/geolocation-not-showing.page
+share/gnome/help/empathy/C/geolocation-privacy.page
+share/gnome/help/empathy/C/geolocation-supported.page
+share/gnome/help/empathy/C/geolocation-turn.page
+share/gnome/help/empathy/C/geolocation-what-is.page
+share/gnome/help/empathy/C/geolocation.page
+share/gnome/help/empathy/C/group-conversations.page
+share/gnome/help/empathy/C/import-account.page
+share/gnome/help/empathy/C/index.page
+share/gnome/help/empathy/C/introduction.page
+share/gnome/help/empathy/C/irc-join-pwd.page
+share/gnome/help/empathy/C/irc-join-room.page
+share/gnome/help/empathy/C/irc-manage.page
+share/gnome/help/empathy/C/irc-nick-password.page
+share/gnome/help/empathy/C/irc-send-file.page
+share/gnome/help/empathy/C/irc-start-conversation.page
 share/gnome/help/empathy/C/legal.xml
-share/gnome/help/empathy/ca/empathy.xml
+share/gnome/help/empathy/C/offline-contacts.page
+share/gnome/help/empathy/C/prev-conv.page
+share/gnome/help/empathy/C/prob-conn-acctdisabled.page
+share/gnome/help/empathy/C/prob-conn-auth.page
+share/gnome/help/empathy/C/prob-conn-name.page
+share/gnome/help/empathy/C/prob-conn-neterror.page
+share/gnome/help/empathy/C/prob-conn.page
+share/gnome/help/empathy/C/remove-account.page
+share/gnome/help/empathy/C/salut-protocol.page
+share/gnome/help/empathy/C/send-file.page
+share/gnome/help/empathy/C/send-message.page
+share/gnome/help/empathy/C/set-custom-status.page
+share/gnome/help/empathy/C/share-desktop.page
+share/gnome/help/empathy/C/status-icons.page
+share/gnome/help/empathy/C/video-call.page
+share/gnome/help/empathy/ca/account-irc.page
+share/gnome/help/empathy/ca/account-jabber.page
+share/gnome/help/empathy/ca/accounts-window.page
+share/gnome/help/empathy/ca/add-account.page
+share/gnome/help/empathy/ca/add-contact.page
+share/gnome/help/empathy/ca/audio-call.page
+share/gnome/help/empathy/ca/audio-video.page
+share/gnome/help/empathy/ca/change-status.page
+share/gnome/help/empathy/ca/create-account.page
+share/gnome/help/empathy/ca/disable-account.page
+share/gnome/help/empathy/ca/favorite-rooms.page
+share/gnome/help/empathy/ca/figures/audio-input-microphone.png
+share/gnome/help/empathy/ca/figures/available.png
+share/gnome/help/empathy/ca/figures/away.png
+share/gnome/help/empathy/ca/figures/busy.png
+share/gnome/help/empathy/ca/figures/camera-web.png
 share/gnome/help/empathy/ca/figures/empathy-main-window.png
-share/gnome/help/empathy/cs/empathy.xml
+share/gnome/help/empathy/ca/figures/gtk-add.png
+share/gnome/help/empathy/ca/figures/gtk-edit.png
+share/gnome/help/empathy/ca/figures/gtk-remove.png
+share/gnome/help/empathy/ca/figures/offline.png
+share/gnome/help/empathy/ca/geolocation-not-showing.page
+share/gnome/help/empathy/ca/geolocation-privacy.page
+share/gnome/help/empathy/ca/geolocation-supported.page
+share/gnome/help/empathy/ca/geolocation-turn.page
+share/gnome/help/empathy/ca/geolocation-what-is.page
+share/gnome/help/empathy/ca/geolocation.page
+share/gnome/help/empathy/ca/group-conversations.page
+share/gnome/help/empathy/ca/import-account.page
+share/gnome/help/empathy/ca/index.page
+share/gnome/help/empathy/ca/introduction.page
+share/gnome/help/empathy/ca/irc-join-pwd.page
+share/gnome/help/empathy/ca/irc-join-room.page
+share/gnome/help/empathy/ca/irc-manage.page
+share/gnome/help/empathy/ca/irc-nick-password.page
+share/gnome/help/empathy/ca/irc-send-file.page
+share/gnome/help/empathy/ca/irc-start-conversation.page
+share/gnome/help/empathy/ca/legal.xml
+share/gnome/help/empathy/ca/offline-contacts.page
+share/gnome/help/empathy/ca/prev-conv.page
+share/gnome/help/empathy/ca/prob-conn-acctdisabled.page
+share/gnome/help/empathy/ca/prob-conn-auth.page
+share/gnome/help/empathy/ca/prob-conn-name.page
+share/gnome/help/empathy/ca/prob-conn-neterror.page
+share/gnome/help/empathy/ca/prob-conn.page
+share/gnome/help/empathy/ca/remove-account.page
+share/gnome/help/empathy/ca/salut-protocol.page
+share/gnome/help/empathy/ca/send-file.page
+share/gnome/help/empathy/ca/send-message.page
+share/gnome/help/empathy/ca/set-custom-status.page
+share/gnome/help/empathy/ca/share-desktop.page
+share/gnome/help/empathy/ca/status-icons.page
+share/gnome/help/empathy/ca/video-call.page
+share/gnome/help/empathy/cs/account-irc.page
+share/gnome/help/empathy/cs/account-jabber.page
+share/gnome/help/empathy/cs/accounts-window.page
+share/gnome/help/empathy/cs/add-account.page
+share/gnome/help/empathy/cs/add-contact.page
+share/gnome/help/empathy/cs/audio-call.page
+share/gnome/help/empathy/cs/audio-video.page
+share/gnome/help/empathy/cs/change-status.page
+share/gnome/help/empathy/cs/create-account.page
+share/gnome/help/empathy/cs/disable-account.page
+share/gnome/help/empathy/cs/favorite-rooms.page
+share/gnome/help/empathy/cs/figures/audio-input-microphone.png
+share/gnome/help/empathy/cs/figures/available.png
+share/gnome/help/empathy/cs/figures/away.png
+share/gnome/help/empathy/cs/figures/busy.png
+share/gnome/help/empathy/cs/figures/camera-web.png
 share/gnome/help/empathy/cs/figures/empathy-main-window.png
-share/gnome/help/empathy/de/empathy.xml
+share/gnome/help/empathy/cs/figures/gtk-add.png
+share/gnome/help/empathy/cs/figures/gtk-edit.png
+share/gnome/help/empathy/cs/figures/gtk-remove.png
+share/gnome/help/empathy/cs/figures/offline.png
+share/gnome/help/empathy/cs/geolocation-not-showing.page
+share/gnome/help/empathy/cs/geolocation-privacy.page
+share/gnome/help/empathy/cs/geolocation-supported.page
+share/gnome/help/empathy/cs/geolocation-turn.page
+share/gnome/help/empathy/cs/geolocation-what-is.page
+share/gnome/help/empathy/cs/geolocation.page
+share/gnome/help/empathy/cs/group-conversations.page
+share/gnome/help/empathy/cs/import-account.page
+share/gnome/help/empathy/cs/index.page
+share/gnome/help/empathy/cs/introduction.page
+share/gnome/help/empathy/cs/irc-join-pwd.page
+share/gnome/help/empathy/cs/irc-join-room.page
+share/gnome/help/empathy/cs/irc-manage.page
+share/gnome/help/empathy/cs/irc-nick-password.page
+share/gnome/help/empathy/cs/irc-send-file.page
+share/gnome/help/empathy/cs/irc-start-conversation.page
+share/gnome/help/empathy/cs/legal.xml
+share/gnome/help/empathy/cs/offline-contacts.page
+share/gnome/help/empathy/cs/prev-conv.page
+share/gnome/help/empathy/cs/prob-conn-acctdisabled.page
+share/gnome/help/empathy/cs/prob-conn-auth.page
+share/gnome/help/empathy/cs/prob-conn-name.page
+share/gnome/help/empathy/cs/prob-conn-neterror.page
+share/gnome/help/empathy/cs/prob-conn.page
+share/gnome/help/empathy/cs/remove-account.page
+share/gnome/help/empathy/cs/salut-protocol.page
+share/gnome/help/empathy/cs/send-file.page
+share/gnome/help/empathy/cs/send-message.page
+share/gnome/help/empathy/cs/set-custom-status.page
+share/gnome/help/empathy/cs/share-desktop.page
+share/gnome/help/empathy/cs/status-icons.page
+share/gnome/help/empathy/cs/video-call.page
+share/gnome/help/empathy/de/account-irc.page
+share/gnome/help/empathy/de/account-jabber.page
+share/gnome/help/empathy/de/accounts-window.page
+share/gnome/help/empathy/de/add-account.page
+share/gnome/help/empathy/de/add-contact.page
+share/gnome/help/empathy/de/audio-call.page
+share/gnome/help/empathy/de/audio-video.page
+share/gnome/help/empathy/de/change-status.page
+share/gnome/help/empathy/de/create-account.page
+share/gnome/help/empathy/de/disable-account.page
+share/gnome/help/empathy/de/favorite-rooms.page
+share/gnome/help/empathy/de/figures/audio-input-microphone.png
+share/gnome/help/empathy/de/figures/available.png
+share/gnome/help/empathy/de/figures/away.png
+share/gnome/help/empathy/de/figures/busy.png
+share/gnome/help/empathy/de/figures/camera-web.png
 share/gnome/help/empathy/de/figures/empathy-main-window.png
-share/gnome/help/empathy/el/empathy.xml
+share/gnome/help/empathy/de/figures/gtk-add.png
+share/gnome/help/empathy/de/figures/gtk-edit.png
+share/gnome/help/empathy/de/figures/gtk-remove.png
+share/gnome/help/empathy/de/figures/offline.png
+share/gnome/help/empathy/de/geolocation-not-showing.page
+share/gnome/help/empathy/de/geolocation-privacy.page
+share/gnome/help/empathy/de/geolocation-supported.page
+share/gnome/help/empathy/de/geolocation-turn.page
+share/gnome/help/empathy/de/geolocation-what-is.page
+share/gnome/help/empathy/de/geolocation.page
+share/gnome/help/empathy/de/group-conversations.page
+share/gnome/help/empathy/de/import-account.page
+share/gnome/help/empathy/de/index.page
+share/gnome/help/empathy/de/introduction.page
+share/gnome/help/empathy/de/irc-join-pwd.page
+share/gnome/help/empathy/de/irc-join-room.page
+share/gnome/help/empathy/de/irc-manage.page
+share/gnome/help/empathy/de/irc-nick-password.page
+share/gnome/help/empathy/de/irc-send-file.page
+share/gnome/help/empathy/de/irc-start-conversation.page
+share/gnome/help/empathy/de/legal.xml
+share/gnome/help/empathy/de/offline-contacts.page
+share/gnome/help/empathy/de/prev-conv.page
+share/gnome/help/empathy/de/prob-conn-acctdisabled.page
+share/gnome/help/empathy/de/prob-conn-auth.page
+share/gnome/help/empathy/de/prob-conn-name.page
+share/gnome/help/empathy/de/prob-conn-neterror.page
+share/gnome/help/empathy/de/prob-conn.page
+share/gnome/help/empathy/de/remove-account.page
+share/gnome/help/empathy/de/salut-protocol.page
+share/gnome/help/empathy/de/send-file.page
+share/gnome/help/empathy/de/send-message.page
+share/gnome/help/empathy/de/set-custom-status.page
+share/gnome/help/empathy/de/share-desktop.page
+share/gnome/help/empathy/de/status-icons.page
+share/gnome/help/empathy/de/video-call.page
+share/gnome/help/empathy/el/account-irc.page
+share/gnome/help/empathy/el/account-jabber.page
+share/gnome/help/empathy/el/accounts-window.page
+share/gnome/help/empathy/el/add-account.page
+share/gnome/help/empathy/el/add-contact.page
+share/gnome/help/empathy/el/audio-call.page
+share/gnome/help/empathy/el/audio-video.page
+share/gnome/help/empathy/el/change-status.page
+share/gnome/help/empathy/el/create-account.page
+share/gnome/help/empathy/el/disable-account.page
+share/gnome/help/empathy/el/favorite-rooms.page
+share/gnome/help/empathy/el/figures/audio-input-microphone.png
+share/gnome/help/empathy/el/figures/available.png
+share/gnome/help/empathy/el/figures/away.png
+share/gnome/help/empathy/el/figures/busy.png
+share/gnome/help/empathy/el/figures/camera-web.png
 share/gnome/help/empathy/el/figures/empathy-main-window.png
-share/gnome/help/empathy/en_GB/empathy.xml
+share/gnome/help/empathy/el/figures/gtk-add.png
+share/gnome/help/empathy/el/figures/gtk-edit.png
+share/gnome/help/empathy/el/figures/gtk-remove.png
+share/gnome/help/empathy/el/figures/offline.png
+share/gnome/help/empathy/el/geolocation-not-showing.page
+share/gnome/help/empathy/el/geolocation-privacy.page
+share/gnome/help/empathy/el/geolocation-supported.page
+share/gnome/help/empathy/el/geolocation-turn.page
+share/gnome/help/empathy/el/geolocation-what-is.page
+share/gnome/help/empathy/el/geolocation.page
+share/gnome/help/empathy/el/group-conversations.page
+share/gnome/help/empathy/el/import-account.page
+share/gnome/help/empathy/el/index.page
+share/gnome/help/empathy/el/introduction.page
+share/gnome/help/empathy/el/irc-join-pwd.page
+share/gnome/help/empathy/el/irc-join-room.page
+share/gnome/help/empathy/el/irc-manage.page
+share/gnome/help/empathy/el/irc-nick-password.page
+share/gnome/help/empathy/el/irc-send-file.page
+share/gnome/help/empathy/el/irc-start-conversation.page
+share/gnome/help/empathy/el/legal.xml
+share/gnome/help/empathy/el/offline-contacts.page
+share/gnome/help/empathy/el/prev-conv.page
+share/gnome/help/empathy/el/prob-conn-acctdisabled.page
+share/gnome/help/empathy/el/prob-conn-auth.page
+share/gnome/help/empathy/el/prob-conn-name.page
+share/gnome/help/empathy/el/prob-conn-neterror.page
+share/gnome/help/empathy/el/prob-conn.page
+share/gnome/help/empathy/el/remove-account.page
+share/gnome/help/empathy/el/salut-protocol.page
+share/gnome/help/empathy/el/send-file.page
+share/gnome/help/empathy/el/send-message.page
+share/gnome/help/empathy/el/set-custom-status.page
+share/gnome/help/empathy/el/share-desktop.page
+share/gnome/help/empathy/el/status-icons.page
+share/gnome/help/empathy/el/video-call.page
+share/gnome/help/empathy/en_GB/account-irc.page
+share/gnome/help/empathy/en_GB/account-jabber.page
+share/gnome/help/empathy/en_GB/accounts-window.page
+share/gnome/help/empathy/en_GB/add-account.page
+share/gnome/help/empathy/en_GB/add-contact.page
+share/gnome/help/empathy/en_GB/audio-call.page
+share/gnome/help/empathy/en_GB/audio-video.page
+share/gnome/help/empathy/en_GB/change-status.page
+share/gnome/help/empathy/en_GB/create-account.page
+share/gnome/help/empathy/en_GB/disable-account.page
+share/gnome/help/empathy/en_GB/favorite-rooms.page
+share/gnome/help/empathy/en_GB/figures/audio-input-microphone.png
+share/gnome/help/empathy/en_GB/figures/available.png
+share/gnome/help/empathy/en_GB/figures/away.png
+share/gnome/help/empathy/en_GB/figures/busy.png
+share/gnome/help/empathy/en_GB/figures/camera-web.png
 share/gnome/help/empathy/en_GB/figures/empathy-main-window.png
-share/gnome/help/empathy/es/empathy.xml
+share/gnome/help/empathy/en_GB/figures/gtk-add.png
+share/gnome/help/empathy/en_GB/figures/gtk-edit.png
+share/gnome/help/empathy/en_GB/figures/gtk-remove.png
+share/gnome/help/empathy/en_GB/figures/offline.png
+share/gnome/help/empathy/en_GB/geolocation-not-showing.page
+share/gnome/help/empathy/en_GB/geolocation-privacy.page
+share/gnome/help/empathy/en_GB/geolocation-supported.page
+share/gnome/help/empathy/en_GB/geolocation-turn.page
+share/gnome/help/empathy/en_GB/geolocation-what-is.page
+share/gnome/help/empathy/en_GB/geolocation.page
+share/gnome/help/empathy/en_GB/group-conversations.page
+share/gnome/help/empathy/en_GB/import-account.page
+share/gnome/help/empathy/en_GB/index.page
+share/gnome/help/empathy/en_GB/introduction.page
+share/gnome/help/empathy/en_GB/irc-join-pwd.page
+share/gnome/help/empathy/en_GB/irc-join-room.page
+share/gnome/help/empathy/en_GB/irc-manage.page
+share/gnome/help/empathy/en_GB/irc-nick-password.page
+share/gnome/help/empathy/en_GB/irc-send-file.page
+share/gnome/help/empathy/en_GB/irc-start-conversation.page
+share/gnome/help/empathy/en_GB/legal.xml
+share/gnome/help/empathy/en_GB/offline-contacts.page
+share/gnome/help/empathy/en_GB/prev-conv.page
+share/gnome/help/empathy/en_GB/prob-conn-acctdisabled.page
+share/gnome/help/empathy/en_GB/prob-conn-auth.page
+share/gnome/help/empathy/en_GB/prob-conn-name.page
+share/gnome/help/empathy/en_GB/prob-conn-neterror.page
+share/gnome/help/empathy/en_GB/prob-conn.page
+share/gnome/help/empathy/en_GB/remove-account.page
+share/gnome/help/empathy/en_GB/salut-protocol.page
+share/gnome/help/empathy/en_GB/send-file.page
+share/gnome/help/empathy/en_GB/send-message.page
+share/gnome/help/empathy/en_GB/set-custom-status.page
+share/gnome/help/empathy/en_GB/share-desktop.page
+share/gnome/help/empathy/en_GB/status-icons.page
+share/gnome/help/empathy/en_GB/video-call.page
+share/gnome/help/empathy/es/account-irc.page
+share/gnome/help/empathy/es/account-jabber.page
+share/gnome/help/empathy/es/accounts-window.page
+share/gnome/help/empathy/es/add-account.page
+share/gnome/help/empathy/es/add-contact.page
+share/gnome/help/empathy/es/audio-call.page
+share/gnome/help/empathy/es/audio-video.page
+share/gnome/help/empathy/es/change-status.page
+share/gnome/help/empathy/es/create-account.page
+share/gnome/help/empathy/es/disable-account.page
+share/gnome/help/empathy/es/favorite-rooms.page
+share/gnome/help/empathy/es/figures/audio-input-microphone.png
+share/gnome/help/empathy/es/figures/available.png
+share/gnome/help/empathy/es/figures/away.png
+share/gnome/help/empathy/es/figures/busy.png
+share/gnome/help/empathy/es/figures/camera-web.png
 share/gnome/help/empathy/es/figures/empathy-main-window.png
-share/gnome/help/empathy/fi/empathy.xml
+share/gnome/help/empathy/es/figures/gtk-add.png
+share/gnome/help/empathy/es/figures/gtk-edit.png
+share/gnome/help/empathy/es/figures/gtk-remove.png
+share/gnome/help/empathy/es/figures/offline.png
+share/gnome/help/empathy/es/geolocation-not-showing.page
+share/gnome/help/empathy/es/geolocation-privacy.page
+share/gnome/help/empathy/es/geolocation-supported.page
+share/gnome/help/empathy/es/geolocation-turn.page
+share/gnome/help/empathy/es/geolocation-what-is.page
+share/gnome/help/empathy/es/geolocation.page
+share/gnome/help/empathy/es/group-conversations.page
+share/gnome/help/empathy/es/import-account.page
+share/gnome/help/empathy/es/index.page
+share/gnome/help/empathy/es/introduction.page
+share/gnome/help/empathy/es/irc-join-pwd.page
+share/gnome/help/empathy/es/irc-join-room.page
+share/gnome/help/empathy/es/irc-manage.page
+share/gnome/help/empathy/es/irc-nick-password.page
+share/gnome/help/empathy/es/irc-send-file.page
+share/gnome/help/empathy/es/irc-start-conversation.page
+share/gnome/help/empathy/es/legal.xml
+share/gnome/help/empathy/es/offline-contacts.page
+share/gnome/help/empathy/es/prev-conv.page
+share/gnome/help/empathy/es/prob-conn-acctdisabled.page
+share/gnome/help/empathy/es/prob-conn-auth.page
+share/gnome/help/empathy/es/prob-conn-name.page
+share/gnome/help/empathy/es/prob-conn-neterror.page
+share/gnome/help/empathy/es/prob-conn.page
+share/gnome/help/empathy/es/remove-account.page
+share/gnome/help/empathy/es/salut-protocol.page
+share/gnome/help/empathy/es/send-file.page
+share/gnome/help/empathy/es/send-message.page
+share/gnome/help/empathy/es/set-custom-status.page
+share/gnome/help/empathy/es/share-desktop.page
+share/gnome/help/empathy/es/status-icons.page
+share/gnome/help/empathy/es/video-call.page
+share/gnome/help/empathy/fi/account-irc.page
+share/gnome/help/empathy/fi/account-jabber.page
+share/gnome/help/empathy/fi/accounts-window.page
+share/gnome/help/empathy/fi/add-account.page
+share/gnome/help/empathy/fi/add-contact.page
+share/gnome/help/empathy/fi/audio-call.page
+share/gnome/help/empathy/fi/audio-video.page
+share/gnome/help/empathy/fi/change-status.page
+share/gnome/help/empathy/fi/create-account.page
+share/gnome/help/empathy/fi/disable-account.page
+share/gnome/help/empathy/fi/favorite-rooms.page
+share/gnome/help/empathy/fi/figures/audio-input-microphone.png
+share/gnome/help/empathy/fi/figures/available.png
+share/gnome/help/empathy/fi/figures/away.png
+share/gnome/help/empathy/fi/figures/busy.png
+share/gnome/help/empathy/fi/figures/camera-web.png
 share/gnome/help/empathy/fi/figures/empathy-main-window.png
-share/gnome/help/empathy/fr/empathy.xml
+share/gnome/help/empathy/fi/figures/gtk-add.png
+share/gnome/help/empathy/fi/figures/gtk-edit.png
+share/gnome/help/empathy/fi/figures/gtk-remove.png
+share/gnome/help/empathy/fi/figures/offline.png
+share/gnome/help/empathy/fi/geolocation-not-showing.page
+share/gnome/help/empathy/fi/geolocation-privacy.page
+share/gnome/help/empathy/fi/geolocation-supported.page
+share/gnome/help/empathy/fi/geolocation-turn.page
+share/gnome/help/empathy/fi/geolocation-what-is.page
+share/gnome/help/empathy/fi/geolocation.page
+share/gnome/help/empathy/fi/group-conversations.page
+share/gnome/help/empathy/fi/import-account.page
+share/gnome/help/empathy/fi/index.page
+share/gnome/help/empathy/fi/introduction.page
+share/gnome/help/empathy/fi/irc-join-pwd.page
+share/gnome/help/empathy/fi/irc-join-room.page
+share/gnome/help/empathy/fi/irc-manage.page
+share/gnome/help/empathy/fi/irc-nick-password.page
+share/gnome/help/empathy/fi/irc-send-file.page
+share/gnome/help/empathy/fi/irc-start-conversation.page
+share/gnome/help/empathy/fi/legal.xml
+share/gnome/help/empathy/fi/offline-contacts.page
+share/gnome/help/empathy/fi/prev-conv.page
+share/gnome/help/empathy/fi/prob-conn-acctdisabled.page
+share/gnome/help/empathy/fi/prob-conn-auth.page
+share/gnome/help/empathy/fi/prob-conn-name.page
+share/gnome/help/empathy/fi/prob-conn-neterror.page
+share/gnome/help/empathy/fi/prob-conn.page
+share/gnome/help/empathy/fi/remove-account.page
+share/gnome/help/empathy/fi/salut-protocol.page
+share/gnome/help/empathy/fi/send-file.page
+share/gnome/help/empathy/fi/send-message.page
+share/gnome/help/empathy/fi/set-custom-status.page
+share/gnome/help/empathy/fi/share-desktop.page
+share/gnome/help/empathy/fi/status-icons.page
+share/gnome/help/empathy/fi/video-call.page
+share/gnome/help/empathy/fr/account-irc.page
+share/gnome/help/empathy/fr/account-jabber.page
+share/gnome/help/empathy/fr/accounts-window.page
+share/gnome/help/empathy/fr/add-account.page
+share/gnome/help/empathy/fr/add-contact.page
+share/gnome/help/empathy/fr/audio-call.page
+share/gnome/help/empathy/fr/audio-video.page
+share/gnome/help/empathy/fr/change-status.page
+share/gnome/help/empathy/fr/create-account.page
+share/gnome/help/empathy/fr/disable-account.page
+share/gnome/help/empathy/fr/favorite-rooms.page
+share/gnome/help/empathy/fr/figures/audio-input-microphone.png
+share/gnome/help/empathy/fr/figures/available.png
+share/gnome/help/empathy/fr/figures/away.png
+share/gnome/help/empathy/fr/figures/busy.png
+share/gnome/help/empathy/fr/figures/camera-web.png
 share/gnome/help/empathy/fr/figures/empathy-main-window.png
-share/gnome/help/empathy/it/empathy.xml
+share/gnome/help/empathy/fr/figures/gtk-add.png
+share/gnome/help/empathy/fr/figures/gtk-edit.png
+share/gnome/help/empathy/fr/figures/gtk-remove.png
+share/gnome/help/empathy/fr/figures/offline.png
+share/gnome/help/empathy/fr/geolocation-not-showing.page
+share/gnome/help/empathy/fr/geolocation-privacy.page
+share/gnome/help/empathy/fr/geolocation-supported.page
+share/gnome/help/empathy/fr/geolocation-turn.page
+share/gnome/help/empathy/fr/geolocation-what-is.page
+share/gnome/help/empathy/fr/geolocation.page
+share/gnome/help/empathy/fr/group-conversations.page
+share/gnome/help/empathy/fr/import-account.page
+share/gnome/help/empathy/fr/index.page
+share/gnome/help/empathy/fr/introduction.page
+share/gnome/help/empathy/fr/irc-join-pwd.page
+share/gnome/help/empathy/fr/irc-join-room.page
+share/gnome/help/empathy/fr/irc-manage.page
+share/gnome/help/empathy/fr/irc-nick-password.page
+share/gnome/help/empathy/fr/irc-send-file.page
+share/gnome/help/empathy/fr/irc-start-conversation.page
+share/gnome/help/empathy/fr/legal.xml
+share/gnome/help/empathy/fr/offline-contacts.page
+share/gnome/help/empathy/fr/prev-conv.page
+share/gnome/help/empathy/fr/prob-conn-acctdisabled.page
+share/gnome/help/empathy/fr/prob-conn-auth.page
+share/gnome/help/empathy/fr/prob-conn-name.page
+share/gnome/help/empathy/fr/prob-conn-neterror.page
+share/gnome/help/empathy/fr/prob-conn.page
+share/gnome/help/empathy/fr/remove-account.page
+share/gnome/help/empathy/fr/salut-protocol.page
+share/gnome/help/empathy/fr/send-file.page
+share/gnome/help/empathy/fr/send-message.page
+share/gnome/help/empathy/fr/set-custom-status.page
+share/gnome/help/empathy/fr/share-desktop.page
+share/gnome/help/empathy/fr/status-icons.page
+share/gnome/help/empathy/fr/video-call.page
+share/gnome/help/empathy/it/account-irc.page
+share/gnome/help/empathy/it/account-jabber.page
+share/gnome/help/empathy/it/accounts-window.page
+share/gnome/help/empathy/it/add-account.page
+share/gnome/help/empathy/it/add-contact.page
+share/gnome/help/empathy/it/audio-call.page
+share/gnome/help/empathy/it/audio-video.page
+share/gnome/help/empathy/it/change-status.page
+share/gnome/help/empathy/it/create-account.page
+share/gnome/help/empathy/it/disable-account.page
+share/gnome/help/empathy/it/favorite-rooms.page
+share/gnome/help/empathy/it/figures/audio-input-microphone.png
+share/gnome/help/empathy/it/figures/available.png
+share/gnome/help/empathy/it/figures/away.png
+share/gnome/help/empathy/it/figures/busy.png
+share/gnome/help/empathy/it/figures/camera-web.png
 share/gnome/help/empathy/it/figures/empathy-main-window.png
-share/gnome/help/empathy/ru/empathy.xml
+share/gnome/help/empathy/it/figures/gtk-add.png
+share/gnome/help/empathy/it/figures/gtk-edit.png
+share/gnome/help/empathy/it/figures/gtk-remove.png
+share/gnome/help/empathy/it/figures/offline.png
+share/gnome/help/empathy/it/geolocation-not-showing.page
+share/gnome/help/empathy/it/geolocation-privacy.page
+share/gnome/help/empathy/it/geolocation-supported.page
+share/gnome/help/empathy/it/geolocation-turn.page
+share/gnome/help/empathy/it/geolocation-what-is.page
+share/gnome/help/empathy/it/geolocation.page
+share/gnome/help/empathy/it/group-conversations.page
+share/gnome/help/empathy/it/import-account.page
+share/gnome/help/empathy/it/index.page
+share/gnome/help/empathy/it/introduction.page
+share/gnome/help/empathy/it/irc-join-pwd.page
+share/gnome/help/empathy/it/irc-join-room.page
+share/gnome/help/empathy/it/irc-manage.page
+share/gnome/help/empathy/it/irc-nick-password.page
+share/gnome/help/empathy/it/irc-send-file.page
+share/gnome/help/empathy/it/irc-start-conversation.page
+share/gnome/help/empathy/it/legal.xml
+share/gnome/help/empathy/it/offline-contacts.page
+share/gnome/help/empathy/it/prev-conv.page
+share/gnome/help/empathy/it/prob-conn-acctdisabled.page
+share/gnome/help/empathy/it/prob-conn-auth.page
+share/gnome/help/empathy/it/prob-conn-name.page
+share/gnome/help/empathy/it/prob-conn-neterror.page
+share/gnome/help/empathy/it/prob-conn.page
+share/gnome/help/empathy/it/remove-account.page
+share/gnome/help/empathy/it/salut-protocol.page
+share/gnome/help/empathy/it/send-file.page
+share/gnome/help/empathy/it/send-message.page
+share/gnome/help/empathy/it/set-custom-status.page
+share/gnome/help/empathy/it/share-desktop.page
+share/gnome/help/empathy/it/status-icons.page
+share/gnome/help/empathy/it/video-call.page
+share/gnome/help/empathy/ru/account-irc.page
+share/gnome/help/empathy/ru/account-jabber.page
+share/gnome/help/empathy/ru/accounts-window.page
+share/gnome/help/empathy/ru/add-account.page
+share/gnome/help/empathy/ru/add-contact.page
+share/gnome/help/empathy/ru/audio-call.page
+share/gnome/help/empathy/ru/audio-video.page
+share/gnome/help/empathy/ru/change-status.page
+share/gnome/help/empathy/ru/create-account.page
+share/gnome/help/empathy/ru/disable-account.page
+share/gnome/help/empathy/ru/favorite-rooms.page
+share/gnome/help/empathy/ru/figures/audio-input-microphone.png
+share/gnome/help/empathy/ru/figures/available.png
+share/gnome/help/empathy/ru/figures/away.png
+share/gnome/help/empathy/ru/figures/busy.png
+share/gnome/help/empathy/ru/figures/camera-web.png
 share/gnome/help/empathy/ru/figures/empathy-main-window.png
-share/gnome/help/empathy/sv/empathy.xml
+share/gnome/help/empathy/ru/figures/gtk-add.png
+share/gnome/help/empathy/ru/figures/gtk-edit.png
+share/gnome/help/empathy/ru/figures/gtk-remove.png
+share/gnome/help/empathy/ru/figures/offline.png
+share/gnome/help/empathy/ru/geolocation-not-showing.page
+share/gnome/help/empathy/ru/geolocation-privacy.page
+share/gnome/help/empathy/ru/geolocation-supported.page
+share/gnome/help/empathy/ru/geolocation-turn.page
+share/gnome/help/empathy/ru/geolocation-what-is.page
+share/gnome/help/empathy/ru/geolocation.page
+share/gnome/help/empathy/ru/group-conversations.page
+share/gnome/help/empathy/ru/import-account.page
+share/gnome/help/empathy/ru/index.page
+share/gnome/help/empathy/ru/introduction.page
+share/gnome/help/empathy/ru/irc-join-pwd.page
+share/gnome/help/empathy/ru/irc-join-room.page
+share/gnome/help/empathy/ru/irc-manage.page
+share/gnome/help/empathy/ru/irc-nick-password.page
+share/gnome/help/empathy/ru/irc-send-file.page
+share/gnome/help/empathy/ru/irc-start-conversation.page
+share/gnome/help/empathy/ru/legal.xml
+share/gnome/help/empathy/ru/offline-contacts.page
+share/gnome/help/empathy/ru/prev-conv.page
+share/gnome/help/empathy/ru/prob-conn-acctdisabled.page
+share/gnome/help/empathy/ru/prob-conn-auth.page
+share/gnome/help/empathy/ru/prob-conn-name.page
+share/gnome/help/empathy/ru/prob-conn-neterror.page
+share/gnome/help/empathy/ru/prob-conn.page
+share/gnome/help/empathy/ru/remove-account.page
+share/gnome/help/empathy/ru/salut-protocol.page
+share/gnome/help/empathy/ru/send-file.page
+share/gnome/help/empathy/ru/send-message.page
+share/gnome/help/empathy/ru/set-custom-status.page
+share/gnome/help/empathy/ru/share-desktop.page
+share/gnome/help/empathy/ru/status-icons.page
+share/gnome/help/empathy/ru/video-call.page
+share/gnome/help/empathy/sv/account-irc.page
+share/gnome/help/empathy/sv/account-jabber.page
+share/gnome/help/empathy/sv/accounts-window.page
+share/gnome/help/empathy/sv/add-account.page
+share/gnome/help/empathy/sv/add-contact.page
+share/gnome/help/empathy/sv/audio-call.page
+share/gnome/help/empathy/sv/audio-video.page
+share/gnome/help/empathy/sv/change-status.page
+share/gnome/help/empathy/sv/create-account.page
+share/gnome/help/empathy/sv/disable-account.page
+share/gnome/help/empathy/sv/favorite-rooms.page
+share/gnome/help/empathy/sv/figures/audio-input-microphone.png
+share/gnome/help/empathy/sv/figures/available.png
+share/gnome/help/empathy/sv/figures/away.png
+share/gnome/help/empathy/sv/figures/busy.png
+share/gnome/help/empathy/sv/figures/camera-web.png
 share/gnome/help/empathy/sv/figures/empathy-main-window.png
+share/gnome/help/empathy/sv/figures/gtk-add.png
+share/gnome/help/empathy/sv/figures/gtk-edit.png
+share/gnome/help/empathy/sv/figures/gtk-remove.png
+share/gnome/help/empathy/sv/figures/offline.png
+share/gnome/help/empathy/sv/geolocation-not-showing.page
+share/gnome/help/empathy/sv/geolocation-privacy.page
+share/gnome/help/empathy/sv/geolocation-supported.page
+share/gnome/help/empathy/sv/geolocation-turn.page
+share/gnome/help/empathy/sv/geolocation-what-is.page
+share/gnome/help/empathy/sv/geolocation.page
+share/gnome/help/empathy/sv/group-conversations.page
+share/gnome/help/empathy/sv/import-account.page
+share/gnome/help/empathy/sv/index.page
+share/gnome/help/empathy/sv/introduction.page
+share/gnome/help/empathy/sv/irc-join-pwd.page
+share/gnome/help/empathy/sv/irc-join-room.page
+share/gnome/help/empathy/sv/irc-manage.page
+share/gnome/help/empathy/sv/irc-nick-password.page
+share/gnome/help/empathy/sv/irc-send-file.page
+share/gnome/help/empathy/sv/irc-start-conversation.page
+share/gnome/help/empathy/sv/legal.xml
+share/gnome/help/empathy/sv/offline-contacts.page
+share/gnome/help/empathy/sv/prev-conv.page
+share/gnome/help/empathy/sv/prob-conn-acctdisabled.page
+share/gnome/help/empathy/sv/prob-conn-auth.page
+share/gnome/help/empathy/sv/prob-conn-name.page
+share/gnome/help/empathy/sv/prob-conn-neterror.page
+share/gnome/help/empathy/sv/prob-conn.page
+share/gnome/help/empathy/sv/remove-account.page
+share/gnome/help/empathy/sv/salut-protocol.page
+share/gnome/help/empathy/sv/send-file.page
+share/gnome/help/empathy/sv/send-message.page
+share/gnome/help/empathy/sv/set-custom-status.page
+share/gnome/help/empathy/sv/share-desktop.page
+share/gnome/help/empathy/sv/status-icons.page
+share/gnome/help/empathy/sv/video-call.page
 share/icons/hicolor/16x16/apps/empathy.png
 share/icons/hicolor/22x22/apps/empathy.png
 share/icons/hicolor/24x24/apps/empathy.png
@@ -365,11 +1022,17 @@ share/icons/hicolor/48x48/apps/empathy.png
 share/icons/hicolor/scalable/apps/empathy.svg
 share/locale/ar/LC_MESSAGES/empathy.mo
 share/locale/as/LC_MESSAGES/empathy.mo
+share/locale/ast/LC_MESSAGES/empathy.mo
 share/locale/az/LC_MESSAGES/empathy.mo
+share/locale/be/LC_MESSAGES/empathy.mo
 share/locale/be@latin/LC_MESSAGES/empathy.mo
 share/locale/bg/LC_MESSAGES/empathy.mo
+share/locale/bn/LC_MESSAGES/empathy.mo
 share/locale/bn_IN/LC_MESSAGES/empathy.mo
+share/locale/br/LC_MESSAGES/empathy.mo
 share/locale/ca/LC_MESSAGES/empathy.mo
+share/locale/ca@valencia/LC_MESSAGES/empathy.mo
+share/locale/crh/LC_MESSAGES/empathy.mo
 share/locale/cs/LC_MESSAGES/empathy.mo
 share/locale/cy/LC_MESSAGES/empathy.mo
 share/locale/da/LC_MESSAGES/empathy.mo
@@ -380,6 +1043,7 @@ share/locale/en_CA/LC_MESSAGES/empathy.mo
 share/locale/en_GB/LC_MESSAGES/empathy.mo
 share/locale/eo/LC_MESSAGES/empathy.mo
 share/locale/es/LC_MESSAGES/empathy.mo
+share/locale/et/LC_MESSAGES/empathy.mo
 share/locale/eu/LC_MESSAGES/empathy.mo
 share/locale/fi/LC_MESSAGES/empathy.mo
 share/locale/fr/LC_MESSAGES/empathy.mo
@@ -428,37 +1092,9 @@ share/locale/vi/LC_MESSAGES/empathy.mo
 share/locale/zh_CN/LC_MESSAGES/empathy.mo
 share/locale/zh_HK/LC_MESSAGES/empathy.mo
 share/locale/zh_TW/LC_MESSAGES/empathy.mo
-share/mission-control/profiles/aim.profile
-share/mission-control/profiles/ekiga.profile
-share/mission-control/profiles/fwd.profile
-share/mission-control/profiles/gadugadu.profile
-share/mission-control/profiles/groupwise.profile
-share/mission-control/profiles/gtalk.profile
-share/mission-control/profiles/icq.profile
-share/mission-control/profiles/irc.profile
-share/mission-control/profiles/jabber.profile
-share/mission-control/profiles/msn-haze.profile
-share/mission-control/profiles/msn.profile
-share/mission-control/profiles/qq.profile
-share/mission-control/profiles/salut.profile
-share/mission-control/profiles/sipphone.profile
-share/mission-control/profiles/sofiasip.profile
-share/mission-control/profiles/yahoo.profile
-share/omf/empathy/empathy-C.omf
-share/omf/empathy/empathy-ca.omf
-share/omf/empathy/empathy-cs.omf
-share/omf/empathy/empathy-de.omf
-share/omf/empathy/empathy-el.omf
-share/omf/empathy/empathy-en_GB.omf
-share/omf/empathy/empathy-es.omf
-share/omf/empathy/empathy-fi.omf
-share/omf/empathy/empathy-fr.omf
-share/omf/empathy/empathy-it.omf
-share/omf/empathy/empathy-ru.omf
-share/omf/empathy/empathy-sv.omf
-@dirrm share/omf/empathy
-@dirrm share/mission-control/profiles
-@dirrm share/mission-control
+share/telepathy/clients/Empathy.client
+@dirrmtry share/telepathy/clients
+@dirrmtry share/telepathy
 @dirrm share/gnome/help/empathy/sv/figures
 @dirrm share/gnome/help/empathy/sv
 @dirrm share/gnome/help/empathy/ru/figures
@@ -515,10 +1151,10 @@ share/omf/empathy/empathy-sv.omf
 @dirrm include/libempathy
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
 @dirrmtry share/locale/sr@latin/LC_MESSAGES
 @dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
 @dirrmtry share/locale/ps/LC_MESSAGES
 @dirrmtry share/locale/ps
 @dirrmtry share/locale/oc/LC_MESSAGES
@@ -531,9 +1167,13 @@ share/omf/empathy/empathy-sv.omf
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast