--- empathy-2.30.2.orig/debian/gbp.conf
+++ empathy-2.30.2/debian/gbp.conf
@@ -0,0 +1,9 @@
+[DEFAULT]
+debian-branch = debian
+upstream-branch = upstream
+pristine-tar = True
+compression = bzip2
+
+[git-buildpackage]
+tarball-dir = ../tarballs/
+export-dir = ../build-area/
--- empathy-2.30.2.orig/debian/empathy-accounts.1
+++ empathy-2.30.2/debian/empathy-accounts.1
@@ -0,0 +1,36 @@
+.TH EMPATHY-ACCOUNTS "1" "February 2010" "Telepathy project" "User Commands"
+.SH NAME
+empathy-accounts \- Accounts configuration dialog for Empathy instant messaging client
+.SH SYNOPSIS
+empathy-accounts
+.RI [ options ]
+.SH DESCRIPTION
+Accounts configuration dialog for Empathy instant messaging client
+.PP
+This utility allows you to configure your instant messaging accounts for Empathy.
+.SH OPTIONS
+.TP
+.BR \-i ,\  \-\-import
+Try to import any recognized accounts and display an assistant if that fails
+.TP
+.BR \-h ,\  \-\-hidden
+Don't display any dialogs; do any work (eg, importing) and exit
+.TP
+.BI \-s\  account\-id
+.TQ
+.BI \-\-select\-account= account\-id
+Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)
+.SH AUTHOR
+This manual page was written by
+.MT bigon@debian.org
+Laurent Bigonville
+.ME ,
+for the Debian GNU/Linux system (but may be used by others).
+.SH SEE ALSO
+.BR empathy (1),
+.UR http://telepathy.freedesktop.org/
+The Telepathy project
+.UE ,
+.UR http://live.gnome.org/Empathy
+The Empathy project
+.UE .
--- empathy-2.30.2.orig/debian/empathy.preinst
+++ empathy-2.30.2/debian/empathy.preinst
@@ -0,0 +1,12 @@
+#!/bin/sh -e
+
+case $1 in
+    install|upgrade)
+	if dpkg --compare-versions "$2" lt-nl "2.28.0-0ubuntu1"; then
+            rm /etc/indicators/messages/applications/empathy || true
+            rmdir --ignore-fail-on-non-empty /etc/indicators/messages/applications/ || true
+        fi
+        ;;
+esac
+
+#DEBHELPER#
--- empathy-2.30.2.orig/debian/watch
+++ empathy-2.30.2/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://ftp.gnome.org/pub/GNOME/sources/empathy/([0-9.]+)/empathy-(.*).tar.gz
--- empathy-2.30.2.orig/debian/empathy.1
+++ empathy-2.30.2/debian/empathy.1
@@ -0,0 +1,46 @@
+.TH EMPATHY "1" "February 2010" "Telepathy project" "User Commands"
+.SH NAME
+empathy \- GNOME multi-protocol chat and call client
+.SH SYNOPSIS
+empathy
+.SH DESCRIPTION
+GNOME multi-protocol chat and call client
+Instant messaging program supporting text, voice, video, file transfers
+and inter-application communication over many different protocols,
+including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
+Gadu-Gadu, Groupwise, ICQ and QQ.
+.PP
+The main user interface consists of a contact list window and an icon in the
+notification area.
+.SH OPTIONS
+.TP
+.BR \-n ,\  \-\-no\-connect
+Don't connect on startup
+.TP
+.BR \-h ,\  \-\-start\-hidden
+Don't display the contact list or any other dialogs on startup
+.TP
+.BR \-v ,\  \-\-version
+Show version
+.SH ENVIRONMENT
+.TP
+.BI EMPATHY_LOGFILE= filename
+If set, debug output will go to the given file rather than to stderr.
+.TP
+.BI EMPATHY_DEBUG= type
+May be set to "all" for full debug output, or various undocumented options
+(which may change from release to release) to filter the output.
+.SH AUTHOR
+This manual page was written by
+.MT bigon@debian.org
+Laurent Bigonville
+.ME ,
+for the Debian GNU/Linux system (but may be used by others).
+.SH SEE ALSO
+.BR empathy-accounts (1),
+.UR http://telepathy.freedesktop.org/
+The Telepathy project
+.UE ,
+.UR http://live.gnome.org/Empathy
+The Empathy project
+.UE .
--- empathy-2.30.2.orig/debian/empathy-common.gconf-defaults
+++ empathy-2.30.2/debian/empathy-common.gconf-defaults
@@ -0,0 +1 @@
+/apps/empathy/ui/show_offline false
--- empathy-2.30.2.orig/debian/nautilus-sendto-empathy.install
+++ empathy-2.30.2/debian/nautilus-sendto-empathy.install
@@ -0,0 +1 @@
+usr/lib/nautilus-sendto/plugins/libnstempathy.so
--- empathy-2.30.2.orig/debian/rules
+++ empathy-2.30.2/debian/rules
@@ -0,0 +1,32 @@
+#!/usr/bin/make -f
+
+DEB_DH_INSTALL_SOURCEDIR=debian/tmp
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/gnome.mk
+
+# List any files which are not installed
+include /usr/share/cdbs/1/rules/utils.mk
+common-binary-post-install-arch:: list-missing
+
+# Ensure at build time that the library has no dependencies on undefined
+# symbols, and speed up loading.
+#LDFLAGS += -Wl,-z,defs -Wl,-O1
+
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-spell \
+                             --with-connectivity=nm \
+                             --enable-libindicate \
+                             --enable-webkit \
+                             --enable-location=no \
+                             --enable-favourite-contacts=no \
+                             --enable-nautilus-sendto
+
+DEB_DBG_PACKAGE_empathy = empathy-dbg
+
+binary-install/empathy::
+	# Add the launcher for empathy
+	mkdir -p debian/$(cdbs_curpkg)/usr/share/indicators/messages/applications
+	echo /usr/share/applications/empathy.desktop > debian/$(cdbs_curpkg)/usr/share/indicators/messages/applications/empathy
+
+include $(CURDIR)/debian/update-patches.mk
--- empathy-2.30.2.orig/debian/empathy-common.install
+++ empathy-2.30.2/debian/empathy-common.install
@@ -0,0 +1,4 @@
+usr/share/icons/
+usr/share/locale/
+usr/share/empathy/
+usr/share/gnome/help/empathy/
--- empathy-2.30.2.orig/debian/empathy.gconf-defaults
+++ empathy-2.30.2/debian/empathy.gconf-defaults
@@ -0,0 +1 @@
+/apps/empathy/notifications/notifications_focus    true
--- empathy-2.30.2.orig/debian/update-patches.mk
+++ empathy-2.30.2/debian/update-patches.mk
@@ -0,0 +1,10 @@
+update-patches:
+	mkdir -p $(CURDIR)/debian/patches
+	rm -f $(CURDIR)/debian/patches/*.patch
+	git format-patch -o $(CURDIR)/debian/patches debian-patches ^upstream
+	for patch in $$(ls $(CURDIR)/debian/patches/*.patch) ; \
+	do \
+		lines=$$(cat $$patch | wc -l) ; \
+		head -n $$(($$lines - 3)) $$patch > $${patch}.chomped ; \
+			mv $${patch}.chomped $$patch ; \
+	done
--- empathy-2.30.2.orig/debian/control
+++ empathy-2.30.2/debian/control
@@ -0,0 +1,114 @@
+Source: empathy
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintainers@lists.alioth.debian.org>
+Uploaders: Sjoerd Simons <sjoerd@debian.org>,
+           Dafydd Harries <daf@debian.org>,
+           Simon McVittie <smcv@debian.org>,
+           Riccardo Setti <giskard@debian.org>,
+           Laurent Bigonville <bigon@debian.org>,
+           Jonny Lamb <jonny@debian.org>
+Build-Depends: cdbs,
+               debhelper (>= 7),
+               rarian-compat,
+               librarian-dev,
+               libglib2.0-dev (>= 2.22.0),
+               libgtk2.0-dev (>= 2.18.0),
+               libgconf2-dev (>= 1.2.0),
+               libtelepathy-glib-dev (>= 0.9.2),
+               intltool,
+               libenchant-dev (>= 1.2.0),
+               iso-codes,
+               libebook1.2-dev,
+               xsltproc,
+               gnome-doc-utils (>= 0.17.3),
+               libcanberra-gtk-dev (>= 0.4),
+               libnotify-dev (>= 0.4.4),
+               libx11-dev,
+               libgstfarsight0.10-dev,
+               libdbus-glib-1-dev,
+               libtelepathy-farsight-dev (>= 0.0.4),
+               libgstreamer0.10-dev,
+               libgstreamer-plugins-base0.10-dev,
+               libnm-glib-dev (>= 0.7),
+               libnm-util-dev (>= 0.7),
+               libwebkit-dev (>= 1.1.15),
+               libgnome-keyring-dev (>= 2.22),
+               libindicate-dev (>= 0.3.0),
+               libindicate-gtk-dev (>= 0.3.0),
+               liblaunchpad-integration-dev (>= 0.1.17),
+               libunique-dev,
+               nautilus-sendto (>= 2.28.1)
+Standards-Version: 3.8.4
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/empathy/ubuntu
+Homepage: http://live.gnome.org/Empathy
+
+Package: empathy
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         empathy-common (= ${source:Version}),
+         telepathy-mission-control-5,
+         gnome-icon-theme,
+         dbus-x11
+Recommends: telepathy-gabble,
+            telepathy-salut,
+            telepathy-haze,
+            telepathy-butterfly,
+            gvfs-backends,
+            nautilus-sendto-empathy
+Suggests: telepathy-idle,
+          vino
+Replaces: libempathy-gtk-common
+Description: GNOME multi-protocol chat and call client
+ Instant messaging program supporting text, voice, video, file transfers
+ and inter-application communication over many different protocols,
+ including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
+ Gadu-Gadu, Groupwise, ICQ and QQ.
+ .
+ This package contains the Empathy IM application and account manager.
+
+Package: empathy-dbg
+Architecture: any
+Depends: ${misc:Depends}, empathy (= ${binary:Version})
+Section: debug
+Priority: extra
+Description: GNOME multi-protocol chat and call client (debug symbols)
+ Instant messaging program supporting text, voice, video, file transfers
+ and inter-application communication over many different protocols,
+ including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
+ Gadu-Gadu, Groupwise, ICQ and QQ.
+ .
+ This package contains debug symbols for the Empathy IM application and
+ account manager.
+
+Package: empathy-common
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: yelp
+Replaces: empathy (<< 2.27.92), empathy-doc, libempathy-common, libempathy-gtk-common
+Conflicts: empathy-doc, libempathy-common, libempathy-gtk-common
+Provides: libempathy-gtk-common,  libempathy-common
+Description: GNOME multi-protocol chat and call client (common files)
+ Instant messaging program supporting text, voice, video, file transfers
+ and inter-application communication over many different protocols,
+ including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
+ Gadu-Gadu, Groupwise, ICQ and QQ.
+ .
+ This package contains the architecture independent files for Empathy
+ IM application.
+
+Package: nautilus-sendto-empathy
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, empathy-common (= ${source:Version})
+Recommends: nautilus-sendto (>= 2.28.2-2)
+Replaces: nautilus-sendto (<< 2.28.2-2)
+Conflicts: nautilus-sendto (<< 2.28.2-2)
+Description: GNOME multi-protocol chat and call client (nautilus-sendto plugin)
+ Instant messaging program supporting text, voice, video, file transfers
+ and inter-application communication over many different protocols,
+ including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
+ Gadu-Gadu, Groupwise, ICQ and QQ.
+ .
+ This package contains nautilus-sendto plugin for the Empathy IM application.
--- empathy-2.30.2.orig/debian/changelog
+++ empathy-2.30.2/debian/changelog
@@ -0,0 +1,1943 @@
+empathy (2.30.2-0ubuntu1) lucid-proposed; urgency=low
+
+  * New upstream release: (LP: #599294)
+    - empathy-2.30.1.1: tests fail (Guillaume Desmottes)
+    - crash when closing chat with still-open notification bubble
+      (Guillaume Desmottes)
+    - Can't connect chatroom if space after adress (Guillaume Desmottes)
+    - Updated translations
+  * debian/patches/32_append_notifications.patch:
+    - refresh to new version
+  * debian/patches/91_git_fix_small_font.patch:
+    - take document font for adium theme to fix small fonts (LP: #531835)
+
+ -- Didier Roche <didrocks@ubuntu.com>  Mon, 28 Jun 2010 11:36:50 +0200
+
+empathy (2.30.1.1-0ubuntu1) lucid-proposed; urgency=low
+
+  * New upstream release:
+    - empathy_dispatcher_join_muc: assertion failed: (connection_data != NULL)
+      when joining favorites rooms while account is connecting
+      (Guillaume Desmottes)
+     - Possible to open multiple accounts dialog (Danielle Madeley)
+     - Fixed build failure due to missing header (Jasper Lievisse
+       Adriaanse)
+     - Empathy accounts CC module calls textdomain (Rob Bradford)
+     - Should call gtk_builder_set_translation_domain on GtkBuilder
+       UI components (Rob Bradford)
+     - Empathy silently fails importing contacts from Pidgin
+       (Guillaume Desmottes) (LP: #550569)
+     - Empathy should use port 8001 to connect to freenode irc (Brian Curtis)
+       (LP: #568901)
+     - IRC account: don't allow to save changes when editing network
+       details (Guillaume Desmottes)
+     - Incomplete localisation of g-c-c module (Rob Bradford)
+     - Avatar chooser can enter infinite loop (Xavier Claessens)
+     - configure script not compatible with dash as /bin/sh (Simon McVittie)
+     - crash on 0-byte file in log search (Robert McQueen)
+     - "Network error" on connecting to Facebook Chat (Guillaume Desmottes)
+       (LP: #542836)
+     - "Previous Conversations" Search entry is not activatable
+       (Guillaume Desmottes)
+     - empathy hangs with high cpu load when changing avatar (Xavier
+       Claessens)
+     - "Join favorites" should deal better with connecting accounts
+       (Guillaume Desmottes)
+     - Status reported by account dialog is wrong in connman mode
+       (Rob Bradford)
+     - accounts_dialog_update_status_infobar mixes const and
+       allocated strings for message (Rob Bradford)
+     - Empathy should not requires that geoclue providers support
+       updates (Laurent Bigonville)
+     - some messages get dropped when using adium themes (Guillaume
+       Desmottes) (LP: #546338)
+     - empathy does not set geoclue requirements before asking for
+       address/position (Laurent Bigonville)
+     - Missing image icon shows up when contact has no avatar
+       (Frédéric Péters)
+     - Crash when trying to start a camera preview without a camera
+       (Sjoerd Simons)
+    - updated translations
+  * added debian/patches/90_revert_removal_stock_person.patch:
+    remove upstream git commit b87a2f274a838e8636c64605506e6ba243c2671a
+    ad we don't have gnome-icon-theme 2.30
+
+ -- Didier Roche <didrocks@ubuntu.com>  Tue, 15 Jun 2010 09:30:00 +0200
+
+empathy (2.30.1-0ubuntu1) lucid-proposed; urgency=low
+
+  * New upstream release: (LP: #567277)
+    Bugs fixed:
+     - Fixed #616629, crash in XRootWindow (Sjoerd Simons)
+     - Fixed #616301, [patch] crash when closing a call. (David Laban)
+     - Fixed #616660, empathy-accounts g-c-c module needs to setup l10n (Rob
+       Bradford)
+     - Fixed #616711, "FreeNode" in IRC server list is incorrectly capitalized
+      (Guillaume Desmottes) (LP: #569276)
+    Updated translations
+  * debian/empathy-common.gconf-defaults: revert change in 2.30.0.2
+    (don't change the default behavior in a SRU which is hiding offline users)
+  * debian/patches/99_autoreconf.patch: refreshed
+
+ -- Didier Roche <didrocks@ubuntu.com>  Wed, 28 Apr 2010 11:46:18 +0200
+
+empathy (2.30.0.2-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release:
+    - Fixed #615027, empathy crashed with SIGSEGV in g_object_unref()
+      (Guillaume Desmottes
+    - Fixed #615058, Wrong account name when using the assistant (Guillaume
+      Desmottes)
+    - Fixed #615164, Keyboard controls for rearranging tabs are reverse from
+      changing tabs (Mirsal Ennaime)
+    - Fixed #615734, Account creation wizard fails to create the last account.
+      (David Laban)
+    - Fixed #615827, generic widget should put advanced section into a scrolled
+      window (Guillaume Desmottes)
+    - Fixed #615829, Crash when trying to add an account (Guillaume Desmottes)
+    - Fixed #615970, Crashes when haze crashes (Guillaume Desmottes)
+    - Fixed #616012, Tabs menu doesn't update when tabs are moved with hotkeys
+      (Mike Ruprecht)
+    - Fixed #616267, Offline contacts not shown by default (Guillaume Desmottes)
+    - Updated translation
+  * debian/patches/99_autoreconf.patch: refreshed
+
+ -- Didier Roche <didrocks@ubuntu.com>  Tue, 20 Apr 2010 15:08:19 +0200
+
+empathy (2.30.0.1-0ubuntu3) lucid; urgency=low
+
+  * debian/patches/11_empathy_accounts_category.patch:
+    - Fix incorrect patch
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Wed, 14 Apr 2010 14:32:53 +0800
+
+empathy (2.30.0.1-0ubuntu2) lucid; urgency=low
+
+  * debian/patches/11_empathy_accounts_category.patch:
+    - Put account settings into correct category
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Wed, 14 Apr 2010 14:16:13 +0800
+
+empathy (2.30.0.1-0ubuntu1) lucid; urgency=low
+
+  * New upstream version 
+    - empathy crashed with SIGSEGV in g_closure_invoke() (LP: #527296)
+    - contact list is empty for a jabber account with a lot of 
+      contacts (LP: #539023)
+    - Join room should be greyed out for AIM (LP: #540525)
+    - Previous/Next Tab menu items aren't disabled if at the first/last tab 
+      and gtk-keynav-wrap-around is 0
+    - empathy incorrectly updates our own IRC nick for /me
+    - Shouldn't request RoomList channel if not supported by connection
+    - account-chooser crashes when setting a filter and has-all-option to TRUE
+    - empathy crashed with SIGSEGV in g_object_unref() (LP: #556977)
+    - Wrong account name when using the assistant 
+    - Empathy fails to initiate a audio/video call over XMPP
+  * debian/patches/20_libindicate.patch
+    - Ported patch to remove NotificationData, removed upstream
+  * debian/patches/32_append_notifications.patch
+    - Ported patch to remove NotificationData, removed upstream
+  * debian/patches/21_login_indicators.patch
+    - Only display indicator for signon events if the preference 
+      is set (LP: #533857)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 09 Apr 2010 15:07:58 -0400
+
+empathy (2.30.0-0ubuntu4) lucid; urgency=low
+
+  * debian/patches/38_raise_voip_calls.patch
+    - Dropped patch that raised the answer dialog (LP: #552577) 
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 31 Mar 2010 11:29:38 -0400
+
+empathy (2.30.0-0ubuntu3) lucid; urgency=low
+
+  * debian/patches/32_append_notifications.patch
+    - Fix appending/merging of notifications (Nicolò Chieffo) (LP: #476662)
+  * debian/patches/35_check_actions_notifications.patch
+    - dropped patch that seems to actually no do anything
+   
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 30 Mar 2010 21:17:04 -0400
+
+empathy (2.30.0-0ubuntu2) lucid; urgency=low
+
+  * debian/control:
+    - use C/R/P on libempathy-gtk-common, libempathy-common to force
+      removal of libempathy-gtk-common in favor of empathy-common 
+      (LP: #549469)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 30 Mar 2010 20:14:45 +0200
+
+empathy (2.30.0-0ubuntu1) lucid; urgency=low
+
+  * New upstream release:
+    - Fixed #613596, Account Assistant translations are not loaded (Guillaume
+      Desmottes) (LP: #544208)
+    - Fixed #601693, Shouldn't cycle tab if gtk-keynav-wrap-around is 0 (Aaron
+      Brown)
+    - Fixed #612557, empathy_sidebar_menu_position_under: assertion
+      `gtk_widget_get_has_window (user_data)' failed (Guillaume Desmottes)
+    - Fixed #613117, Please fix escaping of UTF-chars in ui file (Gabor Kelemen)
+    - Fixed #613272, im settings capplet goes offscreen when advanced is expanded
+      (Travis Reitter)
+    - Fixed #613437, Empathy fails to build (Guillaume Desmottes)
+    - Fixed #613793, remove non-standard notification capabilities (Nicolò Chieffo)
+    - Fixed #613892, Should start hidden when activated (Guillaume Desmottes)
+    - Fixed #614155, Move Tab Left/Right should have accelerator (Aaron Brown)
+    - Fixed #613772, Minor typo in Empathy documentation (Marios Zindilis)
+  * debian/patches/99_autoreconf.patch: renamed and refreshed 
+
+ -- Didier Roche <didrocks@ubuntu.com>  Mon, 29 Mar 2010 16:38:54 +0200
+
+empathy (2.29.93-0ubuntu1) lucid; urgency=low
+
+  * New upstream release
+  * debian/patches/38_accounts_window_title.patch
+    - removed, merged upstream
+  * debian/patches/20_libindicate.patch
+    - refreshed to apply against 2.29.93
+  * debian/patches/38_raise_voip_calls.patch
+    - Raise the answer call dialog for incoming calls (LP: #440865)
+  * debian/rules
+    - make sure favourite-contacts is disabled, it requires telepathy-logger
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 16 Mar 2010 09:29:13 -0400
+
+empathy (2.29.92-0ubuntu2) lucid; urgency=low
+
+  * debian/patches/37_facebook_default.patch
+    - Make facebook the default chat account type, it is the most popular 
+      now and fits with our Social From the Start theme for Lucid 
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 10 Mar 2010 12:43:52 -0500
+
+empathy (2.29.92-0ubuntu1) lucid; urgency=low
+
+  * New upstream release
+  * debian/patches/38_accounts_window_title.patch
+    - Make the accounts window title consistent with what is in the menu
+
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 09 Mar 2010 13:49:26 -0500
+
+empathy (2.29.91.2-0ubuntu2) lucid; urgency=low
+
+  * debian/patches/36_chat_window_default_size.patch
+    - Make the default chat window size big enough to have a 
+      conversation in (LP: #509756) 
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Mon, 08 Mar 2010 10:09:11 -0500
+
+empathy (2.29.91.2-0ubuntu1) lucid; urgency=low
+
+  * new upstream release
+    - URL in contact's status are not clickable (LP: #411150)
+    - "Network Error" on any new Google Talk account (LP: #477233)
+  * debian/patches/20_libindicate.patch
+    - Updated for 2.29.91.2
+  *  debian/empathy.gconf-defaults
+    - enable notifications when chat is not focused (LP: #460286)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 04 Mar 2010 21:49:39 -0500
+
+empathy (2.29.91.1-1ubuntu1) lucid; urgency=low
+
+  * New upstream release
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 03 Mar 2010 15:15:21 -0500
+
+empathy (2.29.91-1ubuntu2) lucid; urgency=low
+
+  * debian/patches/20_libindicate.patch:
+    - don't attach notifications to the status icon if the icon
+      isn't visible, it was drawing a black line (LP: #528637)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 26 Feb 2010 16:26:47 -0500
+
+empathy (2.29.91-1ubuntu1) lucid; urgency=low
+
+  * Merge from debian experimental
+    - Disable Empathy's "Contact goes online" and "Contact goes offline" 
+      sound notifications by default (LP: #516804)
+  * debian/patches/20_libindicate.patch 
+    - updated patch for 2.29.91
+  * debian/patches/99_autoconf.patch
+    - regenerated 
+  * -debian/source/format -debian/patches/series
+    - Our patches aren't using quilt
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 23 Feb 2010 12:15:15 -0500
+
+empathy (2.29.91-1) experimental; urgency=low
+
+  * New upstream release
+    - debian/empathy-accounts.1: Add manpage for empathy-accounts binary
+    - debian/empathy.install: Also install empathy-accounts.desktop
+  * Bump Standards-Version (no further changes)
+
+ -- Laurent Bigonville <bigon@debian.org>  Mon, 22 Feb 2010 23:45:14 +0100
+
+empathy (2.29.90-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Laurent Bigonville <bigon@debian.org>  Thu, 11 Feb 2010 20:27:11 +0100
+
+empathy (2.29.90-0ubuntu2) lucid; urgency=low
+
+  * debian/patches/20_libindicate.patch:
+    - don't set extra timestamp argument for the status_icon_activate_cb()
+      callback, fix crashes happening to user not using the message indicator
+      (lp: #519194, #520901)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Fri, 12 Feb 2010 16:04:41 +0100
+
+empathy (2.29.90-0ubuntu1) lucid; urgency=low
+
+  * New upstream release
+    - Fixed #606329, Buttons in GtkInfoBar are too big.
+    - Fixed #607868, Change Hidden to Invisible in docs
+    - Fixed #608053, gtk_notebook_set_tab_label_packing has been deprecated 
+      in GTK+ 2.20 (Reimundo Heluani)
+    - Fixed #608690, Edit needs context (Guillaume Desmottes)
+    - Fixed #608813, EmpathyIdle singleton can be referenced by async 
+      functions after being finalized (crasher) (Travis Reitter)
+    - Fixed #608974, decling subscription doesn't remove the user from 
+      publish/local-pending (Danielle Madeley)
+    - Fixed #608975, Empathy calls SetAlias on a contact pending 
+      subscription (Danielle Madeley)
+    - Fixed #608979, Once chat window is open Empathy acks messages 
+      immediately (Danielle Madeley)
+    - Fixed #609030, uninitialised variable access (Danielle Madeley)
+    - Fixed #608882, Typo in salut-protocol.page (Łukasz Jernaś)
+  * debian/patches/01_lpi.patch
+    - updated to add LP integration in the chat window too (LP: #513148)
+  * debian/patches/20_libindicate.patch
+    - Fixed another crasher from the API breakage in libindicate (LP: #518735)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Mon, 08 Feb 2010 23:45:24 -0500
+
+empathy (2.29.6-0ubuntu5) lucid; urgency=low
+
+  * debian/patches/20_libindicate.patch:
+    - fixed a crasher from INDICATE_SERVER_SIGNAL_SERVER_DISPLAY
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Sun, 07 Feb 2010 14:57:46 -0500
+
+empathy (2.29.6-0ubuntu4) lucid; urgency=low
+
+  * debian/patches/20_libindicate.patch:
+    - fixed a crasher when activating the message indicator
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Sun, 07 Feb 2010 12:31:19 -0500
+
+empathy (2.29.6-0ubuntu3) lucid; urgency=low
+
+  * debian/patches/20_libindicate.patch:
+    - fixed a syntax error
+    - handle timestamp passed back from the indicator
+  * debian/control:
+    - bumped build depends for libindicate to 0.3.0
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 05 Feb 2010 10:29:07 -0800
+
+empathy (2.29.6-0ubuntu2) lucid; urgency=low
+
+  * debian/patches/20_libindicate.patch:
+    - use easier to understand label for the message indicator option,
+      thanks to Matthew Paul Thomas for the suggestion (lp: #516168) 
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 03 Feb 2010 11:01:06 -0800
+
+empathy (2.29.6-0ubuntu1) lucid; urgency=low
+
+  [ Ken VanDine ]
+  * debian/patches/20_libindicate.patch:
+    - split out notification related stuff into separate patches
+  * debian/patches/35_check_actions_notifications.patch
+    - If notifications support actions, inhibit updates
+  * debian/patches/32_append_notifications.patch
+    - use built in empathy functions to check caps
+
+  [ Steve Langasek ]
+  * debian/control: have empathy-common Breaks: libempathy-{gtk-,}common
+    and empathy-doc instead of conflicting with them, and drop the Provides:;
+    the special semantics of C/R/P aren't applicable here, and in fact seem
+    to confuse update-manager in some cases into refusing to upgrade empathy.
+
+  [ Didier Roche ]
+  * New upstream release
+    - #603472, Rename "Hidden" to "Invisible" (G.Balaji) (LP: #489097)
+    - #606329, Buttons in GtkInfoBar are too big. (Felix Kaser)
+    - #573407, Empathy and telepathy-idle don't pass on server commands to
+               server (LP: #509802, #397504)
+    - #585168, Scrollback search and jump-to-highlight would be nice.
+               (Thomas Meire) (LP: #447097)
+    - #596575, Automatic salut account creation doesn't work
+              (Guillaume Desmottes) (LP: #437396)
+    - #599159, Stop to handle tube channels (Guillaume Desmottes)
+    - #599163, Should use ContactCapability to get A/V caps
+               (Guillaume Desmottes)
+    - #599164, Should use ContactCapability to get FT caps (Guillaume Desmottes)
+    - #600693, Empathy calls xmlCleanupParser() where it shouldn't
+               (Guillaume Desmottes)
+    - #600949, Deleting accounts from the treeview is weird
+    - #603498, Escaped text displayed in notifications (Guillaume Desmottes)
+    - #606642, IRC account: "Connect" button is not sensitive when changing the
+               IRC network (Guillaume Desmottes)
+    - #606753, Scrollback search is not case sensitive
+    - #607207, show protocol icons in compact view (Guillaume Desmottes)
+    - #607306, /join fails to work on the latest version of empathy
+               (Thomas Meire) (LP: #509160)
+    - #607436, Salut account should only automatically created when the wizard
+               is run (Guillaume Desmottes)
+    - #607455, Misc fixes regarding the accounts assistant (Guillaume Desmottes)
+    - #607463, Edit Custom Messages window is too narrow (Ken VanDine)
+               (LP: #502996)
+    - #607868, Change Hidden to Invisible in docs
+    - #607925, edit account from infobar does not open the right account
+               (Guillaume Desmottes)
+    - #608043, Should ellipsize text in connection error infobars
+               (Will Thompson)
+    - #604700, (null) status infobar with IRC account (Guillaume Desmottes)
+    - #604706, infobar shows no icon if the presence is empty (Felix Kaser)
+    - #605309, Show the status of accounts in the treeview (Guillaume Desmottes)
+               (LP: #470096)
+    - #605532, on account-creation some field should be persistent over a
+               protocol change (Guillaume Desmottes)
+    - #606510, Unclear string meaning (Guillaume Desmottes)
+    - #585364, Get rid of shave with AM_SILENT_RULES automake option
+  * debian/patches/32_append_notifications.patch refreshed
+  * debian/patches/33_wider_custom_messages.patch integrated upstream
+  * debian/patches/99_autoconf.patch refreshed
+
+ -- Didier Roche <didrocks@ubuntu.com>  Mon, 25 Jan 2010 20:55:37 +0100
+
+empathy (2.29.5.1-1ubuntu2) lucid; urgency=low
+
+  * Really merge from debian experimental, remaining changes (LP: #509081):
+    - Add Suggests on telepathy-idle
+    - Bump telepathy-butterfly, telepathy-haze to recommends
+    - Drop geoloc support, dependencies not in main
+    - Add Vcs-Bzr tag and remove debian one
+    - debian/patches/01_lpi.patch: Added launchpad integration
+    - 10_use_notify_osd_icons.patch: Use the notify-OSD icons for new messages
+    - Add libindicate support:
+      + 20_libindicate.patch: Integrate into messaging menu
+      + Add build-dependencies
+      + debian/empathy.preinst: remove the old indicator from /etc and remove
+        the directory if it is empty
+      + debian/rules: Add empathy launcher to the messaging menu
+    - debian/patches/31_really_raise_window.patch
+      + really raise the answer/reject dialog for incoming calls
+    - debian/patches/33_wider_custom_messages.patch
+      + Custom messages dialog should be wider
+    - debian/patches/32_append_notifications.patch
+      + Set append hint to notifications
+    - debian/patches/34_start_raised_execpt_in_session.patch
+      + If not started with the session, we should always raise
+    - 99_autoconf.patch: Rebuild autofoo stuff
+  * Consolidate empathy-2.29.5.1/debian/patches/20_libindicate.patch with 
+    debian/patches/30_raise_not_toggle.patch and refresh all patches
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Mon, 18 Jan 2010 01:55:54 +0100
+
+empathy (2.29.5.1-1ubuntu1) lucid; urgency=low
+
+  * New upstream release
+  * debian/patches/31_really_raise_window.patch
+    - really raise the answer/reject dialog for incoming calls
+  * debian/patches/34_start_raised_execpt_in_session.patch
+    - If not started with the session, we should always raise (LP: #503052)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 12 Jan 2010 11:46:51 -0500
+
+empathy (2.29.5.1-1) experimental; urgency=low
+
+  * New upstream release
+    - Bump libtelepathy-glib-dev build-dep
+  * debian/control:
+    - Suggests vino for empathy package (Closes: #562288)
+  * debian/gbp.conf: Use bzip2 compression for orig tarball
+  * Do not install empathy-accounts.1 and empathy-logs.1 manpages anymore
+
+ -- Laurent Bigonville <bigon@debian.org>  Tue, 12 Jan 2010 23:47:02 +0100
+
+empathy (2.28.2-3) unstable; urgency=low
+
+  * debian/control:
+    - Recommends freedesktop-sound-theme for empathy package (Closes: #526137)
+
+ -- Laurent Bigonville <bigon@debian.org>  Sun, 31 Jan 2010 20:45:36 +0100
+
+empathy (2.29.6-1) experimental; urgency=low
+
+  * New upstream release
+    - Should now build correctly with gcc-4.5 (Closes: #564979)
+  * debian/rules: Remove --enable-python flag
+
+ -- Laurent Bigonville <bigon@debian.org>  Wed, 27 Jan 2010 23:39:10 +0100
+
+empathy (2.29.5.1-1) experimental; urgency=low
+
+  * New upstream release
+    - Bump libtelepathy-glib-dev build-dep
+  * debian/control:
+    - Suggests vino for empathy package (Closes: #562288)
+  * debian/gbp.conf: Use bzip2 compression for orig tarball
+  * Do not install empathy-accounts.1 and empathy-logs.1 manpages anymore
+
+ -- Laurent Bigonville <bigon@debian.org>  Tue, 12 Jan 2010 23:47:02 +0100
+
+empathy (2.28.2-2) unstable; urgency=low
+
+  * debian/control:
+    - Suggests vino for empathy package (Closes: #562288)
+    - Add Recommends to allow -dbg package to pull each other (Closes: #564679)
+
+ -- Laurent Bigonville <bigon@debian.org>  Tue, 12 Jan 2010 22:37:10 +0100
+
+empathy (2.29.4-1ubuntu1) lucid; urgency=low
+
+  * New upstream release
+  * debian/patches/20_libindicate.patch:
+    - Updated to apply cleanly to 2.29.4
+  * debian/patches/33_wider_custom_messages.patch
+    - Custom messages dialog should be wider (LP: #502996)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Mon, 04 Jan 2010 09:12:25 -0500
+
+empathy (2.29.4-1) experimental; urgency=low
+
+  * New upstream release
+  * Enable in-tree nautilus-sendto plugin
+  * debian/control:
+    - Use better short description
+    - Recommends freedesktop-sound-theme for empathy package (Closes: #526137)
+  * Use new source package version "3.0 (quilt)"
+
+ -- Laurent Bigonville <bigon@debian.org>  Wed, 23 Dec 2009 00:10:21 +0100
+
+empathy (2.28.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Laurent Bigonville <bigon@debian.org>  Tue, 15 Dec 2009 18:43:31 +0100
+
+empathy (2.28.1.2-2) unstable; urgency=low
+
+  * debian/control: Fix typo (Closes: #559673)
+
+ -- Laurent Bigonville <bigon@debian.org>  Wed, 09 Dec 2009 18:14:50 +0100
+
+empathy (2.29.3-1ubuntu1) lucid; urgency=low
+
+  * debian/patches/20_libindicate.patch:
+    - Updated to apply cleanly to 2.29.3
+  * debian/patches/31_really_raise_window.patch
+    - Force focus of the window when selected from the indicator (LP: #442389)
+  * debian/patches/32_append_notifications.patch
+    - Set append hint to notifications (LP: #476662)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Mon, 07 Dec 2009 09:48:06 -0500
+
+empathy (2.29.3-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Laurent Bigonville <bigon@debian.org>  Tue, 01 Dec 2009 13:53:52 +0100
+
+empathy (2.28.1.2-1) unstable; urgency=low
+
+  * New upstream release
+    - Should now build correctly with --no-add-needed flag
+      (Closes: #554325)
+  * debian/control: Fix typo (packages->package) (Closes: #557373)
+
+ -- Laurent Bigonville <bigon@debian.org>  Thu, 26 Nov 2009 06:33:51 +0100
+
+empathy (2.29.2-1) experimental; urgency=low
+
+  * Merge with debian unstable
+  * New upstream release
+    - Bump build-dependencies
+    - Should now build correctly with --no-add-needed flag
+      (Closes: #554325)
+    - IRC commands should now be passed to server (Closes: #549173)
+
+ -- Laurent Bigonville <bigon@debian.org>  Mon, 16 Nov 2009 23:40:52 +0100
+
+empathy (2.28.1.1-4) unstable; urgency=low
+
+  * Add symbols file for arch where geoclue support is disabled
+
+ -- Laurent Bigonville <bigon@debian.org>  Sat, 14 Nov 2009 20:45:54 +0100
+
+empathy (2.28.1.1-3) unstable; urgency=low
+
+  * Also do not try to build with geoclue support on non-linux arch
+
+ -- Laurent Bigonville <bigon@debian.org>  Sat, 14 Nov 2009 19:25:08 +0100
+
+empathy (2.28.1.1-2) unstable; urgency=low
+
+  * Do not try to build with networkmanager support on non-linux arch
+
+ -- Laurent Bigonville <bigon@debian.org>  Wed, 11 Nov 2009 22:56:43 +0100
+
+empathy (2.29.1-1) experimental; urgency=low
+
+  * New upstream release
+    - Drop megaphone applet
+    - Drop libempathy, libempathy-gtk and python-empathy packages
+    - Rename empathy-doc to empathy-common (Closes: #547904)
+  * debian/control:
+    - Fix typo
+    - packet -> package
+    - Add Recommends on yelp for empathy-common (Closes: #553524)
+  * Move GConf schema to empathy package
+
+ -- Laurent Bigonville <bigon@debian.org>  Wed, 04 Nov 2009 18:27:30 +0100
+
+empathy (2.28.1.1-1) unstable; urgency=low
+
+  * New upstream bugfix release
+  * debian/patches/*: removed, all fixed upstream
+  * debian/control: Recommend empathy-doc instead of depending on it
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Mon, 26 Oct 2009 22:36:02 +0000
+
+empathy (2.28.1.1-0ubuntu1) karmic-proposed; urgency=low
+
+  * New upstream release (LP: #462016)
+    - Incoming message while menu is open freezes X
+    - crash when typoing room name 
+    - Empathy crashes with SIGSEGV when trying spellcheck
+    - Empathy protocol chooser shouldn't cache TpConnectionManagerProtocol
+    - fixes potential security issue by ensuring that messages are always
+      escaped before being displayed in Webkit
+  * debian/patches/20_libindicate.patch
+    - fixed empathy_tp_chat_acknowledge_message: assertion failed (LP: #408530)
+    - added some DEBUG output for better logging
+    - Cleaned up a couple glib criticals
+  * debian/libempathy-gtk28.symbols
+    - Removed symbols related to location manager, they don't apply
+  * debian/patches/30_raise_not_toggle.patch
+    - toggle contact list visibility with the status icon (LP: #451568)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 29 Oct 2009 14:18:50 +0100
+
+empathy (2.28.1-2) unstable; urgency=low
+
+  * d/patches/0001-Ignoring-non-installed-languages.patch
+    + Added. Fix a crash when trying to spell-check using a dictionary that's
+      no longer installed. (from upstream git)
+  * d/patches/0002-empathy-protocol-chooser-don-t-cache-TpConnectionMan.patch
+    + Added. Prevent TpConnectionManager from being cached as it can be freed
+      under out feet. Fixes a crash while managing accounts (Closes: #551265)
+      (from upstream git)
+  * d/patches/0003-empathy-chat-window-Don-t-update-the-Contact-menu-if.patch,
+    d/patches/0004-Fix-crash-when-joining-a-chat-GTK_WIDGET_VISIBLE-is-.patch:
+    + Added. Fixes Empathy blocking when a notication is displayed while the
+      contact menu is open (from upstream git)
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Sun, 25 Oct 2009 19:04:54 +0000
+
+empathy (2.28.1-1ubuntu1) karmic; urgency=low
+
+  * debian/libempathy-gtk28.symbols:
+    - updated to list new symbols
+
+  [ Ken VanDine ]
+  * New upstream release (LP: #455763)
+    - asserts in empathy_idle_set_presence() after suspend/resume (LP: #433108)
+    - empathy crashed when dnding an avatar image (LP: #446393)
+    - crash with SIGSEGV in contact_list_store_iface_setup() (LP: #448580)
+    - copy/paste is broken
+    - crash with SIGSEGV in empathy_account_settings_get_default(LP: #424903)
+    - crash with SIGSEGV in tp_contact_list_got_added_members_cb (LP: #427684)
+    - libnotify chat bubbles aren't displayed once the first bubble disappeared
+    - Info dialog says "Edit contact information"
+    - libempathy header files are wrong
+    - crash with SIGSEGV in empathy_account_settings_get_account (LP: #437111)
+    - Crash when CM crashes during a channel request
+    - Presence chooser shouldn't be sensitive when there are no accounts
+    - Use pretty names for protocol in account display names
+    - Changing display name can crash empathy
+    - empathy crashed with SIGSEGV in
+      empathy_call_window_audio_input_level_changed_cb() (LP: #442756)
+    - empathy crashed with SIGSEGV in
+      empathy_call_window_got_self_contact_cb() (LP: #447301)
+    - Empathy start isn't idempotent
+  * debian/patches/20_libindicate.patch
+    - updated to apply cleanly
+  * debian/patches/99_autoconf.patch
+    - updated to apply cleanly
+  * debian/libempathy30.symbols
+    - Added symbol
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Mon, 19 Oct 2009 22:45:22 +0200
+
+empathy (2.28.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/libempathy30.symbols: Updated.
+
+ -- Jonny Lamb <jonny@debian.org>  Tue, 20 Oct 2009 13:59:06 +0100
+
+empathy (2.28.0.1-2) unstable; urgency=low
+
+  * Add libempathy30-dbg, libempathy-gtk28-dbg and empathy-dbg packages.
+  * debian/control: Add Conflicts and Replaces fields to
+    libempathy{30,-gtk28} packages to make upgrades easier. Thanks to
+    Andres Salomon <dilinger@collabora.co.uk> for the "patch".
+    (Closes: #548779)
+
+ -- Jonny Lamb <jonny@debian.org>  Sat, 17 Oct 2009 12:34:49 +0100
+
+empathy (2.28.0.1-1ubuntu6) karmic; urgency=low
+
+  * debian/patches/20_libindicate.patch
+    - display the status icon when the indicator isn't present (LP: #435329)
+    - don't attach notifications to the status icon if the icon 
+      isn't visible, it was drawing a black line (LP: #434316)
+  * debian/patches/30_raise_not_toggle.patch
+    - Updated to apply cleanly
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 14 Oct 2009 16:34:36 -0400
+
+empathy (2.28.0.1-1ubuntu5) karmic; urgency=low
+
+  * debian/patches/01_lpi.patch
+    - Added launchpad integration (LP: #436742)
+  * debian/control
+    - added liblaunchpad-integration-dev to build depends
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 13 Oct 2009 14:31:32 -0400
+
+empathy (2.28.0.1-1ubuntu4) karmic; urgency=low
+
+  * debian/patches/20_libindicate.patch
+    - Don't set draw-attention for login events (LP: #434726)
+    - Don't display time for login events (LP: #438237)
+
+  [Laurent Bigonville]
+  * debian/empathy-doc.install: install missing documentation (LP: #446420)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 09 Oct 2009 08:24:12 +0200
+
+empathy (2.28.0.1-1ubuntu3) karmic; urgency=low
+
+  * debian/patches/20_libindicate.patch
+    - Fixed a crasher caused by not properly removing 
+      indicators.  When comparing events, we shouldn't compare
+      the message content. (LP: #435216)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 07 Oct 2009 17:19:48 -0400
+
+empathy (2.28.0.1-1ubuntu2) karmic; urgency=low
+
+  * debian/patches/20_libindicate.patch
+    - Updated patch to apply cleanly against 2.28.0.1
+  * debian/patches/99_autoconf.patch
+    - regenerated
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 06 Oct 2009 09:40:21 -0400
+
+empathy (2.28.0.1-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #441795):
+    - Add Suggests on telepathy-idle
+    - Bump telepathy-butterfly, telepathy-haze to recommends
+    - Drop geoloc support, dependencies not in main
+    - add Vcs-Bzr tag
+    - Add libindicate support:
+      + 20_libindicate.patch: Integrate into messaging menu
+      + 30_raise_not_toggle.patch: Always raise contact list when clicked
+      + 99_autoconf.patch: Rebuild autofoo stuff
+      + debian/empathy.preinst: remove the old indicator from /etc and remove
+        the directory if it is empty
+      + debian/rules: Add empathy launcher to the messaging menu
+    - 10_use_notify_osd_icons.patch: Use the notify-OSD icons for new messages
+  * Readd documentation in empathy-doc package as it seems not installed in
+    previous version
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Mon, 05 Oct 2009 14:18:34 +0200
+
+empathy (2.28.0.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Sun, 04 Oct 2009 13:09:34 +0100
+
+empathy (2.28.0-1) unstable; urgency=low
+
+  [ Laurent Bigonville ]
+  * libempathy-gtk-dev: add missing Depends on libcanberra-gtk-dev
+
+  [ Jonny Lamb ]
+  * New upstream release.
+  * debian/control:
+    + Upped build-depend versions on libtelepathy-glib and libchamplain.
+
+ -- Jonny Lamb <jonny@debian.org>  Mon, 21 Sep 2009 23:23:38 +0100
+
+empathy (2.28.0-0ubuntu3) karmic; urgency=low
+
+  * debian/empathy.preinst:
+    - fixed the version compare to be friendly on new installs 
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 25 Sep 2009 02:41:51 -0400
+
+empathy (2.28.0-0ubuntu2) karmic; urgency=low
+
+  * debian/postinst:
+    - renamed empathy.preinst and did some tweaking there 
+
+  [ Ken VanDine ]
+  * debian/rules:
+    - Moved the indicator launcher to /usr/share (LP: #434097)
+  * debian/postinst:
+    - remove the old indicator from /etc and remove the directory
+      if it is empty
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 24 Sep 2009 23:56:55 +0200
+
+empathy (2.28.0-0ubuntu1) karmic; urgency=low
+
+  [ Ken VanDine ]
+  * debian/patches/20_libindicate.patch:
+    - Updated patch to set "draw-attention" (LP: #433999) 
+    - Updated patch to set the avatar in the indicator (LP: #434209)
+
+  [ Iain Lane ]
+  *  New upstream release 2.28.0 (LP: #434264)
+   - Empathy theme doesn't work (and opens a folder in Nautilus!)
+   - icq accounts import from pidgin not working
+   - Invalid read when terminating an audio call
+   - Room auto-connect doesn't work
+   - using *_run_* calls prevents quitting Empathy
+   - Chat windows don't show when we are reconnected
+   - Use GOptionContext to parse options
+   - Empathy misbehaviour
+   - Empathy forgets IRC bookmarks
+   - Empathy 2.27.92 fails to build
+   - asserts in empathy_idle_set_presence() after suspend/resume
+   - empathy crashed with SIGSEGV in empathy_account_settings_get_uint32() (Guillaume Desmottes)
+   - cannot add yahoo account (Frédéric Péters)
+   - Empathy crashing with CSW (Danielle Madeley)
+   - empathy crashed with SIGSEGV in empathy_audio_sink_set_volume() (LP: #427579)
+   - empathy crashed with SIGSEGV in tp_contact_list_got_added_members_cb()
+   - Doesn't respawn existing channel when trying to reopen it
+   - crash when dragging user from roster to MUC window
+   - Pasting text into a disconnected chat window crashes (Cosimo Cecchi)
+   - EmpathyIdle should wait for account manager to be ready
+   - double click on a contact should raise the window
+  * debian/patches/20_libindicate.patch: Update for new code
+  * debian/patches/99_autoconf.patch: Refresh (autoreconf -f -i -s) 
+
+ -- Iain Lane <laney@ubuntu.com>  Tue, 22 Sep 2009 00:19:48 +0100
+
+empathy (2.27.92-1ubuntu3) karmic; urgency=low
+
+  [Ken VanDine]
+  * debian/control:
+    - Added libindicate-gtk-dev and libindicate-dev (>=0.2.0) to build depends
+  * debian/patches/30_raise_not_toggle.patch:
+    - Always raise contact list when clicked (LP: #392153)
+  * debian/patches/99_autoconf.patch added
+
+  [Robert Ancell]
+  * debian/patches/10_use_notify_osd_icons.patch:
+    - Use the notify-OSD icons for new messages (LP: #409828)
+  * debian/patches/20_libindicate.patch:
+    - Integrate into messaging menu (LP: #340180)
+  * debian/control:
+    - Remove Debian VCS links as they confuse debcheckout
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Mon, 21 Sep 2009 14:34:40 +0200
+
+empathy (2.27.92-1ubuntu2) karmic; urgency=low
+
+  * debian/rules:
+    - Add empathy launcher to the messaging menu (LP: #424494) 
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 11 Sep 2009 11:55:59 -0400
+
+empathy (2.27.92-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian experimental, remaining changes:
+    - Add Suggests on telepathy-idle
+    - Bump telepathy-butterfly, telepathy-haze to recommends
+    - Drop geoloc support, dependencies not in main
+    - add Vcs-Bzr tag
+    - libempathy-gtk-dev: add missing Depends on libcanberra-gtk-dev
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Thu, 10 Sep 2009 09:13:00 +0200
+
+empathy (2.27.92-1) experimental; urgency=low
+
+  * New upstream release
+    - Drop debian/patches/0001-Remove-libmissioncontrol-deps.patch:
+      fixed upstream
+    - Bump libraries soname and adjust .symbols files
+  * Split GNOME documentation out of arch-dependent package
+
+ -- Laurent Bigonville <bigon@debian.org>  Wed, 09 Sep 2009 19:28:22 +0200
+
+empathy (2.27.92-0ubuntu2) karmic; urgency=low
+
+  * debian/control: Re-add telepathy-butterfly recommends, it's in main now.
+    (LP: #388898)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 10 Sep 2009 16:10:15 +0200
+
+empathy (2.27.92-0ubuntu1) karmic; urgency=low
+
+  * New upstream version
+  * debian/patches/0001-Remove-libmissioncontrol-deps.patch:
+    - dropped the change is in the new version
+  * updated for the soname changes
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 08 Sep 2009 23:22:20 +0200
+
+empathy (2.27.91.1-3) experimental; urgency=low
+
+  * debian/control:
+    - Add missing build-deps
+    - Add missing dependencies to -dev packages (LP: #423174)
+  * Re-enable map support now that new versions of champlain and clutter
+    are in debian
+
+ -- Laurent Bigonville <bigon@debian.org>  Thu, 03 Sep 2009 12:08:00 +0200
+
+empathy (2.27.91.1-2ubuntu5) karmic; urgency=low
+
+  * libempathy-gtk-dev: add missing Depends on libcanberra-gtk-dev
+    (lp: #425692)
+
+ -- Michael Bienia <geser@ubuntu.com>  Mon, 07 Sep 2009 15:00:41 +0200
+
+empathy (2.27.91.1-2ubuntu4) karmic; urgency=low
+
+  * Correctly update the vcs with the recent changes
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Fri, 04 Sep 2009 18:09:08 +0200
+
+empathy (2.27.91.1-2ubuntu3) karmic; urgency=low
+
+  [ Steve Langasek ]
+  * libempathy-dev: add missing Depends on libtelepathy-glib-dev.
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Fri, 04 Sep 2009 17:21:59 +0200
+
+empathy (2.27.91.1-2ubuntu2) karmic; urgency=low
+
+  * debian/libempathy-gtk27.symbols: remove symbols related to geoloc
+    (LP: #422010)
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Mon, 31 Aug 2009 16:51:55 +0200
+
+empathy (2.27.91.1-2ubuntu1) karmic; urgency=low
+
+  * Merge from debian experimental, remaining changes (LP: #419811):
+    - Add Suggests on telepathy-idle
+    - Bump telepathy-haze to recommends
+    - Drop geoloc support, dependencies not in main
+    - add build-dep libx11-dev (old missing one), libgstfarsight0.10-dev,
+      libdbus-glib-1-dev and libnm-glib-dev
+    - add Vcs-Bzr tag
+  * debian/control: Set the maintainer to the core team
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Fri, 28 Aug 2009 19:48:30 +0200
+
+empathy (2.27.91.1-2) experimental; urgency=low
+
+  * debian/control:
+    + Remove libtelepathy-dev dependency from libempathy-dev
+    + Remove libmissioncontrol-dev dependency from libempathy-dev
+  * debian/patches/0001-Remove-libmissioncontrol-deps.patch:
+    * Remove missioncontrol deps from the pc files, patch from upstream git
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Thu, 27 Aug 2009 10:20:15 +0100
+
+empathy (2.27.91.1-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    + Upped dependencies as appropriate for the new release.
+    + Upped Standards-Version. (no changes)
+    + Upped sonames as appropriate.
+    + s/Gadu Gadu/Gadu-Gadu/g
+    + Change dep on libempathy29 to telepathy-mission-control-5.
+  * debian/rules:
+    + Use --with-connectivity instead of --enable-network-manager.
+  * Disable building with map as new enough clutter-gtk and champlain
+    packages aren't in the archive yet.
+  * debian/libempathy-common.install: Don't install profiles anymore.
+  * debian/empathy.install: Don't try to install omf files.
+  * debian/*.symbols: Updated.
+  * debian/{empathy,libempathy-common}.install: Update to include some new
+    files.
+
+ -- Jonny Lamb <jonny@debian.org>  Wed, 26 Aug 2009 10:36:05 +0100
+
+empathy (2.27.5-1) experimental; urgency=low
+
+  * New Upstream Version
+    - Bump libraries soname and adjust .symbols files
+  * debian/control:
+    - Add geoclue-yahoo recommends for libempathy-gtk
+    - Use more meaningful desctiptions (LP: #259788)
+  * debian/update-patches.mk: Update script to work with recent git version
+  * Enable network manager support
+
+ -- Laurent Bigonville <bigon@debian.org>  Tue, 04 Aug 2009 11:20:18 +0200
+
+empathy (2.27.5-0ubuntu1) karmic; urgency=low
+
+  * New upstream version:
+    Bugs fixed:
+    - Fixed #459161, Remove should be insensitive for salut contact
+    - Fixed #494007, Empathy should conform to the XDG directory specification 
+    - Fixed #545282, [accessibility] the names of items in friends list are not correct 
+    - Fixed #547327, Wrongly sized dialog
+    - Fixed #579724, Enable building with shave
+    - Fixed #579940, Show a notification when a buddy goes to offline or online
+    - Fixed #584120, "Video call" button shouldn't be sensitive in Contact menu if contact supports only audio
+    - Fixed #584122, "Send Video" should be disable if contact doesn't support video
+    - Fixed #586967, Remeber chat window size and configuration 
+    - Fixed #588498, Mark muc tabs in which you are highlighted differently 
+    - Fixed #588662, Add gconf option to enable usage of the WebKit inspector, for adium themes.
+    - Fixed #588810, respect the button-images setting 
+    - Fixed #588886, crash when selecting an image and clicking "open link" in adium 
+    - Fixed #589091, Feature Share My Desktop for Empathy
+    - Fixed #589830, Online status combo box items are not correctly spoken with the Orca screen reader. 
+    - Fixed #589846, wrap text in contact label status 
+  * debian/patches/01_autoconf_forgot_by_upstream.patch:
+    - the change is in the new version
+  * debian/libempathy27.symbols, debian/libempathy-gtk25.symbols:
+    - new version update
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 30 Jul 2009 10:02:28 +0200
+
+empathy (2.27.4-0ubuntu1) karmic; urgency=low
+
+  * New upstream release: (LP: #399878)
+     - Segfault when the contact selector dispose
+     - Remove should be insensitive for salut contact
+     - empathy should be able to take colours from the GTK theme
+     - IRC widget is cut (Matthias Clasen)
+     - Add option to hide muc roster
+     - time banner is added at each sentence when the remote contact is offline
+     - Should take a well-known bus name (Jonny Lamb)
+     - Contact list view options are scattered over "Chat" menu and "General" Preferences
+     - Doesn't poke block devices to figure out their file size. (Frédéric Péters)
+     - Remove libgnomevfs include in megaphone-applet.c
+     - "Video preview" menu item doesn't do anything
+     - Use call-stop icon (Frédéric Péters)
+     - Should play a sound when calling
+     - Favourite Chat Room tickybox doesn't work. (Abner Silva)
+     - Adds an Adium theme parsing to have a nicer theme selector
+     - EmpathyProfileChooser should extend GtkComboBox
+     - Show a notification when a buddy goes to offline or online
+     - Implement o.fd.Tp.Debug to publish debug messages (Jonny Lamb)
+     - Shouldn't be able to send video and enable preview if no webcam is plugged
+     - Call window: "send video" widgets should be enabled according the state of the call
+     - we should not see the last video frame.
+     - Crash when starting if status-presets.xml contains an 'unset' presence (Guillaume Desmottes)
+     - Crash when trying to add an 'unset' status as favorite (Guillaume Desmottes)
+     - Contact list doesn't appear in windows list when respawned
+     - %service% is not replaced in adium themes (Patryk Zawadzki)
+     - Use libchamplain 0.3.3's API
+     - Adium theme is not reloaded on /clear or Ctrl+L or clear menu item
+     - Empathy does not import from Pidgin on start
+     - Capitalisation incorrect
+     - Can't easily copy URL's when using Adium themes
+     - Lines are not smashed together when using Adium themes (Patryk Zawadzki)
+     - "Publish my location" causes a crash
+     - Remove markup from translatable strings
+     - Remove "new message from" from notification message (Guillaume Desmottes)
+     - don't autoscroll on new messages
+     - Display part reasons and messages.
+     - Imported Google account (from Pidgin) not connecting (LP: #388522)
+     - Adium theme should only join messages if time delta is less than 5 minutes (Patryk Zawadzki)
+     - Use themed avatar as fallback if provided
+     - "history" messageClasses is not set for backlogs
+     - We are not using Info.plist settings for adium themes (Patryk Zawadzki)
+     - telepathy-idle IRC chat window has no users or chat content
+     - Status icon not updated when going offline (Guillaume Desmottes)
+     - Modules linking cleanup
+     - empaty crashs whenever a file trasnfert request is received
+     - NM integration doesn't work if NM is started after empathy (Sjoerd Simons)
+     - Don't use McAccount (Sjoerd Simons)
+     - Crash when trying to add a contact while connecting (Guillaume Desmottes)
+     - Labels with RTL control code don't right-align
+     - please add bug-database to doap (Guillaume Desmottes)
+     - typo for enable_network_manager in configure.ac (Ken VanDine)
+     - Crasher: click on the microphone once disconnected
+  * debian/control.in:
+    - bump soname for libempathy26 -> 27 (and associated {.install,.symbols files})
+    - bump soname for libempathy-gtk24 -> 25 (and associated {.install,.symbols files})
+    - add build-dep libx11-dev (old missing one), libgstfarsight0.10-dev,
+      libdbus-glib-1-dev and libnm-glib-dev
+    - add Vcs-Bzr tag
+  * add debian/patches/01_autoconf_forgot_by_upstream.patch to update configure
+    from configure.ac
+  * update libempathy27.symbols and libempathy-gtk25.symbols
+
+ -- Didier Roche <didrocks@ubuntu.com>  Thu, 16 Jul 2009 18:34:37 +0200
+
+empathy (2.27.3-2ubuntu3) karmic; urgency=low
+
+  * debian/control: Temporarily drop telepathy-butterfly recommends. The pymsn
+    replacement is still being sorted out, and in the meantime, -haze provides
+    support for MSN. (See LP #388898 for status). This will be added back
+    later.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 14 Jul 2009 19:15:56 +0200
+
+empathy (2.27.3-2ubuntu2) karmic; urgency=low
+
+  * Drop geoclue dependencies, really
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Mon, 06 Jul 2009 09:48:10 +0200
+
+empathy (2.27.3-2ubuntu1) karmic; urgency=low
+
+  * Merge from debian experimental, remaining changes:
+    - Add Suggests on telepathy-idle
+    - Bump telepathy-butterfly and telepathy-haze to recommends
+  * Drop libindicate support for now
+  * Drop geoloc support, dependencies not in main (yet)
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Thu, 25 Jun 2009 10:02:52 +0200
+
+empathy (2.27.3-2) experimental; urgency=low
+
+  * debian/rules: Remove duplicate include
+  * debian/control:
+    - Bump Standards-Version (no further changes)
+    - Drop all conflicts, packages not even in old-stable anymore
+  * Enable Adium themes support
+    - debian/rules: Pass --enable-webkit to configure
+    - debian/control: Add libwebkit-dev build-dep
+    - debian/libempathy-gtk24.symbols: Add new exported symbols
+  * Enable geoclue support
+    - debian/rules: Pass --enable-location to configure
+    - debian/control: Add libgeoclue-dev build-dep
+    - debian/libempathy-gtk24.symbols: Add new exported symbols
+  * Enable map (champlain) support
+    - debian/rules: Pass --enable-map to configure
+    - debian/control: Add libchamplain-0.3-dev, libchamplain-gtk-0.3-dev
+      and libclutter-gtk-0.8-dev build-dep
+
+ -- Laurent Bigonville <bigon@debian.org>  Tue, 23 Jun 2009 11:10:25 +0200
+
+empathy (2.27.3-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian experimental, remaining changes: (LP: #388590)
+    - Add Suggests on telepathy-idle
+    - Bump telepathy-butterfly and telepathy-haze to recommends
+  * debian/patches/001_add_indicator.patch:
+    - Add libindicate support (LP: #340180)
+  * debian/patches/099_autoreconf.patch: Run autoreconf
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Tue, 23 Jun 2009 11:43:15 +0200
+
+empathy (2.27.3-1) experimental; urgency=low
+
+  * New upstream release.
+    - Bump libraries soname and adjust .symbols files
+  * debian/control: Bump libtelepathy-glib-dev build-dep
+  * debian/libempathy-gtk-common.install: Add default adium theme
+
+ -- Laurent Bigonville <bigon@debian.org>  Wed, 17 Jun 2009 20:38:21 +0200
+
+empathy (2.27.2-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian experimental, remaining changes:
+    - Add Suggests on telepathy-idle
+    - Bump telepathy-butterfly and telepathy-haze to recommends
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Sun, 31 May 2009 19:05:28 +0200
+
+empathy (2.27.2-1) experimental; urgency=low
+
+  * New upstream release
+    - Bump libraries soname and adjust .symbols files
+
+ -- Laurent Bigonville <bigon@debian.org>  Sun, 31 May 2009 16:52:39 +0200
+
+empathy (2.27.1.1-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian experimental, remaining changes:
+    - Add Suggests on telepathy-idle
+  * Bump telepathy-butterfly and telepathy-haze to recommends
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Wed, 20 May 2009 09:52:57 +0200
+
+empathy (2.27.1.1-1) experimental; urgency=low
+
+  * New upstream release
+    - Bump libraries soname and adjust .symbols files
+  * debian/control:
+    - Bump libgtk2.0-dev and libtelepathy-glib-dev build-dep
+    - Bump libgtk2.0-dev dependency for libempathy-gtk-dev
+    - Remove all libglade references
+  * debian/libempathy-gtk-common.install: now install .ui files instead
+    of .glade files
+  * Bump debhelper version to 7
+
+ -- Laurent Bigonville <bigon@debian.org>  Tue, 19 May 2009 14:18:13 +0200
+
+empathy (2.26.2-1) unstable; urgency=low
+
+  [ Jonny Lamb ]
+  * debian/control: Added haze and butterfly as empathy Suggests.
+
+  [ Laurent Bigonville ]
+  * New upstream release
+
+ -- Laurent Bigonville <bigon@debian.org>  Mon, 18 May 2009 21:43:25 +0200
+
+empathy (2.26.1-1ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Add Recommends on telepathy-butterfly and telepathy-haze
+    - Add Suggests on telepathy-idle
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Tue, 14 Apr 2009 12:03:23 +0200
+
+empathy (2.26.1-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/control: Add Homepage field
+
+ -- Laurent Bigonville <bigon@debian.org>  Tue, 14 Apr 2009 11:44:14 +0200
+
+empathy (2.26.0.1-0ubuntu1) jaunty; urgency=low
+
+  * New upstream release (LP: #351884)
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Wed, 01 Apr 2009 20:22:40 +0200
+
+empathy (2.26.0-1ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Add Recommends on telepathy-butterfly and telepathy-haze
+    - Add Suggests on telepathy-idle
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Wed, 18 Mar 2009 13:43:01 +0100
+
+empathy (2.26.0-1) unstable; urgency=low
+
+  * New Upstream Version
+    - Bump libtelepathy-glib-dev build-dependency
+    - Bump libempathy soname and adjust .symbols file
+  * debian/control:
+    - Bump Standards-Version to 3.8.1 (no further changes)
+    - Remove telepathy-stream-engine recommends and conflicts
+  * python-empathy.install: Fix FTBFS with python >= 2.6
+
+ -- Laurent Bigonville <bigon@debian.org>  Wed, 18 Mar 2009 13:18:54 +0100
+
+empathy (2.25.92-1ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Add Recommends on telepathy-butterfly and telepathy-haze
+    - Add Suggests on telepathy-idle
+  * Fix FTBFS with python >= 2.6
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Wed, 11 Mar 2009 01:28:38 +0100
+
+empathy (2.25.92-1) unstable; urgency=low
+
+  * New Upstream Version
+  * Bump libempathy soname again
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Tue, 03 Mar 2009 23:46:29 +0000
+
+empathy (2.25.91-2) unstable; urgency=low
+
+  [ Laurent Bigonville ]
+  * debian/control: Add minimal version for libtelepathy-farsight-dev build-dep
+
+  [ Jonny Lamb ]
+  * Upload to unstable.
+
+ -- Jonny Lamb <jonny@debian.org>  Tue, 03 Mar 2009 18:05:50 +0000
+
+empathy (2.25.91-1) experimental; urgency=low
+
+  [ Sjoerd Simons ]
+  * debian/patches/0001-Set-initial-value-for-sound-pref-checkboxes.patch
+    - Removed, fixed upstream
+
+  [ Jonny Lamb ]
+  * New upstream release.
+    + Bumped libempathy{,-gtk} sonames.
+  * debian/gbp.conf: Removed no-create-orig field.
+  * debian/control:
+    + Added myself to Uploaders.
+    + Removed XS-Dm-Upload-Allowed field.
+    + Upped build-dep on libtelepathy-glib-dev to >= 0.7.21.
+    + Removed duplicate Section fields.
+    + Made short descriptions unique.
+  * debian/libempathy21.symbols: Updated symbols file.
+  * debian/libempathy-gtk19.symbols: Updated symbols file.
+  * debian/empathy-logs.1: Added new manpage.
+  * debian/copyright: Completely rewrote.
+
+ -- Jonny Lamb <jonny@debian.org>  Fri, 27 Feb 2009 15:20:03 +0000
+
+empathy (2.25.4-1ubuntu1) jaunty; urgency=low
+
+  * Merge from debian experimental, remaining changes:
+    - Add Recommends on telepathy-butterfly and telepathy-haze
+    - Add Suggests on telepathy-idle
+  * Drop debian/patches/01fixtabbehavour.diff: Upstream is not happy
+    with this patch.
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Sun, 18 Jan 2009 14:31:56 +0100
+
+empathy (2.25.4-1) experimental; urgency=low
+
+  [ Simon McVittie ]
+  * Switch packaging to git
+  * Add gbp.conf (for git-buildpackage) and `debian/rules update-patches`
+    target
+  * Add README.source
+
+  [ Sjoerd Simons ]
+  * New Upstream Version
+  * debian/control: Add libcanberra-gtk-dev to build-depends
+  * debian/control: Bump libempathy soname from 17 to 19
+  * debian/libempathy-gtk17.symbols: Update with new symbols
+  * debian/libempathy19.symbols: Update with new symbols
+  * debian/patches/0001-Set-initial-value-for-sound-pref-checkboxes.patch
+    - Added. Set the initial values of the sound preferences from the
+      configuration. (From upstream git)
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Wed, 07 Jan 2009 18:33:49 +0000
+
+empathy (2.25.3-1) experimental; urgency=low
+
+  * New upstream release
+    - Bump libempathy-gtk soname
+    - Fix symbols files
+  * debian/control:
+    - Bump libgtk2.0-dev build-dependency
+    - Drop libgnomeui-dev build-dep
+  * Drop debian/patches/64bit-build-fix.patch: fixed upstream
+
+ -- Laurent Bigonville <bigon@debian.org>  Sat, 20 Dec 2008 21:45:15 +0100
+
+empathy (2.25.2-2ubuntu1) jaunty; urgency=low
+
+  * Merge from debian experimental, remaining changes:
+    - debian/patches/01fixtabbehavour.diff: Change behaviour of tabs in chat
+      dialogs
+    - Add Recommends on telepathy-butterfly and telepathy-haze
+    - Add Suggests on telepathy-idle
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Thu, 04 Dec 2008 15:31:52 +0100
+
+empathy (2.25.2-2) experimental; urgency=low
+
+  * debian/patches/64bit-build-fix.patch:
+    - Fix build on 64 bit platforms
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Thu, 04 Dec 2008 00:46:53 +0000
+
+empathy (2.25.2-1ubuntu1) jaunty; urgency=low
+
+  * Merge from debian experimental, remaining changes:
+    - debian/patches/01fixtabbehavour.diff: Change behaviour of tabs in chat
+      dialogs
+    - Add Recommends on telepathy-butterfly and telepathy-haze
+    - Add Suggests on telepathy-idle
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Mon, 01 Dec 2008 22:20:36 +0100
+
+empathy (2.25.2-1) experimental; urgency=low
+
+  * New upstream release.
+    - Bump libtelepathy-glib-dev build-dep and add libgnomeui-dev
+    - Bump soname of libempathy
+
+ -- Laurent Bigonville <bigon@debian.org>  Mon, 01 Dec 2008 21:35:56 +0100
+
+empathy (2.24.1-1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian experimental, remaining changes:
+    - debian/patches/01fixtabbehavour.diff: Change behaviour of tabs in chat
+      dialogs
+    - Add Recommends on telepathy-butterfly and telepathy-haze
+    - Add Suggests on telepathy-idle
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Mon, 20 Oct 2008 21:48:50 +0200
+
+empathy (2.24.1-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Laurent Bigonville <bigon@debian.org>  Mon, 20 Oct 2008 21:12:27 +0200
+
+empathy (2.24.0-1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian experimental, remaining changes:
+    - debian/patches/01fixtabbehavour.diff: Change behaviour of tabs in chat
+      dialogs
+    - Add Recommends on telepathy-butterfly and telepathy-haze
+    - Add Suggests on telepathy-idle
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Mon, 22 Sep 2008 23:32:45 +0200
+
+empathy (2.24.0-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Laurent Bigonville <bigon@debian.org>  Mon, 22 Sep 2008 21:37:47 +0200
+
+empathy (2.23.92-1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/patches/01fixtabbehavour.diff: Change behaviour of tabs in chat
+      dialogs
+  * Re-add lost recommends and suggests on tp-butterfly, tp-haze and tp-idle
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Wed, 10 Sep 2008 00:09:14 +0200
+
+empathy (2.23.92-1) experimental; urgency=low
+
+  * New upstream release
+    - Adjust libempathy-gtk15.symbols
+  * Use my debian.org address in Uploaders
+
+ -- Laurent Bigonville <bigon@debian.org>  Tue, 09 Sep 2008 19:03:12 +0200
+
+empathy (2.23.91-0ubuntu1) intrepid; urgency=low
+
+  * New upstream release
+    - Adjust libempathy-gtk15.symbols
+  * Put the telepathy team as maintainer of the package
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Tue, 02 Sep 2008 19:48:54 +0200
+
+empathy (2.23.90-2) experimental; urgency=low
+
+  * debian/libempathy14.symbols: Fix version of an exported symbol
+  * Use rarian-compat and librarian-dev instead of scrollkeeper as build-dep
+  * Bump build-deps and remove libtelepathy-dev (not needed anymore)
+  * Remove --enable-voip flags (voip enabled by default), rename
+    --enable-aspell to --enable-spell
+  * Add explicit build-depends against libglib2.0-dev
+  * Install gnome help and omf files in empathy package
+
+ -- Laurent Bigonville <bigon@bigon.be>  Mon, 25 Aug 2008 08:04:11 +0200
+
+empathy (2.23.90-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Dafydd Harries <daf@debian.org>  Sun, 24 Aug 2008 22:03:36 +0100
+
+empathy (2.23.90-0ubuntu1) intrepid; urgency=low
+
+  * New upstream release, adjust symbols files
+  * Revert to cdbs instead of debhelper 7
+  * Move Scott James Remnant <scott@ubuntu.com> patch to debian/patches
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Wed, 20 Aug 2008 19:00:04 +0200
+
+empathy (2.23.6-0ubuntu8) intrepid; urgency=low
+
+  * Finally got something like the effect I was after.
+
+ -- Scott James Remnant <scott@ubuntu.com>  Mon, 18 Aug 2008 12:01:35 +0100
+
+empathy (2.23.6-0ubuntu7) intrepid; urgency=low
+
+  * Err, it wasn't a homogenous tabs problem, it was simply a packing
+    problem.
+
+ -- Scott James Remnant <scott@ubuntu.com>  Mon, 18 Aug 2008 11:42:55 +0100
+
+empathy (2.23.6-0ubuntu6) intrepid; urgency=low
+
+  * Don't use homogeneous tabs in the chat window.
+
+ -- Scott James Remnant <scott@ubuntu.com>  Mon, 18 Aug 2008 10:32:43 +0100
+
+empathy (2.23.6-0ubuntu5) intrepid; urgency=low
+
+  * Install gnome help and omf files in empathy package (LP: #257189)
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Thu, 14 Aug 2008 18:53:35 +0200
+
+empathy (2.23.6-0ubuntu4) intrepid; urgency=low
+
+  * Demotte telepathy-idle to Suggests
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Mon, 11 Aug 2008 23:37:22 +0200
+
+empathy (2.23.6-0ubuntu3) intrepid; urgency=low
+
+  * Add telepathy-idle as recommends for the empathy package (LP: #256783)
+
+ -- David Futcher <bobbo@ubuntu.com>  Mon, 11 Aug 2008 16:34:16 +0100
+
+empathy (2.23.6-0ubuntu2) intrepid; urgency=low
+
+  * Add telepathy-butterfly and telepathy-haze as recommends for the empathy
+    package
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Fri, 08 Aug 2008 17:02:45 +0200
+
+empathy (2.23.6-0ubuntu1) intrepid; urgency=low
+
+  * New upstream release
+  * Drop debian/patches/00_mark_unknown_presence_id_as_unset.patch: applied
+    upstream
+  * Use rarian-compat and librarian-dev instead of scrollkeeper as build-dep
+  * Bump debhelper compat to 7
+  * Use new dh mechanism instead of cdbs
+  * Bump build-deps and remove libtelepathy-dev (not needed anymore)
+  * Remove --enable-voip flags (voip enabled by default), rename
+    --enable-aspell to --enable-spell
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Fri, 08 Aug 2008 16:15:17 +0200
+
+empathy (0.23.4-1) experimental; urgency=low
+
+  [ Laurent Bigonville ]
+  * Bump Standards-Version to 3.8.0 (no further changes)
+
+  [ Sjoerd Simons ]
+  * New upstream release
+  * Bumped soname of libempathy-gtk again and update symbols file
+  * Add a version depend on telepathy-glib-dev matching the configure.ac
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Sat, 02 Aug 2008 22:08:58 +0100
+
+empathy (0.23.3-3) unstable; urgency=low
+
+  * Use my debian.org address in Uploaders
+  * debian/patches/00empathy_486683.patch: Fix crash when adding SIP contacts
+    (Closes: #486683)
+
+ -- Laurent Bigonville <bigon@debian.org>  Sat, 25 Oct 2008 00:30:02 +0200
+
+empathy (0.23.3-2) unstable; urgency=low
+
+  * Add recommend on gvfs-backends. These are used for the url handlers in the
+    chat window.
+  * debian/patches/00_mark_unknown_presence_id_as_unset.patch
+    + Added. Mark presence as unknown when the presence string isn't
+    recognized
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Sat, 02 Aug 2008 19:56:46 +0100
+
+empathy (0.23.3-1ubuntu2) intrepid; urgency=low
+
+  * Also pass --disable-scrollkeeper to configure.
+    (fixes FTBFS, LP: #247720, #253295)
+
+ -- Michael Bienia <geser@ubuntu.com>  Wed, 30 Jul 2008 16:36:27 +0200
+
+empathy (0.23.3-1ubuntu1) intrepid; urgency=low
+
+  * libempathy-gtk/empathy-ui-utils.c, src/empathy-status-icon.c:
+    - Add format "%s" to function calls. Fixes FTBFS caused by default compiler
+      flags (error: format not a string literal and no format arguments)
+  * Modify Maintainer value to match the DebianMaintainerField specification.
+
+ -- Albin Tonnerre <lutin@ubuntu.com>  Thu, 19 Jun 2008 12:33:47 +0200
+
+empathy (0.23.3-1) unstable; urgency=low
+
+  [ Sjoerd Simons ]
+  * New upstream release (0.23.3)
+  * Bump libempathy and libempathy-gtk sonames
+  * debian/*.symbols: Remove the debian version number from all symbols
+
+  [ Laurent Bigonville ]
+  * New upstream release (0.23.2)
+    - Bump libempathy and libempathy-gtk soname and fix symbols files
+  * Add dbus-x11 dependency on empathy package (Closes: #480486)
+  * Add licence information about files libempathy-gtk/totem-subtitle-encoding.c
+    and libempathy-gtk/totem-subtitle-encoding.h
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Fri, 06 Jun 2008 17:14:31 +0100
+
+empathy (0.23.1-1) unstable; urgency=low
+
+  [ Laurent Bigonville ]
+  * debian/control: Add telepathy-stream-engine as a recommends for empathy
+    package
+
+  [ Sjoerd Simons ]
+  * New upstream release
+  * debian/control: Add conflict with older version of stream-engine
+  * debian/patches/00_fix_python_bindings.patch:
+    - Removed. Fixed upstream
+  * debian/patches/01_remove_unused_code.patch:
+    - Removed. Fixed upstream
+  * Bump libempathy and libempathy-gtk soname
+  * debian/control: Add build-depend on gnome-doc-utils
+
+  [ Simon McVittie ]
+  * Use my debian.org address in Uploaders
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Thu, 01 May 2008 11:42:57 +0200
+
+empathy (0.22.1-1) unstable; urgency=low
+
+  * debian/rules, debian/empathy.install: Enable VOIP support
+  * debian/empathy.install: Chat handler is now part of the main empathy
+    process
+  * debian/patches/00_fix_python_bindings.patch:
+    + Added. Don't try to import objects that don't exist anymore (from
+      upstream git) (Closes: #474260)
+  * debian/patches/01_remove_unused_code.patch:
+    + Added. Remove unused code. Fixes compilation errors with Gcc 4.3
+      (Closes: #466817)
+  * debian/libempathy-gtk11.symbols, debian/libempathy-gtk11.shlibs: Update
+    symbols and shlibs
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Sun, 06 Apr 2008 23:33:50 +0200
+
+empathy (0.22.0-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Mon, 10 Mar 2008 16:39:07 +0100
+
+empathy (0.21.91-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/patches/00_set_null_presence_message.patch:
+    - Removed. Merged upstream
+  * debian/control: Add xsltproc to build-depends
+  * Bump libempathy and libempathy-gtk soname to 11
+  * debian/control: Bump libtelepathy-dev build-depend to 0.3.1
+  * debian/libempathy-common.install: Add irc network definitions
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Mon, 03 Mar 2008 20:45:26 +0100
+
+empathy (0.21.90-2) unstable; urgency=low
+
+  * debian/*.symbols: Remove the debian versioning
+  * debian/patches/00_set_null_presence_message.patch:
+    - Added. If there is no presence-message, (re)set it to NULL. So the UI
+      can choose the right default message
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Sun, 10 Feb 2008 12:46:53 +0100
+
+empathy (0.21.90-1) unstable; urgency=low
+
+  * New upstream release
+  * Removed patches merge upstream:
+    - debian/patches/fix-pyftbfs.patch
+    - debian/patches/accounts-icons-path.patch
+  * Bump sonames for libempathy and libempathy-gtk
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Sat, 09 Feb 2008 23:25:59 +0100
+
+empathy (0.21.5.2-1) unstable; urgency=low
+
+  [ Laurent Bigonville ]
+  * New upstream release (0.21.5.2)
+  * Add XS-Dm-Upload-Allowed: yes, really
+  * Bump libmissioncontrol-client-dev build-dep version
+  * Bump soname of libempathy-gtk
+  * Drop debian/msn-haze.profile: merged upstream
+  * debian/patches/fix-pyftbfs.patch: Fix FTBFS of the python binding
+    (taken from upstream)
+  * debian/patches/accounts-icons-path.patch: Fix search path for icons (taken
+    from upstream)
+  * debian/rules: remove installed test program
+
+  [ Sjoerd Simons ]
+  * Add symbol files for libempathy and libempathy-gtk
+  * libempathy7: Bumped shlibs
+  * debian/libempathy-common.install: Install empathy-log-manager.xsl
+  * debian/libempathy-common, debian/libempathy-gtk-common.install: Install
+    empathy-chatroom-manager.dtd in libempathy-common instead of
+    libempathy-gtk-common
+  * debian/control: Let libempathy-common conflict with older versions of
+    libempathy-gtk-common
+  * debian/rules: Disable the building of tests
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Mon, 21 Jan 2008 20:28:49 +0100
+
+empathy (0.21.4-1) unstable; urgency=low
+
+  [ Laurent Bigonville ]
+  * New upstream release
+  * Bump Standards-Version to 3.7.3, no further changes.
+
+  [ Sjoerd Simons ]
+  * debian/patches/fix_setting_avatar.patch
+    - Added. Fix setting avatars
+  * debian/patches/listen_to_presence_changed.patch
+    - Added. Listen to the PresenceChanged signal from the MC instead of the
+      deprecated PresenceStatusActual.
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Sat, 05 Jan 2008 19:06:01 +0100
+
+empathy (0.21.3-1) unstable; urgency=low
+
+  * New upstream release
+  * Add XS-Dm-Upload-Allowed: yes
+  * Bump soname of both libraries
+  * Drop debian/patches/00_configure.patch: applied upstream
+  * Make -common packages arch:all and let the libs depends on
+    ${source:Version} of their respective -common packages again.
+  * Let the -dev packages depends on ${binary:Version} of their
+    respective lib packages.
+
+ -- Laurent Bigonville <bigon@bigon.be>  Tue, 04 Dec 2007 00:00:31 +0100
+
+empathy (0.21.2-2) unstable; urgency=low
+
+  * debian/patches/00_configure.patch
+    - Added. Use the pkg-config file for X11 to get the right linker arguments
+      Fixes FTBFS (Closes: #451902)
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Wed, 21 Nov 2007 20:59:11 +0100
+
+empathy (0.21.2-1) unstable; urgency=low
+
+  [ Laurent Bigonville ]
+  * New upstream release, bump soname for both libraries
+  * Drop debian/patch/add-haze-profiles.patch and add debian/msn-haze.profile
+    to avoid patching autofoo, installing it via debian/rules
+  * debian/empathy.install: empathy.desktop is now installed in
+    /etc/xdg/autostart/
+  * debian/libempathy-gtk-common.install:
+    - Also install icons that are under /usr/share/empathy/icons/
+  * debian/control:
+    - Add gnome-icon-theme to libempathy-gtk-common dependencies
+    - Bump libmissioncontrol-client-dev build-dep version
+  * Add manpages for empathy and empathy-account,
+    thanks to Simon McVittie <smcv@ianadd.pseudorandom.co.uk> (Closes: #448620)
+  * Use now official Vcs-* field
+  * Install empathy-chat-chandler in /usr/lib/empathy/
+  * Disable voip support and remove recommends for tp-se, not stable enough yet
+  * Install .desktop file in /usr/share/applications
+
+  [ Sjoerd Simons ]
+  * debian/control: Let the libs depend on ${binary:Version} of their
+    respective -common packages.
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Fri, 16 Nov 2007 11:03:08 +0100
+
+empathy (0.14-1ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes: (LP: #89431)
+    - Depends: telepathy-gabble | telepathy-connection-manager,
+    - Suggests: telepathy-core.
+    - Change Conflicts and Replaces accordingly
+    - Change bzr url to the Ubuntu branch
+  * Drop debian/patches/no-date-crash.patch and
+    debian/patches/search-contact-list.patch: applied upstream
+  * debian/patches/add-haze-profiles.patch: use debian one
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Wed, 24 Oct 2007 12:23:47 +0200
+
+empathy (0.14-1) unstable; urgency=low
+
+  [ Loic Minier ]
+  * Fix typo in control.
+
+  [ Laurent Bigonville ]
+  * New upstream version
+    - Drop debian/patches/disable-voip.patch, applied upstream
+  * Enable VOIP and add telepathy-stream-engine to Recommends
+
+ -- Laurent Bigonville <bigon@bigon.be>  Mon, 01 Oct 2007 18:46:11 +0200
+
+empathy (0.13-1) unstable; urgency=low
+
+  [ Laurent Bigonville ]
+  * New upstream release, bump soname for libempathy and libempathy-gtk
+    - Drop build-dep on libgnomeui-dev
+    - Add build-dep on libpanel-applet2-dev
+    - Bump build-dep version of libgtk2.0-dev
+    - Build and install the megaphone applet
+    - Add libtelepathy-dev as build-dep
+  * Fix typo in libempathy-dev description
+  * debian/patches/add-haze-profiles.patch: ship .profile files to support
+    telepathy-haze (Closes: #444032)
+
+  [ Sjoerd Simons ]
+  * debian/patches/disable-voip.patch: Disable voip user interface elements as
+    their noops in this version.
+  * debian/copyright: Updated
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Sat, 29 Sep 2007 18:41:39 +0200
+
+empathy (0.12-2ubuntu2) gutsy; urgency=low
+
+  * debian/control: Fix typo => telepathy-core (LP: #146415)
+
+ -- Laurent Bigonville <bigon@bigon.be>  Fri, 28 Sep 2007 20:28:26 +0200
+
+empathy (0.12-2ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable, remaining Ubuntu changes: (LP: #138027)
+    - Add profiles for haze support
+    - Depends: telepathy-gabble | telepathy-connection-manager,
+    - Suggests: telepaty-core.
+  * Add debian/patches/no-date-crash.patch: Fix crash if there is no date in
+    conversation (Taken from upstream)
+  * Add debian/patches/search-contact-list.patch: Fix search function in
+    contact list (Taken from upstream)
+  * Fix typo in libempathy-dev description
+  * Change Conflicts and Replaces accordingly
+  * Change bzr url to the Ubuntu branch
+
+ -- Laurent Bigonville <bigon@bigon.be>  Mon, 10 Sep 2007 17:12:54 +0200
+
+empathy (0.12-2) unstable; urgency=low
+
+  * debian/control: Let the -common packages conflict and replace the old
+    empathy
+  * debian/control: Let libempathy-gtk-dev depends on libglade2-dev instead of
+    libglade-dev
+  * debian/control: Tighten depends of libempathy-gtk-dev a bit more
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Sat, 08 Sep 2007 21:00:58 +0200
+
+empathy (0.12-1) unstable; urgency=low
+
+  [ Sjoerd Simons ]
+  * New upstream release
+  * Conflict with cohoba and gossip-telepathy
+
+  [ Laurent Bigonville ]
+  * debian/control:
+    - Add myself as Uploaders
+    - Add libaspell-dev and iso-codes as build-dep and enable spellchecker
+    - Add XS-Vcs-Bzr field
+    - Bump mission-control build-dep
+    - Remove unneeded libmissioncontrol-sever builddep and rename
+      libmissioncontrol-dev to libmissioncontrol-client-dev
+
+  [ Loic Minier ]
+  * Tweak copyright.
+  * Wrap build-deps and deps.
+  * Use HTTP in watch file.
+  * Include CDBS' utils.mk.
+
+  [ Sjoerd Simons ]
+  * Added build-depend on libebook1.2-dev
+  * Split up empathy into a whole slew of packages
+  * Set linker flags to  -Wl,-z,defs -Wl,-O1
+  * debian/rules: Call dh_pysupport on python-empathy
+  * debian/control, debian/rules: Explicitely enable the python bindings
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Sat, 25 Aug 2007 18:41:08 +0200
+
+empathy (0.12-0ubuntu2) gutsy; urgency=low
+
+  * debian/control:
+    - Depends: telepathy-gabble | telepathy-connection-manager (LP: #137689),
+    - Suggests: telepaty-core.
+
+ -- Daniel Holbach <daniel.holbach@ubuntu.com>  Thu, 06 Sep 2007 09:18:01 +0200
+
+empathy (0.12-0ubuntu1) gutsy; urgency=low
+
+  * Fake sync with not yet published version
+
+ -- Laurent Bigonville <bigon@bigon.be>  Sat, 25 Aug 2007 01:02:43 +0200
+
+empathy (0.10-0ubuntu2) gutsy; urgency=low
+
+  * Add profiles for haze support
+
+ -- Matthew Garrett <mjg59@srcf.ucam.org>  Tue, 21 Aug 2007 19:19:41 +0100
+
+empathy (0.10-0ubuntu1) gutsy; urgency=low
+
+  * New upstream release
+
+ -- Baptiste Mille-Mathias <baptiste.millemathias@gmail.com>  Mon, 30 Jul 2007 18:49:02 +0200
+
+empathy (0.8-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - debian/control: add libaspell-dev, iso-codes to Build-Depends
+    - debian/rules: --enable-aspell
+    - Update Maintainer field to match Debian-Maintainer-Spec
+
+ -- Vincent Legout <bixente44@gmail.com>  Tue,  3 Jul 2007 11:56:56 +0200
+
+empathy (0.8-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Sat, 23 Jun 2007 14:45:31 +0100
+
+empathy (0.8-0ubuntu1) gutsy; urgency=low
+
+  * New upstream release:
+    - Fixed contact list handling.
+    - Make use of NetworkManager to set presence to OFFILE when we are
+      disconnected and restore presence once we are reconnected.
+    - UI for searching in conversation history and to view all conversations
+      with a given contact.
+    - Do not use 2 different processes (empathy and empathy-chat), merge them
+      into one client. This is easier for debugging and share data.
+    - Do not create log directory for a chat if there is no messages to put
+      in.
+    - Do not set active contacts when creating the store, and when contact
+      groups changed.
+    - Fix warning when using command-line options.
+    - Ignore ssl errors by default. This is needed to connect jabber accounts
+      using ssl.
+    - Adding spellcheck support using aspell.
+    - Lots of bugs fixed.
+  * debian/control: add libaspell-dev, iso-codes to Build-Depends.
+  * debian/rules: --enable-aspell.
+
+ -- Daniel Holbach <daniel.holbach@ubuntu.com>  Thu, 21 Jun 2007 22:43:45 +0200
+
+empathy (0.7-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Mon, 11 Jun 2007 10:31:19 +0200
+
+empathy (0.6-1) unstable; urgency=low
+
+  [ Dafydd Harries ]
+  * Add watch file.
+
+  [ Sjoerd Simons ]
+  * New upstream release
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Mon, 04 Jun 2007 09:27:47 +0200
+
+empathy (0.5-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Sat, 26 May 2007 19:02:41 +0200
+
+empathy (0.4-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Sun, 20 May 2007 15:31:42 +0200
+
+empathy (0.3-1) unstable; urgency=low
+
+  * Initial release
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Mon, 14 May 2007 22:32:24 +0200
+
--- empathy-2.30.2.orig/debian/empathy.install
+++ empathy-2.30.2/debian/empathy.install
@@ -0,0 +1,5 @@
+usr/bin/
+etc/gconf/schemas/empathy.schemas
+usr/share/applications/
+usr/share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service
+usr/share/telepathy/clients/Empathy.client
--- empathy-2.30.2.orig/debian/README.source
+++ empathy-2.30.2/debian/README.source
@@ -0,0 +1,58 @@
+Patches
+=======
+
+This package uses cdbs simple-patch-system to store modifications to the
+upstream source.
+
+To get the fully patched source: make -f debian/rules patch
+
+To revert to what's in git: make -f debian/rules unpatch
+
+To add a patch: obtain a diff and put it in debian/patches, or see below
+
+To remove an existing patch: delete it from debian/patches
+
+Packaging using git
+===================
+
+The repository contains an appropriate debian/gbp.conf to build this package
+using git-buildpackage. The debian branch contains the latest upstream versions
+(for unstable, or experimental while a freeze is in progress). The debian-lenny
+branch contains versions targeted for lenny, etc.
+
+Here's how to build it:
+
+    git clone git://git.debian.org/git/pkg-telepathy/empathy.git
+    cd empathy
+    git checkout debian
+    git-buildpackage -us -uc
+
+or for testing/stable branches like debian-lenny:
+
+    git clone git://git.debian.org/git/pkg-telepathy/empathy.git
+    cd empathy
+    git checkout debian-lenny
+    git-buildpackage -us -uc --git-debian-branch=debian-lenny
+
+The branch 'upstream' is a copy of the contents of upstream tarballs. To import
+upstream tarballs use:
+
+    git checkout debian
+    git-import-orig ~/empathy-2.x.tar.gz
+
+The branch 'debian-patches' is 'upstream' plus any patches needed for Debian.
+It should be rebased on 'upstream' after each upstream release:
+
+    git checkout debian-patches
+    git rebase upstream
+
+The preferred way of adding patches is to cherry pick from an upstream
+repository:
+
+    git remote add collabora \
+        git+ssh://git.collabora.co.uk/git/empathy.git
+    git fetch
+    git checkout debian-patches
+    git cherry-pick xxxxxxxxxxxxxx
+    git checkout debian
+    fakeroot debian/rules update-patches
--- empathy-2.30.2.orig/debian/empathy.manpages
+++ empathy-2.30.2/debian/empathy.manpages
@@ -0,0 +1,2 @@
+debian/empathy.1
+debian/empathy-accounts.1
--- empathy-2.30.2.orig/debian/copyright
+++ empathy-2.30.2/debian/copyright
@@ -0,0 +1,115 @@
+This package was debianized by Sjoerd Simons <sjoerd@debian.org> on
+Mon, 14 May 2007 22:32:24 +0200.
+
+It was downloaded from:
+ http://ftp.gnome.org/pub/GNOME/sources/empathy/
+
+Upstream Authors:
+ Xavier Claessens <xclaesse@gmail.com>
+ Richard Hult <richard@imendio.com>
+ Michael Hallendal <micke@imendio.com>
+ Martyn Russell <martyn@imendio.com>
+ Raphaël Slinckx <raphael@slinckx.net>
+
+Files: *
+Copyright:
+ Copyright (C) 2000 Eazel, Inc.
+ Copyright (C) 2000-2005 Paolo Maggi
+ Copyright (C) 2002-2003 Jeroen Zwartepoorte
+ Copyright (C) 2002-2004 Marco Presenti Gritti
+ Copyright (C) 2002-2006 Imendio AB
+ Copyright (C) 2003-2004 Xan Lopez
+ Copyright (C) 2003 Bastien Nocera <hadess@hadess.net>
+ Copyright (C) 2004 Red Hat, Inc.
+ Copyright (C) 2004-2005 Martyn Russel
+ Copyright (C) 2004-2006 Christian Persch
+ Copyright (C) 2006 Xavier Claessens
+ Copyright (C) 2007-2008 Marco Barisione <marco@barisione.org>
+ Copyright (C) 2007 Raphael Slinckx <raphael@slinckx.net>
+ Copyright (C) 2007 Guillaume Desmottes
+ Copyright (C) 2007-2009 Collabora Ltd.
+License: GPL-2+
+ On Debian systems, the complete text of the GPL-2 can be found in
+ /usr/share/common-licenses/GPL-2.
+
+Files: libempathy-gtk/empathy-avatar-chooser.*
+Copyright:
+ Copyright (C) 2006-2007 Imendio AB.
+ Copyrihgt (C) 2007-2008 Collabora Ltd.
+License: GPL-2
+ On Debian systems, the complete text of the GPL-2 can be found in
+ /usr/share/common-licenses/GPL-2.
+
+Files: src/empathy-status-icon.*, src/empathy-event-manager.*,
+ src/empathy-tube-dispatch.*, src/empathy-call-window.*,
+ libempathy-gtk/empathy-video-src.*, libempathy-gtk/empathy-audio-src.*,
+ libempathy/empathy-call-factory.*, libempathy/empathy-tp-contact-list.*,
+ libempathy/empathy-dispatcher.*, libempathy/empathy-tp-file.*,
+ libempathy/empathy-irc-network-manager.*, libempathy/empathy-tp-call.*,
+ libempathy/empathy-tp-tube.*, libempathy/empathy-idle.*,
+ libempathy/empathy-debug.*, libempathy/empathy-account-manager.*,
+ libempathy/empathy-contact-factory.*, libempathy/empathy-tp-roomlist.*,
+ libempathy/empathy-contact-monitor.*, libempathy/empathy-tp-group.*,
+ libempathy/empathy-contact-manager.*, libempathy/empathy-tube-handler.*,
+ libempathy/empathy-tp-contact-factory.*, libempathy/empathy-contact-list.*,
+ libempathy/empathy-irc-server.*, libempathy/empathy-tp-chat.*,
+ libempathy/empathy-chatroom.*, libempathy/empathy-call-handler.*,
+ libempathy/empathy-dispatch-operation.*, libempathy-gtk/empathy-contact-dialogs.*,
+ libempathy-gtk/empathy-contact-selector.*, libempathy-gtk/empathy-contact-widget.*,
+ libempathy-gtk/empathy-profile-chooser.*, libempathy-gtk/empathy-audio-sink.*,
+ libempathy-gtk/empathy-cell-renderer-activatable.*, libempathy-gtk/empathy-account-widget-irc.*,
+ libempathy-gtk/empathy-account-widget-sip.*, libempathy-gtk/empathy-video-src.*,
+ libempathy-gtk/empathy-smiley-manager.*, libempathy-gtk/empathy-irc-network-dialog.*,
+ libempathy-gtk/empathy-contact-menu.*, libempathy-gtk/totem-subtitle-encoding.*,
+ libempathy-gtk/empathy-video-widget.*, libempathy-gtk/empathy-new-message-dialog.*,
+ libempathy-gtk/empathy-audio-src.*, tools/*
+Copyright:
+ Copyright (C) 2007-2009 Collabora Ltd.
+ Copyright (C) 2007 Xavier Claessens <xclaesse@gmail.com>
+ Copyright (C) 2007 Elliot Fairweather
+ Copyright (C) 2007 Nokia Corporation
+ Copyright (C) 2007 Marco Barisione <marco@barisione.org>
+ Copyright (C) 2007-2008 Guillaume Desmottes
+ Copyright (C) 2007 Raphael Slinckx <raphael@slinckx.net>
+ Copyright (C) 2001-2006 Bastien Nocera <hadess@hadess.net>
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2.1 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
+Files: po/*
+Copyright:
+ Copyright 2002-2006 Free Software Foundation, Inc.
+ Copyright 2002-2003 Richard Hult <richard@imendio.com>
+ Copyright 2003-2004 Christian Rose <menthos@menthos.com>
+ Copyright 2006 Daniel Nylander <po@danielnylander.se>
+License: GPL-2
+ On Debian systems, the complete text of the GPL-2 can be found in
+ /usr/share/common-licenses/GPL-2.
+
+Files: help/*
+Copyright:
+ Copyright 2008 Daniel Dylander <po@danielnylander.se>
+ Copyright 2008-2009 Ubuntu Documentation Project
+ Copyright 2008 Lucas Lommer <llommer@svn.gnome.org>
+ Copyright 2008 Joan Duran <jodufi@gmail.com>
+ Copyright 2008 Mario Blattermann <mario.blaettermann@t-online.de>
+ Copyright 2008 Philipp Kerling <k.philipp@gmail.com>
+ Copyright 2008-2009 Jorge Gonzalez <jorgengonz@svn.gnome.org>
+ Copyright 2008 Marc Vellet <marc.meillet@globetrotter.net>
+ Copyright 2008 Bruno Brouard <annoa.b@gmail.com>
+ Copyright 2008 Claude Paroz <claude@2xlibre.net>
+ Copyright 2008 Никита Белобров <qvzqvz@gmail.com>
+License: GFDL-1.1+
+ Permission is granted to copy, distribute and/or modify this document under
+ the terms of the GNU Free Documentation License, Version 1.1 or any later
+ version published by the Free Software Foundation; with no Invariant
+ Sections, no Front-Cover Texts, and no Back-Cover Texts.
+ .
+ On Debian systems, the complete text of the GFDL-1.2 can be found in
+ /usr/share/common-licenses/GFDL-1.2.
+
+Files: debian/*
+Copyright: Copyright 2007-2009 Sjoerd Simons <sjoerd@debian.org>
+License: GPL-2+
+ On Debian systems, the complete text of the GPL-2 can be found in
+ /usr/share/common-licenses/GPL-2.
--- empathy-2.30.2.orig/debian/compat
+++ empathy-2.30.2/debian/compat
@@ -0,0 +1 @@
+7
--- empathy-2.30.2.orig/debian/patches/90_revert_removal_stock_person.patch
+++ empathy-2.30.2/debian/patches/90_revert_removal_stock_person.patch
@@ -0,0 +1,107 @@
+diff -Nur -x '*.orig' -x '*~' empathy-2.30.1.1//libempathy-gtk/empathy-avatar-chooser.c empathy-2.30.1.1.new//libempathy-gtk/empathy-avatar-chooser.c
+--- empathy-2.30.1.1//libempathy-gtk/empathy-avatar-chooser.c	2010-06-09 15:28:50.000000000 +0200
++++ empathy-2.30.1.1.new//libempathy-gtk/empathy-avatar-chooser.c	2010-06-14 20:20:53.543660552 +0200
+@@ -34,7 +34,6 @@
+ 
+ #include "empathy-avatar-chooser.h"
+ #include "empathy-conf.h"
+-#include "empathy-images.h"
+ #include "empathy-ui-utils.h"
+ 
+ #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
+@@ -591,8 +590,7 @@
+ 		priv->avatar = NULL;
+ 	}
+ 
+-	image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_AVATAR_DEFAULT,
+-		GTK_ICON_SIZE_DIALOG);
++	image = gtk_image_new_from_icon_name ("stock_person", GTK_ICON_SIZE_DIALOG);
+ 	gtk_button_set_image (GTK_BUTTON (chooser), image);
+ 	g_signal_emit (chooser, signals[CHANGED], 0);
+ }
+diff -Nur -x '*.orig' -x '*~' empathy-2.30.1.1//libempathy-gtk/empathy-images.h empathy-2.30.1.1.new//libempathy-gtk/empathy-images.h
+--- empathy-2.30.1.1//libempathy-gtk/empathy-images.h	2010-06-14 20:19:40.403646653 +0200
++++ empathy-2.30.1.1.new//libempathy-gtk/empathy-images.h	2010-06-14 20:20:56.003647490 +0200
+@@ -41,7 +41,6 @@
+ #define EMPATHY_IMAGE_VIDEO_CALL          "camera-web"
+ #define EMPATHY_IMAGE_LOG                 "document-open-recent"
+ #define EMPATHY_IMAGE_DOCUMENT_SEND       "document-send"
+-#define EMPATHY_IMAGE_AVATAR_DEFAULT      "avatar-default"
+ 
+ G_END_DECLS
+ 
+diff -Nur -x '*.orig' -x '*~' empathy-2.30.1.1//libempathy-gtk/empathy-theme-adium.c empathy-2.30.1.1.new//libempathy-gtk/empathy-theme-adium.c
+--- empathy-2.30.1.1//libempathy-gtk/empathy-theme-adium.c	2010-06-08 16:45:12.000000000 +0200
++++ empathy-2.30.1.1.new//libempathy-gtk/empathy-theme-adium.c	2010-06-14 20:20:56.731647212 +0200
+@@ -41,7 +41,6 @@
+ #include "empathy-ui-utils.h"
+ #include "empathy-plist.h"
+ #include "empathy-string-parser.h"
+-#include "empathy-images.h"
+ 
+ #define DEBUG_FLAG EMPATHY_DEBUG_CHAT
+ #include <libempathy/empathy-debug.h>
+@@ -492,7 +491,7 @@
+ 		if (!avatar_filename) {
+ 			if (!priv->data->default_avatar_filename) {
+ 				priv->data->default_avatar_filename =
+-					empathy_filename_from_icon_name (EMPATHY_IMAGE_AVATAR_DEFAULT,
++					empathy_filename_from_icon_name ("stock_person",
+ 									 GTK_ICON_SIZE_DIALOG);
+ 			}
+ 			avatar_filename = priv->data->default_avatar_filename;
+diff -Nur -x '*.orig' -x '*~' empathy-2.30.1.1//src/empathy-call-window.c empathy-2.30.1.1.new//src/empathy-call-window.c
+--- empathy-2.30.1.1//src/empathy-call-window.c	2010-06-09 15:28:50.000000000 +0200
++++ empathy-2.30.1.1.new//src/empathy-call-window.c	2010-06-14 20:20:57.223666557 +0200
+@@ -44,7 +44,6 @@
+ #include <libempathy-gtk/empathy-ui-utils.h>
+ #include <libempathy-gtk/empathy-sound.h>
+ #include <libempathy-gtk/empathy-geometry.h>
+-#include <libempathy-gtk/empathy-images.h>
+ 
+ #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
+ #include <libempathy/empathy-debug.h>
+@@ -1107,8 +1106,8 @@
+ 
+   if (pixbuf_avatar == NULL)
+     {
+-      pixbuf_avatar = empathy_pixbuf_from_icon_name_sized (
+-          EMPATHY_IMAGE_AVATAR_DEFAULT, size);
++      pixbuf_avatar = empathy_pixbuf_from_icon_name_sized ("stock_person",
++          size);
+     }
+ 
+   gtk_image_set_from_pixbuf (GTK_IMAGE (image_widget), pixbuf_avatar);
+diff -Nur -x '*.orig' -x '*~' empathy-2.30.1.1//src/empathy-call-window.ui empathy-2.30.1.1.new//src/empathy-call-window.ui
+--- empathy-2.30.1.1//src/empathy-call-window.ui	2010-06-07 14:12:53.000000000 +0200
++++ empathy-2.30.1.1.new//src/empathy-call-window.ui	2010-06-14 20:20:57.680701459 +0200
+@@ -177,7 +177,7 @@
+               <object class="GtkToggleToolButton" id="camera_preview">
+                 <property name="visible">True</property>
+                 <property name="label" translatable="yes">Preview</property>
+-                <property name="icon_name">avatar-default</property>
++                <property name="icon_name">stock_person</property>
+                 <property name="sensitive">True</property>
+                 <property name="tooltip_text" translatable="yes">Enable camera but don't send video</property>
+               </object>
+diff -Nur -x '*.orig' -x '*~' empathy-2.30.1.1//src/empathy-event-manager.c empathy-2.30.1.1.new//src/empathy-event-manager.c
+--- empathy-2.30.1.1//src/empathy-event-manager.c	2010-06-14 20:19:40.499646234 +0200
++++ empathy-2.30.1.1.new//src/empathy-event-manager.c	2010-06-14 20:20:58.119647420 +0200
+@@ -863,7 +863,7 @@
+             empathy_contact_get_name (contact));
+ 
+           event_manager_add (manager, contact, EMPATHY_EVENT_TYPE_PRESENCE,
+-              EMPATHY_IMAGE_AVATAR_DEFAULT, header, NULL, NULL, NULL, NULL);
++              "stock_person", header, NULL, NULL, NULL, NULL);
+         }
+     }
+   else
+@@ -879,7 +879,7 @@
+             empathy_contact_get_name (contact));
+ 
+           event_manager_add (manager, contact, EMPATHY_EVENT_TYPE_PRESENCE,
+-              EMPATHY_IMAGE_AVATAR_DEFAULT, header, NULL, NULL, NULL, NULL);
++              "stock_person", header, NULL, NULL, NULL, NULL);
+         }
+     }
+   g_free (header);
--- empathy-2.30.2.orig/debian/patches/91_git_fix_small_font.patch
+++ empathy-2.30.2/debian/patches/91_git_fix_small_font.patch
@@ -0,0 +1,24 @@
+From 2ef3eae87e929ed67ad4b36ff612dda60febedb4 Mon Sep 17 00:00:00 2001
+From: Xavier Claessens <xclaesse@gmail.com>
+Date: Tue, 22 Jun 2010 18:05:24 +0000
+Subject: Use document font by default for adium themes
+
+Fixes bug #622266
+---
+diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
+index ad174ce..e19a812 100644
+--- a/libempathy-gtk/empathy-theme-adium.c
++++ b/libempathy-gtk/empathy-theme-adium.c
+@@ -49,8 +49,8 @@
+ #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyThemeAdium)
+ 
+ /* GConf key containing current value of font */
+-#define EMPATHY_GCONF_FONT_KEY_NAME       "/desktop/gnome/interface/font_name"
+-#define BORING_DPI_DEFAULT                96
++#define EMPATHY_GCONF_FONT_KEY_NAME "/desktop/gnome/interface/document_font_name"
++#define BORING_DPI_DEFAULT 96
+ 
+ /* "Join" consecutive messages with timestamps within five minutes */
+ #define MESSAGE_JOIN_PERIOD 5*60
+--
+cgit v0.8.3.1
--- empathy-2.30.2.orig/debian/patches/99_autoreconf.patch
+++ empathy-2.30.2/debian/patches/99_autoreconf.patch
@@ -0,0 +1,723 @@
+diff -Nur -x '*.orig' -x '*~' empathy-2.30.1/config.h.in empathy-2.30.1.new/config.h.in
+--- empathy-2.30.1/config.h.in	2010-04-26 16:38:58.000000000 +0200
++++ empathy-2.30.1.new/config.h.in	2010-04-28 11:51:13.241819015 +0200
+@@ -57,6 +57,9 @@
+ /* Define if you have libchamplain */
+ #undef HAVE_LIBCHAMPLAIN
+ 
++/* Define if you have libindicate */
++#undef HAVE_LIBINDICATE
++
+ /* Define to 1 if you have the <locale.h> header file. */
+ #undef HAVE_LOCALE_H
+ 
+diff -Nur -x '*.orig' -x '*~' empathy-2.30.1/configure empathy-2.30.1.new/configure
+--- empathy-2.30.1/configure	2010-04-26 16:38:58.000000000 +0200
++++ empathy-2.30.1.new/configure	2010-04-28 11:51:12.896818187 +0200
+@@ -762,6 +762,10 @@
+ HAVE_NST_TRUE
+ NST_LIBS
+ NST_CFLAGS
++HAVE_LIBINDICATE_FALSE
++HAVE_LIBINDICATE_TRUE
++INDICATE_LIBS
++INDICATE_CFLAGS
+ HAVE_FAVOURITE_CONTACTS_FALSE
+ HAVE_FAVOURITE_CONTACTS_TRUE
+ TELEPATHY_LOGGER_LIBS
+@@ -1037,6 +1041,7 @@
+ enable_location
+ enable_meego
+ enable_favourite_contacts
++enable_libindicate
+ enable_nautilus_sendto
+ enable_control_center_embedding
+ enable_coding_style_checks
+@@ -1082,6 +1087,8 @@
+ MEEGO_LIBS
+ TELEPATHY_LOGGER_CFLAGS
+ TELEPATHY_LOGGER_LIBS
++INDICATE_CFLAGS
++INDICATE_LIBS
+ NST_CFLAGS
+ NST_LIBS
+ CONTROL_CENTER_EMBEDDING_CFLAGS
+@@ -1743,6 +1750,8 @@
+                           Enable meego widgets
+   --enable-favourite-contacts=@<:no/yes]
+                           Enable favourite contacts
++  --enable-libindicate=[no/yes/auto]
++                          build libindicate support
+   --enable-nautilus-sendto=[no/yes/auto]
+                           build nautilus-sendto plugin
+   --enable-control-center-embedding=[no/yes/auto]
+@@ -1837,6 +1846,10 @@
+               C compiler flags for TELEPATHY_LOGGER, overriding pkg-config
+   TELEPATHY_LOGGER_LIBS
+               linker flags for TELEPATHY_LOGGER, overriding pkg-config
++  INDICATE_CFLAGS
++              C compiler flags for INDICATE, overriding pkg-config
++  INDICATE_LIBS
++              linker flags for INDICATE, overriding pkg-config
+   NST_CFLAGS  C compiler flags for NST, overriding pkg-config
+   NST_LIBS    linker flags for NST, overriding pkg-config
+   CONTROL_CENTER_EMBEDDING_CFLAGS
+@@ -2656,6 +2669,8 @@
+ WEBKIT_REQUIRED=1.1.15
+ KEYRING_REQUIRED=2.22
+ NETWORK_MANAGER_REQUIRED=0.7.0
++INDICATE_REQUIRED=0.3.1
++INDICATE_GTK_REQUIRED=0.3.1
+ NAUTILUS_SENDTO_REQUIRED=2.28.1
+ 
+ # Use --enable-maintainer-mode to disabled deprecated symbols
+@@ -5866,13 +5881,13 @@
+ else
+   lt_cv_nm_interface="BSD nm"
+   echo "int some_variable = 0;" > conftest.$ac_ext
+-  (eval echo "\"\$as_me:5869: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:5884: $ac_compile\"" >&5)
+   (eval "$ac_compile" 2>conftest.err)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:5872: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:5887: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:5875: output\"" >&5)
++  (eval echo "\"\$as_me:5890: output\"" >&5)
+   cat conftest.out >&5
+   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+     lt_cv_nm_interface="MS dumpbin"
+@@ -7077,7 +7092,7 @@
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 7080 "configure"' > conftest.$ac_ext
++  echo '#line 7095 "configure"' > conftest.$ac_ext
+   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -8357,11 +8372,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:8360: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8375: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:8364: \$? = $ac_status" >&5
++   echo "$as_me:8379: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -8696,11 +8711,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:8699: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8714: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:8703: \$? = $ac_status" >&5
++   echo "$as_me:8718: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -8801,11 +8816,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:8804: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8819: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:8808: \$? = $ac_status" >&5
++   echo "$as_me:8823: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -8856,11 +8871,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:8859: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8874: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:8863: \$? = $ac_status" >&5
++   echo "$as_me:8878: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -11240,7 +11255,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 11243 "configure"
++#line 11258 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11336,7 +11351,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 11339 "configure"
++#line 11354 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -14712,6 +14727,7 @@
+    gstreamer-0.10
+    unique-1.0
+    gnome-keyring-1 >= \$KEYRING_REQUIRED
++   launchpad-integration
+ \""; } >&5
+   ($PKG_CONFIG --exists --print-errors "
+    glib-2.0 >= $GLIB_REQUIRED
+@@ -14727,6 +14743,7 @@
+    gstreamer-0.10
+    unique-1.0
+    gnome-keyring-1 >= $KEYRING_REQUIRED
++   launchpad-integration
+ ") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+@@ -14745,6 +14762,7 @@
+    gstreamer-0.10
+    unique-1.0
+    gnome-keyring-1 >= $KEYRING_REQUIRED
++   launchpad-integration
+ " 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -14772,6 +14790,7 @@
+    gstreamer-0.10
+    unique-1.0
+    gnome-keyring-1 >= \$KEYRING_REQUIRED
++   launchpad-integration
+ \""; } >&5
+   ($PKG_CONFIG --exists --print-errors "
+    glib-2.0 >= $GLIB_REQUIRED
+@@ -14787,6 +14806,7 @@
+    gstreamer-0.10
+    unique-1.0
+    gnome-keyring-1 >= $KEYRING_REQUIRED
++   launchpad-integration
+ ") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+@@ -14805,6 +14825,7 @@
+    gstreamer-0.10
+    unique-1.0
+    gnome-keyring-1 >= $KEYRING_REQUIRED
++   launchpad-integration
+ " 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -14838,6 +14859,7 @@
+    gstreamer-0.10
+    unique-1.0
+    gnome-keyring-1 >= $KEYRING_REQUIRED
++   launchpad-integration
+ "`
+         else
+ 	        EMPATHY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
+@@ -14854,6 +14876,7 @@
+    gstreamer-0.10
+    unique-1.0
+    gnome-keyring-1 >= $KEYRING_REQUIRED
++   launchpad-integration
+ "`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+@@ -14873,6 +14896,7 @@
+    gstreamer-0.10
+    unique-1.0
+    gnome-keyring-1 >= $KEYRING_REQUIRED
++   launchpad-integration
+ ) were not met:
+ 
+ $EMPATHY_PKG_ERRORS
+@@ -17030,6 +17054,136 @@
+ 
+ 
+ # -----------------------------------------------------------
++# libindicate
++# -----------------------------------------------------------
++# Check whether --enable-libindicate was given.
++if test "${enable_libindicate+set}" = set; then :
++  enableval=$enable_libindicate;
++else
++  enable_libindicate=auto
++fi
++
++
++if test "x$enable_libindicate" != "xno"; then
++
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for INDICATE" >&5
++$as_echo_n "checking for INDICATE... " >&6; }
++
++if test -n "$PKG_CONFIG"; then
++    if test -n "$INDICATE_CFLAGS"; then
++        pkg_cv_INDICATE_CFLAGS="$INDICATE_CFLAGS"
++    else
++        if test -n "$PKG_CONFIG" && \
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
++     indicate >= \$INDICATE_REQUIRED,
++     indicate-gtk >= \$INDICATE_GTK_REQUIRED
++   \""; } >&5
++  ($PKG_CONFIG --exists --print-errors "
++     indicate >= $INDICATE_REQUIRED,
++     indicate-gtk >= $INDICATE_GTK_REQUIRED
++   ") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
++  pkg_cv_INDICATE_CFLAGS=`$PKG_CONFIG --cflags "
++     indicate >= $INDICATE_REQUIRED,
++     indicate-gtk >= $INDICATE_GTK_REQUIRED
++   " 2>/dev/null`
++else
++  pkg_failed=yes
++fi
++    fi
++else
++	pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++    if test -n "$INDICATE_LIBS"; then
++        pkg_cv_INDICATE_LIBS="$INDICATE_LIBS"
++    else
++        if test -n "$PKG_CONFIG" && \
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
++     indicate >= \$INDICATE_REQUIRED,
++     indicate-gtk >= \$INDICATE_GTK_REQUIRED
++   \""; } >&5
++  ($PKG_CONFIG --exists --print-errors "
++     indicate >= $INDICATE_REQUIRED,
++     indicate-gtk >= $INDICATE_GTK_REQUIRED
++   ") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
++  pkg_cv_INDICATE_LIBS=`$PKG_CONFIG --libs "
++     indicate >= $INDICATE_REQUIRED,
++     indicate-gtk >= $INDICATE_GTK_REQUIRED
++   " 2>/dev/null`
++else
++  pkg_failed=yes
++fi
++    fi
++else
++	pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++        _pkg_short_errors_supported=yes
++else
++        _pkg_short_errors_supported=no
++fi
++        if test $_pkg_short_errors_supported = yes; then
++	        INDICATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
++     indicate >= $INDICATE_REQUIRED,
++     indicate-gtk >= $INDICATE_GTK_REQUIRED
++   "`
++        else
++	        INDICATE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
++     indicate >= $INDICATE_REQUIRED,
++     indicate-gtk >= $INDICATE_GTK_REQUIRED
++   "`
++        fi
++	# Put the nasty error message in config.log where it belongs
++	echo "$INDICATE_PKG_ERRORS" >&5
++
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++                have_libindicate="no"
++elif test $pkg_failed = untried; then
++	have_libindicate="no"
++else
++	INDICATE_CFLAGS=$pkg_cv_INDICATE_CFLAGS
++	INDICATE_LIBS=$pkg_cv_INDICATE_LIBS
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++	have_libindicate="yes"
++fi
++
++   if test "x$have_libindicate" = "xyes"; then
++
++$as_echo "#define HAVE_LIBINDICATE 1" >>confdefs.h
++
++   fi
++else
++   have_libindicate=no
++fi
++
++if test "x$enable_libindicate" = "xyes" -a "x$have_libindicate" != "xyes"; then
++   as_fn_error "Couldn't find libindicate." "$LINENO" 5
++fi
++
++ if test "x$have_libindicate" = "xyes"; then
++  HAVE_LIBINDICATE_TRUE=
++  HAVE_LIBINDICATE_FALSE='#'
++else
++  HAVE_LIBINDICATE_TRUE='#'
++  HAVE_LIBINDICATE_FALSE=
++fi
++
++
++# -----------------------------------------------------------
+ # nautilus-sendto
+ # -----------------------------------------------------------
+ # Check whether --enable-nautilus-sendto was given.
+@@ -17462,6 +17616,10 @@
+   as_fn_error "conditional \"HAVE_FAVOURITE_CONTACTS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
++if test -z "${HAVE_LIBINDICATE_TRUE}" && test -z "${HAVE_LIBINDICATE_FALSE}"; then
++  as_fn_error "conditional \"HAVE_LIBINDICATE\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
+ if test -z "${HAVE_NST_TRUE}" && test -z "${HAVE_NST_FALSE}"; then
+   as_fn_error "conditional \"HAVE_NST\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -19729,6 +19887,7 @@
+ 	Coding style checks.........:  ${ENABLE_CODING_STYLE_CHECKS}
+ 
+     Features:
++        Message indicator support (libindicate):  ${have_libindicate}
+ 	Spell checking (enchant)....:  ${have_enchant}
+ 	Display maps (libchamplain).:  ${have_libchamplain}
+ 	Location awareness (Geoclue):  ${have_geoclue}
+diff -Nur -x '*.orig' -x '*~' empathy-2.30.1/data/icons/Makefile.in empathy-2.30.1.new/data/icons/Makefile.in
+--- empathy-2.30.1/data/icons/Makefile.in	2010-04-26 16:38:59.000000000 +0200
++++ empathy-2.30.1.new/data/icons/Makefile.in	2010-04-28 11:51:14.105818990 +0200
+@@ -118,6 +118,8 @@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ HELP_DIR = @HELP_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff -Nur -x '*.orig' -x '*~' empathy-2.30.1/data/Makefile.in empathy-2.30.1.new/data/Makefile.in
+--- empathy-2.30.1/data/Makefile.in	2010-04-26 16:38:59.000000000 +0200
++++ empathy-2.30.1.new/data/Makefile.in	2010-04-28 11:51:14.033818358 +0200
+@@ -188,6 +188,8 @@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ HELP_DIR = @HELP_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff -Nur -x '*.orig' -x '*~' empathy-2.30.1/extensions/Makefile.in empathy-2.30.1.new/extensions/Makefile.in
+--- empathy-2.30.1/extensions/Makefile.in	2010-04-26 16:38:59.000000000 +0200
++++ empathy-2.30.1.new/extensions/Makefile.in	2010-04-28 11:51:14.237817949 +0200
+@@ -151,6 +151,8 @@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ HELP_DIR = @HELP_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff -Nur -x '*.orig' -x '*~' empathy-2.30.1/help/Makefile.in empathy-2.30.1.new/help/Makefile.in
+--- empathy-2.30.1/help/Makefile.in	2010-04-26 16:38:59.000000000 +0200
++++ empathy-2.30.1.new/help/Makefile.in	2010-04-28 11:51:14.342111651 +0200
+@@ -143,6 +143,8 @@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ HELP_DIR = @HELP_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff -Nur -x '*.orig' -x '*~' empathy-2.30.1/libempathy/Makefile.in empathy-2.30.1.new/libempathy/Makefile.in
+--- empathy-2.30.1/libempathy/Makefile.in	2010-04-26 16:38:59.000000000 +0200
++++ empathy-2.30.1.new/libempathy/Makefile.in	2010-04-28 11:51:14.573818835 +0200
+@@ -247,6 +247,8 @@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ HELP_DIR = @HELP_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff -Nur -x '*.orig' -x '*~' empathy-2.30.1/libempathy-gtk/Makefile.in empathy-2.30.1.new/libempathy-gtk/Makefile.in
+--- empathy-2.30.1/libempathy-gtk/Makefile.in	2010-04-26 16:38:59.000000000 +0200
++++ empathy-2.30.1.new/libempathy-gtk/Makefile.in	2010-04-28 11:51:14.461818349 +0200
+@@ -283,6 +283,8 @@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ HELP_DIR = @HELP_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff -Nur -x '*.orig' -x '*~' empathy-2.30.1/Makefile.in empathy-2.30.1.new/Makefile.in
+--- empathy-2.30.1/Makefile.in	2010-04-26 16:39:00.000000000 +0200
++++ empathy-2.30.1.new/Makefile.in	2010-04-28 11:51:15.257819023 +0200
+@@ -178,6 +178,8 @@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ HELP_DIR = @HELP_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff -Nur -x '*.orig' -x '*~' empathy-2.30.1/nautilus-sendto-plugin/Makefile.in empathy-2.30.1.new/nautilus-sendto-plugin/Makefile.in
+--- empathy-2.30.1/nautilus-sendto-plugin/Makefile.in	2010-04-26 16:39:00.000000000 +0200
++++ empathy-2.30.1.new/nautilus-sendto-plugin/Makefile.in	2010-04-28 11:51:14.657818615 +0200
+@@ -176,6 +176,8 @@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ HELP_DIR = @HELP_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff -Nur -x '*.orig' -x '*~' empathy-2.30.1/src/Makefile.in empathy-2.30.1.new/src/Makefile.in
+--- empathy-2.30.1/src/Makefile.in	2010-04-26 16:39:00.000000000 +0200
++++ empathy-2.30.1.new/src/Makefile.in	2010-04-28 11:51:14.821818987 +0200
+@@ -42,20 +42,30 @@
+ 	$(top_srcdir)/tools/flymake.mk
+ bin_PROGRAMS = empathy$(EXEEXT) empathy-accounts$(EXEEXT) \
+ 	empathy-debugger$(EXEEXT)
+-@HAVE_LIBCHAMPLAIN_TRUE@am__append_1 = \
++@HAVE_LIBINDICATE_TRUE@am__append_1 = \
++@HAVE_LIBINDICATE_TRUE@	empathy-indicator-manager.c		\
++@HAVE_LIBINDICATE_TRUE@	empathy-indicator-manager.h 		\
++@HAVE_LIBINDICATE_TRUE@	empathy-indicator.c empathy-indicator.h
++
++@HAVE_LIBINDICATE_FALSE@am__append_2 = \
++@HAVE_LIBINDICATE_FALSE@	empathy-indicator-manager.c		\
++@HAVE_LIBINDICATE_FALSE@	empathy-indicator-manager.h		\
++@HAVE_LIBINDICATE_FALSE@	empathy-indicator.c empathy-indicator.h
++
++@HAVE_LIBCHAMPLAIN_TRUE@am__append_3 = \
+ @HAVE_LIBCHAMPLAIN_TRUE@	empathy-map-view.c			\
+ @HAVE_LIBCHAMPLAIN_TRUE@	empathy-map-view.h
+ 
+-@HAVE_LIBCHAMPLAIN_TRUE@am__append_2 = \
++@HAVE_LIBCHAMPLAIN_TRUE@am__append_4 = \
+ @HAVE_LIBCHAMPLAIN_TRUE@	empathy-map-view.ui
+ 
+-@HAVE_LIBCHAMPLAIN_FALSE@am__append_3 = \
++@HAVE_LIBCHAMPLAIN_FALSE@am__append_5 = \
+ @HAVE_LIBCHAMPLAIN_FALSE@	empathy-map-view.c			\
+ @HAVE_LIBCHAMPLAIN_FALSE@	empathy-map-view.h			\
+ @HAVE_LIBCHAMPLAIN_FALSE@	empathy-map-view.ui
+ 
+-@HAVE_CONTROL_CENTER_EMBEDDING_FALSE@am__append_4 = $(libempathy_accounts_panel_la_SOURCES)
+-@HAVE_CONTROL_CENTER_EMBEDDING_TRUE@am__append_5 = $(libempathy_accounts_panel_la_SOURCES)
++@HAVE_CONTROL_CENTER_EMBEDDING_FALSE@am__append_6 = $(libempathy_accounts_panel_la_SOURCES)
++@HAVE_CONTROL_CENTER_EMBEDDING_TRUE@am__append_7 = $(libempathy_accounts_panel_la_SOURCES)
+ subdir = src
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \
+@@ -146,9 +156,14 @@
+ 	empathy-new-chatroom-dialog.h empathy-preferences.c \
+ 	empathy-preferences.h empathy-sidebar.c empathy-sidebar.h \
+ 	empathy-status-icon.c empathy-status-icon.h empathy.c \
+-	empathy-map-view.c empathy-map-view.h
+-@HAVE_LIBCHAMPLAIN_TRUE@am__objects_1 = empathy-map-view.$(OBJEXT)
+-am__objects_2 = empathy-about-dialog.$(OBJEXT) \
++	empathy-indicator-manager.c empathy-indicator-manager.h \
++	empathy-indicator.c empathy-indicator.h empathy-map-view.c \
++	empathy-map-view.h
++@HAVE_LIBINDICATE_TRUE@am__objects_1 =  \
++@HAVE_LIBINDICATE_TRUE@	empathy-indicator-manager.$(OBJEXT) \
++@HAVE_LIBINDICATE_TRUE@	empathy-indicator.$(OBJEXT)
++@HAVE_LIBCHAMPLAIN_TRUE@am__objects_2 = empathy-map-view.$(OBJEXT)
++am__objects_3 = empathy-about-dialog.$(OBJEXT) \
+ 	empathy-call-window-fullscreen.$(OBJEXT) \
+ 	empathy-call-window.$(OBJEXT) empathy-chat-window.$(OBJEXT) \
+ 	empathy-chatrooms-window.$(OBJEXT) \
+@@ -159,17 +174,18 @@
+ 	empathy-new-chatroom-dialog.$(OBJEXT) \
+ 	empathy-preferences.$(OBJEXT) empathy-sidebar.$(OBJEXT) \
+ 	empathy-status-icon.$(OBJEXT) empathy.$(OBJEXT) \
+-	$(am__objects_1)
+-am_empathy_OBJECTS = $(am__objects_2)
+-am__objects_3 =
+-nodist_empathy_OBJECTS = $(am__objects_3)
++	$(am__objects_1) $(am__objects_2)
++am_empathy_OBJECTS = $(am__objects_3)
++am__objects_4 =
++nodist_empathy_OBJECTS = $(am__objects_4)
+ empathy_OBJECTS = $(am_empathy_OBJECTS) $(nodist_empathy_OBJECTS)
+ empathy_DEPENDENCIES = libempathy-accounts-common.la \
+ 	$(top_builddir)/libempathy-gtk/libempathy-gtk.la \
+ 	$(top_builddir)/libempathy/libempathy.la \
+ 	$(top_builddir)/extensions/libemp-extensions.la \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1)
+ am_empathy_accounts_OBJECTS = empathy-accounts.$(OBJEXT)
+ empathy_accounts_OBJECTS = $(am_empathy_accounts_OBJECTS)
+ am__DEPENDENCIES_2 = $(top_builddir)/libempathy-gtk/libempathy-gtk.la \
+@@ -177,7 +193,7 @@
+ 	$(top_builddir)/extensions/libemp-extensions.la \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ empathy_accounts_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+ 	libempathy-accounts-common.la
+ am_empathy_debugger_OBJECTS = empathy-debug-window.$(OBJEXT) \
+@@ -190,7 +206,7 @@
+ 	$(top_builddir)/extensions/libemp-extensions.la \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -291,6 +307,8 @@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ HELP_DIR = @HELP_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -442,6 +460,7 @@
+ 	$(ERROR_CFLAGS)					\
+ 	-I$(top_srcdir)                          	\
+ 	-DG_LOG_DOMAIN=\"empathy\"			\
++	-DDESKTOPDIR=\"$(datadir)/applications\"	\
+ 	-DBIN_DIR=\"$(bindir)\"                         \
+ 	$(DISABLE_DEPRECATED)				\
+ 	$(WARN_CFLAGS)					\
+@@ -452,6 +471,7 @@
+ 	$(CPPFLAGS_COMMON)				\
+ 	$(TPL_CFLAGS)					\
+ 	$(LIBNOTIFY_CFLAGS)				\
++	$(INDICATE_CFLAGS)				\
+ 	$(LIBCHAMPLAIN_CFLAGS)				\
+ 	$(WEBKIT_CFLAGS)				\
+ 	$(NULL)
+@@ -462,6 +482,7 @@
+ 	$(top_builddir)/extensions/libemp-extensions.la		\
+ 	$(TPL_LIBS)						\
+ 	$(LIBNOTIFY_LIBS)					\
++	$(INDICATE_LIBS)					\
+ 	$(EMPATHY_LIBS)						\
+ 	$(LIBCHAMPLAIN_LIBS)					\
+ 	$(WEBKIT_LIBS)
+@@ -540,7 +561,7 @@
+ 	empathy-new-chatroom-dialog.h empathy-preferences.c \
+ 	empathy-preferences.h empathy-sidebar.c empathy-sidebar.h \
+ 	empathy-status-icon.c empathy-status-icon.h empathy.c \
+-	$(am__append_1)
++	$(am__append_1) $(am__append_3)
+ empathy_SOURCES = \
+ 	$(empathy_handwritten_source)					\
+ 	$(NULL)
+@@ -552,22 +573,23 @@
+         $(top_builddir)/extensions/libemp-extensions.la			\
+         $(LIBNOTIFY_LIBS)						\
+         $(EMPATHY_LIBS)							\
++	$(INDICATE_LIBS)						\
+         $(LIBCHAMPLAIN_LIBS)						\
+         $(WEBKIT_LIBS)							\
+ 	$(NULL)
+ 
+ nodist_empathy_SOURCES = $(BUILT_SOURCES)
+ check_c_sources = $(empathy_handwritten_source) \
+-	$(empathy_logs_SOURCES) $(am__append_5)
++	$(empathy_logs_SOURCES) $(am__append_7)
+ uidir = $(datadir)/empathy
+ ui_DATA = empathy-accounts-dialog.ui empathy-call-window-fullscreen.ui \
+ 	empathy-call-window.ui empathy-chat-window.ui \
+ 	empathy-chatrooms-window.ui empathy-ft-manager.ui \
+ 	empathy-import-dialog.ui empathy-main-window.ui \
+ 	empathy-new-chatroom-dialog.ui empathy-preferences.ui \
+-	empathy-status-icon.ui $(am__append_2)
+-EXTRA_DIST = $(autostart_DATA) $(ui_DATA) $(am__append_3) \
+-	$(am__append_4)
++	empathy-status-icon.ui $(am__append_4)
++EXTRA_DIST = $(autostart_DATA) $(ui_DATA) $(am__append_2) \
++	$(am__append_5) $(am__append_6)
+ dist_man_MANS = \
+ 	empathy.1
+ 
+@@ -729,6 +751,8 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-import-pidgin.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-import-utils.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-import-widget.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-indicator-manager.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-indicator.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-invite-participant-dialog.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-main-window.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-map-view.Po@am__quote@
+diff -Nur -x '*.orig' -x '*~' empathy-2.30.1/tests/interactive/Makefile.in empathy-2.30.1.new/tests/interactive/Makefile.in
+--- empathy-2.30.1/tests/interactive/Makefile.in	2010-04-26 16:39:00.000000000 +0200
++++ empathy-2.30.1.new/tests/interactive/Makefile.in	2010-04-28 11:51:15.029818618 +0200
+@@ -217,6 +217,8 @@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ HELP_DIR = @HELP_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff -Nur -x '*.orig' -x '*~' empathy-2.30.1/tests/Makefile.in empathy-2.30.1.new/tests/Makefile.in
+--- empathy-2.30.1/tests/Makefile.in	2010-04-26 16:39:00.000000000 +0200
++++ empathy-2.30.1.new/tests/Makefile.in	2010-04-28 11:51:14.929818890 +0200
+@@ -256,6 +256,8 @@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ HELP_DIR = @HELP_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff -Nur -x '*.orig' -x '*~' empathy-2.30.1/tests/xml/Makefile.in empathy-2.30.1.new/tests/xml/Makefile.in
+--- empathy-2.30.1/tests/xml/Makefile.in	2010-04-26 16:39:00.000000000 +0200
++++ empathy-2.30.1.new/tests/xml/Makefile.in	2010-04-28 11:51:15.093818234 +0200
+@@ -118,6 +118,8 @@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ HELP_DIR = @HELP_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff -Nur -x '*.orig' -x '*~' empathy-2.30.1/tools/Makefile.in empathy-2.30.1.new/tools/Makefile.in
+--- empathy-2.30.1/tools/Makefile.in	2010-04-26 16:39:00.000000000 +0200
++++ empathy-2.30.1.new/tools/Makefile.in	2010-04-28 11:51:15.165818863 +0200
+@@ -120,6 +120,8 @@
+ GOBJECT_QUERY = @GOBJECT_QUERY@
+ GREP = @GREP@
+ HELP_DIR = @HELP_DIR@
++INDICATE_CFLAGS = @INDICATE_CFLAGS@
++INDICATE_LIBS = @INDICATE_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
--- empathy-2.30.2.orig/debian/patches/32_append_notifications.patch
+++ empathy-2.30.2/debian/patches/32_append_notifications.patch
@@ -0,0 +1,188 @@
+=== modified file 'src/empathy-chat-window.c'
+diff -Nur -x '*.orig' -x '*~' empathy-2.30.2//src/empathy-chat-window.c empathy-2.30.2.new//src/empathy-chat-window.c
+--- empathy-2.30.2//src/empathy-chat-window.c	2010-06-28 11:32:13.809918001 +0200
++++ empathy-2.30.2.new//src/empathy-chat-window.c	2010-06-28 11:36:09.965918001 +0200
+@@ -1207,7 +1207,11 @@
+ 	EmpathyChatWindowPriv *priv = GET_PRIV (self);
+ 
+ 	g_object_unref (notify);
+-	priv->notification = NULL;
++
++	if (priv->notification == notify) {
++		priv->notification = NULL;
++	}
++
+ }
+ 
+ #ifdef HAVE_LIBINDICATE
+@@ -1286,7 +1290,8 @@
+ 	const char *body;
+ 	GdkPixbuf *pixbuf;
+ 	EmpathyChatWindowPriv *priv = GET_PRIV (window);
+-	gboolean res;
++	gboolean res, has_x_canonical_append;
++	NotifyNotification *notification = priv->notification;
+ 
+ 	if (!empathy_notify_manager_notification_is_enabled (priv->notify_mgr)) {
+ 		return;
+@@ -1302,27 +1307,38 @@
+ 	header = empathy_contact_get_name (sender);
+ 	body = empathy_message_get_body (message);
+ 	escaped = g_markup_escape_text (body, -1);
++	has_x_canonical_append = empathy_notify_manager_has_capability (priv->notify_mgr,
++		EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_APPEND);
+ 
+-	if (priv->notification != NULL) {
+-		notify_notification_update (priv->notification,
++	if (notification != NULL && ! has_x_canonical_append) {
++		notify_notification_update (notification,
+ 					    header, escaped, NULL);
+ 	} else {
+-		priv->notification = notify_notification_new (header, escaped, NULL, NULL);
+-		notify_notification_set_timeout (priv->notification, NOTIFY_EXPIRES_DEFAULT);
++		notification = notify_notification_new (header, escaped, NULL, NULL);
++		if (priv->notification == NULL) {
++			priv->notification = notification;
++		}
++
++		notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT);
+ 
+-		empathy_signal_connect_weak (priv->notification, "closed",
++		g_signal_connect (notification, "closed",
+ 				  G_CALLBACK (chat_window_notification_closed_cb), G_OBJECT (window));
++
++		if (has_x_canonical_append) {
++			notify_notification_set_hint_string (notification,
++				EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_APPEND, "");
++		}
+ 	}
+ 
+ 	pixbuf = empathy_notify_manager_get_pixbuf_for_notification (priv->notify_mgr,
+ 		sender, EMPATHY_IMAGE_NEW_MESSAGE);
+ 
+ 	if (pixbuf != NULL) {
+-		notify_notification_set_icon_from_pixbuf (priv->notification, pixbuf);
++		notify_notification_set_icon_from_pixbuf (notification, pixbuf);
+ 		g_object_unref (pixbuf);
+ 	}
+ 
+-	notify_notification_show (priv->notification, NULL);
++	notify_notification_show (notification, NULL);
+ 
+ 	g_free (escaped);
+ }
+@@ -2025,6 +2041,7 @@
+ 	priv->chats_new_msg = NULL;
+ 	priv->chats_composing = NULL;
+ 	priv->current_chat = NULL;
++	priv->notification = NULL;
+ 
+ 	priv->notify_mgr = empathy_notify_manager_dup_singleton ();
+ 
+diff -Nur -x '*.orig' -x '*~' empathy-2.30.2//src/empathy-status-icon.c empathy-2.30.2.new//src/empathy-status-icon.c
+--- empathy-2.30.2//src/empathy-status-icon.c	2010-06-28 11:32:13.813918001 +0200
++++ empathy-2.30.2.new//src/empathy-status-icon.c	2010-06-28 11:32:14.501918001 +0200
+@@ -110,9 +110,8 @@
+ static void
+ notification_close_helper (EmpathyStatusIconPriv *priv)
+ {
+-	if (priv->notification) {
++	if (priv->notification != NULL) {
+ 		notify_notification_close (priv->notification, NULL);
+-		g_object_unref (priv->notification);
+ 		priv->notification = NULL;
+ 	}
+ }
+@@ -142,29 +141,45 @@
+ 
+ 	if (priv->event) {
+ 		gchar *message_esc = NULL;
++		gboolean has_x_canonical_append;
++		NotifyNotification *notification = priv->notification;
+ 
+ 		if (priv->event->message != NULL)
+ 			message_esc = g_markup_escape_text (priv->event->message, -1);
+ 
+-		if (priv->notification) {
+-			notify_notification_update (priv->notification,
++		has_x_canonical_append =
++				empathy_notify_manager_has_capability (priv->notify_mgr,
++					EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_APPEND);
++
++		if (notification != NULL && ! has_x_canonical_append) {
++			notify_notification_update (notification,
+ 						    priv->event->header, message_esc,
+ 						    NULL);
+ 		} else {
+ 			if (gtk_status_icon_get_visible (priv->icon)) {
+-				priv->notification = notify_notification_new_with_status_icon
+-				(priv->event->header, message_esc, NULL, priv->icon);
++				notification = notify_notification_new_with_status_icon
++					(priv->event->header, message_esc, NULL, priv->icon);
+ 			} else {
+-				priv->notification = notify_notification_new
++				notification = notify_notification_new
+ 					(priv->event->header, message_esc, NULL, NULL);
+ 			}
+-			notify_notification_set_timeout (priv->notification,
++
++			if (priv->notification == NULL) {
++				priv->notification = notification;
++			}
++
++			notify_notification_set_timeout (notification,
+ 							 NOTIFY_EXPIRES_DEFAULT);
+ 
++			if (has_x_canonical_append) {
++				notify_notification_set_hint_string (notification,
++					EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_APPEND, "");
++			}
++
+ 			if (empathy_notify_manager_has_capability (priv->notify_mgr,
+ 			           EMPATHY_NOTIFY_MANAGER_CAP_ACTIONS) &&
+ 			           priv->event->type != EMPATHY_EVENT_TYPE_PRESENCE) {
+-				notify_notification_add_action (priv->notification,
++				notify_notification_add_action (notification,
+ 					"respond",
+ 					_("Respond"),
+ 					(NotifyActionCallback) notification_action_cb,
+@@ -172,7 +187,7 @@
+ 					NULL);
+ 			}
+ 
+-			g_signal_connect (priv->notification, "closed",
++			g_signal_connect (notification, "closed",
+ 					  G_CALLBACK (status_icon_notification_closed_cb), icon);
+ 		}
+ 
+@@ -181,12 +196,11 @@
+ 								   priv->event->icon_name);
+ 
+ 		if (pixbuf != NULL) {
+-			notify_notification_set_icon_from_pixbuf (priv->notification,
+-							  pixbuf);
++			notify_notification_set_icon_from_pixbuf (notification, pixbuf);
+ 			g_object_unref (pixbuf);
+ 		}
+ 
+-		notify_notification_show (priv->notification, NULL);
++		notify_notification_show (notification, NULL);
+ 
+ 		g_free (message_esc);
+ 	} else {
+@@ -510,7 +524,6 @@
+ 
+ 		if (priv->notification) {
+ 			notify_notification_close (priv->notification, NULL);
+-			g_object_unref (priv->notification);
+ 			priv->notification = NULL;
+ 		}
+ 	}
+@@ -771,6 +784,7 @@
+ 			  G_CALLBACK (status_icon_popup_menu_cb),
+ 			  icon);
+ 
++	priv->notification = NULL;
+ 	priv->notify_mgr = empathy_notify_manager_dup_singleton ();
+ }
+ 
--- empathy-2.30.2.orig/debian/patches/34_start_raised_execpt_in_session.patch
+++ empathy-2.30.2/debian/patches/34_start_raised_execpt_in_session.patch
@@ -0,0 +1,32 @@
+=== modified file 'src/empathy-status-icon.c'
+--- a/src/empathy-status-icon.c
++++ b/src/empathy-status-icon.c
+@@ -873,6 +873,9 @@
+ #ifdef HAVE_LIBINDICATE
+ 	gboolean               use_libindicate;
+ #endif
++	const gchar *desktop_autostart_id;
++
++	desktop_autostart_id = g_getenv ("DESKTOP_AUTOSTART_ID");
+ 
+ 	g_return_val_if_fail (GTK_IS_WINDOW (window), NULL);
+ 
+@@ -908,9 +911,17 @@
+ 			  icon);
+ 
+ 	if (!hide_contact_list) {
+-		empathy_conf_get_bool (empathy_conf_get (),
++		/* If not started with the session, we should raise the window.
++                   https://bugs.launchpad.net/ubuntu/+source/empathy/+bug/503052 */
++		if (desktop_autostart_id == NULL) {
++			DEBUG ("Not started with session, showing contact list");
++			should_hide = FALSE;
++		} else {
++			DEBUG ("Auto-started with session, so honor the previous known state");
++			empathy_conf_get_bool (empathy_conf_get (),
+ 				       EMPATHY_PREFS_UI_MAIN_WINDOW_HIDDEN,
+ 			               &should_hide);
++		}
+ 	} else {
+ 		should_hide = TRUE;
+ 	}
--- empathy-2.30.2.orig/debian/patches/36_chat_window_default_size.patch
+++ empathy-2.30.2/debian/patches/36_chat_window_default_size.patch
@@ -0,0 +1,22 @@
+#
+# Description: Make the default chat window size larger
+# Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/empathy/+bug/509756
+# Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=612216
+#
+
+https://bugzilla.gnome.org/show_bug.cgi?id=612216
+=== modified file 'src/empathy-chat-window.ui'
+--- old/src/empathy-chat-window.ui	2010-03-08 15:07:43 +0000
++++ new/src/empathy-chat-window.ui	2010-03-08 15:08:28 +0000
+@@ -188,8 +188,8 @@
+   <object class="GtkWindow" id="chat_window">
+     <property name="title" translatable="yes">Chat</property>
+     <property name="role">chat</property>
+-    <property name="default_width">350</property>
+-    <property name="default_height">250</property>
++    <property name="default_width">580</property>
++    <property name="default_height">480</property>
+     <child>
+       <object class="GtkVBox" id="chat_vbox">
+         <property name="visible">True</property>
+
--- empathy-2.30.2.orig/debian/patches/01_lpi.patch
+++ empathy-2.30.2/debian/patches/01_lpi.patch
@@ -0,0 +1,85 @@
+=== modified file 'configure.ac'
+--- old/configure.ac	2010-02-09 05:13:33 +0000
++++ new/configure.ac	2010-02-09 05:14:08 +0000
+@@ -179,6 +179,7 @@
+    gstreamer-0.10
+    unique-1.0
+    gnome-keyring-1 >= $KEYRING_REQUIRED
++   launchpad-integration
+ ])
+ 
+ PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
+
+=== modified file 'src/empathy-chat-window.c'
+--- old/src/empathy-chat-window.c	2010-02-09 05:13:33 +0000
++++ new/src/empathy-chat-window.c	2010-02-09 05:58:14 +0000
+@@ -35,6 +35,9 @@
+ #include <glib/gi18n.h>
+ #include <libnotify/notification.h>
+ 
++/* Add launchpad hooks */
++#include <launchpad-integration.h>
++
+ #include <telepathy-glib/telepathy-glib.h>
+ 
+ #include <libempathy/empathy-contact.h>
+@@ -1945,6 +1948,10 @@
+ 	priv->current_chat = NULL;
+ 
+ 	priv->notify_mgr = empathy_notify_manager_dup_singleton ();
++
++	/* Add launchpad hooks */
++	launchpad_integration_add_ui (priv->ui_manager, "/chats_menubar/menu_help/LaunchpadItems");
++
+ }
+ 
+ EmpathyChatWindow *
+
+=== modified file 'src/empathy-chat-window.ui'
+--- old/src/empathy-chat-window.ui	2010-02-09 05:13:33 +0000
++++ new/src/empathy-chat-window.ui	2010-02-09 05:35:32 +0000
+@@ -180,6 +180,7 @@
+         </menu>
+         <menu action="menu_help">
+           <menuitem action="menu_help_contents"/>
++          <placeholder name="LaunchpadItems"/>
+           <menuitem action="menu_help_about"/>
+         </menu>
+       </menubar>
+
+=== modified file 'src/empathy-main-window.c'
+--- old/src/empathy-main-window.c	2010-02-09 05:13:33 +0000
++++ new/src/empathy-main-window.c	2010-02-09 05:14:08 +0000
+@@ -29,6 +29,9 @@
+ 
+ #include <telepathy-glib/account-manager.h>
+ 
++/* Add launchpad hooks */
++#include <launchpad-integration.h>
++
+ #include <libempathy/empathy-contact.h>
+ #include <libempathy/empathy-idle.h>
+ #include <libempathy/empathy-utils.h>
+@@ -1473,6 +1476,9 @@
+ 						 EMPATHY_PREFS_UI_SHOW_AVATARS,
+ 						 window);
+ 
++	/* Add launchpad hooks */
++	launchpad_integration_add_ui (window->ui_manager, "/menubar/help/LaunchpadItems");
++
+ 	return window->window;
+ }
+ 
+
+=== modified file 'src/empathy-main-window.ui'
+--- old/src/empathy-main-window.ui	2010-02-09 05:13:33 +0000
++++ new/src/empathy-main-window.ui	2010-02-09 05:14:08 +0000
+@@ -259,6 +259,7 @@
+         <menu action="help">
+           <menuitem action="help_contents"/>
+           <menuitem action="help_debug"/>
++          <placeholder name="LaunchpadItems"/>
+           <menuitem action="help_about"/>
+         </menu>
+       </menubar>
+
--- empathy-2.30.2.orig/debian/patches/10_use_notify_osd_icons.patch
+++ empathy-2.30.2/debian/patches/10_use_notify_osd_icons.patch
@@ -0,0 +1,21 @@
+#
+# Ubuntu: https://bugs.edge.launchpad.net/ubuntu/karmic/+source/empathy/+bug/409828
+# Description: Use the notify-osd image for new messages
+#
+
+From 18170177bf037f682438ddcb93b8682563db7c64 Mon Sep 17 00:00:00 2001
+From: Robert Ancell <robert.ancell@canonical.com>
+Date: Thu, 17 Sep 2009 17:42:26 +1000
+Subject: [PATCH] Use the notify-osd image for new messages
+
+--- a/libempathy-gtk/empathy-images.h
++++ b/libempathy-gtk/empathy-images.h
+@@ -33,7 +33,7 @@
+ #define EMPATHY_IMAGE_UNKNOWN             "empathy-pending"
+ 
+ #define EMPATHY_IMAGE_MESSAGE             "im-message"
+-#define EMPATHY_IMAGE_NEW_MESSAGE         "im-message-new"
++#define EMPATHY_IMAGE_NEW_MESSAGE         "notification-message-im"
+ #define EMPATHY_IMAGE_TYPING              "user-typing"
+ #define EMPATHY_IMAGE_CONTACT_INFORMATION "gtk-info"
+ #define EMPATHY_IMAGE_GROUP_MESSAGE       "system-users"
--- empathy-2.30.2.orig/debian/patches/37_facebook_default.patch
+++ empathy-2.30.2/debian/patches/37_facebook_default.patch
@@ -0,0 +1,18 @@
+=== modified file 'libempathy-gtk/empathy-protocol-chooser.c'
+--- old/libempathy-gtk/empathy-protocol-chooser.c	2010-03-16 13:30:07 +0000
++++ new/libempathy-gtk/empathy-protocol-chooser.c	2010-03-16 13:36:37 +0000
+@@ -137,10 +137,10 @@
+             COL_IS_FACEBOOK, &is_facebook,
+             -1);
+ 
+-          if (is_gtalk || is_facebook)
++          if (is_facebook)
++            cmp = -1;
++          else
+             cmp = 1;
+-          else
+-            cmp = -1;
+         }
+     }
+ 
+
--- empathy-2.30.2.orig/debian/patches/20_libindicate.patch
+++ empathy-2.30.2/debian/patches/20_libindicate.patch
@@ -0,0 +1,1698 @@
+=== modified file 'configure.ac'
+--- old/configure.ac	2010-04-09 19:10:25 +0000
++++ new/configure.ac	2010-04-09 19:26:13 +0000
+@@ -45,6 +45,8 @@
+ WEBKIT_REQUIRED=1.1.15
+ KEYRING_REQUIRED=2.22
+ NETWORK_MANAGER_REQUIRED=0.7.0
++INDICATE_REQUIRED=0.3.1
++INDICATE_GTK_REQUIRED=0.3.1
+ NAUTILUS_SENDTO_REQUIRED=2.28.1
+ 
+ # Use --enable-maintainer-mode to disabled deprecated symbols
+@@ -486,6 +488,34 @@
+ AM_CONDITIONAL(HAVE_FAVOURITE_CONTACTS, test "x$have_telepathy_logger" = "xyes")
+ 
+ # -----------------------------------------------------------
++# libindicate
++# -----------------------------------------------------------
++AC_ARG_ENABLE(libindicate,
++              AS_HELP_STRING([--enable-libindicate=@<:@no/yes/auto@:>@],
++                             [build libindicate support]), ,
++                             enable_libindicate=auto)
++
++if test "x$enable_libindicate" != "xno"; then
++   PKG_CHECK_MODULES(INDICATE,
++   [
++     indicate >= $INDICATE_REQUIRED,
++     indicate-gtk >= $INDICATE_GTK_REQUIRED
++   ], have_libindicate="yes", have_libindicate="no")
++
++   if test "x$have_libindicate" = "xyes"; then
++      AC_DEFINE(HAVE_LIBINDICATE, 1, [Define if you have libindicate])
++   fi
++else
++   have_libindicate=no
++fi
++
++if test "x$enable_libindicate" = "xyes" -a "x$have_libindicate" != "xyes"; then
++   AC_MSG_ERROR([Couldn't find libindicate.])
++fi
++
++AM_CONDITIONAL(HAVE_LIBINDICATE, test "x$have_libindicate" = "xyes")
++
++# -----------------------------------------------------------
+ # nautilus-sendto
+ # -----------------------------------------------------------
+ AC_ARG_ENABLE(nautilus-sendto,
+@@ -576,6 +606,7 @@
+ 	Coding style checks.........:  ${ENABLE_CODING_STYLE_CHECKS}
+ 
+     Features:
++        Message indicator support (libindicate):  ${have_libindicate}
+ 	Spell checking (enchant)....:  ${have_enchant}
+ 	Display maps (libchamplain).:  ${have_libchamplain}
+ 	Location awareness (Geoclue):  ${have_geoclue}
+
+=== modified file 'data/empathy.schemas.in'
+--- old/data/empathy.schemas.in	2010-04-09 19:09:01 +0000
++++ new/data/empathy.schemas.in	2010-04-09 19:26:13 +0000
+@@ -306,6 +306,21 @@
+     </schema>
+ 
+     <schema>
++      <key>/schemas/apps/empathy/notifications/use_libindicate</key>
++      <applyto>/apps/empathy/notifications/use_libindicate</applyto>
++      <owner>empathy</owner>
++      <type>bool</type>
++      <default>true</default>
++      <locale name="C">
++         <short>Use the messaging indicator</short>
++         <long>
++         Whether or not to use the messaging indicator, if false
++	 the icon in the notification area will be displayed.
++         </long>
++      </locale>
++    </schema>
++
++    <schema>
+        <key>/schemas/apps/empathy/ui/separate_chat_windows</key>
+        <applyto>/apps/empathy/ui/separate_chat_windows</applyto>
+        <owner>empathy</owner>
+
+=== modified file 'libempathy-gtk/empathy-conf.h'
+--- old/libempathy-gtk/empathy-conf.h	2010-04-09 19:09:01 +0000
++++ new/libempathy-gtk/empathy-conf.h	2010-04-09 19:26:13 +0000
+@@ -75,6 +75,7 @@
+ #define EMPATHY_PREFS_UI_SHOW_AVATARS              EMPATHY_PREFS_PATH "/ui/show_avatars"
+ #define EMPATHY_PREFS_UI_SHOW_PROTOCOLS            EMPATHY_PREFS_PATH "/ui/show_protocols"
+ #define EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST      EMPATHY_PREFS_PATH "/ui/compact_contact_list"
++#define EMPATHY_PREFS_UI_USE_LIBINDICATE           EMPATHY_PREFS_PATH "/notifications/use_libindicate"
+ #define EMPATHY_PREFS_UI_CHAT_WINDOW_PANED_POS     EMPATHY_PREFS_PATH "/ui/chat_window_paned_pos"
+ #define EMPATHY_PREFS_CONTACTS_SHOW_OFFLINE        EMPATHY_PREFS_PATH "/contacts/show_offline"
+ #define EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM      EMPATHY_PREFS_PATH "/contacts/sort_criterium"
+
+=== modified file 'libempathy-gtk/empathy-ui-utils.c'
+--- old/libempathy-gtk/empathy-ui-utils.c	2010-04-09 19:09:01 +0000
++++ new/libempathy-gtk/empathy-ui-utils.c	2010-04-09 19:26:13 +0000
+@@ -1362,25 +1362,36 @@
+ 	Display      *dpy;
+ 	GdkWindow    *gdk_window;
+ 
+-	gtk_status_icon_get_geometry (status_icon, NULL, &icon_location, NULL);
+-	gdk_window = gtk_widget_get_window (GTK_WIDGET (window));
+-	dpy = gdk_x11_drawable_get_xdisplay (gdk_window);
+-
+-	data[0] = icon_location.x;
+-	data[1] = icon_location.y;
+-	data[2] = icon_location.width;
+-	data[3] = icon_location.height;
+-
+-	XChangeProperty (dpy,
+-			 GDK_WINDOW_XID (gdk_window),
+-			 gdk_x11_get_xatom_by_name_for_display (
+-				gdk_drawable_get_display (gdk_window),
+-			 "_NET_WM_ICON_GEOMETRY"),
+-			 XA_CARDINAL, 32, PropModeReplace,
+-			 (guchar *)&data, 4);
++	// If the status icon isn't visible (because indicators are used) then
++	// attempting to change the properties of the status icon doesn't work.
++	if (gtk_status_icon_get_visible (status_icon)) {
++		gtk_status_icon_get_geometry (status_icon, NULL, &icon_location, NULL);
++		gdk_window = gtk_widget_get_window (GTK_WIDGET (window));
++		dpy = gdk_x11_drawable_get_xdisplay (gdk_window);
++
++		data[0] = icon_location.x;
++		data[1] = icon_location.y;
++		data[2] = icon_location.width;
++		data[3] = icon_location.height;
++
++		XChangeProperty (dpy,
++				 GDK_WINDOW_XID (gdk_window),
++				 gdk_x11_get_xatom_by_name_for_display (
++					gdk_drawable_get_display (gdk_window),
++				 "_NET_WM_ICON_GEOMETRY"),
++				 XA_CARDINAL, 32, PropModeReplace,
++				 (guchar *)&data, 4);
++	}
+ 
+ 	gtk_window_set_skip_taskbar_hint (window, TRUE);
+-	gtk_window_iconify (window);
++	// If the status icon isn't present then the WM will probably choose to
++	// iconfy to the taskbar, which doesn't look as good as the taskbar
++	// entry has just been removed. Just hide instead.
++	if (gtk_status_icon_get_visible (status_icon)) {
++		gtk_window_iconify (window);
++	} else {
++		gtk_widget_hide (GTK_WIDGET(window));
++	}
+ }
+ 
+ /* Code from Thomas Thurman
+
+=== modified file 'po/POTFILES.in'
+--- old/po/POTFILES.in	2010-04-09 19:09:01 +0000
++++ new/po/POTFILES.in	2010-04-09 19:26:13 +0000
+@@ -77,6 +77,8 @@
+ [type: gettext/glade]src/empathy-import-dialog.ui
+ src/empathy-import-widget.c
+ src/empathy-import-mc4-accounts.c
++src/empathy-indicator.c
++src/empathy-indicator-manager.c
+ src/empathy-main-window.c
+ [type: gettext/glade]src/empathy-main-window.ui
+ src/empathy-new-chatroom-dialog.c
+
+=== modified file 'src/Makefile.am'
+--- old/src/Makefile.am	2010-04-09 19:09:01 +0000
++++ new/src/Makefile.am	2010-04-09 19:26:13 +0000
+@@ -5,6 +5,7 @@
+ 	$(ERROR_CFLAGS)					\
+ 	-I$(top_srcdir)                          	\
+ 	-DG_LOG_DOMAIN=\"empathy\"			\
++	-DDESKTOPDIR=\"$(datadir)/applications\"	\
+ 	-DBIN_DIR=\"$(bindir)\"                         \
+ 	$(DISABLE_DEPRECATED)				\
+ 	$(WARN_CFLAGS)					\
+@@ -15,6 +16,7 @@
+ 	$(CPPFLAGS_COMMON)				\
+ 	$(TPL_CFLAGS)					\
+ 	$(LIBNOTIFY_CFLAGS)				\
++	$(INDICATE_CFLAGS)				\
+ 	$(LIBCHAMPLAIN_CFLAGS)				\
+ 	$(WEBKIT_CFLAGS)				\
+ 	$(NULL)
+@@ -25,6 +27,7 @@
+ 	$(top_builddir)/extensions/libemp-extensions.la		\
+ 	$(TPL_LIBS)						\
+ 	$(LIBNOTIFY_LIBS)					\
++	$(INDICATE_LIBS)					\
+ 	$(EMPATHY_LIBS)						\
+ 	$(LIBCHAMPLAIN_LIBS)					\
+ 	$(WEBKIT_LIBS)
+@@ -128,6 +131,7 @@
+         $(top_builddir)/extensions/libemp-extensions.la			\
+         $(LIBNOTIFY_LIBS)						\
+         $(EMPATHY_LIBS)							\
++	$(INDICATE_LIBS)						\
+         $(LIBCHAMPLAIN_LIBS)						\
+         $(WEBKIT_LIBS)							\
+ 	$(NULL)
+@@ -159,6 +163,18 @@
+ 	$(autostart_DATA)	\
+ 	$(ui_DATA)
+ 
++if HAVE_LIBINDICATE
++empathy_handwritten_source += 				\
++	empathy-indicator-manager.c		\
++	empathy-indicator-manager.h 		\
++	empathy-indicator.c empathy-indicator.h
++else
++EXTRA_DIST += 					\
++	empathy-indicator-manager.c		\
++	empathy-indicator-manager.h		\
++	empathy-indicator.c empathy-indicator.h
++endif
++
+ if HAVE_LIBCHAMPLAIN
+ empathy_handwritten_source += 				\
+ 	empathy-map-view.c			\
+
+=== modified file 'src/empathy-chat-window.c'
+--- old/src/empathy-chat-window.c	2010-04-09 19:10:25 +0000
++++ new/src/empathy-chat-window.c	2010-04-09 19:26:13 +0000
+@@ -61,6 +61,11 @@
+ #include "empathy-about-dialog.h"
+ #include "empathy-invite-participant-dialog.h"
+ 
++#ifdef HAVE_LIBINDICATE
++#include "empathy-indicator.h"
++#include "empathy-indicator-manager.h"
++#endif
++
+ #define DEBUG_FLAG EMPATHY_DEBUG_CHAT
+ #include <libempathy/empathy-debug.h>
+ 
+@@ -77,7 +82,11 @@
+ 	GtkWidget   *dialog;
+ 	GtkWidget   *notebook;
+ 	NotifyNotification *notification;
+-
++#ifdef HAVE_LIBINDICATE
++	EmpathyIndicatorManager *indicator_manager;
++	/* EmpathyChat -> EmpathyIndicator for that chat, if any */
++	GHashTable  *indicators;
++#endif
+ 	GtkTargetList *contact_targets;
+ 	GtkTargetList *file_targets;
+ 
+@@ -1195,6 +1204,71 @@
+ 	priv->notification = NULL;
+ }
+ 
++#ifdef HAVE_LIBINDICATE
++static void
++chat_window_indicator_activate_cb (EmpathyIndicator *indicator, guint timestamp,
++				    EmpathyChat *chat)
++{
++	empathy_chat_window_present_chat (chat);
++	empathy_indicator_hide (indicator);
++}
++
++static void
++chat_window_add_indicator (EmpathyChatWindow *window,
++					 EmpathyMessage *message,
++					 EmpathyChat    *chat)
++{
++	EmpathyChatWindowPriv *priv = GET_PRIV (window);
++	EmpathyContact *sender;
++	const char *body;
++	gboolean use_libindicate;
++	EmpathyIndicator *indicator = NULL;
++
++	empathy_conf_get_bool (empathy_conf_get (),
++			       EMPATHY_PREFS_UI_USE_LIBINDICATE,
++		               &use_libindicate);
++
++	if (!use_libindicate) {
++		return;
++	}
++
++	sender = empathy_message_get_sender (message);
++	body = empathy_message_get_body (message);
++
++	indicator = g_hash_table_lookup (priv->indicators, chat);
++	if (indicator != NULL) {
++		DEBUG ("indicator exists");
++		empathy_indicator_update (indicator, body);
++	} else {
++		DEBUG ("indicator doesn't exist yet, creating a new indicator");
++		indicator = empathy_indicator_manager_create_indicator (priv->indicator_manager,
++			sender, body);
++		g_signal_connect (indicator, "activate",
++				  G_CALLBACK (chat_window_indicator_activate_cb), chat);
++
++		g_hash_table_insert (priv->indicators, chat, indicator);
++	}
++	empathy_indicator_show (indicator);
++}
++
++static void
++chat_window_remove_indicator (EmpathyChatWindow *window, EmpathyChat *chat)
++{
++	EmpathyIndicator *indicator = NULL;
++	EmpathyChatWindowPriv *priv = GET_PRIV (window);
++
++	indicator = g_hash_table_lookup (priv->indicators, chat);
++
++	if ((indicator) && (indicator != NULL)) {
++		DEBUG ("indicator is %p", indicator);
++		empathy_indicator_hide (indicator);
++		g_hash_table_remove (priv->indicators, chat);
++	} else {
++		DEBUG ("indicator is NULL, nothing to remove");
++	}
++}
++#endif
++
+ static void
+ chat_window_show_or_update_notification (EmpathyChatWindow *window,
+ 					 EmpathyMessage *message,
+@@ -1327,6 +1401,9 @@
+ 		empathy_sound_play (GTK_WIDGET (priv->dialog),
+ 		    EMPATHY_SOUND_MESSAGE_INCOMING);
+ 		chat_window_show_or_update_notification (window, message, chat);
++#ifdef HAVE_LIBINDICATE
++		chat_window_add_indicator (window, message, chat);
++#endif
+ 	}
+ 
+ 	/* update the number of unread messages */
+@@ -1390,6 +1467,10 @@
+ 	empathy_chat_messages_read (chat);
+ 
+ 	chat_window_update_chat_tab (chat);
++
++#ifdef HAVE_LIBINDICATE
++	chat_window_remove_indicator (window, chat);
++#endif
+ }
+ 
+ static void
+@@ -1506,6 +1587,11 @@
+ 	/* Update the title, since we now mark all unread messages as read. */
+ 	chat_window_update_chat_tab (priv->current_chat);
+ 
++#ifdef HAVE_LIBINDICATE
++	/* Remove the indicator for the active chat */
++	chat_window_remove_indicator (window, priv->current_chat);
++#endif
++
+ 	return FALSE;
+ }
+ 
+@@ -1834,6 +1920,11 @@
+ 	g_object_unref (gui);
+ 
+ 	priv->chatroom_manager = empathy_chatroom_manager_dup_singleton (NULL);
++#ifdef HAVE_LIBINDICATE
++	priv->indicator_manager = empathy_indicator_manager_dup_singleton ();
++	priv->indicators = g_hash_table_new_full (g_direct_hash, g_direct_equal,
++			      NULL, g_object_unref);
++#endif
+ 
+ 	priv->notebook = gtk_notebook_new ();
+ 	gtk_notebook_set_group (GTK_NOTEBOOK (priv->notebook), "EmpathyChatWindow");
+
+=== added file 'src/empathy-indicator-manager.c'
+--- old/src/empathy-indicator-manager.c	1970-01-01 00:00:00 +0000
++++ new/src/empathy-indicator-manager.c	2010-04-09 19:26:13 +0000
+@@ -0,0 +1,468 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
++/*
++ * Copyright (C) 2009 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public
++ * License along with this program; if not, write to the
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA  02110-1301  USA
++ *
++ * Authors: James Westby <james.westby@ubuntu.com>
++ *
++ */
++
++#include <config.h>
++
++#include <gtk/gtk.h>
++
++#include <libempathy/empathy-contact.h>
++#include <libempathy/empathy-dispatcher.h>
++#include <libempathy/empathy-utils.h>
++
++#include <libempathy-gtk/empathy-conf.h>
++#include <libempathy-gtk/empathy-ui-utils.h>
++#include <libempathy-gtk/empathy-notify-manager.h>
++
++#include <telepathy-glib/util.h>
++
++#include "empathy-event-manager.h"
++#include "empathy-indicator.h"
++#include "empathy-indicator-manager.h"
++
++#include <libindicate/server.h>
++#include <libindicate/indicator.h>
++
++#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
++#include <libempathy/empathy-debug.h>
++
++#define INDICATOR_LOGIN_TIMEOUT 15
++#define EMPATHY_DESKTOP_PATH DESKTOPDIR "/empathy.desktop"
++
++#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndicatorManager)
++
++enum {
++  SERVER_ACTIVATE,
++  LAST_SIGNAL
++};
++
++static guint signals[LAST_SIGNAL];
++
++typedef struct {
++  EmpathyEventManager *event_manager;
++  IndicateServer      *indicate_server;
++  GSList              *indicator_events;
++  GHashTable          *login_timeouts;
++} EmpathyIndicatorManagerPriv;
++
++typedef struct {
++  EmpathyIndicator    *indicator;
++  EmpathyEvent        *event;
++} IndicatorEvent;
++
++typedef struct {
++  EmpathyIndicatorManager *manager;
++  EmpathyIndicator        *indicator;
++} LoginData;
++
++G_DEFINE_TYPE (EmpathyIndicatorManager, empathy_indicator_manager, G_TYPE_OBJECT);
++
++static EmpathyIndicatorManager *manager_singleton = NULL;
++
++static EmpathyEvent *
++event_copy (EmpathyEvent *event)
++{
++	EmpathyEvent *ret = g_new0 (EmpathyEvent, 1);
++
++	ret->contact = g_object_ref (event->contact);
++	ret->icon_name = g_strdup (event->icon_name);
++	ret->header = g_strdup (event->header);
++	ret->message = g_strdup (event->message);
++	ret->must_ack = event->must_ack;
++
++	return ret;
++}
++
++static gboolean
++compare_events (EmpathyEvent *ev1, EmpathyEvent *ev2)
++{
++	return ((g_strcmp0 (ev1->icon_name, ev2->icon_name) == 0) &&
++		(g_strcmp0 (ev1->header, ev2->header) == 0) &&
++		(ev1->must_ack == ev2->must_ack) &&
++		(ev1->contact == ev2->contact));
++}
++
++static IndicatorEvent *
++indicator_event_new (EmpathyIndicator *indicator,
++		     EmpathyEvent *event)
++{
++  IndicatorEvent *indicator_event;
++
++  indicator_event = g_slice_new0 (IndicatorEvent);
++  indicator_event->indicator = g_object_ref (indicator);
++  indicator_event->event = event_copy (event);
++
++  return indicator_event;
++}
++
++
++static void
++indicator_event_free (IndicatorEvent *indicator_event)
++{
++  g_object_unref (indicator_event->indicator);
++  g_free (indicator_event);
++}
++
++
++static void
++indicate_server_activate (IndicateServer *server, guint timestamp,
++    EmpathyIndicatorManager *manager)
++{
++  g_signal_emit (manager, signals[SERVER_ACTIVATE], 0, timestamp);
++}
++
++
++static void
++indicate_show_cb (EmpathyIndicator *indicator, guint timestamp,
++    EmpathyEvent *event)
++{
++  empathy_event_activate (event);
++}
++
++
++static void
++indicator_manager_event_added_cb (EmpathyEventManager *event_manager,
++    EmpathyEvent *event,
++    EmpathyIndicatorManager *manager)
++{
++  EmpathyIndicator *indicator = NULL;
++  EmpathyIndicatorManagerPriv *priv;
++  IndicatorEvent *indicator_event;
++
++  priv = GET_PRIV (manager);
++
++  DEBUG ("Event added");
++
++  if (event->contact == NULL)
++    return;
++
++  indicator = empathy_indicator_new (event->contact, event->message, "im");
++  if (indicator == NULL) {
++    return;
++  }
++
++  empathy_indicator_show (indicator);
++  g_signal_connect (G_OBJECT(indicator), "activate",
++      G_CALLBACK (indicate_show_cb),
++      event);
++  indicator_event = indicator_event_new (indicator, event);
++  g_object_unref (indicator);
++  priv->indicator_events = g_slist_prepend (priv->indicator_events,
++      indicator_event);
++}
++
++static void
++indicator_manager_event_removed_cb (EmpathyEventManager *event_manager,
++    EmpathyEvent *event,
++    EmpathyIndicatorManager *manager)
++{
++  EmpathyIndicatorManagerPriv *priv;
++  GSList *l;
++
++  priv = GET_PRIV (manager);
++
++  DEBUG ("Event removed");
++
++  for (l = priv->indicator_events; l; l = l->next)
++  {
++    IndicatorEvent *indicator_event;
++    indicator_event = l->data;
++
++    if (compare_events (indicator_event->event, event)) {
++      priv->indicator_events = g_slist_remove (priv->indicator_events,
++          indicator_event);
++      empathy_indicator_hide (indicator_event->indicator);
++      return;
++    }
++  }
++}
++
++
++static void
++indicator_manager_event_updated_cb (EmpathyEventManager *event_manager,
++    EmpathyEvent *event,
++    EmpathyIndicatorManager *manager)
++{
++  EmpathyIndicatorManagerPriv *priv;
++  GSList *l;
++
++  priv = GET_PRIV (manager);
++
++  for (l = priv->indicator_events; l; l = l->next)
++  {
++    IndicatorEvent *indicator_event;
++    indicator_event = l->data;
++    if (compare_events (indicator_event->event, event)) {
++      empathy_indicator_update (indicator_event->indicator,
++          event->message);
++      return;
++    }
++  }
++}
++
++
++/* Remove the login indicator when it times out */
++static gboolean
++indicate_login_timeout (gpointer data)
++{
++  LoginData *login_data;
++  EmpathyIndicator *e_indicator;
++  EmpathyIndicatorManager *manager;
++  EmpathyIndicatorManagerPriv *priv;
++
++  login_data = (LoginData *) data;
++  e_indicator = login_data->indicator;
++  manager = login_data->manager;
++  priv = GET_PRIV (manager);
++
++  empathy_indicator_hide (e_indicator);
++  g_hash_table_remove (priv->login_timeouts, e_indicator);
++
++  return FALSE;
++}
++
++
++static void
++indicate_login_cb (EmpathyIndicator *e_indicator, guint timestamp,
++    EmpathyIndicatorManager *manager)
++{
++  EmpathyIndicatorManagerPriv *priv;
++  GSList *events, *l;
++  EmpathyContact *contact;
++
++  priv = GET_PRIV (manager);
++
++  empathy_indicator_hide (e_indicator);
++  g_hash_table_remove (priv->login_timeouts, e_indicator);
++
++  contact = empathy_indicator_get_contact (e_indicator);
++  /* If the contact has an event activate it, otherwise the
++   * default handler of row-activated will be called. */
++  events = empathy_event_manager_get_events (priv->event_manager);
++  for (l = events; l; l = l->next) {
++    EmpathyEvent *event;
++
++    event = l->data;
++    if (event->contact == contact) {
++      empathy_event_activate (event);
++      return;
++    }
++  }
++
++  /* Else start a new conversation */
++  empathy_dispatcher_chat_with_contact (contact, NULL, NULL);
++}
++
++
++EmpathyIndicatorManager *
++empathy_indicator_manager_dup_singleton (void)
++{
++  return g_object_new (EMPATHY_TYPE_INDICATOR_MANAGER, NULL);
++}
++
++
++static void
++indicator_manager_dispose (GObject *object)
++{
++  EmpathyIndicatorManagerPriv *priv;
++
++  priv = GET_PRIV (object);
++
++  if (priv->indicator_events) {
++    g_slist_foreach (priv->indicator_events, (GFunc) indicator_event_free,
++        NULL);
++    g_slist_free (priv->indicator_events);
++    priv->indicator_events = NULL;
++  }
++  if (priv->event_manager) {
++    g_object_unref (priv->event_manager);
++    priv->event_manager = NULL;
++  }
++  if (priv->indicate_server) {
++    g_object_unref (priv->indicate_server);
++    priv->indicate_server = NULL;
++  }
++  if (priv->login_timeouts) {
++    g_hash_table_unref (priv->login_timeouts);
++    priv->login_timeouts = NULL;
++  }
++
++  G_OBJECT_CLASS (empathy_indicator_manager_parent_class)->dispose (object);
++}
++
++
++static GObject *
++indicator_manager_constructor (GType type,
++    guint n_props,
++    GObjectConstructParam *props)
++{
++  GObject *retval;
++
++  if (manager_singleton != NULL) {
++    retval = g_object_ref (manager_singleton);
++  } else {
++    retval = G_OBJECT_CLASS (empathy_indicator_manager_parent_class)->constructor
++      (type, n_props, props);
++
++    manager_singleton = EMPATHY_INDICATOR_MANAGER (retval);
++    g_object_add_weak_pointer (retval, (gpointer) &manager_singleton);
++  }
++
++  return retval;
++}
++
++
++static void
++empathy_indicator_manager_class_init (EmpathyIndicatorManagerClass *klass)
++{
++  GObjectClass *object_class;
++
++  object_class = G_OBJECT_CLASS (klass);
++  object_class->dispose = indicator_manager_dispose;
++  object_class->constructor = indicator_manager_constructor;
++
++  signals[SERVER_ACTIVATE] =
++      g_signal_new ("server-activate",
++          G_TYPE_FROM_CLASS (klass),
++          G_SIGNAL_RUN_LAST,
++          0,
++          NULL, NULL,
++          g_cclosure_marshal_VOID__UINT,
++          G_TYPE_NONE, 1, G_TYPE_UINT);
++
++  g_type_class_add_private (object_class, sizeof (EmpathyIndicatorManagerPriv));
++}
++
++
++static void
++empathy_indicator_manager_init (EmpathyIndicatorManager *manager)
++{
++  EmpathyIndicatorManagerPriv *priv;
++
++  priv = G_TYPE_INSTANCE_GET_PRIVATE (manager,
++       EMPATHY_TYPE_INDICATOR_MANAGER, EmpathyIndicatorManagerPriv);
++  manager->priv = priv;
++
++  priv->event_manager = empathy_event_manager_dup_singleton ();
++  priv->login_timeouts = g_hash_table_new_full (NULL, NULL,
++      (GDestroyNotify) g_object_unref, (GDestroyNotify) g_source_unref);
++  priv->indicate_server = indicate_server_ref_default ();
++  indicate_server_set_type (priv->indicate_server, "message.instant");
++  indicate_server_set_desktop_file (priv->indicate_server,
++      EMPATHY_DESKTOP_PATH);
++
++  g_signal_connect (priv->indicate_server,
++      INDICATE_SERVER_SIGNAL_SERVER_DISPLAY,
++      G_CALLBACK (indicate_server_activate),
++      manager);
++
++  g_signal_connect (priv->event_manager, "event-added",
++      G_CALLBACK (indicator_manager_event_added_cb),
++      manager);
++  g_signal_connect (priv->event_manager, "event-removed",
++      G_CALLBACK (indicator_manager_event_removed_cb),
++      manager);
++  g_signal_connect (priv->event_manager, "event-updated",
++      G_CALLBACK (indicator_manager_event_updated_cb),
++      manager);
++}
++
++void
++empathy_indicator_manager_set_server_visible (EmpathyIndicatorManager *manager,
++    gboolean visible)
++{
++  EmpathyIndicatorManagerPriv *priv;
++
++  priv = GET_PRIV (manager);
++  if (visible) {
++    DEBUG ("Show indicator");
++    indicate_server_show (priv->indicate_server);
++  } else {
++    DEBUG ("Hide indicator");
++    indicate_server_hide (priv->indicate_server);
++  }
++}
++
++
++EmpathyIndicator *
++empathy_indicator_manager_create_indicator (EmpathyIndicatorManager *manager,
++    EmpathyContact *sender,
++    const gchar *body)
++{
++  return empathy_indicator_new (sender, body, "im");
++}
++
++
++static LoginData *
++login_data_new (EmpathyIndicator *e_indicator,
++    EmpathyIndicatorManager *manager)
++{
++  LoginData *login_data;
++
++  login_data = g_slice_new0 (LoginData);
++  login_data->manager = g_object_ref (manager);
++  login_data->indicator = g_object_ref (e_indicator);
++
++  return login_data;
++}
++
++
++static void
++indicator_destroy_login_data (gpointer data)
++{
++  LoginData *login_data;
++
++  login_data = (LoginData *)data;
++
++  g_object_unref (login_data->manager);
++  g_object_unref (login_data->indicator);
++  g_slice_free (LoginData, login_data);
++}
++
++
++/* Add an indicator for someone logging in. This will be displayed for
++ * a short period only.
++ */
++void
++empathy_indicator_manager_add_login_indicator (EmpathyIndicatorManager *manager,
++    EmpathyContact *contact)
++{
++  EmpathyIndicatorManagerPriv *priv;
++  GSource *timeout;
++  EmpathyIndicator *e_indicator;
++  LoginData *login_data;
++
++  priv = GET_PRIV (manager);
++  e_indicator = empathy_indicator_new (contact, NULL, "login");
++  login_data = login_data_new (e_indicator, manager);
++
++  timeout = g_timeout_source_new_seconds (INDICATOR_LOGIN_TIMEOUT);
++  g_source_set_callback (timeout, indicate_login_timeout, login_data,
++      indicator_destroy_login_data);
++  g_source_attach (timeout, NULL);
++
++  g_hash_table_insert (priv->login_timeouts, e_indicator, timeout);
++
++  g_signal_connect (e_indicator, "activate",
++      G_CALLBACK (indicate_login_cb), manager);
++  empathy_indicator_show (e_indicator);
++}
+
+=== added file 'src/empathy-indicator-manager.h'
+--- old/src/empathy-indicator-manager.h	1970-01-01 00:00:00 +0000
++++ new/src/empathy-indicator-manager.h	2010-04-09 19:26:13 +0000
+@@ -0,0 +1,77 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
++/*
++ * Copyright (C) 2009 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public
++ * License along with this program; if not, write to the
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA  02110-1301  USA
++ *
++ * Authors: James Westby <james.westby@ubuntu.com>
++ *
++ */
++
++#ifndef __EMPATHY_INDICATOR_MANAGER_H__
++#define __EMPATHY_INDICATOR_MANAGER_H__
++
++#include <glib.h>
++
++#include <libempathy/empathy-contact.h>
++#include "empathy-indicator.h"
++
++G_BEGIN_DECLS
++
++#define EMPATHY_TYPE_INDICATOR_MANAGER \
++  (empathy_indicator_manager_get_type ())
++#define EMPATHY_INDICATOR_MANAGER(o) \
++  (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_INDICATOR_MANAGER, \
++                               EmpathyIndicatorManager))
++#define EMPATHY_INDICATOR_MANAGER_CLASS(k) \
++  (G_TYPE_CHECK_CLASS_CAST((k), EMPATHY_TYPE_INDICATOR_MANAGER, \
++                           EmpathyIndicatorManagerClass))
++#define EMPATHY_IS_INDICATOR_MANAGER(o) \
++  (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_INDICATOR_MANAGER))
++#define EMPATHY_IS_INDICATOR_MANAGER_CLASS(k) \
++  (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_INDICATOR_MANAGER))
++#define EMPATHY_INDICATOR_MANAGER_GET_CLASS(o) \
++  (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_INDICATOR_MANAGER, \
++                              EmpathyIndicatorManagerClass))
++
++typedef struct _EmpathyIndicatorManager      EmpathyIndicatorManager;
++typedef struct _EmpathyIndicatorManagerClass EmpathyIndicatorManagerClass;
++
++struct _EmpathyIndicatorManager {
++  GObject parent;
++  gpointer priv;
++};
++
++struct _EmpathyIndicatorManagerClass {
++  GObjectClass parent_class;
++};
++
++GType empathy_indicator_manager_get_type (void) G_GNUC_CONST;
++EmpathyIndicatorManager *empathy_indicator_manager_dup_singleton (void);
++void empathy_indicator_manager_set_server_visible (
++    EmpathyIndicatorManager *manager,
++    gboolean visible);
++EmpathyIndicator *empathy_indicator_manager_create_indicator (
++    EmpathyIndicatorManager *manager,
++    EmpathyContact *sender,
++    const gchar *body);
++void empathy_indicator_manager_add_login_indicator (
++    EmpathyIndicatorManager *manager,
++    EmpathyContact *contact);
++
++G_END_DECLS
++
++#endif /* __EMPATHY_INDICATOR_MANAGER_H__ */
+
+=== added file 'src/empathy-indicator.c'
+--- old/src/empathy-indicator.c	1970-01-01 00:00:00 +0000
++++ new/src/empathy-indicator.c	2010-04-09 19:26:13 +0000
+@@ -0,0 +1,325 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
++/*
++ * Copyright (C) 2009 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public
++ * License along with this program; if not, write to the
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA  02110-1301  USA
++ *
++ * Authors: James Westby <james.westby@ubuntu.com>
++ *
++ */
++
++#include <gtk/gtk.h>
++
++#include <libempathy/empathy-contact.h>
++#include <libempathy/empathy-utils.h>
++
++#include <libempathy-gtk/empathy-ui-utils.h>
++#include <libempathy-gtk/empathy-notify-manager.h>
++
++#include "empathy-indicator.h"
++
++#include <libindicate/indicator.h>
++#include <libindicate-gtk/indicator.h>
++
++#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
++#include <libempathy/empathy-debug.h>
++
++#define GET_PRIV(obj) EMPATHY_GET_PRIV ((obj), EmpathyIndicator)
++
++enum {
++  PROP_0,
++  PROP_CONTACT,
++  PROP_BODY,
++  PROP_SUBTYPE,
++  PROP_VISIBLE
++};
++
++enum {
++  ACTIVATE,
++  LAST_SIGNAL
++};
++
++static guint signals[LAST_SIGNAL];
++
++typedef struct {
++  IndicateIndicator *indicator;
++  EmpathyContact    *contact;
++  gchar             *body;
++  gchar             *subtype;
++} EmpathyIndicatorPriv;
++
++G_DEFINE_TYPE (EmpathyIndicator, empathy_indicator, G_TYPE_OBJECT)
++
++
++static void
++empathy_indicator_dispose (GObject *object)
++{
++  EmpathyIndicatorPriv *priv;
++
++  priv = GET_PRIV (object);
++
++  if (priv->indicator) {
++    g_object_unref (priv->indicator);
++    priv->indicator = NULL;
++  }
++  if (priv->contact) {
++    g_object_unref (priv->contact);
++    priv->contact = NULL;
++  }
++
++  G_OBJECT_CLASS (empathy_indicator_parent_class)->dispose (object);
++}
++
++
++static void
++empathy_indicator_finalize (GObject *object)
++{
++  EmpathyIndicatorPriv *priv;
++
++  priv = GET_PRIV (object);
++
++  g_free (priv->body);
++  g_free (priv->subtype);
++
++  G_OBJECT_CLASS (empathy_indicator_parent_class)->finalize (object);
++}
++
++static void
++indicate_show_cb (IndicateIndicator *indicator, guint timestamp,
++    EmpathyIndicator *e_indicator)
++{
++  g_signal_emit (e_indicator, signals[ACTIVATE], 0, timestamp);
++}
++
++
++static IndicateIndicator *
++empathy_indicator_get_indicator (EmpathyIndicator *e_indicator)
++{
++  EmpathyIndicatorPriv *priv;
++
++  priv = GET_PRIV (e_indicator);
++  if (priv->indicator)
++    return priv->indicator;
++
++  priv->indicator = indicate_indicator_new ();
++  g_assert (priv->indicator);
++  g_signal_connect (G_OBJECT (priv->indicator),
++      INDICATE_INDICATOR_SIGNAL_DISPLAY,
++      G_CALLBACK (indicate_show_cb),
++      e_indicator);
++
++  return priv->indicator;
++}
++
++
++static void
++empathy_indicator_set_property (GObject *object,
++    guint param_id,
++    const GValue *value,
++    GParamSpec *pspec)
++{
++  EmpathyIndicator *e_indicator;
++  EmpathyIndicatorPriv *priv;
++  IndicateIndicator *indicator;
++  GTimeVal time;
++  GdkPixbuf *pixbuf_avatar = NULL;
++
++  e_indicator = EMPATHY_INDICATOR (object);
++  priv = GET_PRIV (e_indicator);
++
++  indicator = empathy_indicator_get_indicator (e_indicator);
++
++  switch (param_id) {
++  case PROP_CONTACT:
++    priv->contact = g_object_ref (g_value_get_object (value));
++    g_assert (priv->contact);
++    indicate_indicator_set_property (indicator, "sender",
++        empathy_contact_get_name (priv->contact));
++    /* get the scaled avatar (22,22) until LP bug #433143 is fixed then switch to
++       to letting indicate-messages handle the scaling by setting the size to 0, 0 */
++    pixbuf_avatar = empathy_pixbuf_avatar_from_contact_scaled (priv->contact, 22, 22);
++    if (pixbuf_avatar != NULL)
++    {
++      indicate_indicator_set_property_icon(indicator, "icon", pixbuf_avatar);
++      g_object_unref(G_OBJECT(pixbuf_avatar));
++    }
++    break;
++  case PROP_BODY:
++    if (priv->body)
++      g_free (priv->body);
++    priv->body = g_strdup (g_value_get_string (value));
++    indicate_indicator_set_property (indicator, "body", priv->body);
++    if (priv->body != NULL) {
++      g_get_current_time (&time);
++      indicate_indicator_set_property_time (indicator, "time", &time);
++    }
++    break;
++  case PROP_SUBTYPE:
++    if (priv->subtype)
++      g_free (priv->subtype);
++    priv->subtype = g_strdup (g_value_get_string (value));
++    indicate_indicator_set_property (indicator, "subtype", priv->subtype);
++    if (g_strcmp0 (priv->subtype, "login") != 0 ) {
++      indicate_indicator_set_property (indicator, "draw-attention", "true");
++    }
++    break;
++  case PROP_VISIBLE:
++    if (g_value_get_boolean (value))
++      indicate_indicator_show (indicator);
++    else
++      indicate_indicator_hide (indicator);
++    break;
++  default:
++    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
++    break;
++  }
++}
++
++
++static void
++empathy_indicator_get_property (GObject *object,
++    guint param_id,
++    GValue *value,
++    GParamSpec *pspec)
++{
++  EmpathyIndicator *e_indicator;
++  EmpathyIndicatorPriv *priv;
++
++  e_indicator = EMPATHY_INDICATOR (object);
++  priv = GET_PRIV (e_indicator);
++
++  switch (param_id) {
++  case PROP_CONTACT:
++    g_value_set_object (value, priv->contact);
++    break;
++  case PROP_BODY:
++    g_value_set_string (value, priv->body);
++    break;
++  case PROP_SUBTYPE:
++    g_value_set_string (value, priv->subtype);
++    break;
++  case PROP_VISIBLE:
++    g_value_set_boolean (value, indicate_indicator_is_visible (priv->indicator));
++    break;
++  default:
++    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
++    break;
++  }
++}
++
++
++static void
++empathy_indicator_class_init (EmpathyIndicatorClass *klass)
++{
++  GObjectClass *object_class;
++
++  object_class = G_OBJECT_CLASS (klass);
++
++  object_class->set_property = empathy_indicator_set_property;
++  object_class->get_property = empathy_indicator_get_property;
++  object_class->dispose = empathy_indicator_dispose;
++  object_class->finalize = empathy_indicator_finalize;
++
++  g_object_class_install_property (object_class, PROP_CONTACT,
++      g_param_spec_object ("contact",
++          "Contact",
++          "The contact being indicated",
++          EMPATHY_TYPE_CONTACT,
++          (G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)));
++  g_object_class_install_property (object_class, PROP_BODY,
++      g_param_spec_string ("body",
++          "Body",
++          "The text for this contact",
++          NULL,
++          (G_PARAM_READWRITE | G_PARAM_CONSTRUCT)));
++  g_object_class_install_property (object_class, PROP_SUBTYPE,
++      g_param_spec_string ("subtype",
++          "Subtype",
++          "The type of this indicator",
++          NULL,
++          (G_PARAM_READWRITE | G_PARAM_CONSTRUCT)));
++  g_object_class_install_property (object_class, PROP_VISIBLE,
++      g_param_spec_boolean ("visible",
++          "Visible",
++          "The visibility of this indicator",
++          FALSE,
++          G_PARAM_READWRITE));
++
++  signals[ACTIVATE] =
++      g_signal_new ("activate",
++          G_TYPE_FROM_CLASS (klass),
++          G_SIGNAL_RUN_LAST,
++          0,
++          NULL, NULL,
++          g_cclosure_marshal_VOID__UINT,
++          G_TYPE_NONE, 1, G_TYPE_UINT);
++
++  g_type_class_add_private (object_class, sizeof (EmpathyIndicatorPriv));
++}
++
++
++static void
++empathy_indicator_init (EmpathyIndicator *e_indicator)
++{
++  e_indicator->priv = G_TYPE_INSTANCE_GET_PRIVATE (e_indicator,
++      EMPATHY_TYPE_INDICATOR,
++      EmpathyIndicatorPriv);
++}
++
++
++EmpathyIndicator *
++empathy_indicator_new (EmpathyContact *sender,
++    const gchar *body,
++    const gchar *subtype)
++{
++  DEBUG ("Creating a new indicator");
++  return g_object_new (EMPATHY_TYPE_INDICATOR, "contact", sender, "body", body,
++      "subtype", subtype, NULL);
++}
++
++
++void
++empathy_indicator_show (EmpathyIndicator *e_indicator)
++{
++  DEBUG ("Showing indicator %p", e_indicator);
++  g_object_set (e_indicator, "visible", TRUE, NULL);
++}
++
++
++void
++empathy_indicator_hide (EmpathyIndicator *e_indicator)
++{
++  DEBUG ("Hiding indicator %p", e_indicator);
++  g_object_set (e_indicator, "visible", FALSE, NULL);
++}
++
++
++void
++empathy_indicator_update (EmpathyIndicator *e_indicator,
++    const gchar *body)
++{
++  DEBUG ("Updating existing indicator %p", e_indicator);
++  g_object_set (e_indicator, "body", body, NULL);
++}
++
++
++EmpathyContact *
++empathy_indicator_get_contact (EmpathyIndicator *e_indicator)
++{
++  EmpathyContact *contact;
++  g_object_get (e_indicator, "contact", &contact, NULL);
++  return contact;
++}
+
+=== added file 'src/empathy-indicator.h'
+--- old/src/empathy-indicator.h	1970-01-01 00:00:00 +0000
++++ new/src/empathy-indicator.h	2010-04-09 19:26:13 +0000
+@@ -0,0 +1,65 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
++/*
++ * Copyright (C) 2009 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public
++ * License along with this program; if not, write to the
++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
++ * Boston, MA  02110-1301  USA
++ *
++ * Authors: James Westby <james.westby@ubuntu.com>
++ *
++ */
++
++#ifndef __EMPATHY_INDICATOR_H__
++#define __EMPATHY_INDICATOR_H__
++
++#include <glib.h>
++
++#include <libempathy/empathy-contact.h>
++
++G_BEGIN_DECLS
++
++#define EMPATHY_TYPE_INDICATOR         (empathy_indicator_get_type ())
++#define EMPATHY_INDICATOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_INDICATOR, EmpathyIndicator))
++#define EMPATHY_INDICATOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), EMPATHY_TYPE_INDICATOR, EmpathyIndicatorClass))
++#define EMPATHY_IS_INDICATOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_INDICATOR))
++#define EMPATHY_IS_INDICATOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_INDICATOR))
++#define EMPATHY_INDICATOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_INDICATOR, EmpathyIndicatorClass))
++
++typedef struct _EmpathyIndicator      EmpathyIndicator;
++typedef struct _EmpathyIndicatorClass EmpathyIndicatorClass;
++
++struct _EmpathyIndicator {
++  GObject parent;
++  gpointer priv;
++};
++
++struct _EmpathyIndicatorClass {
++  GObjectClass parent_class;
++};
++
++GType empathy_indicator_get_type (void) G_GNUC_CONST;
++EmpathyIndicator *empathy_indicator_new (EmpathyContact *sender,
++    const gchar *body,
++    const gchar *type);
++void empathy_indicator_show (EmpathyIndicator *e_indicator);
++void empathy_indicator_hide (EmpathyIndicator *e_indicator);
++void empathy_indicator_update (EmpathyIndicator *e_indicator,
++    const gchar *body);
++EmpathyContact *empathy_indicator_get_contact (EmpathyIndicator *e_indicator);
++
++G_END_DECLS
++
++
++#endif /* __EMPATHY-INDICATOR_H__ */
+
+=== modified file 'src/empathy-main-window.c'
+--- old/src/empathy-main-window.c	2010-04-09 19:10:25 +0000
++++ new/src/empathy-main-window.c	2010-04-09 19:26:13 +0000
+@@ -68,6 +68,10 @@
+ #include "empathy-ft-manager.h"
+ #include "empathy-migrate-butterfly-logs.h"
+ 
++#ifdef HAVE_LIBINDICATE
++#include "empathy-indicator-manager.h"
++#endif
++
+ #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
+ #include <libempathy/empathy-debug.h>
+ 
+@@ -123,6 +127,10 @@
+ 
+ 	/* Actions that are enabled when there are connected accounts */
+ 	GList                  *actions_connected;
++#ifdef HAVE_LIBINDICATE
++       EmpathyIndicatorManager *indicator_manager;
++       GHashTable              *indicator_timeouts;
++#endif
+ 
+ 	/* The idle event source to migrate butterfly's logs */
+ 	guint butterfly_log_migration_contact_added_id;
+@@ -591,6 +599,10 @@
+         /* someone is logging in */
+         empathy_sound_play (GTK_WIDGET (window->window),
+           EMPATHY_SOUND_CONTACT_CONNECTED);
++#ifdef HAVE_LIBINDICATE
++        empathy_indicator_manager_add_login_indicator (window->indicator_manager,
++          contact);
++#endif
+     }
+ 
+ out:
+@@ -662,6 +674,10 @@
+ 	g_object_unref (window->ui_manager);
+ 	g_object_unref (window->chatroom_manager);
+ 
++#ifdef HAVE_LIBINDICATE
++	g_object_unref (window->indicator_manager);
++#endif
++
+ 	g_free (window);
+ }
+ 
+@@ -1483,6 +1499,10 @@
+ 		l = l->next;
+ 	}
+ 
++#ifdef HAVE_LIBINDICATE
++	window->indicator_manager = empathy_indicator_manager_dup_singleton ();
++#endif
++
+ 	conf = empathy_conf_get ();
+ 
+ 	/* Show offline ? */
+
+=== modified file 'src/empathy-preferences.c'
+--- old/src/empathy-preferences.c	2010-04-09 19:09:01 +0000
++++ new/src/empathy-preferences.c	2010-04-09 19:26:13 +0000
+@@ -53,6 +53,7 @@
+ 
+ 	GtkWidget *checkbutton_show_smileys;
+ 	GtkWidget *checkbutton_show_contacts_in_rooms;
++	GtkWidget *checkbutton_use_libindicate;
+ 	GtkWidget *combobox_chat_theme;
+ 	GtkWidget *checkbutton_separate_chat_windows;
+ 	GtkWidget *checkbutton_autoconnect;
+@@ -215,6 +216,14 @@
+ 					  EMPATHY_PREFS_CHAT_SHOW_SMILEYS,
+ 					  preferences->checkbutton_show_smileys);
+ 
++#ifdef HAVE_LIBINDICATE
++	preferences_hookup_toggle_button (preferences,
++					  EMPATHY_PREFS_UI_USE_LIBINDICATE,
++					  preferences->checkbutton_use_libindicate);
++#else
++	gtk_widget_hide (GTK_WIDGET (preferences->checkbutton_use_libindicate));
++#endif
++
+ 	preferences_hookup_toggle_button (preferences,
+ 					  EMPATHY_PREFS_CHAT_SHOW_CONTACTS_IN_ROOMS,
+ 					  preferences->checkbutton_show_contacts_in_rooms);
+@@ -1137,6 +1146,7 @@
+ 		"notebook", &preferences->notebook,
+ 		"checkbutton_show_smileys", &preferences->checkbutton_show_smileys,
+ 		"checkbutton_show_contacts_in_rooms", &preferences->checkbutton_show_contacts_in_rooms,
++		"checkbutton_use_libindicate", &preferences->checkbutton_use_libindicate,
+ 		"combobox_chat_theme", &preferences->combobox_chat_theme,
+ 		"checkbutton_separate_chat_windows", &preferences->checkbutton_separate_chat_windows,
+ 		"checkbutton_autoconnect", &preferences->checkbutton_autoconnect,
+
+=== modified file 'src/empathy-preferences.ui'
+--- old/src/empathy-preferences.ui	2010-04-09 19:09:01 +0000
++++ new/src/empathy-preferences.ui	2010-04-09 19:26:13 +0000
+@@ -250,6 +250,20 @@
+                     <property name="position">1</property>
+                   </packing>
+                 </child>
++                <child>
++                  <object class="GtkCheckButton" id="checkbutton_use_libindicate">
++                    <property name="label" translatable="yes">Show incoming messages in the messaging menu</property>
++                    <property name="visible">True</property>
++                    <property name="can_focus">True</property>
++                    <property name="receives_default">False</property>
++                    <property name="draw_indicator">True</property>
++                  </object>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">False</property>
++                    <property name="position">2</property>
++                  </packing>
++                </child>
+               </object>
+               <packing>
+                 <property name="position">1</property>
+
+=== modified file 'src/empathy-status-icon.c'
+--- old/src/empathy-status-icon.c	2010-04-09 19:09:01 +0000
++++ new/src/empathy-status-icon.c	2010-04-09 19:26:13 +0000
+@@ -29,6 +29,7 @@
+ #include <gdk/gdkkeysyms.h>
+ #include <glib/gi18n.h>
+ 
++#include <libnotify/notify.h>
+ #include <libnotify/notification.h>
+ #include <libnotify/notify.h>
+ 
+@@ -50,6 +51,12 @@
+ #include "empathy-preferences.h"
+ #include "empathy-event-manager.h"
+ 
++#ifdef HAVE_LIBINDICATE
++#include "empathy-indicator-manager.h"
++#include <libindicate/server.h>
++#include <libindicate/interests.h>
++#endif
++
+ #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
+ #include <libempathy/empathy-debug.h>
+ 
+@@ -73,6 +80,10 @@
+ 	GtkAction           *show_window_item;
+ 	GtkAction           *new_message_item;
+ 	GtkAction           *status_item;
++#ifdef HAVE_LIBINDICATE
++        EmpathyIndicatorManager *indicator_manager;
++        IndicateServer      *indicate_server;
++#endif
+ } EmpathyStatusIconPriv;
+ 
+ G_DEFINE_TYPE (EmpathyStatusIcon, empathy_status_icon, G_TYPE_OBJECT);
+@@ -140,8 +151,13 @@
+ 						    priv->event->header, message_esc,
+ 						    NULL);
+ 		} else {
+-			priv->notification = notify_notification_new_with_status_icon
++			if (gtk_status_icon_get_visible (priv->icon)) {
++				priv->notification = notify_notification_new_with_status_icon
+ 				(priv->event->header, message_esc, NULL, priv->icon);
++			} else {
++				priv->notification = notify_notification_new
++					(priv->event->header, message_esc, NULL, NULL);
++			}
+ 			notify_notification_set_timeout (priv->notification,
+ 							 NOTIFY_EXPIRES_DEFAULT);
+ 
+@@ -342,6 +358,94 @@
+ 		empathy_window_present (GTK_WINDOW (priv->window));
+ 	}
+ }
++#ifdef HAVE_LIBINDICATE
++static void
++empathy_status_icon_set_visible (gboolean show_icon, EmpathyStatusIcon *icon)
++{
++	EmpathyStatusIconPriv *priv = GET_PRIV (icon);
++	gtk_status_icon_set_visible (priv->icon, show_icon);
++}
++
++static void
++empathy_indicator_interest_status_icon (gboolean icon_visibility,
++	EmpathyStatusIcon *icon)
++{
++        EmpathyIndicatorManager *manager;
++	manager = empathy_indicator_manager_dup_singleton();
++
++        gboolean use_libindicate = FALSE;
++        empathy_conf_get_bool (empathy_conf_get (),
++                              EMPATHY_PREFS_UI_USE_LIBINDICATE,
++                              &use_libindicate);
++
++        if (use_libindicate && !icon_visibility) {
++                empathy_indicator_manager_set_server_visible (manager,
++                                TRUE);
++                /* Hide the status icon so there are not two ways to access
++		 * empathy.
++                 */
++		DEBUG ("Hiding the icon, we are shown in the indicator");
++                empathy_status_icon_set_visible (FALSE, icon);
++        } else {
++                empathy_indicator_manager_set_server_visible (manager,
++                                FALSE);
++		DEBUG ("Show the icon, we are not shown in the indicator");
++                empathy_status_icon_set_visible (TRUE, icon);
++        }
++}
++
++static void
++empathy_indicator_interest_added (IndicateServer * server,
++	IndicateInterests interest, EmpathyStatusIcon *icon)
++{
++	if (interest != INDICATE_INTEREST_SERVER_SIGNAL) {
++		return;
++	}
++	DEBUG ("Indicator received interest-added signal");
++        empathy_indicator_interest_status_icon(FALSE, icon);
++}
++
++static void
++empathy_indicator_interest_removed (IndicateServer * server,
++	IndicateInterests interest, EmpathyStatusIcon *icon)
++{
++	if (interest != INDICATE_INTEREST_SERVER_SIGNAL) {
++		return;
++	}
++
++	DEBUG ("Indicator received interest-removed signal");
++	empathy_indicator_interest_status_icon(TRUE, icon);
++}
++
++static void
++status_icon_set_use_libindicate (EmpathyStatusIcon *icon,
++			    gboolean use_libindicate)
++{
++	EmpathyStatusIconPriv *priv = GET_PRIV (icon);
++
++	if (use_libindicate) {
++		empathy_indicator_manager_set_server_visible (priv->indicator_manager,
++			TRUE);
++	} else {
++		empathy_indicator_manager_set_server_visible (priv->indicator_manager,
++			FALSE);
++		empathy_status_icon_set_visible(TRUE, icon);
++	}
++}
++
++static void
++status_icon_notify_libindicate_cb (EmpathyConf *conf,
++				  const gchar *key,
++				  gpointer     user_data)
++{
++	EmpathyStatusIcon *icon = user_data;
++	gboolean           use_libindicate = FALSE;
++
++	if (empathy_conf_get_bool (conf, key, &use_libindicate)) {
++		status_icon_set_use_libindicate (icon, use_libindicate);
++	}
++}
++#endif
+ 
+ static void
+ status_icon_notify_visibility_cb (EmpathyConf *conf,
+@@ -362,10 +466,37 @@
+ 	EmpathyStatusIconPriv *priv = GET_PRIV (icon);
+ 	gboolean               visible;
+ 
++
+ 	visible = gtk_window_is_active (priv->window);
++#ifdef HAVE_LIBINDICATE
++	gboolean               use_libindicate;
++	empathy_conf_get_bool (empathy_conf_get (),
++			       EMPATHY_PREFS_UI_USE_LIBINDICATE,
++		               &use_libindicate);
++	if (use_libindicate) {
++		/* If indicators are used then we may very well not be active
++		 * when toggled, as they are usually windows themselves. This
++		 * makes it damn hard to toggle, so we just look at whether
++		 * we are visible.
++		 */
++		visible = GTK_WIDGET_VISIBLE (priv->window);
++		status_icon_set_visibility (icon, TRUE, TRUE);
++		return;
++	}
++#endif
++
+ 	status_icon_set_visibility (icon, !visible, TRUE);
+ }
+ 
++#ifdef HAVE_LIBINDICATE
++static void
++indicate_server_activate_cb (EmpathyIndicatorManager *manager,
++				guint timestamp, EmpathyStatusIcon *icon)
++{
++	status_icon_toggle_visibility (icon);
++}
++#endif
++
+ static void
+ status_icon_presence_changed_cb (EmpathyStatusIcon *icon)
+ {
+@@ -548,6 +679,9 @@
+ 	g_object_unref (priv->event_manager);
+ 	g_object_unref (priv->ui_manager);
+ 	g_object_unref (priv->notify_mgr);
++#ifdef HAVE_LIBINDICATE
++	g_object_unref (priv->indicator_manager);
++#endif
+ }
+ 
+ static void
+@@ -607,6 +741,14 @@
+ 				 status_icon_notify_visibility_cb,
+ 				 icon);
+ 
++#ifdef HAVE_LIBINDICATE
++
++	empathy_conf_notify_add (empathy_conf_get (),
++				 EMPATHY_PREFS_UI_USE_LIBINDICATE,
++				 status_icon_notify_libindicate_cb,
++				 icon);
++#endif
++
+ 	status_icon_create_menu (icon);
+ 
+ 	g_signal_connect_swapped (priv->account_manager,
+@@ -638,6 +780,9 @@
+ 	EmpathyStatusIconPriv *priv;
+ 	EmpathyStatusIcon     *icon;
+ 	gboolean               should_hide;
++#ifdef HAVE_LIBINDICATE
++	gboolean               use_libindicate;
++#endif
+ 
+ 	g_return_val_if_fail (GTK_IS_WINDOW (window), NULL);
+ 
+@@ -645,6 +790,24 @@
+ 	priv = GET_PRIV (icon);
+ 
+ 	priv->window = g_object_ref (window);
++#ifdef HAVE_LIBINDICATE
++	priv->indicator_manager = empathy_indicator_manager_dup_singleton ();
++	priv->indicate_server = indicate_server_ref_default ();
++
++	g_signal_connect (priv->indicator_manager, "server-activate",
++			  G_CALLBACK (indicate_server_activate_cb),
++			  icon);
++
++	g_signal_connect (priv->indicate_server,
++			  INDICATE_SERVER_SIGNAL_INTEREST_ADDED,
++			  G_CALLBACK(empathy_indicator_interest_added),
++			  icon);
++
++	g_signal_connect (priv->indicate_server,
++			  INDICATE_SERVER_SIGNAL_INTEREST_REMOVED,
++			  G_CALLBACK(empathy_indicator_interest_removed),
++			  icon);
++#endif
+ 
+ 	g_signal_connect_after (priv->window, "key-press-event",
+ 			  G_CALLBACK (status_icon_key_press_event_cb),
+@@ -662,6 +825,13 @@
+ 		should_hide = TRUE;
+ 	}
+ 
++#ifdef HAVE_LIBINDICATE
++	empathy_conf_get_bool (empathy_conf_get (),
++			       EMPATHY_PREFS_UI_USE_LIBINDICATE,
++		               &use_libindicate);
++	status_icon_set_use_libindicate (icon, use_libindicate);
++#endif
++
+ 	if (gtk_window_is_active (priv->window) == should_hide) {
+ 		status_icon_set_visibility (icon, !should_hide, FALSE);
+ 	}
+
--- empathy-2.30.2.orig/debian/patches/21_login_indicators.patch
+++ empathy-2.30.2/debian/patches/21_login_indicators.patch
@@ -0,0 +1,46 @@
+=== modified file 'src/empathy-indicator-manager.c'
+--- src/empathy-indicator-manager.c	2010-04-09 19:26:13 +0000
++++ src/empathy-indicator-manager.c	2010-04-09 20:30:53 +0000
+@@ -450,19 +450,26 @@
+   GSource *timeout;
+   EmpathyIndicator *e_indicator;
+   LoginData *login_data;
+-
+-  priv = GET_PRIV (manager);
+-  e_indicator = empathy_indicator_new (contact, NULL, "login");
+-  login_data = login_data_new (e_indicator, manager);
+-
+-  timeout = g_timeout_source_new_seconds (INDICATOR_LOGIN_TIMEOUT);
+-  g_source_set_callback (timeout, indicate_login_timeout, login_data,
+-      indicator_destroy_login_data);
+-  g_source_attach (timeout, NULL);
+-
+-  g_hash_table_insert (priv->login_timeouts, e_indicator, timeout);
+-
+-  g_signal_connect (e_indicator, "activate",
+-      G_CALLBACK (indicate_login_cb), manager);
+-  empathy_indicator_show (e_indicator);
++  gboolean contact_signon_notifications = FALSE;
++
++  empathy_conf_get_bool (empathy_conf_get (),
++     EMPATHY_PREFS_NOTIFICATIONS_CONTACT_SIGNIN, &contact_signon_notifications);
++
++  if (contact_signon_notifications) {
++      priv = GET_PRIV (manager);
++      e_indicator = empathy_indicator_new (contact, NULL, "login");
++      login_data = login_data_new (e_indicator, manager);
++
++      timeout = g_timeout_source_new_seconds (INDICATOR_LOGIN_TIMEOUT);
++      g_source_set_callback (timeout, indicate_login_timeout, login_data,
++          indicator_destroy_login_data);
++      g_source_attach (timeout, NULL);
++
++      g_hash_table_insert (priv->login_timeouts, e_indicator, timeout);
++
++      g_signal_connect (e_indicator, "activate",
++          G_CALLBACK (indicate_login_cb), manager);
++      empathy_indicator_show (e_indicator);
++  }
++
+ }
+
--- empathy-2.30.2.orig/debian/patches/31_really_raise_window.patch
+++ empathy-2.30.2/debian/patches/31_really_raise_window.patch
@@ -0,0 +1,64 @@
+=== modified file 'libempathy-gtk/empathy-ui-utils.c'
+--- a/libempathy-gtk/empathy-ui-utils.c
++++ b/libempathy-gtk/empathy-ui-utils.c
+@@ -1416,6 +1416,41 @@
+ 	}
+ }
+ 
++/* Really raise the window, even if the window manager doesn't agree */
++static void
++really_activate_window (GtkWindow *window)
++{
++        Screen *screen;
++        Time    timestamp;
++        XEvent  xev;
++
++        g_return_if_fail (GTK_IS_WINDOW (window));
++
++        screen = GDK_SCREEN_XSCREEN (gtk_widget_get_screen (GTK_WIDGET (window)));
++        timestamp = GDK_CURRENT_TIME;
++
++        xev.xclient.type = ClientMessage;
++        xev.xclient.serial = 0;
++        xev.xclient.send_event = True;
++        xev.xclient.display = GDK_DISPLAY ();
++        xev.xclient.window = GDK_WINDOW_XWINDOW (GTK_WIDGET (window)->window);
++        xev.xclient.message_type = gdk_x11_get_xatom_by_name ("_NET_ACTIVE_WINDOW");
++        xev.xclient.format = 32;
++        xev.xclient.data.l[0] = 2; /* Pager client type */
++        xev.xclient.data.l[1] = timestamp;
++        xev.xclient.data.l[2] = 0;
++        xev.xclient.data.l[3] = 0;
++        xev.xclient.data.l[4] = 0;
++
++        gdk_error_trap_push ();
++        XSendEvent (GDK_DISPLAY (),
++                RootWindowOfScreen (screen),
++                False,
++                SubstructureRedirectMask | SubstructureNotifyMask,
++                &xev);
++        gdk_error_trap_pop ();
++}
++
+ /* Takes care of moving the window to the current workspace. */
+ void
+ empathy_window_present (GtkWindow *window,
+@@ -1448,6 +1483,7 @@
+ 	gtk_window_present_with_time (window, timestamp);
+ 	gtk_window_set_skip_taskbar_hint (window, FALSE);
+ 	gtk_window_deiconify (window);
++	really_activate_window (window);
+ }
+ 
+ GtkWindow *
+--- a/src/empathy-event-manager.c
++++ b/src/empathy-event-manager.c
+@@ -331,7 +331,7 @@
+ 
+   if (event->approval->dialog != NULL)
+     {
+-      gtk_window_present (GTK_WINDOW (event->approval->dialog));
++      empathy_window_present (GTK_WINDOW (event->approval->dialog), TRUE);
+       return;
+     }
+ 
--- empathy-2.30.2.orig/debian/patches/11_empathy_accounts_category.patch
+++ empathy-2.30.2/debian/patches/11_empathy_accounts_category.patch
@@ -0,0 +1,39 @@
+## Description: Put empathy-accounts in correct category
+## Origin/Author: add some origin or author
+## Bug: https://bugzilla.gnome.org/show_bug.cgi?id=611913
+diff -Nur -x '*.orig' -x '*~' empathy-2.30.0.1/data/empathy-accounts.desktop empathy-2.30.0.1.new/data/empathy-accounts.desktop
+--- empathy-2.30.0.1/data/empathy-accounts.desktop	2010-04-09 20:16:43.000000000 +0800
++++ empathy-2.30.0.1.new/data/empathy-accounts.desktop	2010-04-14 14:16:03.144181696 +0800
+@@ -122,7 +122,7 @@
+ StartupNotify=true
+ Terminal=false
+ Type=Application
+-Categories=GNOME;GTK;Settings;DesktopSettings;
++Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=empathy
+ X-GNOME-Bugzilla-Component=General
+diff -Nur -x '*.orig' -x '*~' empathy-2.30.0.1/data/empathy-accounts.desktop.in empathy-2.30.0.1.new/data/empathy-accounts.desktop.in
+--- empathy-2.30.0.1/data/empathy-accounts.desktop.in	2010-04-09 20:16:18.000000000 +0800
++++ empathy-2.30.0.1.new/data/empathy-accounts.desktop.in	2010-04-14 14:15:51.856703116 +0800
+@@ -8,7 +8,7 @@
+ StartupNotify=true
+ Terminal=false
+ Type=Application
+-Categories=GNOME;GTK;Settings;DesktopSettings;
++Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=empathy
+ X-GNOME-Bugzilla-Component=General
+diff -Nur -x '*.orig' -x '*~' empathy-2.30.0.1/data/empathy-accounts.desktop.in.in empathy-2.30.0.1.new/data/empathy-accounts.desktop.in.in
+--- empathy-2.30.0.1/data/empathy-accounts.desktop.in.in	2010-04-09 20:15:39.000000000 +0800
++++ empathy-2.30.0.1.new/data/empathy-accounts.desktop.in.in	2010-04-14 14:15:42.994204251 +0800
+@@ -8,7 +8,7 @@
+ StartupNotify=true
+ Terminal=false
+ Type=Application
+-Categories=GNOME;GTK;Settings;DesktopSettings;
++Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=empathy
+ X-GNOME-Bugzilla-Component=General
