--- bluez-gnome-1.8.orig/debian/watch +++ bluez-gnome-1.8/debian/watch @@ -0,0 +1,4 @@ +version=3 +# this is ugly +opts=downloadurlmangle=s@.*download%2F(.*)@http://bluez.sf.net/download/$1@,filenamemangle=s/.*download%2F(.*)/$1/ \ +http://www.bluez.org/download.html .*bluez-gnome-(.+)\.tar\.gz --- bluez-gnome-1.8.orig/debian/bluez-gnome.postinst +++ bluez-gnome-1.8/debian/bluez-gnome.postinst @@ -0,0 +1,20 @@ +#!/bin/sh + +set -e +case "$1" in + configure) + # the old conffile got renamed, but contains an executable path that + # changed as well so it is modified for sure. Moving to + # $NEWCONFFILE.dpkg-old if it has been modified by the user + OLDCONFFILE="/etc/xdg/autostart/bt-applet.desktop" + if [ -e "$OLDCONFFILE" ]; then + mv -f "$OLDCONFFILE" "/etc/xdg/autostart/bluetooth-applet.desktop.dpkg-old" + fi + ;; + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +#DEBHELPER# --- bluez-gnome-1.8.orig/debian/control +++ bluez-gnome-1.8/debian/control @@ -0,0 +1,19 @@ +Source: bluez-gnome +Section: gnome +Priority: optional +XSBC-Original-Maintainer: Debian Bluetooth Maintainers +Maintainer: Ubuntu Core Developers +Uploaders: Edd Dumbill , Filippo Giunchedi , Mario Iseli +Build-Depends: libnotify-dev (>= 0.3.2), libgtk2.0-dev (>= 2.8), libgconf2-dev (>= 2.14), libdbus-glib-1-dev (>= 0.60), autotools-dev, cdbs, debhelper (>= 5), intltool, libhal-dev, intltool +Standards-Version: 3.7.3 +Homepage: http://www.bluez.org/ + +Package: bluez-gnome +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, dbus, obex-data-server (>= 0.3) +Conflicts: bluez-passkey-gnome (<= 0.5-2) +Replaces: bluez-passkey-gnome +Recommends: bluetooth +Description: Bluetooth utilities for GNOME + This package contains various GNOME applets to detect bluetooth adapters and + configure them. --- bluez-gnome-1.8.orig/debian/copyright +++ bluez-gnome-1.8/debian/copyright @@ -0,0 +1,51 @@ +This package was debianized by Filippo Giunchedi on +Tue Sep 19 14:54:10 CEST 2006 + +It was downloaded from http://bluez.sf.net/ + +Upstream Author: Marcel Holtmann + +Copyright: + + BlueZ - Bluetooth protocol stack for Linux + + Copyright (C) 2005-2006 Marcel Holtmann + + The contents of compat/ are licensed under the LGPL. (excerpt below) + + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This package 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + On Debian systems, the complete text of the GNU Lesser General + Public License can be found in `/usr/share/common-licenses/LGPL'. + + +This package 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; version 2 dated June, 1991. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. +IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY CLAIM, +OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER +RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE +USE OR PERFORMANCE OF THIS SOFTWARE. + +ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, COPYRIGHTS, +TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS SOFTWARE IS DISCLAIMED. --- bluez-gnome-1.8.orig/debian/bluez-gnome.preinst +++ bluez-gnome-1.8/debian/bluez-gnome.preinst @@ -0,0 +1,26 @@ +#!/bin/sh + +# snip from http://www.dpkg.org/ConffileHandling + +# Prepare to move a conffile without triggering a dpkg question +prep_mv_conffile() { + PKGNAME="$1" + CONFFILE="$2" + + if [ -e "$CONFFILE" ]; then + md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`" + if [ "$md5sum" = "$old_md5sum" ]; then + rm -f "$CONFFILE" + fi + fi +} + +case "$1" in +install|upgrade) + if dpkg --compare-versions "$2" le "0.5-2"; then + prep_mv_conffile "/etc/xdg/autostart/bt-applet.desktop" + fi +esac + +#DEBHELPER# --- bluez-gnome-1.8.orig/debian/changelog +++ bluez-gnome-1.8/debian/changelog @@ -0,0 +1,307 @@ +bluez-gnome (1.8-0ubuntu4) jaunty; urgency=low + + * No-change rebuild to fix lpia shared library dependencies. + + -- Colin Watson Thu, 19 Mar 2009 12:22:45 +0000 + +bluez-gnome (1.8-0ubuntu3) jaunty; urgency=low + + * Add 10_wizard-custom-pin.patch: Allow the user to enter a custom PIN for + pairing; A lot of devices use a hardcoded PIN and do not have a keyboard + for entering a random one. Patch by Vincent Untz, merci! (LP: #284994) + + -- Martin Pitt Mon, 16 Mar 2009 13:26:00 +0100 + +bluez-gnome (1.8-0ubuntu2) jaunty; urgency=low + + [ Joel Ebel ] + * New patch 08_XFCE.patch in debian/patches + - Adds XFCE to OnlyShowIn lines for desktop files. Enables + bluetooth-applet under XFCE and shows bluetooth-properties in menus. + + [ Richard Laager ] + * Add 09_visibility.patch to make visibility settings in + applet persist across login sessions. (LP: #297819) + + -- Mario Limonciello Thu, 12 Feb 2009 14:22:15 -0600 + +bluez-gnome (1.8-0ubuntu1) intrepid; urgency=low + + [ Mario Limonciello ] + * New upstream version (LP: #274950) + * debian/control: + - Update Recommends for bluetooth to bring in the bluetooth stack. + * debian/patches: + - Drop 05_hildon_ui for now since it doesn't work properly. + - Drop 80_from_fedora_fix_nautilus_sendto_compatibility.patch as not necessary. + - Drop 99_automake for now too. + - Add 04_bluetooth-sendto-ods-svn.patch from F10 to let this work with SVN + obex-data-server. + - Add 05_bluetooth_sendto_dbus-snd.patch to make this more functional + w/ SVN obex-data-server. + - Add 07_null_device_name.patch to prevent showing "(null)" in wizard. + + [ Emmet Hikory ] + * Add 06_preferences-horizontal-layout.patch for 800x600 support. + + -- Mario Limonciello Tue, 07 Oct 2008 14:33:11 -0500 + +bluez-gnome (0.25-0ubuntu2) intrepid; urgency=low + + [ Michael Frey ] + * Add hildon support and enable it on lpia; LP: #208423. + - New patch, 05_hildon_ui, misc Hildon UI changes for low resolution + screens. + . New --enable-hildon configure flag to define HILDON. + . Use a Gtk+ hbox instead of vbox in the UI to make a better use of + screen estate. + . Wrap top level container (main box) into a vbox and hbox to tweak + horiz and vert positions. + - New patch, 99_automake, generated with aclocal-1.10 && autoconf && + autoheader && rm -rf autom4te.cache config.h.in~. + + [ Loic Minier ] + * Tune patches 05_hildon_ui and 99_automake. + . Use upstream indentation style (tabs). + . Use #ifdef HILDON consistenly instead of mixing with #if HILDON. + . Minimize number of patched lines (no removed lines anymore). + . Move configure.in snippet from 99_automake (carrying autogenerated + files) to 05_hildon_ui. + * Call autoheader when generating 99_automake. + * Change enable_hildon != no test in 05_hildon_ui to enable_hildon == yes as + enable_hildon is empty when not given. + * Use DEB_HOST_ARCH instead of DEB_BUILD_ARCH to test target architecture. + * Tweak above changelog entries slightly to document each individual change, + to close LP bug, to target intrepid, and to update upload time. + * Move DEB_CONFIGURE_EXTRA_FLAGS additions below the cdbs includes as + otherwise these are reset... doh! + + -- Michael Frey Tue, 17 Jun 2008 22:37:30 +0200 + +bluez-gnome (0.25-0ubuntu1) hardy; urgency=low + + * New upstream versions: + - Remove signal handlers when no longer needed. + - Show OBEX errors and close server on failure. + - Add tablets and joypads/joysticks device types. + - Fix setting filter properties in the device selection widget. + - Fix missing assignment of filter labels. + - Show all the possibly known devices. + * debian/patches/80_from_fedora_fix_nautilus_sendto_compatibility.patch: + - change from fedora to fix nautilus-sendto (lp: #197145) + * debian/rules: + - don't distribute caches generated during the build + + -- Sebastien Bacher Fri, 28 Mar 2008 10:39:37 +0100 + +bluez-gnome (0.23-0ubuntu3) hardy; urgency=low + + * Drop 01_dont_run_update-mime-database.patch and just pass + --disable-mime-update and --disable-desktop-update to configure + instead. + * Fix it so we are no longer a native package. LP: #196319 + + -- Tollef Fog Heen Mon, 10 Mar 2008 14:10:18 +0100 + +bluez-gnome (0.23-0ubuntu2) hardy; urgency=low + + * Remove unneeded dependency on gnome-vfs-obexftp. Gvfs now supports + OBEX itself. + + -- Tollef Fog Heen Sat, 08 Mar 2008 08:46:14 +0100 + +bluez-gnome (0.23-0ubuntu1) hardy; urgency=low + + [ Onkar Shinde ] + * debian/control + - Add 'obex-data-server' instead for file transfer support. + - Remove gnome-icon-theme dependency as the application now has its own + Tango friendly icon. + - Add 'Homepage' field and remove url from description. + - Update 'Standards-Version' to 3.7.3. + * debian/patches/ + - 01_dont_run_update-mime-database.patch, 02_MenusRevisited.patch - + Refreshed for new release. + - 03_disable_browse_menu.patch - Disable 'Browse Device...' menu in the + applet as gnome-vfs-obexftp is not working currently. + * debian/watch + - Copied from the version in Debian unstable. + + [ Tollef Fog Heen ] + * New upstream release + + -- Tollef Fog Heen Mon, 25 Feb 2008 08:14:27 +0100 + +bluez-gnome (0.15-0ubuntu2) hardy; urgency=low + + * debian/patches/02_MenusRevisited.patch: + - Hide the bluetooth analyzer menu item (MenusRevisited) (LP: #151321). + + -- Matti Lindell Tue, 15 Jan 2008 19:10:50 +0200 + +bluez-gnome (0.15-0ubuntu1) hardy; urgency=low + + * New upstream release (LP: #176664, LP: #181304): + - Use buttons in notification popups. + - Use CreateSecureDevice for input device setup. + - Add remove button for network connections. + - Enable connect/disconnect button for network devices. + - Enable singleton support. + - Update device selection widget. + - Make tooltips HIG compliant (LP: #138085). + * debian/control: + - bluez-gnome: Depends on gnome-vfs-obexftp (LP: #131530). + - bluez-gnome: Change home page link in description (LP: #135501). + + -- Matti Lindell Tue, 08 Jan 2008 18:41:00 +0200 + +bluez-gnome (0.14-0ubuntu2) gutsy; urgency=low + + * debian/control: + - Build-Depends on intltool so the translations template is updated + (LP: #139891) + + -- Sebastien Bacher Thu, 27 Sep 2007 11:18:52 +0200 + +bluez-gnome (0.14-0ubuntu1) gutsy; urgency=low + + * New upstream release: + - Add support for Bluetooth mime types. + - Add support for service specific actions. + - Ask user to confirm when deleting a bonding. + * debian/control: added libhal-dev to Build-Depends. + * debian/rules: + - don't install /usr/share/mime/XMLnamespaces, /usr/share/mime/aliases, + /usr/share/mime/globs, /usr/share/mime/magic, + /usr/share/mime/mime.cache, /usr/share/mime/subclasses. + * debian/patches/01_dont_run_update-mime-database.patch: fix FTBFS. + + -- Daniel Holbach Fri, 07 Sep 2007 10:15:13 +0200 + +bluez-gnome (0.13-1ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - Munge Maintainer field as per spec. + - Update prep_mv_conffile in preinst to use dpkg-query instead of + frobbing the status database directly. + + -- Matti Lindell Sun, 26 Aug 2007 13:06:38 +0300 + +bluez-gnome (0.13-1) unstable; urgency=low + + * New upstream release (Closes: #435343) + + -- Filippo Giunchedi Wed, 01 Aug 2007 20:17:09 +0200 + +bluez-gnome (0.11-0ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - Munge Maintainer field as per spec. + * New upstream release + * Update prep_mv_conffile in preinst to use dpkg-query instead of + frobbing the status database directly. + + -- Tollef Fog Heen Tue, 31 Jul 2007 12:52:39 +0200 + +bluez-gnome (0.9-1) unstable; urgency=low + + * New upstream release. + * Removed debian/patches/01_pt_BR_i18n.patch, it's fixed upstream now. + * Removed dependency on gconf2 and added one on ${misc:Depends}, dh_gconf + will then care about that and use the correct version. + + -- Mario Iseli Mon, 2 Jul 2007 14:33:10 +0200 + +bluez-gnome (0.9-0ubuntu1) gutsy; urgency=low + + * New upstream release: + - 0.9: + - Simplify the GConf callbacks. + - Make some strings more translator friendly. + - Don't translate command-line warnings. + - Rename Brazilian translation file. + - Update Polish translation. + - Add Romanian translation. + - 0.8: + - Add support for limited discovery mode. + + -- Daniel Holbach Tue, 26 Jun 2007 11:10:18 +0200 + +bluez-gnome (0.7-2) unstable; urgency=low + + * Added myself to the Uploaders field. + * Added debian/patches/01_pt_BR_i18n.patch to fix locale in configure.in and + rename po/pt-br.po to po/pt_BR.po (Closes: #429747). + * Set DEB_AUTO_UPDATE_AUTOCONF to use apply from the locale patch and + rebuild the configure script. + + -- Mario Iseli Wed, 20 Jun 2007 13:48:36 +0100 + +bluez-gnome (0.7-1ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. + * Remaining Ubuntu changes: + - debian/patches/01-fix-POTFILES.in.patch: Include files that also have + translatable strings. + - Munge Maintainer field as per spec. + * Ubuntu changes dropped: + - debian/patches/02-fix_desktop_translations.patch, + debian/patches/03-make_tooltip_and_dialog_name_translatable.patch: + Included upstream. + + -- Steve Kowalik Mon, 18 Jun 2007 17:01:34 +1000 + +bluez-gnome (0.7-1) unstable; urgency=low + + * New upstream release, add gconf2 depends + * gah, move gnome-icon-theme from build-depends to depends, this ought to + fix #420447 + * remove our manpages, now integrated upstream + + -- Filippo Giunchedi Sun, 20 May 2007 15:37:53 +0200 + +bluez-gnome (0.6-2ubuntu1) gutsy; urgency=low + + * Resynchronized with Debian, remaining Ubuntu changes: + - debian/control: Maintainer: Ubuntu Core Developers + + - debian/patches/01-fix-POTFILES.in.patch, + debian/patches/02-fix_desktop_translations.patch + debian/patches/03-make_tooltip_and_dialog_name_translatable.patch: + Distro fixes. + + -- Daniel Holbach Tue, 15 May 2007 14:21:05 +0200 + +bluez-gnome (0.6-2) unstable; urgency=low + + * add Recommends: bluez-utils (Closes: #405251) + * add gnome-icon-theme (>= 2.16) as a dependency for stock_bluetooth.png + (Closes: #420447) + * rebuild against current gtk, fixes black background (Closes: #392539) + + -- Filippo Giunchedi Tue, 15 May 2007 11:39:53 +0200 + +bluez-gnome (0.6-1) unstable; urgency=low + + * New upstream release (moves bt-applet to bluetooth-applet to avoid + confusion with BitTorrent, and also Closes: #396088, #395173) + * merge bluez-passkey-gnome into bluez-gnome as it will grow to a + full-fletched bluetooth manager + * fix some copyrights in debian/copyright, thanks to Daniel Holdbach + * /etc/xdg/autostart/bt-applet.desktop is renamed to + bluetooth-applet.desktop, if bt-applet.desktop is found to be modified it + will be moved to bluetooth-applet.desktop.dpkg-old + + -- Filippo Giunchedi Sun, 5 Nov 2006 16:19:29 +0100 + +bluez-gnome (0.5-2) unstable; urgency=low + + * build-dep on intltool as well, thus fixing FTBFS + + -- Filippo Giunchedi Fri, 6 Oct 2006 02:38:28 +0200 + +bluez-gnome (0.5-1) unstable; urgency=low + + * First upload to debian (Closes: #387923) + + -- Filippo Giunchedi Mon, 2 Oct 2006 21:42:48 +0200 --- bluez-gnome-1.8.orig/debian/rules +++ bluez-gnome-1.8/debian/rules @@ -0,0 +1,23 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/buildcore.mk +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 + +DEB_CONFIGURE_EXTRA_FLAGS += --disable-mime-update --disable-desktop-update + +ifeq ($(DEB_HOST_ARCH), lpia) +DEB_CONFIGURE_EXTRA_FLAGS += --enable-hildon +endif + +binary-post-install/bluez-gnome:: + rm -f debian/bluez-gnome/usr/share/applications/mimeinfo.cache + rm -f debian/bluez-gnome/usr/share/icons/hicolor/icon-theme.cache + rm -f debian/bluez-gnome/usr/share/mime/XMLnamespaces + rm -f debian/bluez-gnome/usr/share/mime/aliases + rm -f debian/bluez-gnome/usr/share/mime/globs + rm -f debian/bluez-gnome/usr/share/mime/magic + rm -f debian/bluez-gnome/usr/share/mime/mime.cache + rm -f debian/bluez-gnome/usr/share/mime/subclasses + --- bluez-gnome-1.8.orig/debian/compat +++ bluez-gnome-1.8/debian/compat @@ -0,0 +1 @@ +5 --- bluez-gnome-1.8.orig/debian/patches/09_visibility.patch +++ bluez-gnome-1.8/debian/patches/09_visibility.patch @@ -0,0 +1,59 @@ +# Description: Fixes visibility settings +# This patch was taken from upstream. Please see this link for more information: +# Upstream: http://git.kernel.org/?p=bluetooth/bluez-gnome.git;a=blobdiff;f=applet/main.c;h=62993755f098d06fbdc5aa3eaaa1325e448aa15f;hp=71f8778dd4388187f163fc736e440bace9256f3c;hb=4d56f10dc2a065d60724ccce8496d173fa0dc85a;hpb=68b98e6b6043acd8f6b2875d9f17fce84b14b9fb +# Ubuntu: 297819 + +diff --git a/applet/main.c b/applet/main.c +index 71f8778..6299375 100644 (file) +diff -Nur -x '*.orig' -x '*~' bluez-gnome-1.8/applet/main.c bluez-gnome-1.8.new/applet/main.c +--- bluez-gnome-1.8/applet/main.c 2008-09-29 07:08:50.000000000 -0500 ++++ bluez-gnome-1.8.new/applet/main.c 2009-02-12 14:39:54.000000000 -0600 +@@ -288,6 +288,20 @@ + } + } + ++static void update_icon_visibility() ++{ ++ if (icon_policy == ICON_POLICY_NEVER) ++ hide_icon(); ++ else if (icon_policy == ICON_POLICY_ALWAYS) ++ show_icon(); ++ else if (icon_policy == ICON_POLICY_PRESENT) { ++ if (adapter_present == TRUE) ++ show_icon(); ++ else ++ hide_icon(); ++ } ++} ++ + static GConfEnumStringPair icon_policy_enum_map [] = { + { ICON_POLICY_NEVER, "never" }, + { ICON_POLICY_ALWAYS, "always" }, +@@ -313,16 +327,7 @@ + + gconf_string_to_enum(icon_policy_enum_map, str, &icon_policy); + +- if (icon_policy == ICON_POLICY_NEVER) +- hide_icon(); +- else if (icon_policy == ICON_POLICY_ALWAYS) +- show_icon(); +- else if (icon_policy == ICON_POLICY_PRESENT) { +- if (adapter_present == TRUE) +- show_icon(); +- else +- hide_icon(); +- } ++ update_icon_visibility(); + return; + } + +@@ -410,8 +415,7 @@ + + statusicon = init_notification(); + +- if (icon_policy != ICON_POLICY_ALWAYS && adapter_present == FALSE) +- hide_icon(); ++ update_icon_visibility(); + + g_signal_connect(statusicon, "activate", + G_CALLBACK(activate_callback), NULL); --- bluez-gnome-1.8.orig/debian/patches/07_null_device_name.patch +++ bluez-gnome-1.8/debian/patches/07_null_device_name.patch @@ -0,0 +1,18 @@ +From: Marcel Holtmann +Date: Mon, 6 Oct 2008 08:01:50 +0000 (+0200) +Subject: Display the alias instead of the remote device name +X-Git-Url: http://git.kernel.org/?p=bluetooth%2Fbluez-gnome.git;a=commitdiff_plain;h=7256de93be73f50913f6689a0690e3c0a28dfe3b + +Display the alias instead of the remote device name +diff -Nur -x '*.orig' -x '*~' bluez-gnome-1.8/wizard/main.c bluez-gnome-1.8.new/wizard/main.c +--- bluez-gnome-1.8/wizard/main.c 2008-10-06 01:23:55.000000000 -0500 ++++ bluez-gnome-1.8.new/wizard/main.c 2008-10-06 08:27:57.000000000 -0500 +@@ -353,7 +353,7 @@ + gtk_tree_model_get(model, &iter, + BLUETOOTH_COLUMN_PAIRED, &paired, + BLUETOOTH_COLUMN_ADDRESS, &address, +- BLUETOOTH_COLUMN_NAME, &name, ++ BLUETOOTH_COLUMN_ALIAS, &name, + BLUETOOTH_COLUMN_TYPE, &type, -1); + + if (paired == TRUE) --- bluez-gnome-1.8.orig/debian/patches/02_MenusRevisited.patch +++ bluez-gnome-1.8/debian/patches/02_MenusRevisited.patch @@ -0,0 +1,8 @@ +diff -Nur -x '*.orig' -x '*~' bluez-gnome-1.4/analyzer/bluetooth-analyzer.desktop.in bluez-gnome-1.4.new/analyzer/bluetooth-analyzer.desktop.in +--- bluez-gnome-1.4/analyzer/bluetooth-analyzer.desktop.in 2008-08-24 11:05:50.000000000 -0500 ++++ bluez-gnome-1.4.new/analyzer/bluetooth-analyzer.desktop.in 2008-09-26 15:59:26.000000000 -0500 +@@ -9,3 +9,4 @@ + Type=Application + Categories=System;Monitor; + OnlyShowIn=GNOME; ++NoDisplay=true --- bluez-gnome-1.8.orig/debian/patches/04_bluetooth-sendto-ods-svn.patch +++ bluez-gnome-1.8/debian/patches/04_bluetooth-sendto-ods-svn.patch @@ -0,0 +1,13 @@ +diff --git a/sendto/main.c b/sendto/main.c +index 044bbbc..f0c435b 100644 +diff -Nur -x '*.orig' -x '*~' bluez-gnome-1.8/sendto/main.c bluez-gnome-1.8.new/sendto/main.c +--- bluez-gnome-1.8/sendto/main.c 2008-10-04 14:32:56.000000000 -0500 ++++ bluez-gnome-1.8.new/sendto/main.c 2008-10-06 01:01:19.000000000 -0500 +@@ -790,6 +790,7 @@ + dbus_g_proxy_begin_call(proxy, "CreateBluetoothSession", + create_notify, NULL, NULL, + G_TYPE_STRING, option_device, ++ G_TYPE_STRING, "00:00:00:00:00:00", + G_TYPE_STRING, "opp", G_TYPE_INVALID); + } else { + GHashTable *hash = NULL; --- bluez-gnome-1.8.orig/debian/patches/05_bluetooth_sendto_dbus-snd.patch +++ bluez-gnome-1.8/debian/patches/05_bluetooth_sendto_dbus-snd.patch @@ -0,0 +1,153 @@ +diff -Nur -x '*.orig' -x '*~' bluez-gnome-1.8/common/marshal.list bluez-gnome-1.8.new/common/marshal.list +--- bluez-gnome-1.8/common/marshal.list 2008-08-24 16:14:24.000000000 -0500 ++++ bluez-gnome-1.8.new/common/marshal.list 2008-10-06 01:01:59.000000000 -0500 +@@ -3,3 +3,4 @@ + VOID:STRING,STRING + VOID:STRING,STRING,UINT64 + VOID:UINT64 ++VOID:STRING,STRING,STRING +diff -Nur -x '*.orig' -x '*~' bluez-gnome-1.8/sendto/main.c bluez-gnome-1.8.new/sendto/main.c +--- bluez-gnome-1.8/sendto/main.c 2008-10-06 01:01:58.000000000 -0500 ++++ bluez-gnome-1.8.new/sendto/main.c 2008-10-06 01:05:05.000000000 -0500 +@@ -64,6 +64,8 @@ + static gint64 first_update = 0; + static gint64 last_update = 0; + ++static DBusGProxy *session_proxy = NULL; ++ + static gchar *filename_to_path(const gchar *filename) + { + GFile *file; +@@ -354,7 +356,16 @@ + static void error_occurred(DBusGProxy *proxy, const gchar *name, + const gchar *message, gpointer user_data) + { +- transfer_completed(proxy, user_data); ++ gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress), ++ _("Error Occurred")); ++ ++ gchar *text = g_strdup_printf("%s", ++ message); ++ gtk_label_set_markup(GTK_LABEL(label_status), text); ++ g_free(text); ++ ++ gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), ++ GTK_RESPONSE_CLOSE, TRUE); + } + + static void session_connected(DBusGProxy *proxy, gpointer user_data) +@@ -363,7 +374,7 @@ + + first_update = get_system_time(); + +- send_file(proxy); ++ send_file(session_proxy); + } + + #define OPENOBEX_CONNECTION_FAILED "org.openobex.Error.ConnectionAttemptFailed" +@@ -407,60 +418,41 @@ + if (dbus_g_proxy_end_call(proxy, call, &error, + DBUS_TYPE_G_OBJECT_PATH, &path, + G_TYPE_INVALID) == FALSE) { +- gchar *text, *message; ++ gchar *message; + + message = get_error_message(error); + +- text = g_strdup_printf("%s", +- message); +- gtk_label_set_markup(GTK_LABEL(label_status), text); +- g_free(text); ++ error_occurred(proxy,NULL,message,NULL); + + g_free(message); + +- gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), +- GTK_RESPONSE_CLOSE, TRUE); + return; + } +- +- proxy = dbus_g_proxy_new_for_name(conn, "org.openobex", ++ session_proxy = dbus_g_proxy_new_for_name(conn, "org.openobex", + path, "org.openobex.Session"); + +- dbus_g_proxy_add_signal(proxy, "Connected", G_TYPE_INVALID); ++ dbus_g_proxy_add_signal(session_proxy, "Cancelled", G_TYPE_INVALID); + +- dbus_g_proxy_connect_signal(proxy, "Connected", +- G_CALLBACK(session_connected), NULL, NULL); +- +- dbus_g_proxy_add_signal(proxy, "ErrorOccurred", +- G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID); +- +- dbus_g_proxy_connect_signal(proxy, "ErrorOccurred", +- G_CALLBACK(error_occurred), NULL, NULL); +- +- dbus_g_proxy_add_signal(proxy, "Cancelled", G_TYPE_INVALID); +- +- dbus_g_proxy_connect_signal(proxy, "Cancelled", ++ dbus_g_proxy_connect_signal(session_proxy, "Cancelled", + G_CALLBACK(transfer_cancelled), NULL, NULL); + +- dbus_g_proxy_add_signal(proxy, "TransferStarted", G_TYPE_STRING, ++ dbus_g_proxy_add_signal(session_proxy, "TransferStarted", G_TYPE_STRING, + G_TYPE_STRING, G_TYPE_UINT64, G_TYPE_INVALID); + +- dbus_g_proxy_connect_signal(proxy, "TransferStarted", ++ dbus_g_proxy_connect_signal(session_proxy, "TransferStarted", + G_CALLBACK(transfer_started), NULL, NULL); + +- dbus_g_proxy_add_signal(proxy, "TransferProgress", ++ dbus_g_proxy_add_signal(session_proxy, "TransferProgress", + G_TYPE_UINT64, G_TYPE_INVALID); + +- dbus_g_proxy_connect_signal(proxy, "TransferProgress", ++ dbus_g_proxy_connect_signal(session_proxy, "TransferProgress", + G_CALLBACK(transfer_progress), NULL, NULL); + +- dbus_g_proxy_add_signal(proxy, "TransferCompleted", G_TYPE_INVALID); ++ dbus_g_proxy_add_signal(session_proxy, "TransferCompleted", G_TYPE_INVALID); + +- dbus_g_proxy_connect_signal(proxy, "TransferCompleted", ++ dbus_g_proxy_connect_signal(session_proxy, "TransferCompleted", + G_CALLBACK(transfer_completed), NULL, NULL); + +- dbus_g_proxy_call(proxy, "Connect", NULL, G_TYPE_INVALID, +- G_TYPE_INVALID); + } + + static gchar *get_name(DBusGProxy *device) +@@ -766,6 +758,14 @@ + + dbus_g_object_register_marshaller(marshal_VOID__UINT64, + G_TYPE_NONE, G_TYPE_UINT64, G_TYPE_INVALID); ++ ++ dbus_g_object_register_marshaller(marshal_VOID__STRING_STRING_STRING, ++ G_TYPE_NONE, ++ DBUS_TYPE_G_OBJECT_PATH, ++ G_TYPE_STRING, ++ G_TYPE_STRING, ++ G_TYPE_INVALID); ++ + + device_name = get_device_name(option_device); + if (device_name == NULL) +@@ -787,6 +787,18 @@ + dbus_g_proxy_connect_signal(proxy, "NameOwnerChanged", + G_CALLBACK(name_owner_changed), NULL, NULL); + ++ dbus_g_proxy_add_signal(proxy, "SessionConnected", DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID); ++ ++ dbus_g_proxy_connect_signal(proxy, "SessionConnected", ++ G_CALLBACK(session_connected), NULL, NULL); ++ ++ dbus_g_proxy_add_signal(proxy, "SessionConnectError", ++ DBUS_TYPE_G_OBJECT_PATH, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID); ++ ++ dbus_g_proxy_connect_signal(proxy, "SessionConnectError", ++ G_CALLBACK(error_occurred), NULL, NULL); ++ ++ + dbus_g_proxy_begin_call(proxy, "CreateBluetoothSession", + create_notify, NULL, NULL, + G_TYPE_STRING, option_device, --- bluez-gnome-1.8.orig/debian/patches/08_XFCE.patch +++ bluez-gnome-1.8/debian/patches/08_XFCE.patch @@ -0,0 +1,35 @@ +# +# Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/bluez-gnome/+bug/325530 +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=571535 +# Patch: http://bugzilla.gnome.org/attachment.cgi?id=128584 +# Description: Show BlueZ in XFCE +# + +diff -Nur -x '*.orig' -x '*~' bluez-gnome-1.8/analyzer/bluetooth-analyzer.desktop.in bluez-gnome-1.8.new/analyzer/bluetooth-analyzer.desktop.in +--- bluez-gnome-1.8/analyzer/bluetooth-analyzer.desktop.in 2009-02-04 14:04:41.000000000 -0800 ++++ bluez-gnome-1.8.new/analyzer/bluetooth-analyzer.desktop.in 2009-02-04 14:02:24.000000000 -0800 +@@ -8,5 +8,5 @@ + MimeType=application/x-hcidump;application/x-btsnoop;application/x-pktlog; + Type=Application + Categories=System;Monitor; +-OnlyShowIn=GNOME; ++OnlyShowIn=GNOME;XFCE; + NoDisplay=true +diff -Nur -x '*.orig' -x '*~' bluez-gnome-1.8/applet/bluetooth-applet.desktop.in bluez-gnome-1.8.new/applet/bluetooth-applet.desktop.in +--- bluez-gnome-1.8/applet/bluetooth-applet.desktop.in 2008-08-29 08:32:53.000000000 -0700 ++++ bluez-gnome-1.8.new/applet/bluetooth-applet.desktop.in 2009-02-04 13:55:31.000000000 -0800 +@@ -7,4 +7,4 @@ + Terminal=false + Type=Application + Categories= +-OnlyShowIn=GNOME; ++OnlyShowIn=GNOME;XFCE; +diff -Nur -x '*.orig' -x '*~' bluez-gnome-1.8/properties/bluetooth-properties.desktop.in bluez-gnome-1.8.new/properties/bluetooth-properties.desktop.in +--- bluez-gnome-1.8/properties/bluetooth-properties.desktop.in 2008-09-13 10:34:11.000000000 -0700 ++++ bluez-gnome-1.8.new/properties/bluetooth-properties.desktop.in 2009-02-04 14:02:56.000000000 -0800 +@@ -7,4 +7,4 @@ + Terminal=false + Type=Application + Categories=GTK;GNOME;Settings;HardwareSettings; +-OnlyShowIn=GNOME; ++OnlyShowIn=GNOME;XFCE; --- bluez-gnome-1.8.orig/debian/patches/06_preferences-horizontal-layout.patch +++ bluez-gnome-1.8/debian/patches/06_preferences-horizontal-layout.patch @@ -0,0 +1,91 @@ +diff -Nur -x '*.orig' -x '*~' bluez-gnome-1.6/properties/adapter.c bluez-gnome-1.6.new/properties/adapter.c +--- bluez-gnome-1.6/properties/adapter.c 2008-09-29 07:08:50.000000000 -0500 ++++ bluez-gnome-1.6.new/properties/adapter.c 2008-09-29 09:55:36.000000000 -0500 +@@ -246,16 +246,10 @@ + } + + update_buttons(adapter, paired, trusted, connected); +- +- if (selected == TRUE) { +- gtk_widget_show(adapter->button_disconnect); +- gtk_widget_show(adapter->button_trusted); +- gtk_widget_show(adapter->button_delete); +- } else { +- gtk_widget_hide(adapter->button_disconnect); +- gtk_widget_hide(adapter->button_trusted); +- gtk_widget_hide(adapter->button_delete); +- } ++ ++ gtk_widget_set_sensitive(adapter->button_disconnect,selected); ++ gtk_widget_set_sensitive(adapter->button_trusted,selected); ++ gtk_widget_set_sensitive(adapter->button_delete,selected); + } + + static void row_callback(GtkTreeModel *model, GtkTreePath *path, +@@ -461,7 +455,7 @@ + adapter->discoverable = discoverable; + adapter->timeout_value = timeout; + +- mainbox = gtk_vbox_new(FALSE, 18); ++ mainbox = gtk_hbox_new(FALSE, 12); + gtk_container_set_border_width(GTK_CONTAINER(mainbox), 12); + + gtk_notebook_prepend_page(GTK_NOTEBOOK(adapter->notebook), +@@ -471,6 +465,9 @@ + + adapter->child = mainbox; + ++ mainbox = gtk_vbox_new (FALSE, 18); ++ gtk_container_add(GTK_CONTAINER (GTK_CONTAINER (adapter->child)), mainbox); ++ + vbox = gtk_vbox_new(FALSE, 6); + gtk_box_pack_start(GTK_BOX(mainbox), vbox, FALSE, FALSE, 0); + +@@ -569,7 +566,7 @@ + entry = gtk_entry_new(); + gtk_entry_set_max_length(GTK_ENTRY(entry), 248); + gtk_widget_set_size_request(entry, 240, -1); +- gtk_box_pack_start(GTK_BOX(vbox), entry, TRUE, TRUE, 0); ++ gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0); + + if (name != NULL) + gtk_entry_set_text(GTK_ENTRY(entry), name); +@@ -582,7 +579,7 @@ + G_CALLBACK(focus_callback), adapter); + + vbox = gtk_vbox_new(FALSE, 6); +- gtk_box_pack_start(GTK_BOX(mainbox), vbox, TRUE, TRUE, 0); ++ gtk_box_pack_start(GTK_BOX(adapter->child), vbox, TRUE, TRUE, 0); + + label = create_label(_("Known devices")); + gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); +@@ -634,8 +631,8 @@ + GTK_ICON_SIZE_BUTTON); + gtk_container_add(GTK_CONTAINER(button), image); + gtk_container_set_border_width(GTK_CONTAINER(button), 0); +- gtk_widget_set_no_show_all(button, TRUE); + gtk_widget_show(image); ++ gtk_widget_set_sensitive(button,FALSE); + gtk_box_pack_end(GTK_BOX(buttonbox), button, FALSE, FALSE, 0); + gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(buttonbox), + button, TRUE); +@@ -651,8 +648,8 @@ + GTK_ICON_SIZE_BUTTON); + gtk_container_add(GTK_CONTAINER(button), image); + gtk_container_set_border_width(GTK_CONTAINER(button), 0); +- gtk_widget_set_no_show_all(button, TRUE); + gtk_widget_show(image); ++ gtk_widget_set_sensitive(button,FALSE); + gtk_box_pack_end(GTK_BOX(buttonbox), button, FALSE, FALSE, 0); + gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(buttonbox), + button, TRUE); +@@ -668,8 +665,8 @@ + GTK_ICON_SIZE_BUTTON); + gtk_container_add(GTK_CONTAINER(button), image); + gtk_container_set_border_width(GTK_CONTAINER(button), 0); +- gtk_widget_set_no_show_all(button, TRUE); + gtk_widget_show(image); ++ gtk_widget_set_sensitive(button,FALSE); + gtk_box_pack_end(GTK_BOX(buttonbox), button, FALSE, FALSE, 0); + gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(buttonbox), + button, TRUE); --- bluez-gnome-1.8.orig/debian/patches/10_wizard-custom-pin.patch +++ bluez-gnome-1.8/debian/patches/10_wizard-custom-pin.patch @@ -0,0 +1,209 @@ +# Description: Allow the user to enter a custom PIN for pairing. A lot of devices use a hardcoded PIN and do not have a keyboard for entering a random one. +# Ubuntu: https://launchpad.net/bugs/284994 +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=570457 +Index: bluez-gnome-1.8/wizard/main.c +=================================================================== +--- bluez-gnome-1.8.orig/wizard/main.c ++++ bluez-gnome-1.8/wizard/main.c +@@ -27,6 +27,7 @@ + + #include + #include ++#include + + #include + +@@ -47,6 +48,11 @@ static gchar *target_pincode = NULL; + static guint target_type = BLUETOOTH_TYPE_ANY; + static gboolean target_ssp = FALSE; + ++/* NULL means automatic, anything else is a pincode specified by the user */ ++static const gchar *user_pincode = NULL; ++static const gchar *last_fixed_pincode = "0000"; ++ ++static GtkWidget *window_assistant = NULL; + static GtkWidget *page_search = NULL; + static GtkWidget *page_setup = NULL; + static GtkWidget *page_summary = NULL; +@@ -72,6 +78,9 @@ static gboolean pincode_callback(DBusGMe + target_type == BLUETOOTH_TYPE_HEADPHONE) + pincode = "0000"; + ++ if (user_pincode != NULL && strlen(user_pincode) == 4) ++ pincode = user_pincode; ++ + text = g_strdup_printf(_("Please enter the following PIN code: %s"), + pincode); + gtk_label_set_markup(GTK_LABEL(label_passkey), text); +@@ -337,6 +346,19 @@ static void create_type(GtkWidget *assis + } + #endif + ++static void set_page_search_complete(void) ++{ ++ int selected; ++ gboolean complete; ++ ++ selected = gtk_tree_selection_count_selected_rows (search_selection); ++ complete = (selected != 0 && ++ (user_pincode == NULL || strlen(user_pincode) == 4)); ++ ++ gtk_assistant_set_page_complete(GTK_ASSISTANT (window_assistant), ++ page_search, complete); ++} ++ + static void select_callback(GtkTreeSelection *selection, gpointer user_data) + { + GtkAssistant *assistant = user_data; +@@ -368,7 +390,7 @@ static void select_callback(GtkTreeSelec + target_type = type; + } + +- gtk_assistant_set_page_complete(assistant, page_search, selected); ++ set_page_search_complete(); + } + + static gboolean device_filter(GtkTreeModel *model, +@@ -381,6 +403,54 @@ static gboolean device_filter(GtkTreeMod + return (paired == TRUE) ? FALSE : TRUE; + } + ++static gboolean entry_custom_event(GtkWidget *entry, ++ GdkEventKey *event, GtkWidget *box) ++{ ++ if (event->length == 0) ++ return FALSE; ++ ++ if ((event->keyval >= GDK_0 && event->keyval <= GDK_9) || ++ (event->keyval >= GDK_KP_0 && event->keyval <= GDK_KP_9)) ++ return FALSE; ++ ++ return TRUE; ++} ++ ++static void entry_custom_changed(GtkWidget *entry, gpointer user_data) ++{ ++ user_pincode = gtk_entry_get_text(GTK_ENTRY(entry)); ++ set_page_search_complete(); ++} ++ ++static void toggle_set_sensitive(GtkWidget *button, GtkWidget *widget) ++{ ++ gboolean active; ++ ++ active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)); ++ gtk_widget_set_sensitive(widget, active); ++} ++ ++static void set_user_pincode(GtkWidget *button, const gchar *pincode) ++{ ++ if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) ++ return; ++ ++ if (pincode == NULL && user_pincode != NULL) ++ last_fixed_pincode = user_pincode; ++ ++ user_pincode = pincode; ++ set_page_search_complete(); ++} ++ ++static void set_from_last_fixed_pincode(GtkWidget *button, gpointer user_data) ++{ ++ if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) ++ return; ++ ++ user_pincode = last_fixed_pincode; ++ set_page_search_complete(); ++} ++ + static void create_search(GtkWidget *assistant) + { + GtkWidget *vbox; +@@ -389,6 +459,16 @@ static void create_search(GtkWidget *ass + GtkTreeModel *model; + GtkTreeModel *sorted; + GtkTreeSelection *selection; ++ GtkWidget *radio_auto; ++ GtkWidget *radio_fixed; ++ GtkWidget *align_fixed; ++ GtkWidget *vbox_fixed; ++ GtkWidget *radio_0000; ++ GtkWidget *radio_1111; ++ GtkWidget *radio_1234; ++ GtkWidget *hbox_custom; ++ GtkWidget *radio_custom; ++ GtkWidget *entry_custom; + + vbox = create_vbox(assistant, GTK_ASSISTANT_PAGE_CONTENT, + _("Device search"), +@@ -418,6 +498,62 @@ static void create_search(GtkWidget *ass + + gtk_container_add(GTK_CONTAINER(scrolled), tree); + ++ radio_auto = gtk_radio_button_new_with_mnemonic(NULL, ++ _("_Automatic PIN code selection")); ++ gtk_container_add(GTK_CONTAINER(vbox), radio_auto); ++ ++ radio_fixed = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(radio_auto), _("Use _fixed PIN code:")); ++ gtk_container_add(GTK_CONTAINER(vbox), radio_fixed); ++ ++ align_fixed = gtk_alignment_new(0, 0, 1, 1); ++ gtk_alignment_set_padding(GTK_ALIGNMENT(align_fixed), 0, 0, 24, 0); ++ gtk_container_add(GTK_CONTAINER(vbox), align_fixed); ++ vbox_fixed = gtk_vbox_new(FALSE, 0); ++ gtk_container_add(GTK_CONTAINER(align_fixed), vbox_fixed); ++ ++ radio_0000 = gtk_radio_button_new_with_label(NULL, _("'0000' (most headsets, mice and GPS devices)")); ++ gtk_container_add(GTK_CONTAINER(vbox_fixed), radio_0000); ++ ++ radio_1111 = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(radio_0000), _("'1111'")); ++ gtk_container_add(GTK_CONTAINER(vbox_fixed), radio_1111); ++ ++ radio_1234 = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(radio_0000), _("'1234'")); ++ gtk_container_add(GTK_CONTAINER(vbox_fixed), radio_1234); ++ ++ hbox_custom = gtk_hbox_new(FALSE, 6); ++ radio_custom = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(radio_0000), _("Custom PIN code:")); ++ entry_custom = gtk_entry_new_with_max_length(4); ++ gtk_entry_set_width_chars(GTK_ENTRY(entry_custom), 4); ++ g_signal_connect (entry_custom, "key-press-event", ++ G_CALLBACK (entry_custom_event), NULL); ++ g_signal_connect (entry_custom, "changed", ++ G_CALLBACK (entry_custom_changed), NULL); ++ gtk_box_pack_start(GTK_BOX(hbox_custom), radio_custom, ++ FALSE, FALSE, 0); ++ gtk_box_pack_start(GTK_BOX(hbox_custom), entry_custom, ++ FALSE, FALSE, 0); ++ gtk_container_add(GTK_CONTAINER(vbox_fixed), hbox_custom); ++ ++ toggle_set_sensitive(radio_fixed, vbox_fixed); ++ g_signal_connect(radio_fixed, "toggled", ++ G_CALLBACK(toggle_set_sensitive), vbox_fixed); ++ toggle_set_sensitive(radio_custom, entry_custom); ++ g_signal_connect(radio_custom, "toggled", ++ G_CALLBACK(toggle_set_sensitive), entry_custom); ++ ++ g_signal_connect(radio_auto, "toggled", ++ G_CALLBACK(set_user_pincode), NULL); ++ g_signal_connect(radio_fixed, "toggled", ++ G_CALLBACK(set_from_last_fixed_pincode), NULL); ++ g_signal_connect(radio_0000, "toggled", ++ G_CALLBACK(set_user_pincode), "0000"); ++ g_signal_connect(radio_1111, "toggled", ++ G_CALLBACK(set_user_pincode), "1111"); ++ g_signal_connect(radio_1234, "toggled", ++ G_CALLBACK(set_user_pincode), "1234"); ++ g_signal_connect_swapped (radio_custom, "toggled", ++ G_CALLBACK (entry_custom_changed), entry_custom); ++ + page_search = vbox; + } + +@@ -529,6 +665,7 @@ int main(int argc, char *argv[]) + bluetooth_agent_setup(agent, AGENT_PATH); + + window = create_wizard(); ++ window_assistant = window; + + bluetooth_instance_set_window(instance, GTK_WINDOW(window)); +