--- empathy-2.28.0.1.orig/debian/empathy.1 +++ empathy-2.28.0.1/debian/empathy.1 @@ -0,0 +1,24 @@ +.TH EMPATHY "1" "October 2007" "Telepathy project" "User Commands" +.SH NAME +empathy \- GNOME instant messaging client using Telepathy +.SH SYNOPSIS +empathy +.SH DESCRIPTION +Empathy consists of a rich set of reusable instant messaging widgets, and a +GNOME client using those widgets. +It uses Telepathy and Nokia's Mission Control, and reuses Gossip's UI. +.PP +The main user interface consists of a contact list window and an icon in the +notification area. +.SH OPTIONS +There are no command-line options. +.SH ENVIRONMENT +.TP +\fBEMPATHY_LOGFILE\fR=\fIfilename\fR +If set, debug output will go to the given file rather than to stderr. +.TP +\fBEMPATHY_DEBUG\fR=\fItype\fR +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 SEE ALSO +\fIhttp://telepathy.freedesktop.org/\fR, \fIhttp://live.gnome.org/Empathy\fR --- empathy-2.28.0.1.orig/debian/rules +++ empathy-2.28.0.1/debian/rules @@ -0,0 +1,33 @@ +#!/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 \ + --enable-python \ + --enable-megaphone \ + --disable-tests \ + --with-connectivity=nm \ + --enable-libindicate \ + --enable-webkit + +binary-install/python-empathy:: + dh_pysupport -p$(cdbs_curpkg) + +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.28.0.1.orig/debian/pyversion +++ empathy-2.28.0.1/debian/pyversion @@ -0,0 +1 @@ +2.4- --- empathy-2.28.0.1.orig/debian/changelog +++ empathy-2.28.0.1/debian/changelog @@ -0,0 +1,1225 @@ +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 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 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 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 Mon, 05 Oct 2009 14:18:34 +0200 + +empathy (2.28.0.1-1) unstable; urgency=low + + * New upstream release + + -- Sjoerd Simons 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 Tue, 14 Jul 2009 19:15:56 +0200 + +empathy (2.27.3-2ubuntu2) karmic; urgency=low + + * Drop geoclue dependencies, really + + -- Laurent Bigonville 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 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 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 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 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 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 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 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 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 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 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 Tue, 14 Apr 2009 11:44:14 +0200 + +empathy (2.26.0.1-0ubuntu1) jaunty; urgency=low + + * New upstream release (LP: #351884) + + -- Laurent Bigonville 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 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 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 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 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 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 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 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 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 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 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 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 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 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 Mon, 20 Oct 2008 21:48:50 +0200 + +empathy (2.24.1-1) experimental; urgency=low + + * New upstream release. + + -- Laurent Bigonville 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 Mon, 22 Sep 2008 23:32:45 +0200 + +empathy (2.24.0-1) experimental; urgency=low + + * New upstream release. + + -- Laurent Bigonville 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 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 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 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 Mon, 25 Aug 2008 08:04:11 +0200 + +empathy (2.23.90-1) experimental; urgency=low + + * New upstream release. + + -- Dafydd Harries 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 patch to debian/patches + + -- Laurent Bigonville 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 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 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 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 Thu, 14 Aug 2008 18:53:35 +0200 + +empathy (2.23.6-0ubuntu4) intrepid; urgency=low + + * Demotte telepathy-idle to Suggests + + -- Laurent Bigonville 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 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 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 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 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 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 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 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 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 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 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 Sun, 06 Apr 2008 23:33:50 +0200 + +empathy (0.22.0-1) unstable; urgency=low + + * New upstream release + + -- Sjoerd Simons 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 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 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 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 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 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 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 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 (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 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 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 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 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 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 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 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 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 Thu, 06 Sep 2007 09:18:01 +0200 + +empathy (0.12-0ubuntu1) gutsy; urgency=low + + * Fake sync with not yet published version + + -- Laurent Bigonville Sat, 25 Aug 2007 01:02:43 +0200 + +empathy (0.10-0ubuntu2) gutsy; urgency=low + + * Add profiles for haze support + + -- Matthew Garrett Tue, 21 Aug 2007 19:19:41 +0100 + +empathy (0.10-0ubuntu1) gutsy; urgency=low + + * New upstream release + + -- Baptiste Mille-Mathias 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 Tue, 3 Jul 2007 11:56:56 +0200 + +empathy (0.8-1) unstable; urgency=low + + * New upstream release + + -- Sjoerd Simons 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 Thu, 21 Jun 2007 22:43:45 +0200 + +empathy (0.7-1) unstable; urgency=low + + * New upstream release + + -- Sjoerd Simons 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 Mon, 04 Jun 2007 09:27:47 +0200 + +empathy (0.5-1) unstable; urgency=low + + * New upstream release + + -- Sjoerd Simons Sat, 26 May 2007 19:02:41 +0200 + +empathy (0.4-1) unstable; urgency=low + + * New upstream release + + -- Sjoerd Simons Sun, 20 May 2007 15:31:42 +0200 + +empathy (0.3-1) unstable; urgency=low + + * Initial release + + -- Sjoerd Simons Mon, 14 May 2007 22:32:24 +0200 + --- empathy-2.28.0.1.orig/debian/update-patches.mk +++ empathy-2.28.0.1/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.28.0.1.orig/debian/libempathy-common.install +++ empathy-2.28.0.1/debian/libempathy-common.install @@ -0,0 +1,8 @@ +usr/share/locale +usr/share/empathy/empathy-chatroom-manager.dtd +usr/share/empathy/empathy-log-manager.xsl +usr/share/empathy/empathy-irc-networks.dtd +usr/share/empathy/irc-networks.xml +usr/share/empathy/codec-preferences +usr/share/empathy/element-properties + --- empathy-2.28.0.1.orig/debian/watch +++ empathy-2.28.0.1/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://ftp.gnome.org/pub/GNOME/sources/empathy/([0-9.]+)/empathy-(.*).tar.gz --- empathy-2.28.0.1.orig/debian/empathy.install +++ empathy-2.28.0.1/debian/empathy.install @@ -0,0 +1,4 @@ +usr/bin/ +usr/share/applications/empathy.desktop +usr/share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service +usr/share/telepathy/clients/Empathy.client --- empathy-2.28.0.1.orig/debian/libempathy-dev.install +++ empathy-2.28.0.1/debian/libempathy-dev.install @@ -0,0 +1,4 @@ +usr/include/libempathy +usr/lib/libempathy.so +usr/lib/libempathy.a +usr/lib/pkgconfig/libempathy.pc --- empathy-2.28.0.1.orig/debian/libempathy30.install +++ empathy-2.28.0.1/debian/libempathy30.install @@ -0,0 +1 @@ +usr/lib/libempathy.so.* --- empathy-2.28.0.1.orig/debian/copyright +++ empathy-2.28.0.1/debian/copyright @@ -0,0 +1,115 @@ +This package was debianized by Sjoerd Simons 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 + Richard Hult + Michael Hallendal + Martyn Russell + Raphaël Slinckx + +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 + 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 + Copyright (C) 2007 Raphael Slinckx + 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 + Copyright (C) 2007 Elliot Fairweather + Copyright (C) 2007 Nokia Corporation + Copyright (C) 2007 Marco Barisione + Copyright (C) 2007-2008 Guillaume Desmottes + Copyright (C) 2007 Raphael Slinckx + Copyright (C) 2001-2006 Bastien Nocera +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 + Copyright 2003-2004 Christian Rose + Copyright 2006 Daniel Nylander +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 + Copyright 2008-2009 Ubuntu Documentation Project + Copyright 2008 Lucas Lommer + Copyright 2008 Joan Duran + Copyright 2008 Mario Blattermann + Copyright 2008 Philipp Kerling + Copyright 2008-2009 Jorge Gonzalez + Copyright 2008 Marc Vellet + Copyright 2008 Bruno Brouard + Copyright 2008 Claude Paroz + Copyright 2008 Никита Белобров +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 +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.28.0.1.orig/debian/libempathy-gtk-doc.install +++ empathy-2.28.0.1/debian/libempathy-gtk-doc.install @@ -0,0 +1 @@ +usr/share/gtk-doc/html/libempathy-gtk/ --- empathy-2.28.0.1.orig/debian/libempathy-doc.install +++ empathy-2.28.0.1/debian/libempathy-doc.install @@ -0,0 +1 @@ +usr/share/gtk-doc/html/libempathy/ --- empathy-2.28.0.1.orig/debian/empathy-doc.install +++ empathy-2.28.0.1/debian/empathy-doc.install @@ -0,0 +1 @@ +usr/share/gnome/help/empathy/ --- empathy-2.28.0.1.orig/debian/libempathy-gtk-dev.install +++ empathy-2.28.0.1/debian/libempathy-gtk-dev.install @@ -0,0 +1,4 @@ +usr/include/libempathy-gtk +usr/lib/libempathy-gtk*.so +usr/lib/libempathy-gtk*.a +usr/lib/pkgconfig/libempathy-gtk.pc --- empathy-2.28.0.1.orig/debian/empathy-megaphone-applet.install +++ empathy-2.28.0.1/debian/empathy-megaphone-applet.install @@ -0,0 +1,4 @@ +etc/gconf/schemas/GNOME_Megaphone_Applet.schemas +usr/share/empathy/GNOME_Megaphone_Applet.xml +usr/lib/bonobo/servers/GNOME_Megaphone_Applet.server +usr/lib/empathy/megaphone-applet --- empathy-2.28.0.1.orig/debian/python-empathy.install +++ empathy-2.28.0.1/debian/python-empathy.install @@ -0,0 +1 @@ +usr/lib/python*/*-packages/*.so --- empathy-2.28.0.1.orig/debian/gbp.conf +++ empathy-2.28.0.1/debian/gbp.conf @@ -0,0 +1,8 @@ +[DEFAULT] +debian-branch = debian +upstream-branch = upstream +pristine-tar = True + +[git-buildpackage] +tarball-dir = ../tarballs/ +export-dir = ../build-area/ --- empathy-2.28.0.1.orig/debian/compat +++ empathy-2.28.0.1/debian/compat @@ -0,0 +1 @@ +7 --- empathy-2.28.0.1.orig/debian/empathy-logs.1 +++ empathy-2.28.0.1/debian/empathy-logs.1 @@ -0,0 +1,12 @@ +.TH EMPATHY-LOGS "1" "February 2009" "Telepathy project" "User Commands" +.SH NAME +empathy\-logs \- view Telepathy instant messaging logs +.SH SYNOPSIS +empathy\-logs +.SH DESCRIPTION +empathy-logs displays a graphical (Gtk+) dialog where the instant messaging +logs used by Emapthy can be read and searched. +.SH OPTIONS +There are no command-line options. +.SH SEE ALSO +\fIhttp://telepathy.freedesktop.org/\fR, \fIhttp://live.gnome.org/Empathy\fR --- empathy-2.28.0.1.orig/debian/empathy.preinst +++ empathy-2.28.0.1/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.28.0.1.orig/debian/README.source +++ empathy-2.28.0.1/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.28.0.1.orig/debian/empathy-accounts.1 +++ empathy-2.28.0.1/debian/empathy-accounts.1 @@ -0,0 +1,12 @@ +.TH EMPATHY-ACCOUNTS "1" "October 2007" "Telepathy project" "User Commands" +.SH NAME +empathy\-accounts \- configure Telepathy instant messaging accounts +.SH SYNOPSIS +empathy\-accounts +.SH DESCRIPTION +empathy-accounts displays a graphical (Gtk+) dialog where the instant messaging +accounts used by Empathy (via Telepathy Mission Control) can be configured. +.SH OPTIONS +There are no command-line options. +.SH SEE ALSO +\fIhttp://telepathy.freedesktop.org/\fR, \fIhttp://live.gnome.org/Empathy\fR --- empathy-2.28.0.1.orig/debian/libempathy-gtk-common.install +++ empathy-2.28.0.1/debian/libempathy-gtk-common.install @@ -0,0 +1,7 @@ +etc/gconf/schemas/empathy.schemas +usr/share/icons/ +usr/share/empathy/icons/ +usr/share/empathy/*.ui +usr/share/empathy/empathy-contact-groups.dtd +usr/share/empathy/empathy-status-presets.dtd +usr/share/empathy/Template.html --- empathy-2.28.0.1.orig/debian/control +++ empathy-2.28.0.1/debian/control @@ -0,0 +1,227 @@ +Source: empathy +Section: gnome +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Debian Telepathy maintainers +Uploaders: Sjoerd Simons , + Dafydd Harries , + Simon McVittie , + Riccardo Setti , + Laurent Bigonville , + Jonny Lamb +Build-Depends: cdbs, + debhelper (>= 7), + rarian-compat, + librarian-dev, + libglib2.0-dev (>= 2.16.0), + libgtk2.0-dev (>= 2.16.0), + libpanel-applet2-dev (>= 2.10.0), + libgconf2-dev (>= 1.2.0), + libtelepathy-glib-dev (>= 0.7.35), + intltool, + libenchant-dev (>= 1.2.0), + iso-codes, + libebook1.2-dev, + python-gtk2-dev, + python-support (>= 0.3), + 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.7), + libgnome-keyring-dev (>= 2.22), + libunique-dev, + libindicate-dev (>= 0.2.0), + libindicate-gtk-dev (>= 0.2.0) +Standards-Version: 3.8.3 +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-doc (= ${source:Version}), + dbus-x11 +Recommends: telepathy-gabble, + telepathy-salut, + telepathy-haze, + telepathy-butterfly, + gvfs-backends +Suggests: telepathy-idle +Description: High-level library and user-interface for Telepathy + 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 packet contains the empathy IM application and account manager. + +Package: empathy-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Replaces: empathy (<< 2.27.92) +Description: High-level library and user-interface for Telepathy (empathy documentation) + 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 packet contains the GNOME documentation for empathy IM application + +Package: libempathy-common +Architecture: all +Section: misc +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: High-level library and user-interface for Telepathy (library 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 packet contains common files for libempathy + +Package: libempathy30 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libempathy-common (= ${source:Version}), + telepathy-mission-control-5 +Description: High-level library and user-interface for Telepathy (low-level library) + 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 packages contains the low-level empathy library + +Package: libempathy-doc +Architecture: all +Section: doc +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: High-level library and user-interface for Telepathy (library documentation) + 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 documentation for libempathy + +Package: libempathy-dev +Architecture: any +Section: libdevel +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libglib2.0-dev, + libxml2-dev, + libtelepathy-glib-dev (>= 0.7.34), + libempathy30 (= ${binary:Version}) +Description: High-level library and user-interface for Telepathy (library dev 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 development files for libempathy + +Package: libempathy-gtk-doc +Architecture: all +Section: doc +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: High-level library and user-interface for Telepathy (GTK documentation) + 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 documentation for libempathy-gtk + +Package: libempathy-gtk-common +Architecture: all +Section: misc +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gnome-icon-theme +Description: High-level library and user-interface for Telepathy (GTK 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 common files for libempathy-gtk + +Package: libempathy-gtk28 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libempathy-gtk-common (= ${source:Version}), +Description: High-level library and user-interface for Telepathy (GTK library) + 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 a library of widgets for use in IM applications. + +Package: libempathy-gtk-dev +Architecture: any +Section: libdevel +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libempathy-dev, + libempathy-gtk28 (= ${binary:Version}), + libgtk2.0-dev (>= 2.16.0), + libcanberra-gtk-dev, + libgstreamer0.10-dev +Description: High-level library and user-interface for Telepathy (GTK dev 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 development files for libempathy-gtk + +Package: python-empathy +Architecture: any +Section: python +Provides: ${python:Provides} +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends} +XB-Python-Version: ${python:Versions} +Description: High-level library and user-interface for Telepathy (python bindings) + 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 Python bindings for libempathy and libempathy-gtk + +Package: empathy-megaphone-applet +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: High-level library and user-interface for Telepathy (megaphone applet) + 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 packet contains the megaphone applet + . + The megaphone applet let you start a conversiation with a contact + and see his status directly from the gnome-panel. --- empathy-2.28.0.1.orig/debian/libempathy-gtk28.install +++ empathy-2.28.0.1/debian/libempathy-gtk28.install @@ -0,0 +1 @@ +usr/lib/libempathy-gtk*.so.* --- empathy-2.28.0.1.orig/debian/libempathy30.symbols +++ empathy-2.28.0.1/debian/libempathy30.symbols @@ -0,0 +1,426 @@ +libempathy.so.30 libempathy30 #MINVER# + empathy_account_get_connection@Base 2.27.91.1 + empathy_account_get_connection_for_path@Base 2.27.91.1 + empathy_account_get_connection_manager@Base 2.27.91.1 + empathy_account_get_display_name@Base 2.27.91.1 + empathy_account_get_icon_name@Base 2.27.91.1 + empathy_account_get_parameters@Base 2.27.91.1 + empathy_account_get_protocol@Base 2.27.91.1 + empathy_account_get_type@Base 2.27.91.1 + empathy_account_get_unique_name@Base 2.27.91.1 + empathy_account_is_enabled@Base 2.27.91.1 + empathy_account_is_just_connected@Base 2.27.91.1 + empathy_account_is_ready@Base 2.27.91.1 + empathy_account_is_valid@Base 2.27.91.1 + empathy_account_manager_create_account_async@Base 2.27.91.1 + empathy_account_manager_create_account_finish@Base 2.27.91.1 + empathy_account_manager_dup_accounts@Base 2.27.91.1 + empathy_account_manager_dup_connections@Base 2.27.91.1 + empathy_account_manager_dup_singleton@Base 2.27.91.1 + empathy_account_manager_ensure_account@Base 2.27.91.1 + empathy_account_manager_get_account@Base 2.27.91.1 + empathy_account_manager_get_account_for_connection@Base 2.27.91.1 + empathy_account_manager_get_connected_accounts@Base 2.27.91.1 + empathy_account_manager_get_connecting_accounts@Base 2.27.91.1 + empathy_account_manager_get_count@Base 2.27.91.1 + empathy_account_manager_get_global_presence@Base 2.27.91.1 + empathy_account_manager_get_requested_global_presence@Base 2.27.91.1 + empathy_account_manager_get_type@Base 2.27.91.1 + empathy_account_manager_is_ready@Base 2.27.91.1 + empathy_account_manager_request_global_presence@Base 2.27.91.1 + empathy_account_new@Base 2.27.91.1 + empathy_account_reconnect_async@Base 2.27.92 + empathy_account_reconnect_finish@Base 2.27.92 + empathy_account_refresh_properties@Base 2.27.92 + empathy_account_remove_async@Base 2.27.91.1 + empathy_account_remove_finish@Base 2.27.91.1 + empathy_account_request_presence@Base 2.27.91.1 + empathy_account_set_display_name_async@Base 2.27.91.1 + empathy_account_set_display_name_finish@Base 2.27.91.1 + empathy_account_set_enabled_async@Base 2.27.91.1 + empathy_account_set_enabled_finish@Base 2.27.91.1 + empathy_account_set_icon_name_async@Base 2.27.92 + empathy_account_set_icon_name_finish@Base 2.27.92 + empathy_account_settings_apply_async@Base 2.27.91.1 + empathy_account_settings_apply_finish@Base 2.27.91.1 + empathy_account_settings_discard_changes@Base 2.27.91.1 + empathy_account_settings_get@Base 2.27.91.1 + empathy_account_settings_get_account@Base 2.27.91.1 + empathy_account_settings_get_boolean@Base 2.27.91.1 + empathy_account_settings_get_cm@Base 2.27.91.1 + empathy_account_settings_get_dbus_signature@Base 2.27.91.1 + empathy_account_settings_get_default@Base 2.27.91.1 + empathy_account_settings_get_display_name@Base 2.27.91.1 + empathy_account_settings_get_icon_name@Base 2.27.91.1 + empathy_account_settings_get_int32@Base 2.27.91.1 + empathy_account_settings_get_int64@Base 2.27.91.1 + empathy_account_settings_get_protocol@Base 2.27.91.1 + empathy_account_settings_get_string@Base 2.27.91.1 + empathy_account_settings_get_tp_params@Base 2.27.91.1 + empathy_account_settings_get_type@Base 2.27.91.1 + empathy_account_settings_get_uint32@Base 2.27.91.1 + empathy_account_settings_get_uint64@Base 2.27.91.1 + empathy_account_settings_has_account@Base 2.27.91.1 + empathy_account_settings_is_ready@Base 2.27.91.1 + empathy_account_settings_is_valid@Base 2.27.91.1 + empathy_account_settings_new@Base 2.27.91.1 + empathy_account_settings_new_for_account@Base 2.27.91.1 + empathy_account_settings_set_boolean@Base 2.27.91.1 + empathy_account_settings_set_display_name_async@Base 2.27.91.1 + empathy_account_settings_set_display_name_finish@Base 2.27.91.1 + empathy_account_settings_set_icon_name_async@Base 2.27.92 + empathy_account_settings_set_icon_name_finish@Base 2.27.92 + empathy_account_settings_set_int32@Base 2.27.91.1 + empathy_account_settings_set_int64@Base 2.27.91.1 + empathy_account_settings_set_string@Base 2.27.91.1 + empathy_account_settings_set_uint32@Base 2.27.91.1 + empathy_account_settings_set_uint64@Base 2.27.91.1 + empathy_account_settings_unset@Base 2.27.91.1 + empathy_account_update_settings_async@Base 2.27.91.1 + empathy_account_update_settings_finish@Base 2.27.91.1 + empathy_avatar_get_type@Base 2.27.91.1 + empathy_avatar_new@Base 2.27.91.1 + empathy_avatar_ref@Base 2.27.91.1 + empathy_avatar_save_to_file@Base 2.27.91.1 + empathy_avatar_unref@Base 2.27.91.1 + empathy_call_factory_claim_channel@Base 2.27.91.1 + empathy_call_factory_get@Base 2.27.91.1 + empathy_call_factory_get_type@Base 2.27.91.1 + empathy_call_factory_initialise@Base 2.27.91.1 + empathy_call_factory_new_call@Base 2.27.91.1 + empathy_call_factory_new_call_with_streams@Base 2.27.91.1 + empathy_call_handler_bus_message@Base 2.27.91.1 + empathy_call_handler_get_type@Base 2.27.91.1 + empathy_call_handler_has_initial_video@Base 2.27.91.1 + empathy_call_handler_new_for_channel@Base 2.27.91.1 + empathy_call_handler_new_for_contact@Base 2.27.91.1 + empathy_call_handler_new_for_contact_with_streams@Base 2.27.91.1 + empathy_call_handler_start_call@Base 2.27.91.1 + empathy_call_handler_stop_call@Base 2.27.91.1 + empathy_capabilities_get_type@Base 2.27.91.1 + empathy_chatroom_equal@Base 2.27.91.1 + empathy_chatroom_get_account@Base 2.27.91.1 + empathy_chatroom_get_auto_connect@Base 2.27.91.1 + empathy_chatroom_get_invite_only@Base 2.27.91.1 + empathy_chatroom_get_members_count@Base 2.27.91.1 + empathy_chatroom_get_name@Base 2.27.91.1 + empathy_chatroom_get_need_password@Base 2.27.91.1 + empathy_chatroom_get_room@Base 2.27.91.1 + empathy_chatroom_get_subject@Base 2.27.91.1 + empathy_chatroom_get_tp_chat@Base 2.27.91.1 + empathy_chatroom_get_type@Base 2.27.91.1 + empathy_chatroom_is_favorite@Base 2.27.91.1 + empathy_chatroom_manager_add@Base 2.27.91.1 + empathy_chatroom_manager_dup_singleton@Base 2.27.91.1 + empathy_chatroom_manager_find@Base 2.27.91.1 + empathy_chatroom_manager_get_chatrooms@Base 2.27.91.1 + empathy_chatroom_manager_get_count@Base 2.27.91.1 + empathy_chatroom_manager_get_type@Base 2.27.91.1 + empathy_chatroom_manager_observe@Base 2.27.91.1 + empathy_chatroom_manager_remove@Base 2.27.91.1 + empathy_chatroom_new@Base 2.27.91.1 + empathy_chatroom_new_full@Base 2.27.91.1 + empathy_chatroom_set_account@Base 2.27.91.1 + empathy_chatroom_set_auto_connect@Base 2.27.91.1 + empathy_chatroom_set_favorite@Base 2.27.91.1 + empathy_chatroom_set_invite_only@Base 2.27.91.1 + empathy_chatroom_set_members_count@Base 2.27.91.1 + empathy_chatroom_set_name@Base 2.27.91.1 + empathy_chatroom_set_need_password@Base 2.27.91.1 + empathy_chatroom_set_room@Base 2.27.91.1 + empathy_chatroom_set_subject@Base 2.27.91.1 + empathy_chatroom_set_tp_chat@Base 2.27.91.1 + empathy_check_available_state@Base 2.27.91.1 + empathy_connection_managers_dup_singleton@Base 2.27.91.1 + empathy_connection_managers_get_cm@Base 2.27.91.1 + empathy_connection_managers_get_cms@Base 2.27.91.1 + empathy_connection_managers_get_cms_num@Base 2.27.91.1 + empathy_connection_managers_get_type@Base 2.27.91.1 + empathy_connection_managers_is_ready@Base 2.27.91.1 + empathy_connection_managers_update@Base 2.27.91.1 + empathy_connectivity_dup_singleton@Base 2.27.91.1 + empathy_connectivity_get_type@Base 2.27.91.1 + empathy_connectivity_get_use_conn@Base 2.27.91.1 + empathy_connectivity_is_online@Base 2.27.91.1 + empathy_connectivity_set_use_conn@Base 2.27.91.1 + empathy_contact_can_send_files@Base 2.27.91.1 + empathy_contact_can_use_stream_tube@Base 2.27.91.1 + empathy_contact_can_voip@Base 2.27.91.1 + empathy_contact_can_voip_audio@Base 2.27.91.1 + empathy_contact_can_voip_video@Base 2.27.91.1 + empathy_contact_equal@Base 2.27.91.1 + empathy_contact_get_account@Base 2.27.91.1 + empathy_contact_get_avatar@Base 2.27.91.1 + empathy_contact_get_capabilities@Base 2.27.91.1 + empathy_contact_get_connection@Base 2.27.91.1 + empathy_contact_get_handle@Base 2.27.91.1 + empathy_contact_get_id@Base 2.27.91.1 + empathy_contact_get_location@Base 2.27.91.1 + empathy_contact_get_name@Base 2.27.91.1 + empathy_contact_get_presence@Base 2.27.91.1 + empathy_contact_get_presence_message@Base 2.27.91.1 + empathy_contact_get_status@Base 2.27.91.1 + empathy_contact_get_tp_contact@Base 2.27.91.1 + empathy_contact_get_type@Base 2.27.91.1 + empathy_contact_group_get_expanded@Base 2.27.91.1 + empathy_contact_group_set_expanded@Base 2.27.91.1 + empathy_contact_groups_get_all@Base 2.27.91.1 + empathy_contact_is_online@Base 2.27.91.1 + empathy_contact_is_user@Base 2.27.91.1 + empathy_contact_list_add@Base 2.27.91.1 + empathy_contact_list_add_to_group@Base 2.27.91.1 + empathy_contact_list_flags_get_type@Base 2.27.91.1 + empathy_contact_list_get_all_groups@Base 2.27.91.1 + empathy_contact_list_get_flags@Base 2.27.91.1 + empathy_contact_list_get_groups@Base 2.27.91.1 + empathy_contact_list_get_members@Base 2.27.91.1 + empathy_contact_list_get_monitor@Base 2.27.91.1 + empathy_contact_list_get_pendings@Base 2.27.91.1 + empathy_contact_list_get_type@Base 2.27.91.1 + empathy_contact_list_remove@Base 2.27.91.1 + empathy_contact_list_remove_from_group@Base 2.27.91.1 + empathy_contact_list_remove_group@Base 2.27.91.1 + empathy_contact_list_rename_group@Base 2.27.91.1 + empathy_contact_load_avatar_cache@Base 2.27.91.1 + empathy_contact_load_avatar_data@Base 2.27.91.1 + empathy_contact_manager_dup_singleton@Base 2.27.91.1 + empathy_contact_manager_get_flags_for_connection@Base 2.27.91.1 + empathy_contact_manager_get_list@Base 2.27.91.1 + empathy_contact_manager_get_type@Base 2.27.91.1 + empathy_contact_manager_initialized@Base 2.27.91.1 + empathy_contact_monitor_get_type@Base 2.27.91.1 + empathy_contact_monitor_new_for_iface@Base 2.27.91.1 + empathy_contact_monitor_set_iface@Base 2.27.91.1 + empathy_contact_new@Base 2.27.91.1 + empathy_contact_new_for_log@Base 2.27.91.1 + empathy_contact_set_avatar@Base 2.27.91.1 + empathy_contact_set_capabilities@Base 2.27.91.1 + empathy_contact_set_handle@Base 2.27.91.1 + empathy_contact_set_id@Base 2.27.91.1 + empathy_contact_set_is_user@Base 2.27.91.1 + empathy_contact_set_location@Base 2.27.91.1 + empathy_contact_set_name@Base 2.27.91.1 + empathy_contact_set_presence@Base 2.27.91.1 + empathy_contact_set_presence_message@Base 2.27.91.1 + empathy_debug@Base 2.27.91.1 + empathy_debug_flag_is_set@Base 2.27.91.1 + empathy_debug_flags_get_type@Base 2.27.91.1 + empathy_debug_free@Base 2.27.91.1 + empathy_debug_set_flags@Base 2.27.91.1 + empathy_debugger_add_message@Base 2.27.91.1 + empathy_debugger_get_singleton@Base 2.27.91.1 + empathy_debugger_get_type@Base 2.27.91.1 + empathy_dispatch_operation_approve@Base 2.27.91.1 + empathy_dispatch_operation_claim@Base 2.27.91.1 + empathy_dispatch_operation_get_channel@Base 2.27.91.1 + empathy_dispatch_operation_get_channel_type@Base 2.27.91.1 + empathy_dispatch_operation_get_channel_type_id@Base 2.27.91.1 + empathy_dispatch_operation_get_channel_wrapper@Base 2.27.91.1 + empathy_dispatch_operation_get_object_path@Base 2.27.91.1 + empathy_dispatch_operation_get_status@Base 2.27.91.1 + empathy_dispatch_operation_get_tp_connection@Base 2.27.91.1 + empathy_dispatch_operation_get_type@Base 2.27.91.1 + empathy_dispatch_operation_is_incoming@Base 2.27.91.1 + empathy_dispatch_operation_new@Base 2.27.91.1 + empathy_dispatch_operation_new_with_wrapper@Base 2.27.91.1 + empathy_dispatch_operation_start@Base 2.27.91.1 + empathy_dispatch_operation_state_get_type@Base 2.27.91.1 + empathy_dispatcher_add_handler@Base 2.27.92 + empathy_dispatcher_chat_with_contact@Base 2.27.91.1 + empathy_dispatcher_chat_with_contact_id@Base 2.27.91.1 + empathy_dispatcher_create_channel@Base 2.27.91.1 + empathy_dispatcher_dup_singleton@Base 2.27.91.1 + empathy_dispatcher_find_requestable_channel_classes@Base 2.27.91.1 + empathy_dispatcher_find_requestable_channel_classes_async@Base 2.27.91.1 + empathy_dispatcher_get_type@Base 2.27.91.1 + empathy_dispatcher_join_muc@Base 2.27.91.1 + empathy_dispatcher_new@Base 2.27.92 + empathy_dispatcher_remove_handler@Base 2.27.92 + empathy_file_lookup@Base 2.27.91.1 + empathy_ft_error_enum_get_type@Base 2.27.91.1 + empathy_ft_factory_claim_channel@Base 2.27.91.1 + empathy_ft_factory_dup_singleton@Base 2.27.91.1 + empathy_ft_factory_get_type@Base 2.27.91.1 + empathy_ft_factory_new_transfer_outgoing@Base 2.27.91.1 + empathy_ft_factory_set_destination_for_incoming_handler@Base 2.27.91.1 + empathy_ft_handler_cancel_transfer@Base 2.27.91.1 + empathy_ft_handler_get_contact@Base 2.27.91.1 + empathy_ft_handler_get_content_type@Base 2.27.91.1 + empathy_ft_handler_get_filename@Base 2.27.91.1 + empathy_ft_handler_get_gfile@Base 2.27.91.1 + empathy_ft_handler_get_total_bytes@Base 2.27.91.1 + empathy_ft_handler_get_transferred_bytes@Base 2.27.91.1 + empathy_ft_handler_get_type@Base 2.27.91.1 + empathy_ft_handler_get_use_hash@Base 2.27.91.1 + empathy_ft_handler_incoming_set_destination@Base 2.27.91.1 + empathy_ft_handler_is_cancelled@Base 2.27.91.1 + empathy_ft_handler_is_completed@Base 2.27.91.1 + empathy_ft_handler_is_incoming@Base 2.27.91.1 + empathy_ft_handler_new_incoming@Base 2.27.91.1 + empathy_ft_handler_new_outgoing@Base 2.27.91.1 + empathy_ft_handler_start_transfer@Base 2.27.91.1 + empathy_handler_get_type@Base 2.27.92 + empathy_handler_new@Base 2.27.92 + empathy_handler_set_channels_func@Base 2.27.92 + empathy_handler_set_handle_channels_func@Base 2.27.92 + empathy_idle_dup_singleton@Base 2.27.91.1 + empathy_idle_get_auto_away@Base 2.27.91.1 + empathy_idle_get_flash_state@Base 2.27.91.1 + empathy_idle_get_state@Base 2.27.91.1 + empathy_idle_get_status@Base 2.27.91.1 + empathy_idle_get_type@Base 2.27.91.1 + empathy_idle_set_auto_away@Base 2.27.91.1 + empathy_idle_set_flash_state@Base 2.27.91.1 + empathy_idle_set_presence@Base 2.27.91.1 + empathy_idle_set_state@Base 2.27.91.1 + empathy_idle_set_status@Base 2.27.91.1 + empathy_init@Base 2.27.91.1 + empathy_irc_network_append_server@Base 2.27.91.1 + empathy_irc_network_get_servers@Base 2.27.91.1 + empathy_irc_network_get_type@Base 2.27.91.1 + empathy_irc_network_manager_add@Base 2.27.91.1 + empathy_irc_network_manager_find_network_by_address@Base 2.27.91.1 + empathy_irc_network_manager_get_networks@Base 2.27.91.1 + empathy_irc_network_manager_get_type@Base 2.27.91.1 + empathy_irc_network_manager_new@Base 2.27.91.1 + empathy_irc_network_manager_remove@Base 2.27.91.1 + empathy_irc_network_new@Base 2.27.91.1 + empathy_irc_network_remove_server@Base 2.27.91.1 + empathy_irc_network_set_server_position@Base 2.27.91.1 + empathy_irc_server_get_type@Base 2.27.91.1 + empathy_irc_server_new@Base 2.27.91.1 + empathy_log_manager_add_message@Base 2.27.91.1 + empathy_log_manager_dup_singleton@Base 2.27.91.1 + empathy_log_manager_exists@Base 2.27.91.1 + empathy_log_manager_get_chats@Base 2.27.91.1 + empathy_log_manager_get_date_readable@Base 2.27.91.1 + empathy_log_manager_get_dates@Base 2.27.91.1 + empathy_log_manager_get_filtered_messages@Base 2.27.91.1 + empathy_log_manager_get_messages_for_date@Base 2.27.91.1 + empathy_log_manager_get_type@Base 2.27.91.1 + empathy_log_manager_observe@Base 2.27.91.1 + empathy_log_manager_search_free@Base 2.27.91.1 + empathy_log_manager_search_hit_free@Base 2.27.91.1 + empathy_log_manager_search_new@Base 2.27.91.1 + empathy_log_store_ack_message@Base 2.27.91.1 + empathy_log_store_add_message@Base 2.27.91.1 + empathy_log_store_empathy_get_type@Base 2.27.91.1 + empathy_log_store_exists@Base 2.27.91.1 + empathy_log_store_get_chats@Base 2.27.91.1 + empathy_log_store_get_dates@Base 2.27.91.1 + empathy_log_store_get_filtered_messages@Base 2.27.91.1 + empathy_log_store_get_last_messages@Base 2.27.91.1 + empathy_log_store_get_messages_for_date@Base 2.27.91.1 + empathy_log_store_get_name@Base 2.27.91.1 + empathy_log_store_get_type@Base 2.27.91.1 + empathy_log_store_search_new@Base 2.27.91.1 + empathy_message_equal@Base 2.27.91.1 + empathy_message_get_body@Base 2.27.91.1 + empathy_message_get_id@Base 2.27.91.1 + empathy_message_get_receiver@Base 2.27.91.1 + empathy_message_get_sender@Base 2.27.91.1 + empathy_message_get_timestamp@Base 2.27.91.1 + empathy_message_get_tptype@Base 2.27.91.1 + empathy_message_get_type@Base 2.27.91.1 + empathy_message_is_backlog@Base 2.27.91.1 + empathy_message_is_incoming@Base 2.27.92 + empathy_message_new@Base 2.27.91.1 + empathy_message_new_from_entry@Base 2.27.92 + empathy_message_set_body@Base 2.27.91.1 + empathy_message_set_id@Base 2.27.91.1 + empathy_message_set_incoming@Base 2.27.92 + empathy_message_set_is_backlog@Base 2.27.91.1 + empathy_message_set_receiver@Base 2.27.91.1 + empathy_message_set_sender@Base 2.27.91.1 + empathy_message_set_timestamp@Base 2.27.91.1 + empathy_message_set_tptype@Base 2.27.91.1 + empathy_message_should_highlight@Base 2.27.91.1 + empathy_message_type_from_str@Base 2.27.91.1 + empathy_message_type_to_str@Base 2.27.91.1 + empathy_presence_from_str@Base 2.27.91.1 + empathy_presence_get_default_message@Base 2.27.91.1 + empathy_presence_to_str@Base 2.27.91.1 + empathy_protocol_icon_name@Base 2.27.91.1 + empathy_protocol_name_to_display_name@Base 2.27.91.1 + empathy_proxy_equal@Base 2.27.91.1 + empathy_proxy_hash@Base 2.27.91.1 + empathy_status_presets_clear_default@Base 2.27.91.1 + empathy_status_presets_get@Base 2.27.91.1 + empathy_status_presets_get_all@Base 2.27.91.1 + empathy_status_presets_get_default_state@Base 2.27.91.1 + empathy_status_presets_get_default_status@Base 2.27.91.1 + empathy_status_presets_is_valid@Base 2.27.91.1 + empathy_status_presets_remove@Base 2.27.91.1 + empathy_status_presets_reset@Base 2.27.91.1 + empathy_status_presets_set_default@Base 2.27.91.1 + empathy_status_presets_set_last@Base 2.27.91.1 + empathy_strcasecmp@Base 2.27.91.1 + empathy_strncasecmp@Base 2.27.91.1 + empathy_substring@Base 2.27.91.1 + empathy_time_get_current@Base 2.27.91.1 + empathy_time_get_local_time@Base 2.27.91.1 + empathy_time_parse@Base 2.27.91.1 + empathy_time_to_string_local@Base 2.27.91.1 + empathy_time_to_string_relative@Base 2.27.91.1 + empathy_time_to_string_utc@Base 2.27.91.1 + empathy_tp_call_accept_incoming_call@Base 2.27.91.1 + empathy_tp_call_close@Base 2.27.91.1 + empathy_tp_call_get_type@Base 2.27.91.1 + empathy_tp_call_has_dtmf@Base 2.27.91.1 + empathy_tp_call_is_receiving_video@Base 2.27.91.1 + empathy_tp_call_is_sending_video@Base 2.27.91.1 + empathy_tp_call_new@Base 2.27.91.1 + empathy_tp_call_request_video_stream_direction@Base 2.27.91.1 + empathy_tp_call_start_tone@Base 2.27.91.1 + empathy_tp_call_status_get_type@Base 2.27.91.1 + empathy_tp_call_stop_tone@Base 2.27.91.1 + empathy_tp_call_to@Base 2.27.91.1 + empathy_tp_chat_acknowledge_message@Base 2.27.91.1 + empathy_tp_chat_acknowledge_messages@Base 2.27.91.1 + empathy_tp_chat_close@Base 2.27.91.1 + empathy_tp_chat_get_channel@Base 2.27.91.1 + empathy_tp_chat_get_connection@Base 2.27.91.1 + empathy_tp_chat_get_id@Base 2.27.91.1 + empathy_tp_chat_get_pending_messages@Base 2.27.91.1 + empathy_tp_chat_get_remote_contact@Base 2.27.91.1 + empathy_tp_chat_get_type@Base 2.27.91.1 + empathy_tp_chat_is_ready@Base 2.27.91.1 + empathy_tp_chat_new@Base 2.27.91.1 + empathy_tp_chat_send@Base 2.27.91.1 + empathy_tp_chat_set_property@Base 2.27.91.1 + empathy_tp_chat_set_state@Base 2.27.91.1 + empathy_tp_contact_factory_dup_singleton@Base 2.27.91.1 + empathy_tp_contact_factory_get_from_handle@Base 2.27.91.1 + empathy_tp_contact_factory_get_from_handles@Base 2.27.91.1 + empathy_tp_contact_factory_get_from_id@Base 2.27.91.1 + empathy_tp_contact_factory_get_from_ids@Base 2.27.91.1 + empathy_tp_contact_factory_get_type@Base 2.27.91.1 + empathy_tp_contact_factory_set_alias@Base 2.27.91.1 + empathy_tp_contact_factory_set_avatar@Base 2.27.91.1 + empathy_tp_contact_factory_set_location@Base 2.27.91.1 + empathy_tp_contact_list_get_connection@Base 2.27.91.1 + empathy_tp_contact_list_get_type@Base 2.27.91.1 + empathy_tp_contact_list_new@Base 2.27.91.1 + empathy_tp_contact_list_remove_all@Base 2.27.91.1 + empathy_tp_file_accept@Base 2.27.91.1 + empathy_tp_file_cancel@Base 2.27.91.1 + empathy_tp_file_close@Base 2.27.91.1 + empathy_tp_file_get_type@Base 2.27.91.1 + empathy_tp_file_is_incoming@Base 2.27.91.1 + empathy_tp_file_new@Base 2.27.91.1 + empathy_tp_file_offer@Base 2.27.91.1 + empathy_tp_roomlist_get_type@Base 2.27.91.1 + empathy_tp_roomlist_is_listing@Base 2.27.91.1 + empathy_tp_roomlist_new@Base 2.27.91.1 + empathy_tp_roomlist_start@Base 2.27.91.1 + empathy_tp_roomlist_stop@Base 2.27.91.1 + empathy_tube_handler_build_bus_name@Base 2.27.91.1 + empathy_tube_handler_build_object_path@Base 2.27.91.1 + empathy_tube_handler_get_type@Base 2.27.91.1 + empathy_tube_handler_new@Base 2.27.91.1 + empathy_type_dbus_ao@Base 2.27.91.1 + empathy_uint_compare@Base 2.27.91.1 + empathy_xml_node_find_child_prop_value@Base 2.27.91.1 + empathy_xml_node_get_child@Base 2.27.91.1 + empathy_xml_node_get_child_content@Base 2.27.91.1 + empathy_xml_validate@Base 2.27.91.1 --- empathy-2.28.0.1.orig/debian/libempathy-gtk28.symbols +++ empathy-2.28.0.1/debian/libempathy-gtk28.symbols @@ -0,0 +1,239 @@ +libempathy-gtk.so.28 libempathy-gtk28 #MINVER# + empathy_account_chooser_dup_account@Base 2.27.91.1 + empathy_account_chooser_filter_is_connected@Base 2.27.91.1 + empathy_account_chooser_get_connection@Base 2.27.91.1 + empathy_account_chooser_get_has_all_option@Base 2.27.91.1 + empathy_account_chooser_get_type@Base 2.27.91.1 + empathy_account_chooser_new@Base 2.27.91.1 + empathy_account_chooser_set_account@Base 2.27.91.1 + empathy_account_chooser_set_filter@Base 2.27.91.1 + empathy_account_chooser_set_has_all_option@Base 2.27.91.1 + empathy_account_widget_contains_pending_changes@Base 2.27.92 + empathy_account_widget_discard_pending_changes@Base 2.27.92 + empathy_account_widget_get_type@Base 2.27.91.1 + empathy_account_widget_get_widget@Base 2.27.91.1 + empathy_account_widget_handle_params@Base 2.27.91.1 + empathy_account_widget_irc_build@Base 2.27.91.1 + empathy_account_widget_new_for_protocol@Base 2.27.91.1 + empathy_account_widget_sip_build@Base 2.27.91.1 + empathy_adium_data_get_info@Base 2.27.91.1 + empathy_adium_data_get_path@Base 2.27.91.1 + empathy_adium_data_get_type@Base 2.27.91.1 + empathy_adium_data_new@Base 2.27.91.1 + empathy_adium_data_new_with_info@Base 2.27.91.1 + empathy_adium_data_ref@Base 2.27.91.1 + empathy_adium_data_unref@Base 2.27.91.1 + empathy_adium_info_new@Base 2.27.91.1 + empathy_adium_path_is_valid@Base 2.27.91.1 + empathy_audio_sink_get_type@Base 2.27.91.1 + empathy_audio_sink_get_volume@Base 2.27.91.1 + empathy_audio_sink_new@Base 2.27.91.1 + empathy_audio_sink_set_volume@Base 2.27.91.1 + empathy_audio_src_get_type@Base 2.27.91.1 + empathy_audio_src_get_volume@Base 2.27.91.1 + empathy_audio_src_new@Base 2.27.91.1 + empathy_audio_src_set_volume@Base 2.27.91.1 + empathy_avatar_chooser_get_image_data@Base 2.27.91.1 + empathy_avatar_chooser_get_type@Base 2.27.91.1 + empathy_avatar_chooser_new@Base 2.27.91.1 + empathy_avatar_chooser_set@Base 2.27.91.1 + empathy_avatar_image_get_type@Base 2.27.91.1 + empathy_avatar_image_new@Base 2.27.91.1 + empathy_avatar_image_set@Base 2.27.91.1 + empathy_builder_connect@Base 2.27.91.1 + empathy_builder_get_file@Base 2.27.91.1 + empathy_builder_unref_and_keep_widget@Base 2.27.91.1 + empathy_cell_renderer_activatable_get_type@Base 2.27.91.1 + empathy_cell_renderer_activatable_new@Base 2.27.91.1 + empathy_cell_renderer_expander_get_type@Base 2.27.91.1 + empathy_cell_renderer_expander_new@Base 2.27.91.1 + empathy_cell_renderer_text_get_type@Base 2.27.91.1 + empathy_cell_renderer_text_new@Base 2.27.91.1 + empathy_chat_clear@Base 2.27.91.1 + empathy_chat_copy@Base 2.27.91.1 + empathy_chat_correct_word@Base 2.27.91.1 + empathy_chat_cut@Base 2.27.91.1 + empathy_chat_get_account@Base 2.27.91.1 + empathy_chat_get_contact_menu@Base 2.27.91.1 + empathy_chat_get_id@Base 2.27.91.1 + empathy_chat_get_name@Base 2.27.91.1 + empathy_chat_get_remote_contact@Base 2.27.91.1 + empathy_chat_get_subject@Base 2.27.91.1 + empathy_chat_get_tp_chat@Base 2.27.91.1 + empathy_chat_get_type@Base 2.27.91.1 + empathy_chat_is_room@Base 2.27.91.1 + empathy_chat_new@Base 2.27.91.1 + empathy_chat_paste@Base 2.27.91.1 + empathy_chat_scroll_down@Base 2.27.91.1 + empathy_chat_set_show_contacts@Base 2.27.91.1 + empathy_chat_set_tp_chat@Base 2.27.91.1 + empathy_chat_text_view_append_body@Base 2.27.91.1 + empathy_chat_text_view_append_spacing@Base 2.27.91.1 + empathy_chat_text_view_get_last_contact@Base 2.27.91.1 + empathy_chat_text_view_get_type@Base 2.27.91.1 + empathy_chat_text_view_set_only_if_date@Base 2.27.91.1 + empathy_chat_text_view_tag_set@Base 2.27.91.1 + empathy_chat_view_append_event@Base 2.27.91.1 + empathy_chat_view_append_message@Base 2.27.91.1 + empathy_chat_view_clear@Base 2.27.91.1 + empathy_chat_view_copy_clipboard@Base 2.27.91.1 + empathy_chat_view_find_abilities@Base 2.27.91.1 + empathy_chat_view_find_next@Base 2.27.91.1 + empathy_chat_view_find_previous@Base 2.27.91.1 + empathy_chat_view_get_has_selection@Base 2.27.91.1 + empathy_chat_view_get_type@Base 2.27.91.1 + empathy_chat_view_highlight@Base 2.27.91.1 + empathy_chat_view_scroll@Base 2.27.91.1 + empathy_chat_view_scroll_down@Base 2.27.91.1 + empathy_conf_get@Base 2.27.91.1 + empathy_conf_get_bool@Base 2.27.91.1 + empathy_conf_get_int@Base 2.27.91.1 + empathy_conf_get_string@Base 2.27.91.1 + empathy_conf_get_string_list@Base 2.27.91.1 + empathy_conf_get_type@Base 2.27.91.1 + empathy_conf_notify_add@Base 2.27.91.1 + empathy_conf_notify_remove@Base 2.27.91.1 + empathy_conf_set_bool@Base 2.27.91.1 + empathy_conf_set_int@Base 2.27.91.1 + empathy_conf_set_string@Base 2.27.91.1 + empathy_conf_set_string_list@Base 2.27.91.1 + empathy_conf_shutdown@Base 2.27.91.1 + empathy_contact_add_menu_item_new@Base 2.27.91.1 + empathy_contact_audio_call_menu_item_new@Base 2.27.91.1 + empathy_contact_chat_menu_item_new@Base 2.27.91.1 + empathy_contact_edit_dialog_show@Base 2.27.91.1 + empathy_contact_edit_menu_item_new@Base 2.27.91.1 + empathy_contact_feature_flags_get_type@Base 2.27.91.1 + empathy_contact_file_transfer_menu_item_new@Base 2.27.91.1 + empathy_contact_info_menu_item_new@Base 2.27.91.1 + empathy_contact_information_dialog_show@Base 2.27.91.1 + empathy_contact_invite_menu_item_new@Base 2.27.91.1 + empathy_contact_list_feature_flags_get_type@Base 2.27.91.1 + empathy_contact_list_store_col_get_type@Base 2.27.91.1 + empathy_contact_list_store_get_is_compact@Base 2.27.91.1 + empathy_contact_list_store_get_list_iface@Base 2.27.91.1 + empathy_contact_list_store_get_parent_group@Base 2.27.91.1 + empathy_contact_list_store_get_show_avatars@Base 2.27.91.1 + empathy_contact_list_store_get_show_groups@Base 2.27.91.1 + empathy_contact_list_store_get_show_offline@Base 2.27.91.1 + empathy_contact_list_store_get_sort_criterium@Base 2.27.91.1 + empathy_contact_list_store_get_type@Base 2.27.91.1 + empathy_contact_list_store_new@Base 2.27.91.1 + empathy_contact_list_store_row_separator_func@Base 2.27.91.1 + empathy_contact_list_store_search_equal_func@Base 2.27.91.1 + empathy_contact_list_store_set_is_compact@Base 2.27.91.1 + empathy_contact_list_store_set_show_avatars@Base 2.27.91.1 + empathy_contact_list_store_set_show_groups@Base 2.27.91.1 + empathy_contact_list_store_set_show_offline@Base 2.27.91.1 + empathy_contact_list_store_set_sort_criterium@Base 2.27.91.1 + empathy_contact_list_store_sort_get_type@Base 2.27.91.1 + empathy_contact_list_view_dup_selected@Base 2.27.91.1 + empathy_contact_list_view_get_contact_menu@Base 2.27.91.1 + empathy_contact_list_view_get_flags@Base 2.27.91.1 + empathy_contact_list_view_get_group_menu@Base 2.27.91.1 + empathy_contact_list_view_get_selected_group@Base 2.27.91.1 + empathy_contact_list_view_get_type@Base 2.27.91.1 + empathy_contact_list_view_new@Base 2.27.91.1 + empathy_contact_log_menu_item_new@Base 2.27.91.1 + empathy_contact_menu_new@Base 2.27.91.1 + empathy_contact_personal_dialog_show@Base 2.27.91.1 + empathy_contact_selector_dup_selected@Base 2.27.91.1 + empathy_contact_selector_get_type@Base 2.27.91.1 + empathy_contact_selector_new@Base 2.27.91.1 + empathy_contact_selector_set_visible@Base 2.27.91.1 + empathy_contact_share_my_desktop_menu_item_new@Base 2.27.91.1 + empathy_contact_video_call_menu_item_new@Base 2.27.91.1 + empathy_contact_widget_flags_get_type@Base 2.27.91.1 + empathy_contact_widget_get_contact@Base 2.27.91.1 + empathy_contact_widget_new@Base 2.27.91.1 + empathy_contact_widget_set_account_filter@Base 2.27.91.1 + empathy_contact_widget_set_contact@Base 2.27.91.1 + empathy_filename_from_icon_name@Base 2.27.91.1 + empathy_geometry_load@Base 2.27.91.1 + empathy_geometry_save@Base 2.27.91.1 + empathy_get_toplevel_window@Base 2.27.91.1 + empathy_gst_video_src_channel_get_type@Base 2.27.91.1 + empathy_gtk_init@Base 2.27.91.1 + empathy_icon_name_for_contact@Base 2.27.91.1 + empathy_icon_name_for_presence@Base 2.27.91.1 + empathy_irc_network_dialog_show@Base 2.27.91.1 + empathy_kludge_label_get_type@Base 2.27.91.1 + empathy_kludge_label_new@Base 2.27.91.1 + empathy_link_button_new@Base 2.27.91.1 + empathy_log_window_show@Base 2.27.91.1 + empathy_make_absolute_url@Base 2.27.91.1 + empathy_make_absolute_url_len@Base 2.27.92 + empathy_new_contact_dialog_show@Base 2.27.91.1 + empathy_new_contact_dialog_show_with_contact@Base 2.27.91.1 + empathy_new_message_dialog_show@Base 2.27.91.1 + empathy_pixbuf_avatar_from_contact_scaled@Base 2.27.91.1 + empathy_pixbuf_from_avatar_scaled@Base 2.27.91.1 + empathy_pixbuf_from_data@Base 2.27.91.1 + empathy_pixbuf_from_data_and_mime@Base 2.27.91.1 + empathy_pixbuf_from_icon_name@Base 2.27.91.1 + empathy_pixbuf_from_icon_name_sized@Base 2.27.91.1 + empathy_pixbuf_scale_down_if_necessary@Base 2.27.91.1 + empathy_plist_parse_from_file@Base 2.27.91.1 + empathy_plist_parse_from_memory@Base 2.27.91.1 + empathy_presence_chooser_create_menu@Base 2.27.91.1 + empathy_presence_chooser_get_type@Base 2.27.91.1 + empathy_presence_chooser_new@Base 2.27.91.1 + empathy_protocol_chooser_dup_selected@Base 2.27.91.1 + empathy_protocol_chooser_get_type@Base 2.27.91.1 + empathy_protocol_chooser_new@Base 2.27.91.1 + empathy_protocol_chooser_set_visible@Base 2.27.91.1 + empathy_receive_file_with_file_chooser@Base 2.27.91.1 + empathy_send_file_with_file_chooser@Base 2.27.91.1 + empathy_share_my_desktop_share_with_contact@Base 2.27.91.1 + empathy_smiley_free@Base 2.27.91.1 + empathy_smiley_manager_add@Base 2.27.91.1 + empathy_smiley_manager_dup_singleton@Base 2.27.91.1 + empathy_smiley_manager_get_all@Base 2.27.91.1 + empathy_smiley_manager_get_type@Base 2.27.91.1 + empathy_smiley_manager_load@Base 2.27.91.1 + empathy_smiley_manager_parse@Base 2.27.91.1 + empathy_smiley_menu_new@Base 2.27.91.1 + empathy_sound_get_type@Base 2.27.91.1 + empathy_sound_play@Base 2.27.91.1 + empathy_sound_play_full@Base 2.27.91.1 + empathy_sound_start_playing@Base 2.27.91.1 + empathy_sound_stop@Base 2.27.91.1 + empathy_spell_check@Base 2.27.91.1 + empathy_spell_free_language_codes@Base 2.27.91.1 + empathy_spell_free_suggestions@Base 2.27.91.1 + empathy_spell_get_language_codes@Base 2.27.91.1 + empathy_spell_get_language_name@Base 2.27.91.1 + empathy_spell_get_suggestions@Base 2.27.91.1 + empathy_spell_supported@Base 2.27.91.1 + empathy_status_preset_dialog_get_type@Base 2.27.91.1 + empathy_status_preset_dialog_new@Base 2.27.91.1 + empathy_subscription_dialog_show@Base 2.27.91.1 + empathy_text_iter_backward_search@Base 2.27.91.1 + empathy_text_iter_forward_search@Base 2.27.91.1 + empathy_theme_adium_get_type@Base 2.27.91.1 + empathy_theme_adium_new@Base 2.27.91.1 + empathy_theme_boxes_get_type@Base 2.27.91.1 + empathy_theme_boxes_new@Base 2.27.91.1 + empathy_theme_irc_get_type@Base 2.27.91.1 + empathy_theme_irc_new@Base 2.27.91.1 + empathy_theme_manager_create_view@Base 2.27.91.1 + empathy_theme_manager_get@Base 2.27.91.1 + empathy_theme_manager_get_adium_themes@Base 2.27.91.1 + empathy_theme_manager_get_themes@Base 2.27.91.1 + empathy_theme_manager_get_type@Base 2.27.91.1 + empathy_toggle_button_set_state_quietly@Base 2.27.91.1 + empathy_uri_regex_dup_singleton@Base 2.27.91.1 + empathy_url_show@Base 2.27.91.1 + empathy_video_src_get_channel@Base 2.27.91.1 + empathy_video_src_get_supported_channels@Base 2.27.91.1 + empathy_video_src_get_type@Base 2.27.91.1 + empathy_video_src_new@Base 2.27.91.1 + empathy_video_src_set_channel@Base 2.27.91.1 + empathy_video_widget_get_element@Base 2.27.91.1 + empathy_video_widget_get_sink@Base 2.27.91.1 + empathy_video_widget_get_type@Base 2.27.91.1 + empathy_video_widget_new@Base 2.27.91.1 + empathy_video_widget_new_with_size@Base 2.27.91.1 + empathy_window_get_is_visible@Base 2.27.91.1 + empathy_window_iconify@Base 2.27.91.1 + empathy_window_present@Base 2.27.91.1 --- empathy-2.28.0.1.orig/debian/empathy.manpages +++ empathy-2.28.0.1/debian/empathy.manpages @@ -0,0 +1,3 @@ +debian/empathy.1 +debian/empathy-accounts.1 +debian/empathy-logs.1 --- empathy-2.28.0.1.orig/debian/patches/10_use_notify_osd_icons.patch +++ empathy-2.28.0.1/debian/patches/10_use_notify_osd_icons.patch @@ -0,0 +1,22 @@ +# +# 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 +Date: Thu, 17 Sep 2009 17:42:26 +1000 +Subject: [PATCH] Use the notify-osd image for new messages + +diff -Nur -x '*.orig' -x '*~' empathy-2.27.92/libempathy-gtk/empathy-images.h empathy-2.27.92.new/libempathy-gtk/empathy-images.h +--- empathy-2.27.92/libempathy-gtk/empathy-images.h 2009-08-25 23:44:28.000000000 +1000 ++++ empathy-2.27.92.new/libempathy-gtk/empathy-images.h 2009-09-17 17:49:47.000000000 +1000 +@@ -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.28.0.1.orig/debian/patches/99_autoconf.patch +++ empathy-2.28.0.1/debian/patches/99_autoconf.patch @@ -0,0 +1,761 @@ +=== modified file 'Makefile.in' +--- Makefile.in 2009-10-06 13:44:15 +0000 ++++ Makefile.in 2009-10-06 13:46:45 +0000 +@@ -181,6 +181,8 @@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + +=== modified file 'config.h.in' +--- config.h.in 2009-10-06 13:44:15 +0000 ++++ config.h.in 2009-10-06 13:46:42 +0000 +@@ -39,6 +39,9 @@ + /* Define if you have libchamplain */ + #undef HAVE_LIBCHAMPLAIN + ++/* Define if you have libindicate */ ++#undef HAVE_LIBINDICATE ++ + /* Define to 1 if you have the header file. */ + #undef HAVE_LOCALE_H + + +=== modified file 'configure' +--- configure 2009-10-06 13:44:15 +0000 ++++ configure 2009-10-06 13:46:42 +0000 +@@ -770,6 +770,10 @@ + HAVE_TESTS_TRUE + CHECK_LIBS + CHECK_CFLAGS ++HAVE_LIBINDICATE_FALSE ++HAVE_LIBINDICATE_TRUE ++INDICATE_LIBS ++INDICATE_CFLAGS + HAVE_NOTHERE_FALSE + HAVE_NOTHERE_TRUE + NOTHERE_LIBS +@@ -1053,6 +1057,7 @@ + enable_moblin + enable_megaphone + enable_nothere ++enable_libindicate + enable_tests + enable_python + enable_coding_style_checks +@@ -1097,6 +1102,8 @@ + MEGAPHONE_LIBS + NOTHERE_CFLAGS + NOTHERE_LIBS ++INDICATE_CFLAGS ++INDICATE_LIBS + CHECK_CFLAGS + CHECK_LIBS + PYTHON_BINDING_CFLAGS +@@ -1755,6 +1762,8 @@ + build megaphone applet + --enable-nothere=[no/yes/auto] + build nothere applet ++ --enable-libindicate=[no/yes/auto] ++ build libindicate support + --enable-tests=[no/yes/auto] + build tests + --enable-python=[no/yes/auto] +@@ -1850,6 +1859,10 @@ + C compiler flags for NOTHERE, overriding pkg-config + NOTHERE_LIBS + linker flags for NOTHERE, overriding pkg-config ++ INDICATE_CFLAGS ++ C compiler flags for INDICATE, overriding pkg-config ++ INDICATE_LIBS ++ linker flags for INDICATE, overriding pkg-config + CHECK_CFLAGS + C compiler flags for CHECK, overriding pkg-config + CHECK_LIBS linker flags for CHECK, overriding pkg-config +@@ -2686,6 +2699,8 @@ + WEBKIT_REQUIRED=1.1.7 + KEYRING_REQUIRED=2.22 + NETWORK_MANAGER_REQUIRED=0.7.0 ++INDICATE_REQUIRED=0.2.0 ++INDICATE_GTK_REQUIRED=0.2.0 + + # Use --enable-maintainer-mode to disabled deprecated symbols + +@@ -5845,13 +5860,13 @@ + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:5848: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:5863: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:5851: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:5866: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:5854: output\"" >&5) ++ (eval echo "\"\$as_me:5869: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" +@@ -7056,7 +7071,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 7059 "configure"' > conftest.$ac_ext ++ echo '#line 7074 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -8336,11 +8351,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:8339: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8354: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8343: \$? = $ac_status" >&5 ++ echo "$as_me:8358: \$? = $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. +@@ -8675,11 +8690,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:8678: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8693: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8682: \$? = $ac_status" >&5 ++ echo "$as_me:8697: \$? = $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. +@@ -8780,11 +8795,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:8783: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8798: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8787: \$? = $ac_status" >&5 ++ echo "$as_me:8802: \$? = $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 +@@ -8835,11 +8850,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:8838: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8853: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8842: \$? = $ac_status" >&5 ++ echo "$as_me:8857: \$? = $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 +@@ -11218,7 +11233,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11221 "configure" ++#line 11236 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11314,7 +11329,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11317 "configure" ++#line 11332 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -16550,6 +16565,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 ++ ++ ++# ----------------------------------------------------------- + # Tests + # ----------------------------------------------------------- + # Check whether --enable-tests was given. +@@ -17211,6 +17356,10 @@ + as_fn_error "conditional \"HAVE_NOTHERE\" 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_TESTS_TRUE}" && test -z "${HAVE_TESTS_FALSE}"; then + as_fn_error "conditional \"HAVE_TESTS\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 +@@ -19496,6 +19645,7 @@ + Location awareness (Geoclue): ${have_geoclue} + Adium themes (Webkit).......: ${have_webkit} + Moblin widgets (Nbtk).......: ${have_nbtk} ++ Message indicator support (libindicate): ${have_libindicate} + + Connectivity: + NetworkManager integration..: ${have_nm} + +=== modified file 'data/Makefile.in' +--- data/Makefile.in 2009-10-06 13:44:15 +0000 ++++ data/Makefile.in 2009-10-06 13:46:43 +0000 +@@ -185,6 +185,8 @@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + +=== modified file 'data/icons/Makefile.in' +--- data/icons/Makefile.in 2009-10-06 13:44:15 +0000 ++++ data/icons/Makefile.in 2009-10-06 13:46:43 +0000 +@@ -116,6 +116,8 @@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + +=== modified file 'docs/Makefile.in' +--- docs/Makefile.in 2009-10-06 13:44:15 +0000 ++++ docs/Makefile.in 2009-10-06 13:46:43 +0000 +@@ -156,6 +156,8 @@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + +=== modified file 'docs/libempathy-gtk/Makefile.in' +--- docs/libempathy-gtk/Makefile.in 2009-10-06 13:44:15 +0000 ++++ docs/libempathy-gtk/Makefile.in 2009-10-06 13:46:43 +0000 +@@ -123,6 +123,8 @@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + +=== modified file 'docs/libempathy/Makefile.in' +--- docs/libempathy/Makefile.in 2009-10-06 13:44:15 +0000 ++++ docs/libempathy/Makefile.in 2009-10-06 13:46:43 +0000 +@@ -123,6 +123,8 @@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + +=== modified file 'extensions/Makefile.in' +--- extensions/Makefile.in 2009-10-06 13:44:15 +0000 ++++ extensions/Makefile.in 2009-10-06 13:46:43 +0000 +@@ -140,6 +140,8 @@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + +=== modified file 'help/Makefile.in' +--- help/Makefile.in 2009-10-06 13:44:15 +0000 ++++ help/Makefile.in 2009-10-06 13:46:43 +0000 +@@ -141,6 +141,8 @@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + +=== modified file 'libempathy-gtk/Makefile.in' +--- libempathy-gtk/Makefile.in 2009-10-06 13:44:15 +0000 ++++ libempathy-gtk/Makefile.in 2009-10-06 13:46:44 +0000 +@@ -269,6 +269,8 @@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + +=== modified file 'libempathy/Makefile.in' +--- libempathy/Makefile.in 2009-10-06 13:44:15 +0000 ++++ libempathy/Makefile.in 2009-10-06 13:46:44 +0000 +@@ -197,6 +197,8 @@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + +=== modified file 'megaphone/Makefile.in' +--- megaphone/Makefile.in 2009-10-06 13:44:15 +0000 ++++ megaphone/Makefile.in 2009-10-06 13:46:44 +0000 +@@ -156,6 +156,8 @@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + +=== modified file 'megaphone/data/Makefile.in' +--- megaphone/data/Makefile.in 2009-10-06 13:44:15 +0000 ++++ megaphone/data/Makefile.in 2009-10-06 13:46:44 +0000 +@@ -142,6 +142,8 @@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + +=== modified file 'megaphone/src/Makefile.in' +--- megaphone/src/Makefile.in 2009-10-06 13:44:15 +0000 ++++ megaphone/src/Makefile.in 2009-10-06 13:46:44 +0000 +@@ -143,6 +143,8 @@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + +=== modified file 'nothere/Makefile.in' +--- nothere/Makefile.in 2009-10-06 13:44:15 +0000 ++++ nothere/Makefile.in 2009-10-06 13:46:44 +0000 +@@ -156,6 +156,8 @@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + +=== modified file 'nothere/data/Makefile.in' +--- nothere/data/Makefile.in 2009-10-06 13:44:15 +0000 ++++ nothere/data/Makefile.in 2009-10-06 13:46:44 +0000 +@@ -141,6 +141,8 @@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + +=== modified file 'nothere/src/Makefile.in' +--- nothere/src/Makefile.in 2009-10-06 13:44:15 +0000 ++++ nothere/src/Makefile.in 2009-10-06 13:46:44 +0000 +@@ -143,6 +143,8 @@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + +=== modified file 'python/Makefile.in' +--- python/Makefile.in 2009-10-06 13:44:15 +0000 ++++ python/Makefile.in 2009-10-06 13:46:44 +0000 +@@ -156,6 +156,8 @@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + +=== modified file 'python/pyempathy/Makefile.in' +--- python/pyempathy/Makefile.in 2009-10-06 13:44:15 +0000 ++++ python/pyempathy/Makefile.in 2009-10-06 13:46:44 +0000 +@@ -166,6 +166,8 @@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + +=== modified file 'python/pyempathygtk/Makefile.in' +--- python/pyempathygtk/Makefile.in 2009-10-06 13:44:15 +0000 ++++ python/pyempathygtk/Makefile.in 2009-10-06 13:46:44 +0000 +@@ -167,6 +167,8 @@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + +=== modified file 'src/Makefile.in' +--- src/Makefile.in 2009-10-06 13:44:15 +0000 ++++ src/Makefile.in 2009-10-06 13:46:44 +0000 +@@ -40,14 +40,24 @@ + $(top_srcdir)/tools/check-coding-style.mk \ + $(top_srcdir)/tools/flymake.mk $(top_srcdir)/tools/shave.mk + bin_PROGRAMS = empathy$(EXEEXT) empathy-logs$(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 +@@ -93,10 +103,14 @@ + empathy-preferences.c empathy-preferences.h empathy-sidebar.c \ + empathy-sidebar.h empathy-status-icon.c empathy-status-icon.h \ + empathy-tube-dispatch.c empathy-tube-dispatch.h \ +- empathy-map-view.c empathy-map-view.h ephy-spinner.c \ +- ephy-spinner.h +-@HAVE_LIBCHAMPLAIN_TRUE@am__objects_1 = empathy-map-view.$(OBJEXT) +-am__objects_2 = empathy.$(OBJEXT) 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 ephy-spinner.c ephy-spinner.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.$(OBJEXT) empathy-about-dialog.$(OBJEXT) \ + empathy-account-assistant.$(OBJEXT) \ + empathy-accounts-dialog.$(OBJEXT) \ + empathy-call-window.$(OBJEXT) \ +@@ -112,10 +126,10 @@ + empathy-new-chatroom-dialog.$(OBJEXT) \ + empathy-preferences.$(OBJEXT) empathy-sidebar.$(OBJEXT) \ + empathy-status-icon.$(OBJEXT) empathy-tube-dispatch.$(OBJEXT) \ +- $(am__objects_1) +-am_empathy_OBJECTS = $(am__objects_2) ephy-spinner.$(OBJEXT) +-am__objects_3 = empathy-tube-dispatch-enumtypes.$(OBJEXT) +-nodist_empathy_OBJECTS = $(am__objects_3) ++ $(am__objects_1) $(am__objects_2) ++am_empathy_OBJECTS = $(am__objects_3) ephy-spinner.$(OBJEXT) ++am__objects_4 = empathy-tube-dispatch-enumtypes.$(OBJEXT) ++nodist_empathy_OBJECTS = $(am__objects_4) + empathy_OBJECTS = $(am_empathy_OBJECTS) $(nodist_empathy_OBJECTS) + empathy_LDADD = $(LDADD) + am__DEPENDENCIES_1 = +@@ -124,7 +138,8 @@ + $(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_logs_OBJECTS = empathy-logs.$(OBJEXT) + empathy_logs_OBJECTS = $(am_empathy_logs_OBJECTS) + empathy_logs_LDADD = $(LDADD) +@@ -133,7 +148,8 @@ + $(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) + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -240,6 +256,8 @@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -402,8 +420,10 @@ + AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -DG_LOG_DOMAIN=\"empathy\" \ ++ -DDESKTOPDIR=\"$(datadir)/applications\" \ + $(EMPATHY_CFLAGS) \ + $(LIBNOTIFY_CFLAGS) \ ++ $(INDICATE_CFLAGS) \ + $(LIBCHAMPLAIN_CFLAGS) \ + $(DISABLE_DEPRECATED) \ + $(WEBKIT_CFLAGS) \ +@@ -414,6 +434,7 @@ + $(top_builddir)/libempathy/libempathy.la \ + $(top_builddir)/extensions/libemp-extensions.la \ + $(LIBNOTIFY_LIBS) \ ++ $(INDICATE_LIBS) \ + $(EMPATHY_LIBS) \ + $(LIBCHAMPLAIN_LIBS) \ + $(WEBKIT_LIBS) +@@ -443,7 +464,7 @@ + empathy-preferences.c empathy-preferences.h empathy-sidebar.c \ + empathy-sidebar.h empathy-status-icon.c empathy-status-icon.h \ + empathy-tube-dispatch.c empathy-tube-dispatch.h \ +- $(am__append_1) ++ $(am__append_1) $(am__append_3) + empathy_SOURCES = \ + $(empathy_handwritten_source) \ + ephy-spinner.c ephy-spinner.h +@@ -460,8 +481,9 @@ + empathy-chat-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) ++ empathy-status-icon.ui $(am__append_4) ++EXTRA_DIST = $(autostart_DATA) $(ui_DATA) $(am__append_2) \ ++ $(am__append_5) + dist_man_MANS = \ + empathy.1 + +@@ -572,6 +594,8 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-import-pidgin.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-import-utils.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-import-widget.Po@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-logs.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@ + +=== modified file 'tests/Makefile.in' +--- tests/Makefile.in 2009-10-06 13:44:15 +0000 ++++ tests/Makefile.in 2009-10-06 13:46:45 +0000 +@@ -259,6 +259,8 @@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + +=== modified file 'tests/xml/Makefile.in' +--- tests/xml/Makefile.in 2009-10-06 13:44:15 +0000 ++++ tests/xml/Makefile.in 2009-10-06 13:46:45 +0000 +@@ -116,6 +116,8 @@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + +=== modified file 'tools/Makefile.in' +--- tools/Makefile.in 2009-10-06 13:44:15 +0000 ++++ tools/Makefile.in 2009-10-06 13:46:45 +0000 +@@ -119,6 +119,8 @@ + GTKDOC_CHECK = @GTKDOC_CHECK@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ ++INDICATE_CFLAGS = @INDICATE_CFLAGS@ ++INDICATE_LIBS = @INDICATE_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + --- empathy-2.28.0.1.orig/debian/patches/30_raise_not_toggle.patch +++ empathy-2.28.0.1/debian/patches/30_raise_not_toggle.patch @@ -0,0 +1,18 @@ +# +# Description: Integrate Empathy into the messaging menu +# Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/empathy/+bug/392153 +# + +=== modified file 'src/empathy-status-icon.c' +--- src/empathy-status-icon.c 2009-09-18 19:17:58 +0000 ++++ src/empathy-status-icon.c 2009-09-18 20:00:33 +0000 +@@ -434,7 +434,7 @@ + visible = GTK_WIDGET_VISIBLE (priv->window); + } + #endif +- status_icon_set_visibility (icon, !visible, TRUE); ++ status_icon_set_visibility (icon, TRUE, TRUE); + } + + #ifdef HAVE_LIBINDICATE + --- empathy-2.28.0.1.orig/debian/patches/20_libindicate.patch +++ empathy-2.28.0.1/debian/patches/20_libindicate.patch @@ -0,0 +1,1658 @@ +# +# Description: Integrate Empathy into the messaging menu +# Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/empathy/+bug/340180 +# Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=574744 +# + +=== modified file 'configure.ac' +--- configure.ac 2009-10-09 03:23:36 +0000 ++++ configure.ac 2009-10-09 03:23:58 +0000 +@@ -41,6 +41,8 @@ + WEBKIT_REQUIRED=1.1.7 + KEYRING_REQUIRED=2.22 + NETWORK_MANAGER_REQUIRED=0.7.0 ++INDICATE_REQUIRED=0.2.0 ++INDICATE_GTK_REQUIRED=0.2.0 + + # Use --enable-maintainer-mode to disabled deprecated symbols + GNOME_MAINTAINER_MODE_DEFINES +@@ -407,6 +409,34 @@ + AM_CONDITIONAL(HAVE_NOTHERE, test "x$have_nothere" = "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") ++ ++# ----------------------------------------------------------- + # Tests + # ----------------------------------------------------------- + AC_ARG_ENABLE(tests, +@@ -527,6 +557,7 @@ + Location awareness (Geoclue): ${have_geoclue} + Adium themes (Webkit).......: ${have_webkit} + Moblin widgets (Nbtk).......: ${have_nbtk} ++ Message indicator support (libindicate): ${have_libindicate} + + Connectivity: + NetworkManager integration..: ${have_nm} + +=== modified file 'data/empathy.schemas.in' +--- data/empathy.schemas.in 2009-10-09 03:23:36 +0000 ++++ data/empathy.schemas.in 2009-10-09 03:23:58 +0000 +@@ -291,6 +291,21 @@ + + + ++ /schemas/apps/empathy/notifications/use_libindicate ++ /apps/empathy/notifications/use_libindicate ++ empathy ++ bool ++ true ++ ++ Use the messaging indicator ++ ++ Whether or not to use the messaging indicator, if false ++ the icon in the notification area will be displayed. ++ ++ ++ ++ ++ + /schemas/apps/empathy/ui/separate_chat_windows + /apps/empathy/ui/separate_chat_windows + empathy + +=== modified file 'libempathy-gtk/empathy-conf.h' +--- libempathy-gtk/empathy-conf.h 2009-10-09 03:23:36 +0000 ++++ libempathy-gtk/empathy-conf.h 2009-10-09 03:23:58 +0000 +@@ -74,6 +74,7 @@ + #define EMPATHY_PREFS_UI_AVATAR_DIRECTORY EMPATHY_PREFS_PATH "/ui/avatar_directory" + #define EMPATHY_PREFS_UI_SHOW_AVATARS EMPATHY_PREFS_PATH "/ui/show_avatars" + #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_CONTACTS_SHOW_OFFLINE EMPATHY_PREFS_PATH "/contacts/show_offline" + #define EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM EMPATHY_PREFS_PATH "/contacts/sort_criterium" + #define EMPATHY_PREFS_HINTS_CLOSE_MAIN_WINDOW EMPATHY_PREFS_PATH "/hints/close_main_window" + +=== modified file 'libempathy-gtk/empathy-ui-utils.c' +--- libempathy-gtk/empathy-ui-utils.c 2009-10-09 03:23:36 +0000 ++++ libempathy-gtk/empathy-ui-utils.c 2009-10-09 03:23:58 +0000 +@@ -1269,24 +1269,35 @@ + 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)); ++ } + } + + /* Takes care of moving the window to the current workspace. */ + +=== modified file 'po/POTFILES.in' +--- po/POTFILES.in 2009-10-09 03:23:36 +0000 ++++ po/POTFILES.in 2009-10-09 03:23:58 +0000 +@@ -79,6 +79,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' +--- src/Makefile.am 2009-10-09 03:23:36 +0000 ++++ src/Makefile.am 2009-10-09 03:23:58 +0000 +@@ -4,8 +4,10 @@ + AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -DG_LOG_DOMAIN=\"empathy\" \ ++ -DDESKTOPDIR=\"$(datadir)/applications\" \ + $(EMPATHY_CFLAGS) \ + $(LIBNOTIFY_CFLAGS) \ ++ $(INDICATE_CFLAGS) \ + $(LIBCHAMPLAIN_CFLAGS) \ + $(DISABLE_DEPRECATED) \ + $(WEBKIT_CFLAGS) \ +@@ -16,6 +18,7 @@ + $(top_builddir)/libempathy/libempathy.la \ + $(top_builddir)/extensions/libemp-extensions.la \ + $(LIBNOTIFY_LIBS) \ ++ $(INDICATE_LIBS) \ + $(EMPATHY_LIBS) \ + $(LIBCHAMPLAIN_LIBS) \ + $(WEBKIT_LIBS) +@@ -85,6 +88,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' +--- src/empathy-chat-window.c 2009-10-09 03:23:36 +0000 ++++ src/empathy-chat-window.c 2009-10-09 03:23:58 +0000 +@@ -56,6 +56,11 @@ + #include "empathy-about-dialog.h" + #include "empathy-misc.h" + ++#ifdef HAVE_LIBINDICATE ++#include "empathy-indicator.h" ++#include "empathy-indicator-manager.h" ++#endif ++ + #define DEBUG_FLAG EMPATHY_DEBUG_CHAT + #include + +@@ -78,6 +83,11 @@ + GtkWidget *notebook; + NotifyNotification *notification; + NotificationData *notification_data; ++#ifdef HAVE_LIBINDICATE ++ EmpathyIndicatorManager *indicator_manager; ++ /* EmpathyChat -> EmpathyIndicator for that chat, if any */ ++ GHashTable *indicators; ++#endif + + /* Menu items. */ + GtkUIManager *ui_manager; +@@ -943,6 +953,76 @@ + priv->notification_data = NULL; + } + ++#ifdef HAVE_LIBINDICATE ++static void ++chat_window_indicator_activate_cb (EmpathyIndicator *indicator, ++ NotificationData *cb_data) ++{ ++ empathy_chat_window_present_chat (cb_data->chat); ++ ++ empathy_indicator_hide (indicator); ++ g_object_unref (cb_data->chat); ++ g_slice_free (NotificationData, cb_data); ++} ++ ++static void ++chat_window_add_indicator (EmpathyChatWindow *window, ++ EmpathyMessage *message, ++ EmpathyChat *chat) ++{ ++ EmpathyChatWindowPriv *priv = GET_PRIV (window); ++ EmpathyContact *sender; ++ const char *body; ++ NotificationData *cb_data; ++ gboolean use_libindicate; ++ EmpathyIndicator *indicator; ++ ++ empathy_conf_get_bool (empathy_conf_get (), ++ EMPATHY_PREFS_UI_USE_LIBINDICATE, ++ &use_libindicate); ++ ++ if (!use_libindicate) { ++ return; ++ } ++ ++ cb_data = g_slice_new0 (NotificationData); ++ cb_data->chat = g_object_ref (chat); ++ cb_data->window = window; ++ ++ sender = empathy_message_get_sender (message); ++ body = empathy_message_get_body (message); ++ ++ indicator = g_hash_table_lookup (priv->indicators, chat); ++ if (indicator) { ++ empathy_indicator_update (indicator, body); ++ } else { ++ indicator = empathy_indicator_manager_create_indicator (priv->indicator_manager, ++ sender, body); ++ g_signal_connect (indicator, "activate", ++ G_CALLBACK (chat_window_indicator_activate_cb), cb_data); ++ g_hash_table_insert (priv->indicators, chat, indicator); ++ } ++ empathy_indicator_show (indicator); ++} ++ ++static void ++chat_window_remove_indicator (EmpathyChatWindow *window, EmpathyChat *chat) ++{ ++ EmpathyIndicator *indicator; ++ EmpathyChatWindowPriv *priv = GET_PRIV (window); ++ ++ indicator = g_hash_table_lookup (priv->indicators, chat); ++ ++ if (!indicator) { ++ return; ++ } ++ ++ empathy_indicator_hide (indicator); ++ g_hash_table_remove (priv->indicators, chat); ++ g_object_unref (indicator); ++} ++#endif ++ + static void + chat_window_show_or_update_notification (EmpathyChatWindow *window, + EmpathyMessage *message, +@@ -1076,6 +1156,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 + } + } + +@@ -1135,6 +1218,10 @@ + priv->chats_new_msg = g_list_remove (priv->chats_new_msg, chat); + + chat_window_update_chat_tab (chat); ++ ++#ifdef HAVE_LIBINDICATE ++ chat_window_remove_indicator (window, chat); ++#endif + } + + static void +@@ -1245,6 +1332,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; + } + +@@ -1476,6 +1568,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' +--- src/empathy-indicator-manager.c 1970-01-01 00:00:00 +0000 ++++ src/empathy-indicator-manager.c 2009-10-09 03:23:58 +0000 +@@ -0,0 +1,458 @@ ++/* -*- 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 ++ * ++ */ ++ ++#include ++ ++#include ++ ++#include ++#include ++#include ++ ++#include ++#include ++ ++#include ++ ++#include "empathy-event-manager.h" ++#include "empathy-indicator.h" ++#include "empathy-indicator-manager.h" ++#include "empathy-misc.h" ++ ++#include ++ ++#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, ++ EmpathyIndicatorManager *manager) ++{ ++ g_signal_emit (manager, signals[SERVER_ACTIVATE], 0); ++} ++ ++ ++static void ++indicate_show_cb (EmpathyIndicator *indicator, ++ EmpathyEvent *event) ++{ ++ empathy_event_activate (event); ++} ++ ++ ++static void ++indicator_manager_event_added_cb (EmpathyEventManager *event_manager, ++ EmpathyEvent *event, ++ EmpathyIndicatorManager *manager) ++{ ++ EmpathyIndicator *indicator; ++ EmpathyIndicatorManagerPriv *priv; ++ IndicatorEvent *indicator_event; ++ ++ priv = GET_PRIV (manager); ++ ++ if (event->contact == NULL) ++ return; ++ indicator = empathy_indicator_new (event->contact, event->message, "im"); ++ 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); ++ ++ 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, ++ 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__VOID, ++ G_TYPE_NONE, ++ 0); ++ ++ 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) { ++ indicate_server_show (priv->indicate_server); ++ } else { ++ /* Causes a crash on next show currently due to object not being ++ unregistered from dbus ++ 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' +--- src/empathy-indicator-manager.h 1970-01-01 00:00:00 +0000 ++++ src/empathy-indicator-manager.h 2009-10-09 03:23:58 +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 ++ * ++ */ ++ ++#ifndef __EMPATHY_INDICATOR_MANAGER_H__ ++#define __EMPATHY_INDICATOR_MANAGER_H__ ++ ++#include ++ ++#include ++#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' +--- src/empathy-indicator.c 1970-01-01 00:00:00 +0000 ++++ src/empathy-indicator.c 2009-10-09 03:24:07 +0000 +@@ -0,0 +1,318 @@ ++/* -*- 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 ++ * ++ */ ++ ++#include ++ ++#include ++#include ++#include ++ ++#include "empathy-indicator.h" ++#include "empathy-misc.h" ++ ++#include ++#include ++ ++#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, ++ EmpathyIndicator *e_indicator) ++{ ++ g_signal_emit (e_indicator, signals[ACTIVATE], 0); ++} ++ ++ ++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__VOID, ++ G_TYPE_NONE, ++ 0); ++ ++ 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) ++{ ++ return g_object_new (EMPATHY_TYPE_INDICATOR, "contact", sender, "body", body, ++ "subtype", subtype, NULL); ++} ++ ++ ++void ++empathy_indicator_show (EmpathyIndicator *e_indicator) ++{ ++ g_object_set (e_indicator, "visible", TRUE, NULL); ++} ++ ++ ++void ++empathy_indicator_hide (EmpathyIndicator *e_indicator) ++{ ++ g_object_set (e_indicator, "visible", FALSE, NULL); ++} ++ ++ ++void ++empathy_indicator_update (EmpathyIndicator *e_indicator, ++ const gchar *body) ++{ ++ 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' +--- src/empathy-indicator.h 1970-01-01 00:00:00 +0000 ++++ src/empathy-indicator.h 2009-10-09 03:23:58 +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 ++ * ++ */ ++ ++#ifndef __EMPATHY_INDICATOR_H__ ++#define __EMPATHY_INDICATOR_H__ ++ ++#include ++ ++#include ++ ++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' +--- src/empathy-main-window.c 2009-10-09 03:23:36 +0000 ++++ src/empathy-main-window.c 2009-10-09 03:23:58 +0000 +@@ -61,6 +61,10 @@ + #include "empathy-event-manager.h" + #include "empathy-ft-manager.h" + ++#ifdef HAVE_LIBINDICATE ++#include "empathy-indicator-manager.h" ++#endif ++ + #define DEBUG_FLAG EMPATHY_DEBUG_OTHER + #include + +@@ -111,6 +115,10 @@ + + /* Actions that are enabled when there are connected accounts */ + GList *actions_connected; ++#ifdef HAVE_LIBINDICATE ++ EmpathyIndicatorManager *indicator_manager; ++ GHashTable *indicator_timeouts; ++#endif + } EmpathyMainWindow; + + static EmpathyMainWindow *window = NULL; +@@ -600,6 +608,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 + } + } + +@@ -664,6 +676,10 @@ + g_object_unref (window->event_manager); + g_object_unref (window->ui_manager); + ++#ifdef HAVE_LIBINDICATE ++ g_object_unref (window->indicator_manager); ++#endif ++ + g_free (window); + } + +@@ -1238,6 +1254,10 @@ + "help_contents", "activate", main_window_help_contents_cb, + NULL); + ++#ifdef HAVE_LIBINDICATE ++ window->indicator_manager = empathy_indicator_manager_dup_singleton (); ++#endif ++ + /* Set up connection related widgets. */ + main_window_connection_items_setup (window, gui); + + +=== modified file 'src/empathy-preferences.c' +--- src/empathy-preferences.c 2009-10-09 03:23:36 +0000 ++++ src/empathy-preferences.c 2009-10-09 03:23:58 +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' +--- src/empathy-preferences.ui 2009-10-09 03:23:36 +0000 ++++ src/empathy-preferences.ui 2009-10-09 03:23:58 +0000 +@@ -250,6 +250,20 @@ + 1 + + ++ ++ ++ Use message indicators ++ True ++ True ++ False ++ True ++ ++ ++ False ++ False ++ 2 ++ ++ + + + 1 + +=== modified file 'src/empathy-status-icon.c' +--- src/empathy-status-icon.c 2009-10-09 03:23:36 +0000 ++++ src/empathy-status-icon.c 2009-10-09 03:23:58 +0000 +@@ -29,6 +29,7 @@ + #include + #include + ++#include + #include + #include + +@@ -44,12 +45,18 @@ + #include + #include + ++#include ++ + #include "empathy-accounts-dialog.h" + #include "empathy-status-icon.h" + #include "empathy-preferences.h" + #include "empathy-event-manager.h" + #include "empathy-misc.h" + ++#ifdef HAVE_LIBINDICATE ++#include "empathy-indicator-manager.h" ++#endif ++ + #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER + #include + +@@ -74,6 +81,9 @@ + GtkAction *new_message_item; + GtkAction *status_item; + gboolean notify_supports_actions; ++#ifdef HAVE_LIBINDICATE ++ EmpathyIndicatorManager *indicator_manager; ++#endif + } EmpathyStatusIconPriv; + + G_DEFINE_TYPE (EmpathyStatusIcon, empathy_status_icon, G_TYPE_OBJECT); +@@ -86,6 +96,33 @@ + return FALSE; + } + ++/* Query whether the notification server supports the "action" ++ * extension to the notifications specification, if it doesn't ++ * the sending actions has undefined results. ++ */ ++static gboolean ++notification_server_supports_actions (void) ++{ ++ GList *caps = notify_get_server_caps (); ++ GList *l; ++ gboolean ret = FALSE; ++ ++ for (l = caps; l; l = l->next) { ++ gchar *cap = (gchar *) l->data; ++ if (!cap) { ++ continue; ++ } ++ if (!tp_strdiff (cap, "actions")) { ++ ret = TRUE; ++ break; ++ } ++ } ++ g_list_foreach (caps, (GFunc)g_free, NULL); ++ g_list_free (caps); ++ ++ return ret; ++} ++ + static void + status_icon_notification_closed_cb (NotifyNotification *notification, + EmpathyStatusIcon *icon) +@@ -115,8 +152,14 @@ + */ + g_idle_add ((GSourceFunc) activate_event, priv->event); + } else { +- /* inhibit other updates for this event */ +- empathy_event_inhibit_updates (priv->event); ++ /* inhibit other updates for this event, but only if ++ * the server supports actions, using that as a proxy ++ * for being click-through, as many notifications aren't ++ * a problem then. Maybe not the right thing to do. ++ */ ++ if (notification_server_supports_actions ()) { ++ empathy_event_inhibit_updates (priv->event); ++ } + } + } + +@@ -347,6 +390,28 @@ + } + } + ++#ifdef HAVE_LIBINDICATE ++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); ++ /* Hide the status icon so there are not two ways to access empathy. ++ * Should use libindicate's "interest" to confirm someone is listening. ++ */ ++ gtk_status_icon_set_visible (priv->icon, FALSE); ++ } else { ++ empathy_indicator_manager_set_server_visible (priv->indicator_manager, ++ FALSE); ++ gtk_status_icon_set_visible (priv->icon, TRUE); ++ } ++} ++#endif ++ + static void + status_icon_notify_visibility_cb (EmpathyConf *conf, + const gchar *key, +@@ -360,16 +425,56 @@ + } + } + ++#ifdef HAVE_LIBINDICATE ++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_toggle_visibility (EmpathyStatusIcon *icon) + { + EmpathyStatusIconPriv *priv = GET_PRIV (icon); + gboolean visible; ++#ifdef HAVE_LIBINDICATE ++ gboolean use_libindicate; ++#endif + + visible = gtk_window_is_active (priv->window); ++#ifdef HAVE_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); ++ } ++#endif + status_icon_set_visibility (icon, !visible, TRUE); + } + ++#ifdef HAVE_LIBINDICATE ++static void ++indicate_server_activate_cb (EmpathyIndicatorManager *manager, ++ EmpathyStatusIcon *icon) ++{ ++ status_icon_toggle_visibility (icon); ++} ++#endif ++ + static void + status_icon_idle_notify_cb (EmpathyStatusIcon *icon) + { +@@ -550,6 +655,10 @@ + g_object_unref (priv->account_manager); + g_object_unref (priv->event_manager); + g_object_unref (priv->ui_manager); ++ ++#ifdef HAVE_LIBINDICATE ++ g_object_unref (priv->indicator_manager); ++#endif + } + + static void +@@ -585,6 +694,13 @@ + 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); + status_icon_idle_notify_cb (icon); + +@@ -625,6 +741,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); + +@@ -632,6 +751,12 @@ + priv = GET_PRIV (icon); + + priv->window = g_object_ref (window); ++#ifdef HAVE_LIBINDICATE ++ priv->indicator_manager = empathy_indicator_manager_dup_singleton (); ++ g_signal_connect (priv->indicator_manager, "server-activate", ++ G_CALLBACK (indicate_server_activate_cb), ++ icon); ++#endif + + g_signal_connect_after (priv->window, "key-press-event", + G_CALLBACK (status_icon_key_press_event_cb), +@@ -649,6 +774,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); + } +