--- gnome-bluetooth-2.30.0.orig/debian/copyright +++ gnome-bluetooth-2.30.0/debian/copyright @@ -0,0 +1,85 @@ +This package was first debianized by Edd Dumbill +on Thu Jun 10 11:14:24 BST 2004. +The new version of gnome-bluetooth was debianized by Filippo Giunchedi + on Sun May 24 17:47:30 CEST 2009 + +It was originally downloaded from http://usefulinc.com/software/gnome-bluetooth/ +Now gnome-bluetooth is a fork of bluez-gnome and can be found at +http://live.gnome.org/GnomeBluetooth + +Upstream Authors: + + Marcel Holtmann + Bastien Nocera + Chris Rivera + Jaap A. Haitsma + Antti Kaijanmäki + Michael Terry + +Copyright: + +The source code used to produce contents of libgnomebluetoothX and +libgnomebluetooth-dev package is licensed under LGPL v2.1 or later +and the packages are distributied under that license accordingly. + +All other packages ship combined work for GPL v2 or later and LGPL v2.1 +or later and are hence subject to GPL v2 + +Detailed list of licenses + files + copyright owner: + + ./properties/*: GPL (v2 or later) + [Copyright: 2006-2007 Bastien Nocera / 2005-2008 Marcel Holtmann ] + + ./properties/gconf-bridge.c: LGPL (v2 or later) + [Copyright: 2005 OpenedHand Ltd] + + ./properties/gconf-bridge.h: LGPL (v2 or later) + [Copyright: 2005 OpenedHand Ltd] + + ./applet/*: GPL (v2 or later) + [Copyright: 2006-2007 Bastien Nocera / 2005-2008 Marcel Holtmann ] + + ./sendto/main.c: GPL (v2 or later) + [Copyright: 2005-2008 Marcel Holtmann ] + + ./ltmain.sh: GPL (v2 or later) + [Copyright: 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc] + + ./lib/*: LGPL (v2.1 or later) + [Copyright: 2006-2007 Bastien Nocera / 2005-2008 Marcel Holtmann ] + + ./lib/bling-spinner.c: LGPL (v2 or later) (with incorrect FSF address) + [Copyright: 2007 John Stowers, Neil Jagdish Patel] + + ./lib/test-client.c: GPL (v2 or later) + [Copyright: 2005-2008 Marcel Holtmann ] + + ./lib/bluetooth-killswitch.h: GPL (v2 or later) + [Copyright: 2006-2009 Bastien Nocera / 2005-2008 Marcel Holtmann ] + + ./lib/test-class.c: GPL (v2 or later) + [Copyright: 2009 Bastien Nocera ] + + ./lib/test-agent.c: GPL (v2 or later) + [Copyright: 2005-2008 Marcel Holtmann ] + + ./lib/test-deviceselection.c: GPL (v2 or later) + [Copyright: 2006-2007 Bastien Nocera / 2005-2008 Marcel Holtmann ] + + ./lib/bluetooth-killswitch.c: GPL (v2 or later) + [Copyright: 2006-2009 Bastien Nocera / 2005-2008 Marcel Holtmann ] + + ./lib/rfkill.h: GPL (v2 or later) (with incorrect FSF address) + [Copyright: 2006 - 2007 Ivo van Doorn / 2007 Dmitry Torokhov / 2009 Johannes Berg ] + + ./wizard/*: GPL (v2 or later) + [Copyright: 2009 Bastien Nocera ] + + ./wizard/main.c: GPL (v2 or later) + [Copyright: 2005-2008 Marcel Holtmann ] + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +On Debian GNU/Linux systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. --- gnome-bluetooth-2.30.0.orig/debian/gnome-bluetooth.install +++ gnome-bluetooth-2.30.0/debian/gnome-bluetooth.install @@ -0,0 +1,12 @@ +debian/tmp/etc +debian/tmp/usr/share/gnome/help +debian/tmp/usr/share/locale +debian/tmp/usr/share/man/man1 +debian/tmp/usr/share/applications +debian/tmp/usr/share/omf +debian/tmp/usr/share/icons +debian/tmp/usr/share/gnome-bluetooth +debian/tmp/usr/bin +debian/tmp/usr/lib/gnome-bluetooth/plugins/*.so +debian/tmp/usr/lib/nautilus-sendto/plugins/*.so +debian/61-gnome-bluetooth-rfkill.rules lib/udev/rules.d/ --- gnome-bluetooth-2.30.0.orig/debian/watch +++ gnome-bluetooth-2.30.0/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://ftp.gnome.org/pub/gnome/sources/gnome-bluetooth/([\d\.]+)/gnome-bluetooth-(.*)\.tar\.gz --- gnome-bluetooth-2.30.0.orig/debian/libgnome-bluetooth7.install +++ gnome-bluetooth-2.30.0/debian/libgnome-bluetooth7.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/lib*.so.* --- gnome-bluetooth-2.30.0.orig/debian/control +++ gnome-bluetooth-2.30.0/debian/control @@ -0,0 +1,69 @@ +Source: gnome-bluetooth +Section: gnome +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Bluetooth Maintainers +Uploaders: Filippo Giunchedi +Build-Depends: debhelper (>= 5), + cdbs, + libunique-dev, + libnotify-dev (>= 0.4.3), + libglib2.0-dev, + libgtk2.0-dev (>= 2.19.1), + libgconf2-dev, + libdbus-glib-1-dev (>= 0.74), + intltool (>= 0.35), + libxml2-utils, + gconf2, + gtk-doc-tools, + gnome-doc-utils (>= 0.3.2), + nautilus-sendto, + libxi-dev, + libx11-dev, + libappindicator-dev +Standards-Version: 3.8.2 +Vcs-Svn: svn://svn.debian.org/svn/pkg-bluetooth/packages/gnome-bluetooth/trunk +Vcs-Browser: http://svn.debian.org/wsvn/pkg-bluetooth/packages/gnome-bluetooth/trunk +Vcs-Bzr: https://code.edge.launchpad.net/~ubuntu-desktop/gnome-bluetooth/ubuntu +Homepage: http://live.gnome.org/GnomeBluetooth + +Package: gnome-bluetooth +Section: gnome +Depends: ${shlibs:Depends}, ${misc:Depends}, bluez (>= 4.36), obexd-client +Recommends: gvfs-backends, gnome-user-share +Replaces: nautilus-sendto (<< 2.28.2-2ubuntu2) +Suggests: nautilus-sendto, geoclue +Conflicts: bluez-gnome +Architecture: any +Description: GNOME Bluetooth tools + This package contains tools for managing and manipulating Bluetooth + devices using the GNOME desktop. + . + bluetooth-applet provides an agent to ask for PIN and managing pairing with + devices, together with bluetooth-properties. + . + bluetooth-sendto is also included for sending files to Bluetooth devices via + OBEX. + +Package: libgnome-bluetooth7 +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Architecture: any +Description: GNOME Bluetooth tools - support library + This package contains tools for managing and manipulating Bluetooth + devices using the GNOME desktop. + . + The libraries included provide support to gnome-bluetooth. + +Package: libgnome-bluetooth-dev +Section: libdevel +Provides: libgnome-bluetooth7-dev +Depends: libgnome-bluetooth7 (= ${binary:Version}), ${misc:Depends} +Suggests: pkg-config +Priority: extra +Architecture: any +Description: GNOME Bluetooth tools - support library development files + This package contains tools for managing and manipulating Bluetooth + devices using the GNOME desktop. + . + The libraries included provide support to gnome-bluetooth. --- gnome-bluetooth-2.30.0.orig/debian/libgnome-bluetooth7.symbols +++ gnome-bluetooth-2.30.0/debian/libgnome-bluetooth7.symbols @@ -0,0 +1,39 @@ +libgnome-bluetooth.so.7 libgnome-bluetooth7 #MINVER# + bluetooth_category_get_type@Base 2.27.8 + bluetooth_chooser_button_available@Base 2.27.8 + bluetooth_chooser_button_get_type@Base 2.27.8 + bluetooth_chooser_button_new@Base 2.27.8 + bluetooth_chooser_combo_get_type@Base 2.29.3-0ubuntu1 + bluetooth_chooser_combo_new@Base 2.29.3-0ubuntu1 + bluetooth_chooser_get_model@Base 2.28.1 + bluetooth_chooser_get_selected_device@Base 2.27.8 + bluetooth_chooser_get_selected_device_icon@Base 2.27.8 + bluetooth_chooser_get_selected_device_info@Base 2.27.8 + bluetooth_chooser_get_selected_device_is_connected@Base 2.27.8 + bluetooth_chooser_get_selected_device_name@Base 2.27.8 + bluetooth_chooser_get_selected_device_type@Base 2.27.8 + bluetooth_chooser_get_treeview@Base 2.29.3-0ubuntu1 + bluetooth_chooser_get_type@Base 2.27.8 + bluetooth_chooser_get_type_column@Base 2.29.3-0ubuntu1 + bluetooth_chooser_new@Base 2.27.8 + bluetooth_chooser_remove_selected_device@Base 2.29.3-0ubuntu1 + bluetooth_chooser_set_title@Base 2.27.8 + bluetooth_chooser_start_discovery@Base 2.27.8 + bluetooth_chooser_stop_discovery@Base 2.27.8 + bluetooth_client_get_adapter_model@Base 2.27.8 + bluetooth_client_get_device_filter_model@Base 2.27.8 + bluetooth_client_get_device_model@Base 2.27.8 + bluetooth_client_get_filter_model@Base 2.27.8 + bluetooth_client_get_model@Base 2.27.8 + bluetooth_client_get_type@Base 2.27.8 + bluetooth_client_new@Base 2.27.8 + bluetooth_client_set_discoverable@Base 2.29.3-0ubuntu1 + bluetooth_column_get_type@Base 2.27.8 + bluetooth_filter_widget_bind_filter@Base 2.29.3-0ubuntu1 + bluetooth_filter_widget_get_type@Base 2.29.3-0ubuntu1 + bluetooth_filter_widget_new@Base 2.29.3-0ubuntu1 + bluetooth_filter_widget_set_title@Base 2.29.3-0ubuntu1 + bluetooth_type_get_type@Base 2.27.8 + bluetooth_type_to_string@Base 2.27.8 + bluetooth_uuid_to_string@Base 2.27.8 + bluetooth_verify_address@Base 2.27.8 --- gnome-bluetooth-2.30.0.orig/debian/rules +++ gnome-bluetooth-2.30.0/debian/rules @@ -0,0 +1,26 @@ +#!/usr/bin/make -f + +LDFLAGS=$(shell echo $$LDFLAGS | sed -e 's/-Wl,-Bsymbolic-functions//') +export LDFLAGS + +include /usr/share/cdbs/1/rules/buildcore.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +DEB_DH_MAKESHLIBS_ARGS += -- -c4 + +DEB_CONFIGURE_EXTRA_FLAGS := --disable-scrollkeeper --disable-desktop-update --disable-schemas-install --disable-introspection --disable-icon-update + +binary-post-install/gnome-bluetooth:: + install -m 644 $(CURDIR)/debian/gnome-bluetooth/usr/share/icons/hicolor/22x22/apps/bluetooth.png \ + $(CURDIR)/debian/gnome-bluetooth/usr/share/icons/hicolor/22x22/apps/bluetooth-active.png + install -m 644 debian/gnome-bluetooth/usr/share/icons/hicolor/32x32/apps/bluetooth.png \ + $(CURDIR)/debian/gnome-bluetooth/usr/share/icons/hicolor/32x32/apps/bluetooth-active.png + install -m 644 debian/gnome-bluetooth/usr/share/icons/hicolor/16x16/apps/bluetooth.png \ + $(CURDIR)/debian/gnome-bluetooth/usr/share/icons/hicolor/16x16/apps/bluetooth-active.png + install -m 644 debian/gnome-bluetooth/usr/share/icons/hicolor/24x24/apps/bluetooth.png \ + $(CURDIR)/debian/gnome-bluetooth/usr/share/icons/hicolor/24x24/apps/bluetooth-active.png + install -m 644 debian/gnome-bluetooth/usr/share/icons/hicolor/48x48/apps/bluetooth.png \ + $(CURDIR)/debian/gnome-bluetooth/usr/share/icons/hicolor/48x48/apps/bluetooth-active.png + --- gnome-bluetooth-2.30.0.orig/debian/changelog +++ gnome-bluetooth-2.30.0/debian/changelog @@ -0,0 +1,390 @@ +gnome-bluetooth (2.30.0-0ubuntu2) lucid; urgency=low + + * debian/patches/03-fix-killswitch-memleak.patch: + - the change is in the new version so drop this one, it still applies but + create double g_free which leads to crashes (lp: #552140) + + -- Sebastien Bacher Thu, 01 Apr 2010 11:15:51 +0200 + +gnome-bluetooth (2.30.0-0ubuntu1) lucid; urgency=low + + * New upstream version: + - Updated translations + - Add PIN code for Navman GPS + + -- Sebastien Bacher Mon, 29 Mar 2010 22:22:35 +0200 + +gnome-bluetooth (2.29.91-0ubuntu4) lucid; urgency=low + + * debian/patches/01_use_app_indicator.patch: + - update by Travis B. Hartwell to fix some minors issues (lp: #532104) + + -- Sebastien Bacher Fri, 05 Mar 2010 16:06:18 +0100 + +gnome-bluetooth (2.29.91-0ubuntu3) lucid; urgency=low + + * debian/control.in: + - Build-Depends on libappindicator-dev + * debian/patches/01_use_app_indicator.patch: + - change by Travis B. Hartwell to use the application indicator + (lp: #497856) + * debian/patches/90_autoreconf.patch: + - run autoreconf for the previous change + + -- Sebastien Bacher Wed, 24 Feb 2010 11:02:17 +0100 + +gnome-bluetooth (2.29.91-0ubuntu2) lucid; urgency=low + + * debian/control: + - recommends gnome-user-share rather than suggesting it's required to + get obexpush working + + -- Sebastien Bacher Wed, 17 Feb 2010 16:22:39 +0100 + +gnome-bluetooth (2.29.91-0ubuntu1) lucid; urgency=low + + * New upstream version: + - Mention gnome-user-share in the documentation + Applet: + - Link to the sound preferences for audio devices + - Remove hard-coded use of nautilus + Library: + - Use spinner from GTK+ + - Install introspection data properly + - API documentation fixes + - Fix some parts of the UI not being translated at run-time + Wizard: + - Fix run-time warning when pairing a new device + Moblin applet: + - Add summary page support + - Fix a number of memory leaks and possible crashers + Sendto: + - Fix crash when obex-client isn't already running + (lp: #449209, #456200, #511762) + - Make Cancel button actually work + - Implement "retry" when sending fails + - Fix progress bar when sending multiple files + * debian/control: + - build-depends on libx11-dev + - updated gtk requirement + * debian/libgnome-bluetooth7.symbols: + - new version update + + -- Sebastien Bacher Tue, 16 Feb 2010 13:48:58 +0100 + +gnome-bluetooth (2.29.3-0ubuntu1) lucid; urgency=low + + * New upstream version: + - Build and install nautilus-sendto plugin by default + Preferences: + - Add a button to access "Personal File Sharing" preferences + Library: + - Clean up combo box selection widget + - Make it possible to set the selected device in the chooser + - Make the button chooser select the device when popping up a dialogue + Sendto: + - Wrap errors instead of clipping them + Wizard: + - Make it possible to re-pair devices + * debian/control: + - Build-Depends on nautilus-sendto and libxi-dev and not on libhal-dev + - replaces nautilus-sendto (<< 2.28.2-2ubuntu2) + * debian/gnome-bluetooth.install: + - install the new nautilus-sendto .so there + * debian/libgnome-bluetooth7.symbols: + - new version update + + -- Sebastien Bacher Thu, 07 Jan 2010 15:13:11 +0100 + +gnome-bluetooth (2.28.3-0ubuntu1) lucid; urgency=low + + * New upstream release (LP: #490437): + - Various killswitch bugfixes + * debian/patches: + - 01-status-icon.patch: dropped, applied upstream. + - 02-lazy-killswitch-crashes.patch: dropped, applied upstream. + - 04-fix-yes-no-killswitch-handling.patch: dropped, applied upstream. + - 05-fix-icon-visibility-for-no-killswitch.patch: dropped, applied upstream. + + -- Baptiste Mille-Mathias Mon, 30 Nov 2009 18:18:22 +0100 + +gnome-bluetooth (2.28.1-0ubuntu2) karmic; urgency=low + + * fix LP: #437162 - Gnome Bluetooth needs to use different icons for + notification area and system menu; take notify.c part of bgo:596564 + patch to support special icons for tray; also install all bluetooth.png + as bluetooth-active.png in binary-post-install/gnome-bluetooth:: + - debian/patches/01-status-icon.patch + * fix LP: #445422 - topcrash bluetooth-applet crashed with SIGSEGV in + g_type_instance_get_private(); add improved patch from bgo:598181 + att:145298 + - debian/patches/02-lazy-killswitch-crashes.patch + * fix memleak surrouding killswitch removal + - debian/patches/03-fix-killswitch-memleak.patch + * fix handling of killswitch removal + - debian/patches/04-fix-yes-no-killswitch-handling.patch + * fix icon not properly removed from panel after bt device/killswitch + gets removed + - debian/patches/05-fix-icon-visibility-for-no-killswitch.patch + + -- Alexander Sack Wed, 14 Oct 2009 17:00:55 +0200 + +gnome-bluetooth (2.28.1-0ubuntu1) karmic; urgency=low + + * new upstream release 2.28.1 - noteworthy changes: + - bgo:595845 - The applet shows wrong connection information (LP: #440235) + - bgo:595593 - Make sure pairing agents only bind to default adapter + - bgo:593565 - Use "cell phone" instead of "mobile phone" + - bgo:593170 - Minor string fixes + - Move the pin handling code into a new library, libwizard + - Fix invalid memory access in agent.c + - Don't overwrite UUIDs when discovering known device (LP: #413053) + + * ship 61-gnome-bluetooth-rfkill.rules, which enables access to + /dev/rfkill for users (LP: #436694, #441800); also see rh:514798 + * update libgnome-bluetooth7.symbols; add two new symbols + + -- Alexander Sack Tue, 06 Oct 2009 15:20:10 +0200 + +gnome-bluetooth (2.28.0-0ubuntu2) karmic; urgency=low + + * debian/rules: code is still not good for -Bsymbolic-functions; strip + it from LDFLAGS to prevent type problems LP: #429523 + + -- Alexander Sack Fri, 25 Sep 2009 01:09:43 +0200 + +gnome-bluetooth (2.28.0-0ubuntu1) karmic; urgency=low + + * new upstream release 2.28.0 + + -- Alexander Sack Mon, 21 Sep 2009 14:16:28 +0200 + +gnome-bluetooth (2.27.90-0ubuntu1) karmic; urgency=low + + * upstream release 2.27.90 (LP: #427665) + * addressing MIR comments (LP: #409848) + + [ Loïc Minier ] + * Bump libdbus-glib-1-dev bdep to >= 0.74 to match configure. + * Pass --disable-icon-update to configure by default as icon caches will be + created by default if libgtk2.0-bin is present and might be shipped in the + package. + * Dont include autotools.mk as it's already included by gnome.mk. + * Drop libgeoclue-dev bdep as it doesn't seem to be needed for the geoclue + plugin. + + [ Alexander Sack ] + * debian/control: add geoclue to gnome-bluetooth Suggests + * debian/copyright: clarify copyright for shipped packages + * debian/rules: drop removal of -Bsymbolic-functions link flag; upstream + fixed the way libcommon.la is linked into the various binaries + * debian/control: add Vcs-Bzr info to ~ubuntu-desktop packaging branch + + [ Baptiste Mille-Mathias ] + * Fix rkill status (LP: #407962) + + -- Alexander Sack Fri, 11 Sep 2009 05:08:01 +0200 + +gnome-bluetooth (2.27.8-0ubuntu1) karmic; urgency=low + + [ Baptiste Mille-Mathias ] + * New upstream version (LP: #406592) + - require obexd + - geoclue plugin + * debian/control: + - Update Standards-Version to 3.8.2 + - Add libgeoclue-dev for Build-depends + - Replace obex-data-server by obexd-client in Depends + - Depends on bluez + - Suggest gnome-user-share + - bump soname to 7 + * debian/watch: updated + * debian/rules: + - add DEB_DH_MAKESHLIBS_ARGS += -- -c4 + - remove common-install-arch, seems to not be needed. + * debian/patches/01_bluez-notifications.patch: dropped, applied upstream + * debian/gnome-bluetooth.install: include plugins *.so + * debian/libgnome-bluetooth2.symbols renamed to debian/libgnome-bluetooth7.symbols + and regenerated + * debian/libgnome-bluetooth2.install renamed to debian/libgnome-bluetooth7.install + + [ Alexander Sack ] + * debian/rules: --disable-introspection to prevent build failures on development machines + * debian/rules: drop -Bsymbolic-functions from LDFLAGS to workaround typesystem issues + + -- Alexander Sack Wed, 05 Aug 2009 13:34:38 +0200 + +gnome-bluetooth (2.27.5-1ubuntu1) karmic; urgency=low + + * Merge from Debian unstable. Remaining changes: + + debian/patches/01_bluez-notifications.patch: + - ubuntu patch for notification system taken from bluez-gnome. Updated + to gnome-bluetooth code. + + -- Baptiste Mille-Mathias Thu, 04 Jun 2009 19:13:04 +0200 + +gnome-bluetooth (2.27.5-1) unstable; urgency=low + + * New upstream version (Closes: #530396) + + actually a fork of bluez-gnome, conflict accordingly + + revisit debian/copyright + * Ship a .symbols file for libgnome-bluetooth, thanks Sjoerd Simons + * Add chrpath to build-depends and explictely strip RPATH + * Upgrade to S-V 3.8.1, no changes needed + + -- Filippo Giunchedi Sun, 24 May 2009 21:42:09 +0200 + +gnome-bluetooth (0.9.1-1) unstable; urgency=low + + * New upstream release, bump libgnomeui-dev dep to >= 2.14 + * libbluetooth2-dev -> libbluetooth-dev transition + * first upload to unstable (Closes: #253735) + + -- Filippo Giunchedi Tue, 24 Jul 2007 16:32:57 +0200 + +gnome-bluetooth (0.8.0-1) UNRELEASED; urgency=low + + * New upstream release + * Add Bastien Nocera as author. [debian/copyright] + * Bump debhelper comp. level to 5. [debian/compat, debian/control] + * Update build-depends according to configure.in. [debian/control] + * Bump Standards-Version to 3.7.2. No changes needed. [debian/control] + * Change libbtctl2-dev dep version to binary:Source to reobtain binNMU + compatibility. [debian/control] + * Drop .la files. [debian/libgnomebt0-dev.install] + * Move icon to Utilities menu. [debian/patches/10_desktop-file.patch] + * Add watch file. [debian/watch] + * Change to synchronous rescan [debian/patches/20_rescan.patch] + * Fix typo in nb translation. [30_nb-translation-typo.patch] + * Add man pages + * Fix typo in package description + + -- Oystein Gisnas Sat, 24 Feb 2007 22:39:57 +0100 + +gnome-bluetooth (0.7.0-1) unstable; urgency=low + + * New upstream release + + -- Filippo Giunchedi Fri, 2 Dec 2005 21:20:23 +0100 + +gnome-bluetooth (0.6.0-1) unstable; urgency=low + + * New Upstream release + + -- Filippo Giunchedi Fri, 2 Dec 2005 19:33:47 +0100 + +gnome-bluetooth (0.6.0+cvs2005.09.09-2) unstable; urgency=low + + * build-dep on python-dev and not python2.3-dev + + -- Filippo Giunchedi Sun, 13 Nov 2005 16:29:14 +0100 + +gnome-bluetooth (0.6.0+cvs2005.09.09-1) unstable; urgency=low + + * first upload to debian, imported from ubuntu (Closes: #253735) + * revert back to python2.3 + + -- Filippo Giunchedi Tue, 1 Nov 2005 18:23:17 +0100 + +gnome-bluetooth (0.6.0+cvs2005.09.09-0ubuntu1) breezy; urgency=low + + * CVS fixes: + - src/fileactiondialog.gob: don't use uri after it was freed, make + sure that a URI was created before using it + - src/gnomebt-fileactiondialog-test.c: (main): check that the + files exist before running the tests + - src/controller.gob: fix 2 memory leaks, gconf_client_get_string + already returns a newly-allocated string + - src/permissiondialog.gob: fix a double-free + * fixes Malone #2406. + + -- Daniel Holbach Tue, 20 Sep 2005 19:36:24 +0200 + +gnome-bluetooth (0.6.0-0ubuntu1) breezy; urgency=low + + * New upstream release: + - gnome-obex-server: Now preserves timestamps of reserved files + (Tumoas Salo). + - Save received files to the path specified in the + /apps/gnome-obex-server/savedir GConf key + - Remove the nautilus extension, sending files over Bluetooth + devices is now handled though nautilus-sendto (Bastien Nocera) + - Make gnome-bluetooth-manager run with newer PyGTK (Olav Vitters, + Harald Hoyer) + - Make dialogues comply better with the HIG (Bastien Nocera) + - Add a test program for the spinner widget (Bastien Nocera) + - Build fixes (Bastien Nocera) + - Updated translations. + * debian/control: + - Bumped Standards-Version. + - Adjusted Build-Depends according to configure.in + * debian/patches/01_gnome-ui-appbar-fix.patch: + - dropped. + + -- Daniel Holbach Fri, 9 Sep 2005 17:12:18 +0200 + +gnome-bluetooth (0.5.1-1ubuntu7) hoary; urgency=low + + * Rebuilt, because of libhowl0 moving out. + + -- Daniel Holbach Thu, 10 Mar 2005 13:55:24 +0100 + +gnome-bluetooth (0.5.1-1ubuntu6) hoary; urgency=low + + * debian/patches/01_gnome-ui-appbar-fix.patch: + - gtk.Statusbar() fix thanks very much to Trent Lloyd. + * debian/control: + - Build-Depend on librsvg2-dev, python2.4-dev. Migrate all to python2.4. + + -- Jeff Waugh Mon, 24 Jan 2005 19:11:43 +1100 + +gnome-bluetooth (0.5.1-1ubuntu5) hoary; urgency=low + + * debian/control: + - Build-Depends typo. + + -- Jeff Waugh Thu, 2 Dec 2004 21:51:04 +1100 + +gnome-bluetooth (0.5.1-1ubuntu4) hoary; urgency=low + + * debian/control: + - Eugh, Build-Depends. + + -- Jeff Waugh Thu, 2 Dec 2004 15:05:29 +1100 + +gnome-bluetooth (0.5.1-1ubuntu3) hoary; urgency=low + + * debian/control: + - Build-Depend on intltool + + -- Jeff Waugh Thu, 2 Dec 2004 14:12:48 +1100 + +gnome-bluetooth (0.5.1-1ubuntu2) hoary; urgency=low + + * Upload to Ubuntu + + -- Jeff Waugh Wed, 1 Dec 2004 18:47:26 +1100 + +gnome-bluetooth (0.5.1-1) unstable; urgency=low + + * New upstream release. + + -- Edd Dumbill Fri, 18 Jun 2004 20:13:52 +0100 + +gnome-bluetooth (0.5-3) unstable; urgency=low + + * Add more missing dependencies for gnome-bluetooth (gtk2, glade2, gnome2). + + -- Edd Dumbill Sat, 12 Jun 2004 02:54:48 +0100 + +gnome-bluetooth (0.5-2) unstable; urgency=low + + * Add missing dependency on python2.3-libbtctl. + + -- Edd Dumbill Fri, 11 Jun 2004 15:22:36 +0100 + +gnome-bluetooth (0.5-1) unstable; urgency=low + + * Initial packaging. + + -- Edd Dumbill Thu, 10 Jun 2004 11:07:33 +0100 --- gnome-bluetooth-2.30.0.orig/debian/libgnome-bluetooth-dev.install +++ gnome-bluetooth-2.30.0/debian/libgnome-bluetooth-dev.install @@ -0,0 +1,5 @@ +debian/tmp/usr/include/* +debian/tmp/usr/lib/lib*.so +debian/tmp/usr/lib/*.la +debian/tmp/usr/lib/pkgconfig/* +debian/tmp/usr/share/gtk-doc/html/gnome-bluetooth/* --- gnome-bluetooth-2.30.0.orig/debian/61-gnome-bluetooth-rfkill.rules +++ gnome-bluetooth-2.30.0/debian/61-gnome-bluetooth-rfkill.rules @@ -0,0 +1,3 @@ +# Get access to /dev/rfkill for users +# See https://bugzilla.redhat.com/show_bug.cgi?id=514798 +KERNEL=="rfkill", ENV{ACL_MANAGE}="1" --- gnome-bluetooth-2.30.0.orig/debian/compat +++ gnome-bluetooth-2.30.0/debian/compat @@ -0,0 +1 @@ +5 --- gnome-bluetooth-2.30.0.orig/debian/patches/90_autoreconf.patch +++ gnome-bluetooth-2.30.0/debian/patches/90_autoreconf.patch @@ -0,0 +1,1639 @@ +diff -Nur -x '*.orig' -x '*~' gnome-bluetooth-2.29.91/aclocal.m4 gnome-bluetooth-2.29.91.new/aclocal.m4 +--- gnome-bluetooth-2.29.91/aclocal.m4 2010-02-15 13:49:11.000000000 +0100 ++++ gnome-bluetooth-2.29.91.new/aclocal.m4 2010-02-24 11:04:46.000000000 +0100 +@@ -3422,7 +3422,7 @@ + ;; + + # This must be Linux ELF. +-linux* | k*bsd*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -3447,13 +3447,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # Add ABI-specific directories to the system library path. +- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -3465,6 +3462,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -4052,11 +4061,11 @@ + ;; + + # This must be Linux ELF. +-linux* | k*bsd*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) ++netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else +@@ -4673,7 +4682,7 @@ + ;; + esac + ;; +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler +@@ -4737,7 +4746,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise +@@ -4957,7 +4966,7 @@ + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. + ecc*) +@@ -5162,6 +5171,9 @@ + cygwin* | mingw* | cegcc*) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + ;; ++ linux* | k*bsd*-gnu) ++ _LT_TAGVAR(link_all_deplibs, $1)=no ++ ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; +@@ -5226,6 +5238,9 @@ + openbsd*) + with_gnu_ld=no + ;; ++ linux* | k*bsd*-gnu) ++ _LT_TAGVAR(link_all_deplibs, $1)=no ++ ;; + esac + + _LT_TAGVAR(ld_shlibs, $1)=yes +@@ -5247,6 +5262,7 @@ + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in ++ *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +@@ -5338,7 +5354,7 @@ + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- gnu* | linux* | tpf* | k*bsd*-gnu) ++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in +@@ -5408,7 +5424,7 @@ + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -5583,6 +5599,7 @@ + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi ++ _LT_TAGVAR(link_all_deplibs, $1)=no + else + # not using gcc + if test "$host_cpu" = ia64; then +@@ -5821,7 +5838,7 @@ + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -6817,7 +6834,7 @@ + _LT_TAGVAR(inherit_rpath, $1)=yes + ;; + +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler +@@ -9030,14 +9047,16 @@ + # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) + # --------------------------------------------- + m4_define([_PKG_CONFIG], +-[if test -n "$$1"; then +- pkg_cv_[]$1="$$1" +- elif test -n "$PKG_CONFIG"; then +- PKG_CHECK_EXISTS([$3], +- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], +- [pkg_failed=yes]) +- else +- pkg_failed=untried ++[if test -n "$PKG_CONFIG"; then ++ if test -n "$$1"; then ++ pkg_cv_[]$1="$$1" ++ else ++ PKG_CHECK_EXISTS([$3], ++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], ++ [pkg_failed=yes]) ++ fi ++else ++ pkg_failed=untried + fi[]dnl + ])# _PKG_CONFIG + +@@ -9081,9 +9100,9 @@ + if test $pkg_failed = yes; then + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then +- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + else +- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD +diff -Nur -x '*.orig' -x '*~' gnome-bluetooth-2.29.91/applet/Makefile.in gnome-bluetooth-2.29.91.new/applet/Makefile.in +--- gnome-bluetooth-2.29.91/applet/Makefile.in 2010-02-15 13:49:14.000000000 +0100 ++++ gnome-bluetooth-2.29.91.new/applet/Makefile.in 2010-02-24 11:04:50.000000000 +0100 +@@ -37,6 +37,10 @@ + host_triplet = @host@ + bin_PROGRAMS = bluetooth-applet$(EXEEXT) + noinst_PROGRAMS = test-agentdialog$(EXEEXT) test-icon$(EXEEXT) ++@HAVE_APP_INDICATOR_TRUE@am__append_1 = $(APP_INDICATOR_LIBS) ++@HAVE_APP_INDICATOR_TRUE@am__append_2 = $(APP_INDICATOR_LIBS) ++@HAVE_APP_INDICATOR_TRUE@am__append_3 = $(APP_INDICATOR_LIBS) ++@HAVE_APP_INDICATOR_TRUE@am__append_4 = -DHAVE_APP_INDICATOR $(APP_INDICATOR_CFLAGS) + subdir = applet + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/bluetooth-applet.desktop.in.in +@@ -56,9 +60,10 @@ + agent.$(OBJEXT) + bluetooth_applet_OBJECTS = $(am_bluetooth_applet_OBJECTS) + am__DEPENDENCIES_1 = ++@HAVE_APP_INDICATOR_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) + bluetooth_applet_DEPENDENCIES = $(top_builddir)/lib/libcommon.la \ + $(top_builddir)/lib/libgnome-bluetooth.la \ +- $(am__DEPENDENCIES_1) ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) + AM_V_lt = $(am__v_lt_$(V)) + am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) + am__v_lt_0 = --silent +@@ -66,11 +71,11 @@ + notify.$(OBJEXT) + test_agentdialog_OBJECTS = $(am_test_agentdialog_OBJECTS) + test_agentdialog_DEPENDENCIES = $(top_builddir)/lib/libcommon.la \ +- $(am__DEPENDENCIES_1) ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) + am_test_icon_OBJECTS = test-icon.$(OBJEXT) notify.$(OBJEXT) + test_icon_OBJECTS = $(am_test_icon_OBJECTS) + test_icon_DEPENDENCIES = $(top_builddir)/lib/libcommon.la \ +- $(am__DEPENDENCIES_1) ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -136,6 +141,8 @@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + APPLET_CFLAGS = @APPLET_CFLAGS@ + APPLET_LIBS = @APPLET_LIBS@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +@@ -315,13 +322,17 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + bluetooth_applet_SOURCES = main.c notify.h notify.c agent.h agent.c +-bluetooth_applet_LDADD = $(top_builddir)/lib/libcommon.la $(top_builddir)/lib/libgnome-bluetooth.la $(APPLET_LIBS) ++bluetooth_applet_LDADD = $(top_builddir)/lib/libcommon.la \ ++ $(top_builddir)/lib/libgnome-bluetooth.la $(APPLET_LIBS) \ ++ $(am__append_1) + test_agentdialog_SOURCES = test-agentdialog.c notify.h notify.c +-test_agentdialog_LDADD = $(top_builddir)/lib/libcommon.la $(APPLET_LIBS) ++test_agentdialog_LDADD = $(top_builddir)/lib/libcommon.la \ ++ $(APPLET_LIBS) $(am__append_2) + test_icon_SOURCES = test-icon.c notify.h notify.c +-test_icon_LDADD = $(top_builddir)/lib/libcommon.la $(APPLET_LIBS) ++test_icon_LDADD = $(top_builddir)/lib/libcommon.la $(APPLET_LIBS) \ ++ $(am__append_3) + AM_CFLAGS = $(APPLET_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPKGDATADIR="\"$(pkgdatadir)\"" +-INCLUDES = -I$(top_srcdir)/lib ++INCLUDES = -I$(top_srcdir)/lib $(am__append_4) + man_MANS = bluetooth-applet.1 + ui_DATA = popup-menu.ui authorisation-dialogue.ui confirm-dialogue.ui passkey-dialogue.ui + uidir = $(pkgdatadir) +diff -Nur -x '*.orig' -x '*~' gnome-bluetooth-2.29.91/config.h.in gnome-bluetooth-2.29.91.new/config.h.in +--- gnome-bluetooth-2.29.91/config.h.in 2010-02-15 13:49:28.000000000 +0100 ++++ gnome-bluetooth-2.29.91.new/config.h.in 2010-02-24 11:04:50.000000000 +0100 +@@ -9,6 +9,9 @@ + /* Enable additional debugging at the expense of performance and size */ + #undef GNOME_ENABLE_DEBUG + ++/* Have AppIndicator */ ++#undef HAVE_APP_INDICATOR ++ + /* Define to 1 if you have the `bind_textdomain_codeset' function. */ + #undef HAVE_BIND_TEXTDOMAIN_CODESET + +diff -Nur -x '*.orig' -x '*~' gnome-bluetooth-2.29.91/configure gnome-bluetooth-2.29.91.new/configure +--- gnome-bluetooth-2.29.91/configure 2010-02-15 13:49:17.000000000 +0100 ++++ gnome-bluetooth-2.29.91.new/configure 2010-02-24 11:04:49.000000000 +0100 +@@ -793,6 +793,10 @@ + NST_CFLAGS + SENDTO_LIBS + SENDTO_CFLAGS ++HAVE_APP_INDICATOR_FALSE ++HAVE_APP_INDICATOR_TRUE ++APP_INDICATOR_LIBS ++APP_INDICATOR_CFLAGS + APPLET_LIBS + APPLET_CFLAGS + PROPS_LIBS +@@ -989,6 +993,7 @@ + enable_gtk_doc + enable_desktop_update + enable_icon_update ++enable_appindicator + enable_nautilus_sendto + enable_moblin + enable_introspection +@@ -1016,6 +1021,8 @@ + PROPS_LIBS + APPLET_CFLAGS + APPLET_LIBS ++APP_INDICATOR_CFLAGS ++APP_INDICATOR_LIBS + SENDTO_CFLAGS + SENDTO_LIBS + NST_CFLAGS +@@ -1671,6 +1678,8 @@ + --disable-desktop-update + Disable desktop database update + --disable-icon-update Disable icon cache update ++ --enable-appindicator=[no/auto/yes] ++ Build support for application indicators + --enable-nautilus-sendto=[no/yes/auto] + build nautilus-sendto plugin + --enable-moblin=[no/yes/auto] +@@ -1719,6 +1728,10 @@ + APPLET_CFLAGS + C compiler flags for APPLET, overriding pkg-config + APPLET_LIBS linker flags for APPLET, overriding pkg-config ++ APP_INDICATOR_CFLAGS ++ C compiler flags for APP_INDICATOR, overriding pkg-config ++ APP_INDICATOR_LIBS ++ linker flags for APP_INDICATOR, overriding pkg-config + SENDTO_CFLAGS + C compiler flags for SENDTO, overriding pkg-config + SENDTO_LIBS linker flags for SENDTO, overriding pkg-config +@@ -4789,13 +4802,13 @@ + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:4792: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:4805: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:4795: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:4808: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:4798: output\"" >&5) ++ (eval echo "\"\$as_me:4811: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" +@@ -5261,11 +5274,11 @@ + ;; + + # This must be Linux ELF. +-linux* | k*bsd*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) ++netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else +@@ -6001,7 +6014,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 6004 "configure"' > conftest.$ac_ext ++ echo '#line 6017 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -7497,11 +7510,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:7500: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7513: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7504: \$? = $ac_status" >&5 ++ echo "$as_me:7517: \$? = $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. +@@ -7666,7 +7679,7 @@ + lt_prog_compiler_static='-non_shared' + ;; + +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. + ecc*) +@@ -7836,11 +7849,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:7839: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7852: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7843: \$? = $ac_status" >&5 ++ echo "$as_me:7856: \$? = $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. +@@ -7941,11 +7954,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:7944: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7957: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:7948: \$? = $ac_status" >&5 ++ echo "$as_me:7961: \$? = $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 +@@ -7996,11 +8009,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:7999: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8012: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8003: \$? = $ac_status" >&5 ++ echo "$as_me:8016: \$? = $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 +@@ -8115,6 +8128,9 @@ + openbsd*) + with_gnu_ld=no + ;; ++ linux* | k*bsd*-gnu) ++ link_all_deplibs=no ++ ;; + esac + + ld_shlibs=yes +@@ -8136,6 +8152,7 @@ + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in ++ *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +@@ -8227,7 +8244,7 @@ + archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- gnu* | linux* | tpf* | k*bsd*-gnu) ++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in +@@ -8297,7 +8314,7 @@ + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -8472,6 +8489,7 @@ + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi ++ link_all_deplibs=no + else + # not using gcc + if test "$host_cpu" = ia64; then +@@ -8798,7 +8816,7 @@ + link_all_deplibs=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -9688,7 +9706,7 @@ + ;; + + # This must be Linux ELF. +-linux* | k*bsd*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -9728,13 +9746,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # Add ABI-specific directories to the system library path. +- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -9746,6 +9761,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -10366,7 +10393,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 10369 "configure" ++#line 10396 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -10462,7 +10489,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 10465 "configure" ++#line 10492 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -12438,10 +12465,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PROPS" >&5 + $as_echo_n "checking for PROPS... " >&6; } + +-if test -n "$PROPS_CFLAGS"; then +- pkg_cv_PROPS_CFLAGS="$PROPS_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$PROPS_CFLAGS"; then ++ pkg_cv_PROPS_CFLAGS="$PROPS_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED + gconf-2.0 + gtk+-2.0 +@@ -12460,13 +12488,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$PROPS_LIBS"; then +- pkg_cv_PROPS_LIBS="$PROPS_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$PROPS_LIBS"; then ++ pkg_cv_PROPS_LIBS="$PROPS_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED + gconf-2.0 + gtk+-2.0 +@@ -12485,8 +12515,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -12499,15 +12530,15 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- PROPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED ++ PROPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED + gconf-2.0 + gtk+-2.0 +- unique-1.0" 2>&1` ++ unique-1.0"` + else +- PROPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED ++ PROPS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED + gconf-2.0 + gtk+-2.0 +- unique-1.0" 2>&1` ++ unique-1.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$PROPS_PKG_ERRORS" >&5 +@@ -12552,10 +12583,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for APPLET" >&5 + $as_echo_n "checking for APPLET... " >&6; } + +-if test -n "$APPLET_CFLAGS"; then +- pkg_cv_APPLET_CFLAGS="$APPLET_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$APPLET_CFLAGS"; then ++ pkg_cv_APPLET_CFLAGS="$APPLET_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED + gconf-2.0 + gmodule-export-2.0 +@@ -12580,13 +12612,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$APPLET_LIBS"; then +- pkg_cv_APPLET_LIBS="$APPLET_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$APPLET_LIBS"; then ++ pkg_cv_APPLET_LIBS="$APPLET_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED + gconf-2.0 + gmodule-export-2.0 +@@ -12611,8 +12645,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -12625,19 +12660,19 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED ++ APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED + gconf-2.0 + gmodule-export-2.0 + gtk+-2.0 >= $GTK_REQUIRED + libnotify >= $NOTIFY_REQUIRED +- unique-1.0" 2>&1` ++ unique-1.0"` + else +- APPLET_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED ++ APPLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED + gconf-2.0 + gmodule-export-2.0 + gtk+-2.0 >= $GTK_REQUIRED + libnotify >= $NOTIFY_REQUIRED +- unique-1.0" 2>&1` ++ unique-1.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$APPLET_PKG_ERRORS" >&5 +@@ -12679,15 +12714,155 @@ + : + fi + ++APPINDICATOR_REQUIRED=0.0.7 ++ ++# Check whether --enable-appindicator was given. ++if test "${enable_appindicator+set}" = set; then : ++ enableval=$enable_appindicator; enable_appindicator=$enableval ++else ++ enable_appindicator="auto" ++fi ++ ++ ++if test x$enable_appindicator = xauto ; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator-0.1 >= \$APPINDICATOR_REQUIRED\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "appindicator-0.1 >= $APPINDICATOR_REQUIRED") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ enable_appindicator="yes" ++else ++ enable_appindicator="no" ++fi ++fi ++ ++if test x$enable_appindicator = xyes ; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator-0.1 >= \$APPINDICATOR_REQUIRED\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "appindicator-0.1 >= $APPINDICATOR_REQUIRED") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ : ++else ++ as_fn_error "appindicator-0.1 is not installed" "$LINENO" 5 ++fi ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APP_INDICATOR" >&5 ++$as_echo_n "checking for APP_INDICATOR... " >&6; } ++ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$APP_INDICATOR_CFLAGS"; then ++ pkg_cv_APP_INDICATOR_CFLAGS="$APP_INDICATOR_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator-0.1 >= \$APPINDICATOR_REQUIRED\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "appindicator-0.1 >= $APPINDICATOR_REQUIRED") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_APP_INDICATOR_CFLAGS=`$PKG_CONFIG --cflags "appindicator-0.1 >= $APPINDICATOR_REQUIRED" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++if test -n "$PKG_CONFIG"; then ++ if test -n "$APP_INDICATOR_LIBS"; then ++ pkg_cv_APP_INDICATOR_LIBS="$APP_INDICATOR_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator-0.1 >= \$APPINDICATOR_REQUIRED\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "appindicator-0.1 >= $APPINDICATOR_REQUIRED") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_APP_INDICATOR_LIBS=`$PKG_CONFIG --libs "appindicator-0.1 >= $APPINDICATOR_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 ++ APP_INDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "appindicator-0.1 >= $APPINDICATOR_REQUIRED"` ++ else ++ APP_INDICATOR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "appindicator-0.1 >= $APPINDICATOR_REQUIRED"` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$APP_INDICATOR_PKG_ERRORS" >&5 ++ ++ as_fn_error "Package requirements (appindicator-0.1 >= $APPINDICATOR_REQUIRED) were not met: ++ ++$APP_INDICATOR_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++Alternatively, you may set the environment variables APP_INDICATOR_CFLAGS ++and APP_INDICATOR_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" "$LINENO" 5 ++elif test $pkg_failed = untried; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error "The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++Alternatively, you may set the environment variables APP_INDICATOR_CFLAGS ++and APP_INDICATOR_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++ ++To get pkg-config, see . ++See \`config.log' for more details." "$LINENO" 5; } ++else ++ APP_INDICATOR_CFLAGS=$pkg_cv_APP_INDICATOR_CFLAGS ++ APP_INDICATOR_LIBS=$pkg_cv_APP_INDICATOR_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ : ++fi ++ ++ ++ ++$as_echo "#define HAVE_APP_INDICATOR 1" >>confdefs.h ++ ++fi ++ if test x"$enable_appindicator" = xyes; then ++ HAVE_APP_INDICATOR_TRUE= ++ HAVE_APP_INDICATOR_FALSE='#' ++else ++ HAVE_APP_INDICATOR_TRUE='#' ++ HAVE_APP_INDICATOR_FALSE= ++fi ++ ++ + + pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SENDTO" >&5 + $as_echo_n "checking for SENDTO... " >&6; } + +-if test -n "$SENDTO_CFLAGS"; then +- pkg_cv_SENDTO_CFLAGS="$SENDTO_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$SENDTO_CFLAGS"; then ++ pkg_cv_SENDTO_CFLAGS="$SENDTO_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED + gtk+-2.0 + gio-2.0\""; } >&5 +@@ -12703,13 +12878,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$SENDTO_LIBS"; then +- pkg_cv_SENDTO_LIBS="$SENDTO_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$SENDTO_LIBS"; then ++ pkg_cv_SENDTO_LIBS="$SENDTO_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED + gtk+-2.0 + gio-2.0\""; } >&5 +@@ -12725,8 +12902,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -12739,13 +12917,13 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- SENDTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED ++ SENDTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED + gtk+-2.0 +- gio-2.0" 2>&1` ++ gio-2.0"` + else +- SENDTO_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED ++ SENDTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED + gtk+-2.0 +- gio-2.0" 2>&1` ++ gio-2.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$SENDTO_PKG_ERRORS" >&5 +@@ -12798,10 +12976,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NST" >&5 + $as_echo_n "checking for NST... " >&6; } + +-if test -n "$NST_CFLAGS"; then +- pkg_cv_NST_CFLAGS="$NST_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$NST_CFLAGS"; then ++ pkg_cv_NST_CFLAGS="$NST_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + nautilus-sendto >= \$NAUTILUS_SENDTO_REQUIRED gconf-2.0 + \""; } >&5 +@@ -12817,13 +12996,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$NST_LIBS"; then +- pkg_cv_NST_LIBS="$NST_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$NST_LIBS"; then ++ pkg_cv_NST_LIBS="$NST_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + nautilus-sendto >= \$NAUTILUS_SENDTO_REQUIRED gconf-2.0 + \""; } >&5 +@@ -12839,8 +13020,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -12853,13 +13035,13 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- NST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ++ NST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " + nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED gconf-2.0 +- " 2>&1` ++ "` + else +- NST_PKG_ERRORS=`$PKG_CONFIG --print-errors " ++ NST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " + nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED gconf-2.0 +- " 2>&1` ++ "` + fi + # Put the nasty error message in config.log where it belongs + echo "$NST_PKG_ERRORS" >&5 +@@ -12898,10 +13080,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WIZARD" >&5 + $as_echo_n "checking for WIZARD... " >&6; } + +-if test -n "$WIZARD_CFLAGS"; then +- pkg_cv_WIZARD_CFLAGS="$WIZARD_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$WIZARD_CFLAGS"; then ++ pkg_cv_WIZARD_CFLAGS="$WIZARD_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED + gmodule-export-2.0 + gtk+-2.0 +@@ -12920,13 +13103,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$WIZARD_LIBS"; then +- pkg_cv_WIZARD_LIBS="$WIZARD_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$WIZARD_LIBS"; then ++ pkg_cv_WIZARD_LIBS="$WIZARD_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED + gmodule-export-2.0 + gtk+-2.0 +@@ -12945,8 +13130,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -12959,15 +13145,15 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- WIZARD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED ++ WIZARD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED + gmodule-export-2.0 + gtk+-2.0 +- unique-1.0" 2>&1` ++ unique-1.0"` + else +- WIZARD_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED ++ WIZARD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED + gmodule-export-2.0 + gtk+-2.0 +- unique-1.0" 2>&1` ++ unique-1.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$WIZARD_PKG_ERRORS" >&5 +@@ -13012,10 +13198,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for INPUT" >&5 + $as_echo_n "checking for INPUT... " >&6; } + +-if test -n "$INPUT_CFLAGS"; then +- pkg_cv_INPUT_CFLAGS="$INPUT_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$INPUT_CFLAGS"; then ++ pkg_cv_INPUT_CFLAGS="$INPUT_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xi + x11 + gtk+-2.0\""; } >&5 +@@ -13031,13 +13218,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$INPUT_LIBS"; then +- pkg_cv_INPUT_LIBS="$INPUT_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$INPUT_LIBS"; then ++ pkg_cv_INPUT_LIBS="$INPUT_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xi + x11 + gtk+-2.0\""; } >&5 +@@ -13053,8 +13242,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -13067,13 +13257,13 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- INPUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xi ++ INPUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xi + x11 +- gtk+-2.0" 2>&1` ++ gtk+-2.0"` + else +- INPUT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xi ++ INPUT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xi + x11 +- gtk+-2.0" 2>&1` ++ gtk+-2.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$INPUT_PKG_ERRORS" >&5 +@@ -13117,10 +13307,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGNOMEBT" >&5 + $as_echo_n "checking for LIBGNOMEBT... " >&6; } + +-if test -n "$LIBGNOMEBT_CFLAGS"; then +- pkg_cv_LIBGNOMEBT_CFLAGS="$LIBGNOMEBT_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$LIBGNOMEBT_CFLAGS"; then ++ pkg_cv_LIBGNOMEBT_CFLAGS="$LIBGNOMEBT_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED + gtk+-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED +@@ -13133,13 +13324,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$LIBGNOMEBT_LIBS"; then +- pkg_cv_LIBGNOMEBT_LIBS="$LIBGNOMEBT_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$LIBGNOMEBT_LIBS"; then ++ pkg_cv_LIBGNOMEBT_LIBS="$LIBGNOMEBT_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED + gtk+-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED +@@ -13152,8 +13345,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -13166,11 +13360,11 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LIBGNOMEBT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED +- gtk+-2.0" 2>&1` ++ LIBGNOMEBT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED ++ gtk+-2.0"` + else +- LIBGNOMEBT_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED +- gtk+-2.0" 2>&1` ++ LIBGNOMEBT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED ++ gtk+-2.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBGNOMEBT_PKG_ERRORS" >&5 +@@ -13213,10 +13407,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for COMMON" >&5 + $as_echo_n "checking for COMMON... " >&6; } + +-if test -n "$COMMON_CFLAGS"; then +- pkg_cv_COMMON_CFLAGS="$COMMON_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$COMMON_CFLAGS"; then ++ pkg_cv_COMMON_CFLAGS="$COMMON_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED + gmodule-2.0 + gtk+-2.0\""; } >&5 +@@ -13232,13 +13427,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$COMMON_LIBS"; then +- pkg_cv_COMMON_LIBS="$COMMON_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$COMMON_LIBS"; then ++ pkg_cv_COMMON_LIBS="$COMMON_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED + gmodule-2.0 + gtk+-2.0\""; } >&5 +@@ -13254,8 +13451,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -13268,13 +13466,13 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- COMMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED ++ COMMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED + gmodule-2.0 +- gtk+-2.0" 2>&1` ++ gtk+-2.0"` + else +- COMMON_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED ++ COMMON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED + gmodule-2.0 +- gtk+-2.0" 2>&1` ++ gtk+-2.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$COMMON_PKG_ERRORS" >&5 +@@ -13318,10 +13516,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GEOCLUE" >&5 + $as_echo_n "checking for GEOCLUE... " >&6; } + +-if test -n "$GEOCLUE_CFLAGS"; then +- pkg_cv_GEOCLUE_CFLAGS="$GEOCLUE_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GEOCLUE_CFLAGS"; then ++ pkg_cv_GEOCLUE_CFLAGS="$GEOCLUE_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 + dbus-glib-1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gconf-2.0 +@@ -13334,13 +13533,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$GEOCLUE_LIBS"; then +- pkg_cv_GEOCLUE_LIBS="$GEOCLUE_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GEOCLUE_LIBS"; then ++ pkg_cv_GEOCLUE_LIBS="$GEOCLUE_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 + dbus-glib-1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gconf-2.0 +@@ -13353,8 +13554,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -13367,11 +13569,11 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GEOCLUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gconf-2.0 +- dbus-glib-1" 2>&1` ++ GEOCLUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gconf-2.0 ++ dbus-glib-1"` + else +- GEOCLUE_PKG_ERRORS=`$PKG_CONFIG --print-errors "gconf-2.0 +- dbus-glib-1" 2>&1` ++ GEOCLUE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gconf-2.0 ++ dbus-glib-1"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GEOCLUE_PKG_ERRORS" >&5 +@@ -13414,10 +13616,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PLUGINS" >&5 + $as_echo_n "checking for PLUGINS... " >&6; } + +-if test -n "$PLUGINS_CFLAGS"; then +- pkg_cv_PLUGINS_CFLAGS="$PLUGINS_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$PLUGINS_CFLAGS"; then ++ pkg_cv_PLUGINS_CFLAGS="$PLUGINS_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5 + ac_status=$? +@@ -13427,13 +13630,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$PLUGINS_LIBS"; then +- pkg_cv_PLUGINS_LIBS="$PLUGINS_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$PLUGINS_LIBS"; then ++ pkg_cv_PLUGINS_LIBS="$PLUGINS_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5 + ac_status=$? +@@ -13443,8 +13648,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -13457,9 +13663,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- PLUGINS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0" 2>&1` ++ PLUGINS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0"` + else +- PLUGINS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0" 2>&1` ++ PLUGINS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$PLUGINS_PKG_ERRORS" >&5 +@@ -13510,10 +13716,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MOBLIN" >&5 + $as_echo_n "checking for MOBLIN... " >&6; } + +-if test -n "$MOBLIN_CFLAGS"; then +- pkg_cv_MOBLIN_CFLAGS="$MOBLIN_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$MOBLIN_CFLAGS"; then ++ pkg_cv_MOBLIN_CFLAGS="$MOBLIN_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + dbus-glib-1, + gtk+-2.0, +@@ -13538,13 +13745,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$MOBLIN_LIBS"; then +- pkg_cv_MOBLIN_LIBS="$MOBLIN_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$MOBLIN_LIBS"; then ++ pkg_cv_MOBLIN_LIBS="$MOBLIN_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + dbus-glib-1, + gtk+-2.0, +@@ -13569,8 +13778,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -13583,19 +13793,19 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- MOBLIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ++ MOBLIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " + dbus-glib-1, + gtk+-2.0, + mx-gtk-1.0 + moblin-panel +- " 2>&1` ++ "` + else +- MOBLIN_PKG_ERRORS=`$PKG_CONFIG --print-errors " ++ MOBLIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " + dbus-glib-1, + gtk+-2.0, + mx-gtk-1.0 + moblin-panel +- " 2>&1` ++ "` + fi + # Put the nasty error message in config.log where it belongs + echo "$MOBLIN_PKG_ERRORS" >&5 +@@ -14200,6 +14410,10 @@ + as_fn_error "conditional \"ICON_UPDATE\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi ++if test -z "${HAVE_APP_INDICATOR_TRUE}" && test -z "${HAVE_APP_INDICATOR_FALSE}"; then ++ as_fn_error "conditional \"HAVE_APP_INDICATOR\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi + if test -z "${HAVE_NST_TRUE}" && test -z "${HAVE_NST_FALSE}"; then + as_fn_error "conditional \"HAVE_NST\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 +diff -Nur -x '*.orig' -x '*~' gnome-bluetooth-2.29.91/docs/Makefile.in gnome-bluetooth-2.29.91.new/docs/Makefile.in +--- gnome-bluetooth-2.29.91/docs/Makefile.in 2010-02-15 13:49:14.000000000 +0100 ++++ gnome-bluetooth-2.29.91.new/docs/Makefile.in 2010-02-24 11:04:50.000000000 +0100 +@@ -100,6 +100,8 @@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + APPLET_CFLAGS = @APPLET_CFLAGS@ + APPLET_LIBS = @APPLET_LIBS@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur -x '*.orig' -x '*~' gnome-bluetooth-2.29.91/docs/reference/libgnome-bluetooth/Makefile.in gnome-bluetooth-2.29.91.new/docs/reference/libgnome-bluetooth/Makefile.in +--- gnome-bluetooth-2.29.91/docs/reference/libgnome-bluetooth/Makefile.in 2010-02-15 13:49:14.000000000 +0100 ++++ gnome-bluetooth-2.29.91.new/docs/reference/libgnome-bluetooth/Makefile.in 2010-02-24 11:04:50.000000000 +0100 +@@ -69,6 +69,8 @@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + APPLET_CFLAGS = @APPLET_CFLAGS@ + APPLET_LIBS = @APPLET_LIBS@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur -x '*.orig' -x '*~' gnome-bluetooth-2.29.91/docs/reference/Makefile.in gnome-bluetooth-2.29.91.new/docs/reference/Makefile.in +--- gnome-bluetooth-2.29.91/docs/reference/Makefile.in 2010-02-15 13:49:14.000000000 +0100 ++++ gnome-bluetooth-2.29.91.new/docs/reference/Makefile.in 2010-02-24 11:04:50.000000000 +0100 +@@ -100,6 +100,8 @@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + APPLET_CFLAGS = @APPLET_CFLAGS@ + APPLET_LIBS = @APPLET_LIBS@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur -x '*.orig' -x '*~' gnome-bluetooth-2.29.91/help/Makefile.in gnome-bluetooth-2.29.91.new/help/Makefile.in +--- gnome-bluetooth-2.29.91/help/Makefile.in 2010-02-15 13:49:14.000000000 +0100 ++++ gnome-bluetooth-2.29.91.new/help/Makefile.in 2010-02-24 11:04:50.000000000 +0100 +@@ -85,6 +85,8 @@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + APPLET_CFLAGS = @APPLET_CFLAGS@ + APPLET_LIBS = @APPLET_LIBS@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur -x '*.orig' -x '*~' gnome-bluetooth-2.29.91/icons/Makefile.in gnome-bluetooth-2.29.91.new/icons/Makefile.in +--- gnome-bluetooth-2.29.91/icons/Makefile.in 2010-02-15 13:49:14.000000000 +0100 ++++ gnome-bluetooth-2.29.91.new/icons/Makefile.in 2010-02-24 11:04:51.000000000 +0100 +@@ -62,6 +62,8 @@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + APPLET_CFLAGS = @APPLET_CFLAGS@ + APPLET_LIBS = @APPLET_LIBS@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur -x '*.orig' -x '*~' gnome-bluetooth-2.29.91/lib/Makefile.in gnome-bluetooth-2.29.91.new/lib/Makefile.in +--- gnome-bluetooth-2.29.91/lib/Makefile.in 2010-02-15 13:49:14.000000000 +0100 ++++ gnome-bluetooth-2.29.91.new/lib/Makefile.in 2010-02-24 11:04:51.000000000 +0100 +@@ -202,6 +202,8 @@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + APPLET_CFLAGS = @APPLET_CFLAGS@ + APPLET_LIBS = @APPLET_LIBS@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur -x '*.orig' -x '*~' gnome-bluetooth-2.29.91/lib/plugins/Makefile.in gnome-bluetooth-2.29.91.new/lib/plugins/Makefile.in +--- gnome-bluetooth-2.29.91/lib/plugins/Makefile.in 2010-02-15 13:49:15.000000000 +0100 ++++ gnome-bluetooth-2.29.91.new/lib/plugins/Makefile.in 2010-02-24 11:04:51.000000000 +0100 +@@ -125,6 +125,8 @@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + APPLET_CFLAGS = @APPLET_CFLAGS@ + APPLET_LIBS = @APPLET_LIBS@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur -x '*.orig' -x '*~' gnome-bluetooth-2.29.91/Makefile.in gnome-bluetooth-2.29.91.new/Makefile.in +--- gnome-bluetooth-2.29.91/Makefile.in 2010-02-15 13:49:16.000000000 +0100 ++++ gnome-bluetooth-2.29.91.new/Makefile.in 2010-02-24 11:04:51.000000000 +0100 +@@ -140,6 +140,8 @@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + APPLET_CFLAGS = @APPLET_CFLAGS@ + APPLET_LIBS = @APPLET_LIBS@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur -x '*.orig' -x '*~' gnome-bluetooth-2.29.91/moblin/Makefile.in gnome-bluetooth-2.29.91.new/moblin/Makefile.in +--- gnome-bluetooth-2.29.91/moblin/Makefile.in 2010-02-15 13:49:15.000000000 +0100 ++++ gnome-bluetooth-2.29.91.new/moblin/Makefile.in 2010-02-24 11:04:51.000000000 +0100 +@@ -160,6 +160,8 @@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + APPLET_CFLAGS = @APPLET_CFLAGS@ + APPLET_LIBS = @APPLET_LIBS@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur -x '*.orig' -x '*~' gnome-bluetooth-2.29.91/moblin/moblin-copy-n-paste/Makefile.in gnome-bluetooth-2.29.91.new/moblin/moblin-copy-n-paste/Makefile.in +--- gnome-bluetooth-2.29.91/moblin/moblin-copy-n-paste/Makefile.in 2010-02-15 13:49:15.000000000 +0100 ++++ gnome-bluetooth-2.29.91.new/moblin/moblin-copy-n-paste/Makefile.in 2010-02-24 11:04:51.000000000 +0100 +@@ -95,6 +95,8 @@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + APPLET_CFLAGS = @APPLET_CFLAGS@ + APPLET_LIBS = @APPLET_LIBS@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur -x '*.orig' -x '*~' gnome-bluetooth-2.29.91/moblin/moblin-icons/Makefile.in gnome-bluetooth-2.29.91.new/moblin/moblin-icons/Makefile.in +--- gnome-bluetooth-2.29.91/moblin/moblin-icons/Makefile.in 2010-02-15 13:49:15.000000000 +0100 ++++ gnome-bluetooth-2.29.91.new/moblin/moblin-icons/Makefile.in 2010-02-24 11:04:51.000000000 +0100 +@@ -84,6 +84,8 @@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + APPLET_CFLAGS = @APPLET_CFLAGS@ + APPLET_LIBS = @APPLET_LIBS@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur -x '*.orig' -x '*~' gnome-bluetooth-2.29.91/moblin/theme/Makefile.in gnome-bluetooth-2.29.91.new/moblin/theme/Makefile.in +--- gnome-bluetooth-2.29.91/moblin/theme/Makefile.in 2010-02-15 13:49:15.000000000 +0100 ++++ gnome-bluetooth-2.29.91.new/moblin/theme/Makefile.in 2010-02-24 11:04:51.000000000 +0100 +@@ -84,6 +84,8 @@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + APPLET_CFLAGS = @APPLET_CFLAGS@ + APPLET_LIBS = @APPLET_LIBS@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur -x '*.orig' -x '*~' gnome-bluetooth-2.29.91/properties/Makefile.in gnome-bluetooth-2.29.91.new/properties/Makefile.in +--- gnome-bluetooth-2.29.91/properties/Makefile.in 2010-02-15 13:49:15.000000000 +0100 ++++ gnome-bluetooth-2.29.91.new/properties/Makefile.in 2010-02-24 11:04:51.000000000 +0100 +@@ -125,6 +125,8 @@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + APPLET_CFLAGS = @APPLET_CFLAGS@ + APPLET_LIBS = @APPLET_LIBS@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur -x '*.orig' -x '*~' gnome-bluetooth-2.29.91/sendto/Makefile.in gnome-bluetooth-2.29.91.new/sendto/Makefile.in +--- gnome-bluetooth-2.29.91/sendto/Makefile.in 2010-02-15 13:49:16.000000000 +0100 ++++ gnome-bluetooth-2.29.91.new/sendto/Makefile.in 2010-02-24 11:04:51.000000000 +0100 +@@ -134,6 +134,8 @@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + APPLET_CFLAGS = @APPLET_CFLAGS@ + APPLET_LIBS = @APPLET_LIBS@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +diff -Nur -x '*.orig' -x '*~' gnome-bluetooth-2.29.91/wizard/Makefile.in gnome-bluetooth-2.29.91.new/wizard/Makefile.in +--- gnome-bluetooth-2.29.91/wizard/Makefile.in 2010-02-15 13:49:16.000000000 +0100 ++++ gnome-bluetooth-2.29.91.new/wizard/Makefile.in 2010-02-24 11:04:51.000000000 +0100 +@@ -137,6 +137,8 @@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + APPLET_CFLAGS = @APPLET_CFLAGS@ + APPLET_LIBS = @APPLET_LIBS@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ --- gnome-bluetooth-2.30.0.orig/debian/patches/01_use_app_indicator.patch +++ gnome-bluetooth-2.30.0/debian/patches/01_use_app_indicator.patch @@ -0,0 +1,322 @@ +# Description: use the new application indicator +# Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=606667 +# Ubuntu: https://bugs.launchpad.net/bugs/497856 +diff --git applet/Makefile.am applet/Makefile.am +index 3511c2b..3b5eede 100644 +--- applet/Makefile.am ++++ applet/Makefile.am +@@ -17,6 +17,13 @@ AM_CFLAGS = $(APPLET_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPKGDATADIR=" + + INCLUDES = -I$(top_srcdir)/lib + ++if HAVE_APP_INDICATOR ++bluetooth_applet_LDADD += $(APP_INDICATOR_LIBS) ++test_agentdialog_LDADD += $(APP_INDICATOR_LIBS) ++test_icon_LDADD += $(APP_INDICATOR_LIBS) ++INCLUDES += -DHAVE_APP_INDICATOR $(APP_INDICATOR_CFLAGS) ++endif ++ + man_MANS = bluetooth-applet.1 + + ui_DATA = popup-menu.ui authorisation-dialogue.ui confirm-dialogue.ui passkey-dialogue.ui +diff --git applet/main.c applet/main.c +index 3261d03..5cadbb4 100644 +--- applet/main.c ++++ applet/main.c +@@ -32,6 +32,9 @@ + #include + #include + ++#ifdef HAVE_APP_INDICATOR ++#include ++#endif /* HAVE_APP_INDICATOR */ + #include + #include + #include +@@ -362,6 +365,9 @@ static GtkWidget *create_popupmenu(void) + { + GObject *object; + GError *error = NULL; ++#ifdef HAVE_APP_INDICATOR ++ GtkWidget *menuitem = NULL; ++#endif /* HAVE_APP_INDICATOR */ + + xml = gtk_builder_new (); + if (gtk_builder_add_from_file (xml, "popup-menu.ui", &error) == 0) { +@@ -1030,7 +1052,11 @@ static GOptionEntry options[] = { + int main(int argc, char *argv[]) + { + UniqueApp *app; ++#ifdef HAVE_APP_INDICATOR ++ AppIndicator *indicator; ++#else + GtkStatusIcon *statusicon; ++#endif /* HAVE_APP_INDICATOR */ + GtkWidget *menu; + GConfValue *value; + GOptionContext *context; +@@ -1107,14 +1133,21 @@ int main(int argc, char *argv[]) + gconf_client_notify_add(gconf, PREF_DIR, + gconf_callback, NULL, NULL, NULL); + ++#ifdef HAVE_APP_INDICATOR ++ indicator = init_notification(); ++ app_indicator_set_menu(indicator, GTK_MENU(menu)); ++#else + statusicon = init_notification(); ++#endif /* HAVE_APP_INDICATOR */ + + update_icon_visibility(); + ++#ifndef HAVE_APP_INDICATOR + g_signal_connect(statusicon, "activate", + G_CALLBACK(activate_callback), menu); + g_signal_connect(statusicon, "popup-menu", + G_CALLBACK(popup_callback), menu); ++#endif /* HAVE_APP_INDICATOR */ + + setup_agents(); + +diff --git applet/notify.c applet/notify.c +index e884f62..1d848c7 100644 +--- applet/notify.c ++++ applet/notify.c +@@ -29,9 +29,16 @@ + #include + #include + #include ++#ifdef HAVE_APP_INDICATOR ++#include ++#endif /* HAVE_APP_INDICATOR */ + #include "notify.h" + ++#ifdef HAVE_APP_INDICATOR ++static AppIndicator *indicator = NULL; ++#else + static GtkStatusIcon *statusicon = NULL; ++#endif /* HAVE_APP_INDICATOR */ + static char *icon_name = NULL; + static char *tooltip = NULL; + static NotifyNotification *notify = NULL; +@@ -75,6 +82,7 @@ void show_notification(const gchar *summary, const gchar *message, + + notify_notification_set_timeout(notify, timeout); + ++#ifndef HAVE_APP_INDICATOR + if (gtk_status_icon_get_visible(statusicon) == TRUE) { + gtk_status_icon_get_geometry(statusicon, &screen, &area, NULL); + +@@ -83,6 +91,7 @@ void show_notification(const gchar *summary, const gchar *message, + notify_notification_set_hint_int32(notify, + "y", area.y + area.height / 2); + } ++#endif /* HAVE_APP_INDICATOR */ + + notify_notification_set_urgency(notify, NOTIFY_URGENCY_NORMAL); + +@@ -106,6 +115,21 @@ void close_notification(void) + } + } + ++#ifdef HAVE_APP_INDICATOR ++AppIndicator *init_notification(void) ++{ ++ notify_init("bluetooth-manager"); ++ ++ indicator = app_indicator_new("bluetooth-manager", ++ icon_name, ++ APP_INDICATOR_CATEGORY_HARDWARE); ++ ++ /* TODO: Change this to an appropriate icon. */ ++ app_indicator_set_attention_icon (indicator, "bluetooth-manager"); ++ ++ return indicator; ++} ++#else + GtkStatusIcon *init_notification(void) + { + notify_init("bluetooth-manager"); +@@ -115,12 +139,17 @@ GtkStatusIcon *init_notification(void) + + return statusicon; + } ++#endif /* HAVE_APP_INDICATOR */ + + void cleanup_notification(void) + { + close_notification(); + ++#ifdef HAVE_APP_INDICATOR ++ g_object_unref(indicator); ++#else + g_object_unref(statusicon); ++#endif /* HAVE_APP_INDICATOR */ + + g_free (icon_name); + icon_name = NULL; +@@ -132,14 +161,24 @@ void cleanup_notification(void) + + void show_icon(void) + { ++#ifdef HAVE_APP_INDICATOR ++ if (indicator != NULL) ++ app_indicator_set_status(indicator, APP_INDICATOR_STATUS_ACTIVE); ++#else + if (statusicon != NULL) + gtk_status_icon_set_visible(statusicon, TRUE); ++#endif /* HAVE_APP_INDICATOR */ + } + + void hide_icon(void) + { ++#ifdef HAVE_APP_INDICATOR ++ if (indicator != NULL) ++ app_indicator_set_status(indicator, APP_INDICATOR_STATUS_PASSIVE); ++#else + if (statusicon != NULL) + gtk_status_icon_set_visible(statusicon, FALSE); ++#endif /* HAVE_APP_INDICATOR */ + } + + void set_icon(gboolean enabled) +@@ -147,17 +186,43 @@ void set_icon(gboolean enabled) + const char *name = (enabled ? "bluetooth-active" : "bluetooth-disabled"); + const char *_tooltip = enabled ? _("Bluetooth: Enabled") : _("Bluetooth: Disabled"); + ++#ifdef HAVE_APP_INDICATOR ++ if (indicator == NULL) { ++#else + if (statusicon == NULL) { ++#endif /* HAVE_APP_INDICATOR */ + g_free (icon_name); + g_free (tooltip); + icon_name = g_strdup (name); + tooltip = g_strdup (_tooltip); + } else { ++#ifdef HAVE_APP_INDICATOR ++ app_indicator_set_icon(indicator, name); ++ /* NOTE: I chose not to use the tooltip info because that information is already displayed in the menu. ++ See https://wiki.ubuntu.com/CustomStatusMenuDesignGuidelines#What about tooltips? */ ++#else + gtk_status_icon_set_from_icon_name (statusicon, name); + gtk_status_icon_set_tooltip_markup(statusicon, _tooltip); ++#endif /* HAVE_APP_INDICATOR */ + } + } + ++#ifdef HAVE_APP_INDICATOR ++void enable_blinking(void) ++{ ++ app_indicator_set_status (indicator, APP_INDICATOR_STATUS_ATTENTION); ++} ++ ++void disable_blinking(void) ++{ ++ app_indicator_set_status (indicator, APP_INDICATOR_STATUS_ACTIVE); ++} ++ ++gboolean query_blinking(void) ++{ ++ return (app_indicator_get_status (indicator) == APP_INDICATOR_STATUS_ATTENTION); ++} ++#else + void enable_blinking(void) + { + gtk_status_icon_set_blinking(statusicon, TRUE); +@@ -172,3 +237,4 @@ gboolean query_blinking(void) + { + return gtk_status_icon_get_blinking(statusicon); + } ++#endif /* HAVE_APP_INDICATOR */ +diff --git applet/notify.h applet/notify.h +index 9ee5cb8..7f3ff39 100644 +--- applet/notify.h ++++ applet/notify.h +@@ -22,7 +22,13 @@ + * + */ + ++#ifdef HAVE_APP_INDICATOR ++#include ++ ++AppIndicator *init_notification(void); ++#else + GtkStatusIcon *init_notification(void); ++#endif /* HAVE_APP_INDICATOR */ + void cleanup_notification(void); + + gboolean notification_supports_actions(void); +diff --git applet/test-agentdialog.c applet/test-agentdialog.c +index d2506d5..92a1a4b 100644 +--- applet/test-agentdialog.c ++++ applet/test-agentdialog.c +@@ -31,7 +31,11 @@ static void activate_callback(GObject *widget, gpointer user_data) + + int main(int argc, char *argv[]) + { ++#ifdef HAVE_APP_INDICATOR ++ AppIndicator *indicator; ++#else + GtkStatusIcon *statusicon; ++#endif /* HAVE_APP_INDICATOR */ + DBusGConnection *conn; + DBusGProxy *adapter, *device; + GError *error = NULL; +@@ -53,10 +57,14 @@ int main(int argc, char *argv[]) + } + + set_icon (TRUE); ++#ifdef HAVE_APP_INDICATOR ++ indicator = init_notification(); ++#else + statusicon = init_notification(); + + g_signal_connect(statusicon, "activate", + G_CALLBACK(activate_callback), NULL); ++#endif /* HAVE_APP_INDICATOR */ + + setup_agents(); + +diff --git configure.ac configure.ac +index a4d6e5e..49d0ded 100644 +--- configure.ac ++++ configure.ac +@@ -90,6 +90,31 @@ PKG_CHECK_MODULES(APPLET, + libnotify >= $NOTIFY_REQUIRED + unique-1.0) + ++dnl Requires for application indicators ++APPINDICATOR_REQUIRED=0.0.7 ++ ++AC_ARG_ENABLE(appindicator, ++ AS_HELP_STRING([--enable-appindicator[=@<:@no/auto/yes@:>@]],[Build support for application indicators ]), ++ [enable_appindicator=$enableval], ++ [enable_appindicator="auto"]) ++ ++if test x$enable_appindicator = xauto ; then ++ PKG_CHECK_EXISTS([appindicator-0.1 >= $APPINDICATOR_REQUIRED], ++ enable_appindicator="yes", ++ enable_appindicator="no") ++fi ++ ++if test x$enable_appindicator = xyes ; then ++ PKG_CHECK_EXISTS([appindicator-0.1 >= $APPINDICATOR_REQUIRED],, ++ AC_MSG_ERROR([appindicator-0.1 is not installed])) ++ PKG_CHECK_MODULES(APP_INDICATOR, ++ appindicator-0.1 >= $APPINDICATOR_REQUIRED) ++ AC_SUBST(APP_INDICATOR_CFLAGS) ++ AC_SUBST(APP_INDICATOR_LIBS) ++ AC_DEFINE(HAVE_APP_INDICATOR, 1, [Have AppIndicator]) ++fi ++AM_CONDITIONAL(HAVE_APP_INDICATOR, test x"$enable_appindicator" = xyes) ++ + dnl Requires for the sendto app + PKG_CHECK_MODULES(SENDTO, + dbus-glib-1 >= $DBUS_GLIB_REQUIRED +@@ -231,5 +256,6 @@ Configure summary: + nautilus-sendto plugin......: ${have_nst} + Documentation...............: ${enable_gtk_doc} + GObject-Introspection.......: ${found_introspection} ++ Application Indicators......: ${enable_appindicator} + " +