Presenting GNOME 2.30.1 for FreeBSD. The offical release notes for this

release can be found at http://library.gnome.org/misc/release-notes/2.30/ .

This release brings initial PackageKit support, Upower (replaces power
management part of hal), cuse4bsd integration with HAL and cheese, and a
faster Evolution.

Sadly GNOME 2.30.x will be the last release with FreeBSD 6.X support. This
will also be the last of the 2.x releases. The next release will be the
highly-anticipated GNOME 3.0 which will bring with it a new UI experience.

Currently, there are a few bugs with GNOME 2.30 that may be of note for our
users. Be sure to consult the UPGRADING note or the 2.30 upgrade FAQ at
http://www.freebsd.org/gnome/docs/faq230.html for specific upgrading
instructions, and the up-to-date list of known issues.

This release features commits by avl, ahze, bland, marcus, mezz, and myself.

The FreeBSD GNOME Team would like to thank Anders F Bjorklund for doing the
initual packagekit porting.

And the following contributors & testers for there help with this release:
Eric L. Chen
Vladimir Grebenschikov
Sergio de Almeida Lenzi
DomiX
walder
crsd
Kevin Oberman
Michal Varga
Pavel Plesov
Bapt
kevin

and ITetcu for two exp-run

PR:	ports/143852
	ports/145347
	ports/144980
	ports/145830
	ports/145511

4 files changed, 164 insertions, 284 deletions

diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile
index 272453ba69a1..9b780a857f86 100644
--- a/net-im/empathy/Makefile
+++ b/net-im/empathy/Makefile
@@ -3,11 +3,10 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/net-im/empathy/Makefile,v 1.49 2009/11/18 18:26:02 kwm Exp $
+#    $MCom: ports/net-im/empathy/Makefile,v 1.66 2010/04/26 23:54:08 kwm Exp $
 
 PORTNAME=	empathy
-PORTVERSION=	2.28.2
-PORTREVISION=	2
+PORTVERSION=	2.30.1
 CATEGORIES=	net-im gnome
 MASTER_SITES=	GNOME
 
@@ -16,7 +15,7 @@ COMMENT=	GNOME IM client based around telepathy
 
 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 \
+LIB_DEPENDS=	enchant.1:${PORTSDIR}/textproc/enchant \
 		telepathy.2:${PORTSDIR}/net-im/libtelepathy \
 		telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \
 		telepathy-farsight.0:${PORTSDIR}/net-im/telepathy-farsight \
@@ -25,23 +24,22 @@ LIB_DEPENDS=	aspell.16:${PORTSDIR}/textproc/aspell \
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
     		${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control
 
-MAKE_JOBS_UNSAFE=	yes
-
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
-USE_GNOME=	evolutiondataserver gnomehack gnomeprefix pygtk2 ltverhack \
-		gnomepanel
+USE_GNOME=	evolutiondataserver gnomehack gnomeprefix pygtk2 ltverhack
 USE_GSTREAMER=	yes
 USE_AUTOTOOLS=	libtool:22
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_PYTHON=	yes
+MAKE_JOBS_UNSAFE=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--enable-tpl=no
 
-GCONF_SCHEMAS=	GNOME_Megaphone_Applet.schemas empathy.schemas
+GCONF_SCHEMAS=	empathy.schemas
 
 MAN1=		empathy.1
 
@@ -51,6 +49,7 @@ OPTIONS=	JABBER	"Enable jabber (XMPP) client support" on \
 		SALUT	"Enable link-local (serverless) XMPP support" off \
 		HAZE	"Enable libpurple protocol integration" off \
 		WEBKIT	"Enable Adium Message Style themes" on \
+		NST	"Enable Nautilus SendTo plugin"	on \
 		MAP	"Enable graphical map support" on
 
 .include <bsd.port.pre.mk>
@@ -84,6 +83,16 @@ CONFIGURE_ARGS+=--disable-webkit
 PLIST_SUB+=	ADIUM="@comment "
 .endif
 
+.if defined(WITH_NST)
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/nautilus-sendto.pc:${PORTSDIR}/deskutils/nautilus-sendto
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/nautilus-sendto.pc:${PORTSDIR}/deskutils/nautilus-sendto
+CONFIGURE_ARGS+=--enable-nautilus-sendto=yes
+PLIST_SUB+=	NST=""
+.else
+CONFIGURE_ARGS+=--enable-nautilus-sendto=no
+PLIST_SUB+=	NST="@comment "
+.endif
+
 .if !defined(WITHOUT_MAP)
 LIB_DEPENDS+=	champlain-0.4.1:${PORTSDIR}/graphics/libchamplain
 CONFIGURE_ARGS+=--enable-map
diff --git a/net-im/empathy/distinfo b/net-im/empathy/distinfo
index b033450b7607..25d01ed55c5c 100644
--- a/net-im/empathy/distinfo
+++ b/net-im/empathy/distinfo
@@ -1,3 +1,3 @@
-MD5 (empathy-2.28.2.tar.bz2) = 8d578d82d1e51dc8c83642b81c0fb65a
-SHA256 (empathy-2.28.2.tar.bz2) = 8f1dc1cbf7bda0dcb9804d5aa5d5d0e625c35dee10bfba7050aa3a8b6d491f3b
-SIZE (empathy-2.28.2.tar.bz2) = 2432940
+MD5 (empathy-2.30.1.tar.bz2) = 62a048b41421e24eef4fea8193f5d9af
+SHA256 (empathy-2.30.1.tar.bz2) = b7f06e609c410f1d6898751977fc6b964b9c3e015daec5cc281db715bc032577
+SIZE (empathy-2.30.1.tar.bz2) = 2651081
diff --git a/net-im/empathy/files/patch-configure b/net-im/empathy/files/patch-configure
new file mode 100644
index 000000000000..1a16aca800de
--- /dev/null
+++ b/net-im/empathy/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2010-04-10 22:44:46.000000000 +0200
++++ configure	2010-04-10 22:45:28.000000000 +0200
+@@ -16874,7 +16874,7 @@
+ fi
+ 
+ 
+-if test "x$enable_favourite_contacts" != "xno" -o "x$chain_enable_favourite_contacts" == "xyes"; then
++if test "x$enable_favourite_contacts" != "xno" -o "x$chain_enable_favourite_contacts" = "xyes"; then
+ 
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TELEPATHY_LOGGER" >&5
diff --git a/net-im/empathy/pkg-plist b/net-im/empathy/pkg-plist
index 9860d5b38adf..9f1b99bb6f07 100644
--- a/net-im/empathy/pkg-plist
+++ b/net-im/empathy/pkg-plist
@@ -1,237 +1,22 @@
 bin/empathy
-bin/empathy-logs
-include/libempathy-gtk/empathy-account-chooser.h
-include/libempathy-gtk/empathy-account-widget-irc.h
-include/libempathy-gtk/empathy-account-widget-sip.h
-include/libempathy-gtk/empathy-account-widget.h
-include/libempathy-gtk/empathy-audio-sink.h
-include/libempathy-gtk/empathy-audio-src.h
-include/libempathy-gtk/empathy-avatar-chooser.h
-include/libempathy-gtk/empathy-avatar-image.h
-include/libempathy-gtk/empathy-cell-renderer-activatable.h
-include/libempathy-gtk/empathy-cell-renderer-expander.h
-include/libempathy-gtk/empathy-cell-renderer-text.h
-include/libempathy-gtk/empathy-chat-text-view.h
-include/libempathy-gtk/empathy-chat-view.h
-include/libempathy-gtk/empathy-chat.h
-include/libempathy-gtk/empathy-conf.h
-include/libempathy-gtk/empathy-contact-dialogs.h
-include/libempathy-gtk/empathy-contact-list-store.h
-include/libempathy-gtk/empathy-contact-list-view.h
-include/libempathy-gtk/empathy-contact-menu.h
-include/libempathy-gtk/empathy-contact-selector.h
-include/libempathy-gtk/empathy-contact-widget.h
-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-protocol-chooser.h
-include/libempathy-gtk/empathy-share-my-desktop.h
-include/libempathy-gtk/empathy-smiley-manager.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-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
-include/libempathy/empathy-message.h
-include/libempathy/empathy-status-presets.h
-include/libempathy/empathy-time.h
-include/libempathy/empathy-tp-call.h
-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-roomlist.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.28
-lib/libempathy.a
-lib/libempathy.la
-lib/libempathy.so
-lib/libempathy.so.30
-%%PYTHON_SITELIBDIR%%/empathy.a
-%%PYTHON_SITELIBDIR%%/empathy.la
-%%PYTHON_SITELIBDIR%%/empathy.so
-%%PYTHON_SITELIBDIR%%/empathygtk.a
-%%PYTHON_SITELIBDIR%%/empathygtk.la
-%%PYTHON_SITELIBDIR%%/empathygtk.so
-libdata/bonobo/servers/GNOME_Megaphone_Applet.server
-libdata/bonobo/servers/GNOME_NotHere_Applet.server
-libdata/pkgconfig/libempathy-gtk.pc
-libdata/pkgconfig/libempathy.pc
-libexec/megaphone-applet
-libexec/nothere-applet
+bin/empathy-accounts
+bin/empathy-debugger
+%%NST%%lib/nautilus-sendto/plugins/libnstempathy.a
+%%NST%%lib/nautilus-sendto/plugins/libnstempathy.la
+%%NST%%lib/nautilus-sendto/plugins/libnstempathy.so
+share/applications/empathy-accounts.desktop
 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
-share/doc/libempathy-gtk/EmpathyCellRendererExpander.html
-share/doc/libempathy-gtk/EmpathyCellRendererText.html
-share/doc/libempathy-gtk/EmpathyChat.html
-share/doc/libempathy-gtk/EmpathyChatTextView.html
-share/doc/libempathy-gtk/EmpathyConf.html
-share/doc/libempathy-gtk/EmpathyContactListStore.html
-share/doc/libempathy-gtk/EmpathyContactListView.html
-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
-share/doc/libempathy-gtk/EmpathyVideoWidget.html
-share/doc/libempathy-gtk/home.png
-share/doc/libempathy-gtk/index.html
-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-chat-view.html
-share/doc/libempathy-gtk/libempathy-gtk-empathy-contact-dialogs.html
-share/doc/libempathy-gtk/libempathy-gtk-empathy-contact-menu.html
-share/doc/libempathy-gtk/libempathy-gtk-empathy-contact-widget.html
-share/doc/libempathy-gtk/libempathy-gtk-empathy-geometry.html
-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-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
-share/doc/libempathy-gtk/libempathy-gtk.devhelp
-share/doc/libempathy-gtk/libempathy-gtk.devhelp2
-share/doc/libempathy-gtk/libempathy_api.html
-share/doc/libempathy-gtk/pt01.html
-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/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
-share/doc/libempathy/EmpathyIrcServer.html
-share/doc/libempathy/EmpathyLogManager.html
-share/doc/libempathy/EmpathyLogStoreEmpathy.html
-share/doc/libempathy/EmpathyMessage.html
-share/doc/libempathy/EmpathyTpCall.html
-share/doc/libempathy/EmpathyTpChat.html
-share/doc/libempathy/EmpathyTpContactFactory.html
-share/doc/libempathy/EmpathyTpContactList.html
-share/doc/libempathy/EmpathyTpFile.html
-share/doc/libempathy/EmpathyTpRoomlist.html
-share/doc/libempathy/EmpathyTubeHandler.html
-share/doc/libempathy/home.png
-share/doc/libempathy/index.html
-share/doc/libempathy/index.sgml
-share/doc/libempathy/ix01.html
-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
-share/doc/libempathy/libempathy-empathy-types.html
-share/doc/libempathy/libempathy-empathy-utils.html
-share/doc/libempathy/libempathy-hierarchy.html
-share/doc/libempathy/libempathy.devhelp
-share/doc/libempathy/libempathy.devhelp2
-share/doc/libempathy/libempathy_api.html
-share/doc/libempathy/pt01.html
-share/doc/libempathy/pt02.html
-share/doc/libempathy/right.png
-share/doc/libempathy/style.css
-share/doc/libempathy/up.png
-%%DATADIR%%/GNOME_Megaphone_Applet.xml
-%%DATADIR%%/GNOME_NotHere_Applet.xml
 %%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-local-xmpp.ui
 %%DATADIR%%/empathy-account-widget-msn.ui
 %%DATADIR%%/empathy-account-widget-sip.ui
 %%DATADIR%%/empathy-account-widget-yahoo.ui
@@ -244,6 +29,7 @@ share/doc/libempathy/up.png
 %%DATADIR%%/empathy-chatrooms-window.ui
 %%DATADIR%%/empathy-contact-dialogs.ui
 %%DATADIR%%/empathy-contact-groups.dtd
+%%DATADIR%%/empathy-contact-selector-dialog.ui
 %%DATADIR%%/empathy-contact-widget.ui
 %%DATADIR%%/empathy-ft-manager.ui
 %%DATADIR%%/empathy-import-dialog.ui
@@ -251,27 +37,35 @@ share/doc/libempathy/up.png
 %%DATADIR%%/empathy-log-manager.xsl
 %%DATADIR%%/empathy-log-window.ui
 %%DATADIR%%/empathy-main-window.ui
+%%MAP%%%%DATADIR%%/empathy-map-view.ui
 %%DATADIR%%/empathy-new-chatroom-dialog.ui
-%%DATADIR%%/empathy-new-message-dialog.ui
 %%DATADIR%%/empathy-preferences.ui
+%%DATADIR%%/empathy-search-bar.ui
 %%DATADIR%%/empathy-status-icon.ui
-%%DATADIR%%/empathy-status-presets.dtd
 %%DATADIR%%/empathy-status-preset-dialog.ui
+%%DATADIR%%/empathy-status-presets.dtd
 %%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-aim.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-groupwise.png
+%%DATADIR%%/icons/hicolor/16x16/apps/im-icq.png
 %%DATADIR%%/icons/hicolor/16x16/apps/im-irc.png
+%%DATADIR%%/icons/hicolor/16x16/apps/im-jabber.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-mxit.png
+%%DATADIR%%/icons/hicolor/16x16/apps/im-myspace.png
 %%DATADIR%%/icons/hicolor/16x16/apps/im-qq.png
+%%DATADIR%%/icons/hicolor/16x16/apps/im-sametime.png
+%%DATADIR%%/icons/hicolor/16x16/apps/im-silc.png
 %%DATADIR%%/icons/hicolor/16x16/apps/im-sip.png
-%%DATADIR%%/icons/hicolor/16x16/apps/im-xmpp.png
+%%DATADIR%%/icons/hicolor/16x16/apps/im-yahoo.png
+%%DATADIR%%/icons/hicolor/16x16/apps/im-zephyr.png
 %%DATADIR%%/icons/hicolor/16x16/status/empathy-available.png
 %%DATADIR%%/icons/hicolor/16x16/status/empathy-away.png
 %%DATADIR%%/icons/hicolor/16x16/status/empathy-busy.png
@@ -281,20 +75,27 @@ 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-aim.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-groupwise.png
+%%DATADIR%%/icons/hicolor/22x22/apps/im-icq.png
 %%DATADIR%%/icons/hicolor/22x22/apps/im-irc.png
+%%DATADIR%%/icons/hicolor/22x22/apps/im-jabber.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-mxit.png
+%%DATADIR%%/icons/hicolor/22x22/apps/im-myspace.png
 %%DATADIR%%/icons/hicolor/22x22/apps/im-qq.png
+%%DATADIR%%/icons/hicolor/22x22/apps/im-sametime.png
+%%DATADIR%%/icons/hicolor/22x22/apps/im-silc.png
 %%DATADIR%%/icons/hicolor/22x22/apps/im-sip.png
-%%DATADIR%%/icons/hicolor/22x22/apps/im-xmpp.png
+%%DATADIR%%/icons/hicolor/22x22/apps/im-yahoo.png
+%%DATADIR%%/icons/hicolor/22x22/apps/im-zephyr.png
 %%DATADIR%%/icons/hicolor/22x22/status/empathy-available.png
 %%DATADIR%%/icons/hicolor/22x22/status/empathy-away.png
 %%DATADIR%%/icons/hicolor/22x22/status/empathy-busy.png
@@ -302,81 +103,112 @@ 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-aim.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
 %%DATADIR%%/icons/hicolor/24x24/apps/im-google-talk.png
+%%DATADIR%%/icons/hicolor/24x24/apps/im-groupwise.png
+%%DATADIR%%/icons/hicolor/24x24/apps/im-icq.png
 %%DATADIR%%/icons/hicolor/24x24/apps/im-irc.png
+%%DATADIR%%/icons/hicolor/24x24/apps/im-jabber.png
 %%DATADIR%%/icons/hicolor/24x24/apps/im-local-xmpp.png
+%%DATADIR%%/icons/hicolor/24x24/apps/im-meanwhile.png
 %%DATADIR%%/icons/hicolor/24x24/apps/im-msn.png
+%%DATADIR%%/icons/hicolor/24x24/apps/im-mxit.png
+%%DATADIR%%/icons/hicolor/24x24/apps/im-myspace.png
 %%DATADIR%%/icons/hicolor/24x24/apps/im-qq.png
+%%DATADIR%%/icons/hicolor/24x24/apps/im-sametime.png
+%%DATADIR%%/icons/hicolor/24x24/apps/im-silc.png
 %%DATADIR%%/icons/hicolor/24x24/apps/im-sip.png
-%%DATADIR%%/icons/hicolor/24x24/apps/im-xmpp.png
+%%DATADIR%%/icons/hicolor/24x24/apps/im-yahoo.png
+%%DATADIR%%/icons/hicolor/24x24/apps/im-zephyr.png
 %%DATADIR%%/icons/hicolor/24x24/status/empathy-available.png
 %%DATADIR%%/icons/hicolor/24x24/status/empathy-away.png
 %%DATADIR%%/icons/hicolor/24x24/status/empathy-busy.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-aim.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
 %%DATADIR%%/icons/hicolor/32x32/apps/im-google-talk.png
+%%DATADIR%%/icons/hicolor/32x32/apps/im-groupwise.png
+%%DATADIR%%/icons/hicolor/32x32/apps/im-icq.png
 %%DATADIR%%/icons/hicolor/32x32/apps/im-irc.png
+%%DATADIR%%/icons/hicolor/32x32/apps/im-jabber.png
 %%DATADIR%%/icons/hicolor/32x32/apps/im-local-xmpp.png
+%%DATADIR%%/icons/hicolor/32x32/apps/im-meanwhile.png
 %%DATADIR%%/icons/hicolor/32x32/apps/im-msn.png
+%%DATADIR%%/icons/hicolor/32x32/apps/im-mxit.png
+%%DATADIR%%/icons/hicolor/32x32/apps/im-myspace.png
 %%DATADIR%%/icons/hicolor/32x32/apps/im-qq.png
+%%DATADIR%%/icons/hicolor/32x32/apps/im-sametime.png
+%%DATADIR%%/icons/hicolor/32x32/apps/im-silc.png
 %%DATADIR%%/icons/hicolor/32x32/apps/im-sip.png
-%%DATADIR%%/icons/hicolor/32x32/apps/im-xmpp.png
+%%DATADIR%%/icons/hicolor/32x32/apps/im-yahoo.png
+%%DATADIR%%/icons/hicolor/32x32/apps/im-zephyr.png
 %%DATADIR%%/icons/hicolor/32x32/status/empathy-available.png
 %%DATADIR%%/icons/hicolor/32x32/status/empathy-away.png
 %%DATADIR%%/icons/hicolor/32x32/status/empathy-busy.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-aim.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-groupwise.png
+%%DATADIR%%/icons/hicolor/48x48/apps/im-icq.png
 %%DATADIR%%/icons/hicolor/48x48/apps/im-irc.png
+%%DATADIR%%/icons/hicolor/48x48/apps/im-jabber.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-mxit.png
+%%DATADIR%%/icons/hicolor/48x48/apps/im-myspace.png
 %%DATADIR%%/icons/hicolor/48x48/apps/im-qq.png
+%%DATADIR%%/icons/hicolor/48x48/apps/im-sametime.png
+%%DATADIR%%/icons/hicolor/48x48/apps/im-silc.png
 %%DATADIR%%/icons/hicolor/48x48/apps/im-sip.png
-%%DATADIR%%/icons/hicolor/48x48/apps/im-xmpp.png
+%%DATADIR%%/icons/hicolor/48x48/apps/im-yahoo.png
+%%DATADIR%%/icons/hicolor/48x48/apps/im-zephyr.png
 %%DATADIR%%/icons/hicolor/48x48/status/empathy-available.png
 %%DATADIR%%/icons/hicolor/48x48/status/empathy-away.png
 %%DATADIR%%/icons/hicolor/48x48/status/empathy-busy.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-aim.svg
 %%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-groupwise.svg
+%%DATADIR%%/icons/hicolor/scalable/apps/im-icq.svg
 %%DATADIR%%/icons/hicolor/scalable/apps/im-irc.svg
+%%DATADIR%%/icons/hicolor/scalable/apps/im-jabber.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-mxit.svg
+%%DATADIR%%/icons/hicolor/scalable/apps/im-myspace.svg
 %%DATADIR%%/icons/hicolor/scalable/apps/im-qq.svg
+%%DATADIR%%/icons/hicolor/scalable/apps/im-sametime.svg
+%%DATADIR%%/icons/hicolor/scalable/apps/im-silc.svg
 %%DATADIR%%/icons/hicolor/scalable/apps/im-sip.svg
-%%DATADIR%%/icons/hicolor/scalable/apps/im-xmpp.svg
+%%DATADIR%%/icons/hicolor/scalable/apps/im-yahoo.svg
+%%DATADIR%%/icons/hicolor/scalable/apps/im-zephyr.svg
 %%DATADIR%%/icons/hicolor/scalable/status/empathy-available.svg
 %%DATADIR%%/icons/hicolor/scalable/status/empathy-away.svg
 %%DATADIR%%/icons/hicolor/scalable/status/empathy-busy.svg
 %%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/account-irc.page
 share/gnome/help/empathy/C/account-jabber.page
@@ -394,6 +226,7 @@ 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-logo.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
@@ -406,17 +239,18 @@ 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/hide-contacts.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-commands.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/C/offline-contacts.page
+share/gnome/help/empathy/C/license.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
@@ -447,6 +281,7 @@ 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-logo.png
 share/gnome/help/empathy/ca/figures/empathy-main-window.png
 share/gnome/help/empathy/ca/figures/gtk-add.png
 share/gnome/help/empathy/ca/figures/gtk-edit.png
@@ -459,17 +294,18 @@ 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/hide-contacts.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-commands.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/license.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
@@ -500,6 +336,7 @@ 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-logo.png
 share/gnome/help/empathy/cs/figures/empathy-main-window.png
 share/gnome/help/empathy/cs/figures/gtk-add.png
 share/gnome/help/empathy/cs/figures/gtk-edit.png
@@ -512,17 +349,18 @@ 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/hide-contacts.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-commands.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/license.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
@@ -553,6 +391,7 @@ 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-logo.png
 share/gnome/help/empathy/de/figures/empathy-main-window.png
 share/gnome/help/empathy/de/figures/gtk-add.png
 share/gnome/help/empathy/de/figures/gtk-edit.png
@@ -565,17 +404,18 @@ 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/hide-contacts.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-commands.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/license.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
@@ -606,6 +446,7 @@ 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-logo.png
 share/gnome/help/empathy/el/figures/empathy-main-window.png
 share/gnome/help/empathy/el/figures/gtk-add.png
 share/gnome/help/empathy/el/figures/gtk-edit.png
@@ -618,17 +459,18 @@ 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/hide-contacts.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-commands.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/license.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
@@ -659,6 +501,7 @@ 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-logo.png
 share/gnome/help/empathy/en_GB/figures/empathy-main-window.png
 share/gnome/help/empathy/en_GB/figures/gtk-add.png
 share/gnome/help/empathy/en_GB/figures/gtk-edit.png
@@ -671,17 +514,18 @@ 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/hide-contacts.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-commands.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/license.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
@@ -712,6 +556,7 @@ 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-logo.png
 share/gnome/help/empathy/es/figures/empathy-main-window.png
 share/gnome/help/empathy/es/figures/gtk-add.png
 share/gnome/help/empathy/es/figures/gtk-edit.png
@@ -724,17 +569,18 @@ 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/hide-contacts.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-commands.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/license.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
@@ -765,6 +611,7 @@ 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-logo.png
 share/gnome/help/empathy/fi/figures/empathy-main-window.png
 share/gnome/help/empathy/fi/figures/gtk-add.png
 share/gnome/help/empathy/fi/figures/gtk-edit.png
@@ -777,17 +624,18 @@ 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/hide-contacts.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-commands.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/license.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
@@ -818,6 +666,7 @@ 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-logo.png
 share/gnome/help/empathy/fr/figures/empathy-main-window.png
 share/gnome/help/empathy/fr/figures/gtk-add.png
 share/gnome/help/empathy/fr/figures/gtk-edit.png
@@ -830,17 +679,18 @@ 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/hide-contacts.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-commands.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/license.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
@@ -871,6 +721,7 @@ 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-logo.png
 share/gnome/help/empathy/it/figures/empathy-main-window.png
 share/gnome/help/empathy/it/figures/gtk-add.png
 share/gnome/help/empathy/it/figures/gtk-edit.png
@@ -883,17 +734,18 @@ 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/hide-contacts.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-commands.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/license.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
@@ -924,6 +776,7 @@ 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-logo.png
 share/gnome/help/empathy/ru/figures/empathy-main-window.png
 share/gnome/help/empathy/ru/figures/gtk-add.png
 share/gnome/help/empathy/ru/figures/gtk-edit.png
@@ -936,17 +789,18 @@ 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/hide-contacts.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-commands.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/license.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
@@ -977,6 +831,7 @@ 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-logo.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
@@ -989,17 +844,18 @@ 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/hide-contacts.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-commands.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/license.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
@@ -1039,6 +895,7 @@ share/locale/da/LC_MESSAGES/empathy.mo
 share/locale/de/LC_MESSAGES/empathy.mo
 share/locale/dz/LC_MESSAGES/empathy.mo
 share/locale/el/LC_MESSAGES/empathy.mo
+share/locale/en@shaw/LC_MESSAGES/empathy.mo
 share/locale/en_CA/LC_MESSAGES/empathy.mo
 share/locale/en_GB/LC_MESSAGES/empathy.mo
 share/locale/eo/LC_MESSAGES/empathy.mo
@@ -1078,6 +935,7 @@ share/locale/pt/LC_MESSAGES/empathy.mo
 share/locale/pt_BR/LC_MESSAGES/empathy.mo
 share/locale/ro/LC_MESSAGES/empathy.mo
 share/locale/ru/LC_MESSAGES/empathy.mo
+share/locale/si/LC_MESSAGES/empathy.mo
 share/locale/sl/LC_MESSAGES/empathy.mo
 share/locale/sq/LC_MESSAGES/empathy.mo
 share/locale/sr/LC_MESSAGES/empathy.mo
@@ -1144,17 +1002,15 @@ share/telepathy/clients/Empathy.client
 @dirrm %%DATADIR%%/icons/hicolor
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
-@dirrm share/doc/libempathy-gtk
-@dirrm share/doc/libempathy
 @dirrmtry share/applications
-@dirrm include/libempathy-gtk
-@dirrm include/libempathy
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
-@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/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/ps/LC_MESSAGES
 @dirrmtry share/locale/ps
 @dirrmtry share/locale/oc/LC_MESSAGES
@@ -1165,6 +1021,8 @@ share/telepathy/clients/Empathy.client
 @dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/crh/LC_MESSAGES
@@ -1177,3 +1035,5 @@ share/telepathy/clients/Empathy.client
 @dirrmtry share/locale/be@latin
 @dirrmtry share/locale/ast/LC_MESSAGES
 @dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as