Merge lp:~noskcaj/ubuntu/utopic/blueman/merge2 into lp:ubuntu/utopic/blueman

Proposed by Jackson Doak
Status: Work in progress
Proposed branch: lp:~noskcaj/ubuntu/utopic/blueman/merge2
Merge into: lp:ubuntu/utopic/blueman
Diff against target: 150988 lines (+40913/-69328)
288 files modified
.pc/01_dont_autostart_lxde.patch/data/blueman.desktop.in (+0/-9)
.pc/02_dont_crash_on_non-bluetooth_card.patch/blueman/plugins/applet/PulseAudio.py (+0/-355)
.pc/03_filemanager_fix.patch/apps/blueman-browse (+0/-79)
.pc/applied-patches (+0/-4)
.pc/dhcpclient_priority/blueman/plugins/applet/DhcpClient.py (+0/-82)
CHANGELOG.md (+8/-0)
Makefile (+0/-886)
Makefile.in (+3/-5)
README.md (+5/-5)
acinclude.m4 (+2/-2)
apps/Makefile (+0/-600)
apps/Makefile.in (+3/-5)
apps/blueman-adapters (+27/-21)
apps/blueman-applet (+14/-10)
apps/blueman-assistant (+77/-56)
apps/blueman-browse (+7/-11)
apps/blueman-manager (+57/-61)
apps/blueman-mechanism (+3/-3)
apps/blueman-sendto (+45/-39)
apps/blueman-services (+13/-9)
autogen.sh (+2/-2)
autom4te.cache/output.0 (+382/-298)
autom4te.cache/output.1 (+382/-298)
autom4te.cache/requests (+225/-225)
autom4te.cache/traces.0 (+100/-109)
autom4te.cache/traces.1 (+173/-171)
blueman/Constants.py (+0/-26)
blueman/Functions.py (+35/-34)
blueman/Makefile (+0/-780)
blueman/Makefile.in (+3/-5)
blueman/bluez/Adapter.py (+146/-269)
blueman/bluez/Agent.py (+35/-118)
blueman/bluez/AgentManager.py (+21/-0)
blueman/bluez/AudioSink.py (+13/-0)
blueman/bluez/AudioSource.py (+13/-0)
blueman/bluez/BaseInterface.py (+0/-51)
blueman/bluez/BlueZInterface.py (+33/-62)
blueman/bluez/Device.py (+44/-120)
blueman/bluez/Headset.py (+25/-0)
blueman/bluez/Makefile (+0/-589)
blueman/bluez/Makefile.am (+20/-15)
blueman/bluez/Makefile.in (+21/-17)
blueman/bluez/Manager.py (+60/-125)
blueman/bluez/Network.py (+13/-0)
blueman/bluez/NetworkServer.py (+21/-0)
blueman/bluez/PropertiesBlueZInterface.py (+69/-0)
blueman/bluez/Serial.py (+13/-0)
blueman/bluez/ServiceInterface.py (+7/-29)
blueman/bluez/__init__.py (+5/-23)
blueman/bluez/errors.py (+61/-53)
blueman/bluez/utils.py (+0/-35)
blueman/gui/Animation.py (+4/-4)
blueman/gui/CellRendererPixbufTable.py (+9/-9)
blueman/gui/CommonUi.py (+5/-6)
blueman/gui/DeviceList.py (+57/-107)
blueman/gui/DeviceSelectorDialog.py (+9/-11)
blueman/gui/DeviceSelectorList.py (+10/-9)
blueman/gui/DeviceSelectorWidget.py (+17/-20)
blueman/gui/GenericList.py (+147/-186)
blueman/gui/GsmSettings.py (+8/-7)
blueman/gui/GtkAnimation.py (+51/-82)
blueman/gui/Makefile (+0/-762)
blueman/gui/Makefile.in (+3/-5)
blueman/gui/MessageArea.py (+46/-37)
blueman/gui/Notification.py (+168/-183)
blueman/gui/NstBluetooth.py (+18/-18)
blueman/gui/PixbufTable.py (+1/-1)
blueman/gui/applet/Makefile (+0/-581)
blueman/gui/applet/Makefile.in (+3/-5)
blueman/gui/applet/PluginDialog.py (+34/-34)
blueman/gui/manager/Makefile (+0/-586)
blueman/gui/manager/Makefile.in (+3/-5)
blueman/gui/manager/ManagerDeviceList.py (+35/-34)
blueman/gui/manager/ManagerDeviceMenu.py (+95/-95)
blueman/gui/manager/ManagerMenu.py (+35/-32)
blueman/gui/manager/ManagerProgressbar.py (+22/-22)
blueman/gui/manager/ManagerStats.py (+23/-23)
blueman/gui/manager/ManagerToolbar.py (+7/-3)
blueman/iniparse/Makefile (+0/-583)
blueman/iniparse/Makefile.in (+3/-5)
blueman/main/Config.py (+1/-1)
blueman/main/Device.py (+17/-14)
blueman/main/DhcpClient.py (+74/-23)
blueman/main/FakeDevice.py (+1/-1)
blueman/main/HalManager.py (+4/-4)
blueman/main/KillSwitch.py (+7/-7)
blueman/main/KillSwitchNG.py (+9/-9)
blueman/main/Makefile (+0/-770)
blueman/main/Makefile.in (+3/-5)
blueman/main/PPPConnection.py (+221/-234)
blueman/main/PluginManager.py (+7/-7)
blueman/main/PulseAudioUtils.py (+8/-8)
blueman/main/SignalTracker.py (+6/-6)
blueman/main/applet/BluezAgent.py (+35/-43)
blueman/main/applet/Makefile (+0/-582)
blueman/main/applet/Makefile.in (+3/-5)
blueman/main/applet/Transfer.py (+4/-4)
blueman/ods/Makefile (+0/-585)
blueman/ods/Makefile.in (+3/-5)
blueman/ods/OdsBase.py (+3/-3)
blueman/ods/OdsManager.py (+8/-8)
blueman/ods/OdsServer.py (+7/-7)
blueman/ods/OdsServerSession.py (+7/-7)
blueman/ods/OdsSession.py (+8/-8)
blueman/plugins/AppletPlugin.py (+3/-3)
blueman/plugins/ConfigPlugin.py (+4/-4)
blueman/plugins/Makefile (+0/-774)
blueman/plugins/Makefile.in (+3/-5)
blueman/plugins/applet/AppIndicator.py (+14/-13)
blueman/plugins/applet/AuthAgent.py (+22/-9)
blueman/plugins/applet/DBusService.py (+16/-29)
blueman/plugins/applet/DhcpClient.py (+55/-76)
blueman/plugins/applet/DiscvManager.py (+14/-15)
blueman/plugins/applet/ExitItem.py (+3/-3)
blueman/plugins/applet/Headset.py (+29/-47)
blueman/plugins/applet/KillSwitch.py (+2/-2)
blueman/plugins/applet/Makefile (+0/-587)
blueman/plugins/applet/Makefile.am (+1/-1)
blueman/plugins/applet/Makefile.in (+7/-9)
blueman/plugins/applet/Menu.py (+60/-79)
blueman/plugins/applet/NMDUNSupport.py (+3/-3)
blueman/plugins/applet/NMIntegration.py (+7/-11)
blueman/plugins/applet/NMMonitor.py (+6/-6)
blueman/plugins/applet/NMPANSupport.py (+345/-345)
blueman/plugins/applet/NetUsage.py (+29/-49)
blueman/plugins/applet/Networking.py (+6/-8)
blueman/plugins/applet/PPPSupport.py (+3/-3)
blueman/plugins/applet/PowerManager.py (+13/-18)
blueman/plugins/applet/PulseAudio.py (+0/-359)
blueman/plugins/applet/RecentConns.py (+22/-24)
blueman/plugins/applet/SerialManager.py (+133/-157)
blueman/plugins/applet/ShowConnected.py (+10/-14)
blueman/plugins/applet/StandardItems.py (+11/-11)
blueman/plugins/applet/StatusIcon.py (+26/-29)
blueman/plugins/applet/TransferService.py (+2/-2)
blueman/plugins/config/File.py (+122/-136)
blueman/plugins/config/Gconf.py (+17/-14)
blueman/plugins/config/Makefile (+0/-582)
blueman/plugins/config/Makefile.in (+3/-5)
blueman/plugins/manager/Makefile (+0/-763)
blueman/plugins/manager/Makefile.in (+3/-5)
blueman/plugins/manager/PulseAudioProfile.py (+15/-17)
blueman/plugins/manager/Services.py (+76/-12)
blueman/plugins/mechanism/Config.py (+2/-2)
blueman/plugins/mechanism/Makefile (+0/-582)
blueman/plugins/mechanism/Makefile.in (+3/-5)
blueman/plugins/mechanism/Network.py (+2/-2)
blueman/plugins/services/Audio.py (+3/-3)
blueman/plugins/services/Makefile (+0/-583)
blueman/plugins/services/Makefile.in (+3/-5)
blueman/plugins/services/Network.py (+7/-7)
blueman/plugins/services/Transfer.py (+3/-3)
config.h (+0/-84)
configure (+382/-298)
configure.ac (+20/-14)
data/Makefile (+0/-765)
data/Makefile.in (+3/-5)
data/blueman.desktop.in (+0/-1)
data/configs/Makefile (+0/-666)
data/configs/Makefile.in (+3/-5)
data/configs/blueman-applet.service (+0/-3)
data/configs/org.blueman.Mechanism.service (+0/-4)
data/icons/Makefile (+0/-664)
data/icons/Makefile.in (+3/-5)
data/icons/hicolor/16x16/Makefile (+0/-665)
data/icons/hicolor/16x16/Makefile.in (+3/-5)
data/icons/hicolor/16x16/actions/Makefile (+0/-542)
data/icons/hicolor/16x16/actions/Makefile.in (+3/-5)
data/icons/hicolor/16x16/devices/Makefile (+0/-542)
data/icons/hicolor/16x16/devices/Makefile.in (+3/-5)
data/icons/hicolor/16x16/status/Makefile (+0/-545)
data/icons/hicolor/16x16/status/Makefile.am (+4/-1)
data/icons/hicolor/16x16/status/Makefile.in (+7/-6)
data/icons/hicolor/32x32/Makefile (+0/-663)
data/icons/hicolor/32x32/Makefile.in (+3/-5)
data/icons/hicolor/32x32/actions/Makefile (+0/-544)
data/icons/hicolor/32x32/actions/Makefile.in (+3/-5)
data/icons/hicolor/48x48/Makefile (+0/-665)
data/icons/hicolor/48x48/Makefile.in (+3/-5)
data/icons/hicolor/48x48/actions/Makefile (+0/-542)
data/icons/hicolor/48x48/actions/Makefile.in (+3/-5)
data/icons/hicolor/48x48/devices/Makefile (+0/-555)
data/icons/hicolor/48x48/devices/Makefile.in (+3/-5)
data/icons/hicolor/48x48/status/Makefile (+0/-571)
data/icons/hicolor/48x48/status/Makefile.am (+4/-1)
data/icons/hicolor/48x48/status/Makefile.in (+7/-6)
data/icons/hicolor/Makefile (+0/-682)
data/icons/hicolor/Makefile.in (+3/-5)
data/icons/hicolor/scalable/Makefile (+0/-665)
data/icons/hicolor/scalable/Makefile.in (+3/-5)
data/icons/hicolor/scalable/actions/Makefile (+0/-542)
data/icons/hicolor/scalable/actions/Makefile.in (+3/-5)
data/icons/hicolor/scalable/devices/Makefile (+0/-543)
data/icons/hicolor/scalable/devices/Makefile.in (+3/-5)
data/icons/hicolor/scalable/status/Makefile (+0/-540)
data/icons/hicolor/scalable/status/Makefile.am (+1/-1)
data/icons/hicolor/scalable/status/Makefile.in (+4/-6)
data/icons/hicolor/scalable/status/blueman-tray-active.svg (+0/-245)
data/icons/hicolor/scalable/status/blueman-tray-disabled.svg (+0/-291)
data/icons/hicolor/scalable/status/blueman-tray.svg (+0/-234)
data/icons/hicolor/scalable/status/bluetooth-active.svg (+245/-0)
data/icons/hicolor/scalable/status/bluetooth-disabled.svg (+291/-0)
data/icons/hicolor/scalable/status/bluetooth.svg (+234/-0)
data/icons/main_icon/Makefile (+0/-510)
data/icons/main_icon/Makefile.in (+3/-5)
data/man/Makefile (+0/-570)
data/man/Makefile.in (+3/-5)
data/ui/Makefile (+0/-552)
data/ui/Makefile.in (+3/-5)
data/ui/adapters-tab.ui (+6/-5)
data/ui/adapters.ui (+3/-3)
data/ui/applet-passkey.ui (+7/-5)
data/ui/applet-plugins-widget.ui (+8/-5)
data/ui/assistant.ui (+7/-5)
data/ui/device-list-widget.ui (+5/-3)
data/ui/gsm-settings.ui (+4/-3)
data/ui/manager-main.ui (+10/-5)
data/ui/net-usage.ui (+8/-8)
data/ui/send-dialog.ui (+5/-5)
data/ui/services-audio.ui (+7/-5)
data/ui/services-network.ui (+15/-11)
data/ui/services-transfer.ui (+13/-7)
data/ui/services.ui (+6/-4)
debian/changelog (+30/-0)
debian/control (+10/-9)
debian/patches/02_dont_crash_on_non-bluetooth_card.patch (+0/-30)
debian/patches/03_filemanager_fix.patch (+1/-1)
debian/patches/dhcpclient_priority (+10/-10)
debian/patches/series (+0/-1)
libtool (+0/-10083)
module/.deps/_blueman_la-_blueman.Plo (+0/-1)
module/.deps/_blueman_la-libblueman.Plo (+0/-1)
module/.deps/_blueman_la-modem-prober.Plo (+0/-1)
module/Makefile (+0/-734)
module/Makefile.am (+3/-2)
module/Makefile.in (+9/-8)
module/_blueman.pyx (+3/-3)
po/LINGUAS (+7/-0)
po/Makefile (+0/-364)
po/Makefile.in (+0/-222)
po/POTFILES (+0/-143)
po/ast.po (+1778/-0)
po/be.po (+778/-944)
po/bg.po (+575/-747)
po/bs.po (+657/-606)
po/cs.po (+592/-764)
po/da.po (+854/-836)
po/de.po (+602/-784)
po/el.po (+673/-749)
po/en_AU.po (+1777/-0)
po/en_GB.po (+594/-773)
po/es.po (+634/-857)
po/et.po (+538/-630)
po/eu.po (+1778/-0)
po/fi.po (+554/-725)
po/fr.po (+614/-762)
po/gl.po (+657/-884)
po/hi.po (+1778/-0)
po/hr.po (+562/-736)
po/hu.po (+570/-722)
po/id.po (+928/-868)
po/it.po (+804/-802)
po/ja.po (+657/-628)
po/ko.po (+721/-765)
po/lt.po (+552/-702)
po/mk.po (+1778/-0)
po/mr.po (+1778/-0)
po/ms.po (+1769/-0)
po/nb.po (+529/-569)
po/nl.po (+580/-706)
po/pl.po (+603/-717)
po/pt.po (+761/-743)
po/pt_BR.po (+740/-835)
po/ru.po (+624/-874)
po/sk.po (+728/-783)
po/sl.po (+876/-861)
po/sr.po (+539/-540)
po/sv.po (+573/-790)
po/ta.po (+509/-511)
po/tr.po (+596/-729)
po/uk.po (+572/-797)
po/zh_CN.po (+588/-747)
po/zh_TW.po (+561/-698)
sendto/.deps/libnstblueman_la-nautilus-bluetooth-sendto.Plo (+0/-1)
sendto/Makefile (+0/-709)
sendto/Makefile.am (+2/-2)
sendto/Makefile.in (+7/-8)
stamp-h1 (+0/-1)
To merge this branch: bzr merge lp:~noskcaj/ubuntu/utopic/blueman/merge2
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+230251@code.launchpad.net

Description of the change

Merge from debian

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks but that update seems to have quite some changes and should probably require a ffe. Setting as "work in progress" so it's not listed for sponsoring until that happen, if you don't think it should be in utopic just wait next cycle and set it back to needs review

Unmerged revisions

22. By Jackson Doak

* Merge from debian unstable. Remaining changes:
  - debian/patches/01_dont_autostart_lxde.patch:
    + Don't autostart the applet in LXDE
  - debian/patches/03_filemanager_fix.patch:
    + Add support for more filemanagers
* Drop 02_dont_crash_on_non-bluetooth_card.patch. No longer needed
* Upstream snapshot for unstable (Closes: #754973, #741961)
* Upstream snapshot of new major version with (yet incomplete) BlueZ 5 support
* Add dependency bluez (<< 5)
* Update homepage to GitHub home

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed directory '.pc/01_dont_autostart_lxde.patch'
2=== removed directory '.pc/01_dont_autostart_lxde.patch/data'
3=== removed file '.pc/01_dont_autostart_lxde.patch/data/blueman.desktop.in'
4--- .pc/01_dont_autostart_lxde.patch/data/blueman.desktop.in 2013-07-03 21:40:14 +0000
5+++ .pc/01_dont_autostart_lxde.patch/data/blueman.desktop.in 1970-01-01 00:00:00 +0000
6@@ -1,9 +0,0 @@
7-[Desktop Entry]
8-Encoding=UTF-8
9-_Name=Blueman Applet
10-_Comment=Blueman Bluetooth Manager
11-Icon=blueman
12-Exec=blueman-applet
13-Terminal=false
14-Type=Application
15-Categories=
16
17=== removed directory '.pc/02_dont_crash_on_non-bluetooth_card.patch'
18=== removed directory '.pc/02_dont_crash_on_non-bluetooth_card.patch/blueman'
19=== removed directory '.pc/02_dont_crash_on_non-bluetooth_card.patch/blueman/plugins'
20=== removed directory '.pc/02_dont_crash_on_non-bluetooth_card.patch/blueman/plugins/applet'
21=== removed file '.pc/02_dont_crash_on_non-bluetooth_card.patch/blueman/plugins/applet/PulseAudio.py'
22--- .pc/02_dont_crash_on_non-bluetooth_card.patch/blueman/plugins/applet/PulseAudio.py 2014-07-03 07:37:37 +0000
23+++ .pc/02_dont_crash_on_non-bluetooth_card.patch/blueman/plugins/applet/PulseAudio.py 1970-01-01 00:00:00 +0000
24@@ -1,355 +0,0 @@
25-# Copyright (C) 2008 Valmantas Paliksa <walmis at balticum-tv dot lt>
26-# Copyright (C) 2008 Tadas Dailyda <tadas at dailyda dot com>
27-#
28-# Licensed under the GNU General Public License Version 3
29-#
30-# This program is free software: you can redistribute it and/or modify
31-# it under the terms of the GNU General Public License as published by
32-# the Free Software Foundation, either version 3 of the License, or
33-# (at your option) any later version.
34-#
35-# This program is distributed in the hope that it will be useful,
36-# but WITHOUT ANY WARRANTY; without even the implied warranty of
37-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
38-# GNU General Public License for more details.
39-#
40-# You should have received a copy of the GNU General Public License
41-# along with this program. If not, see <http://www.gnu.org/licenses/>.
42-#
43-from blueman.Functions import *
44-from blueman.plugins.AppletPlugin import AppletPlugin
45-from blueman.bluez.Device import Device as BluezDevice
46-from blueman.main.Device import Device
47-from blueman.gui.Notification import Notification
48-from blueman.main.PulseAudioUtils import PulseAudioUtils, EventType
49-from subprocess import Popen, PIPE
50-import gobject
51-
52-import dbus
53-from blueman.main.SignalTracker import SignalTracker
54-
55-class SourceRedirector:
56- instances = []
57- def __init__(self, module_id, device_path, pa_utils):
58- if module_id in SourceRedirector.instances:
59- return
60- else:
61- SourceRedirector.instances.append(module_id)
62-
63- self.module_id = module_id
64- self.pa_utils = pa_utils
65- self.device = Device(device_path)
66- self.signals = SignalTracker()
67- self.bus = dbus.SystemBus()
68- self.signals.Handle("dbus", self.bus, self.on_source_prop_change, "PropertyChanged", "org.bluez.AudioSource", path=device_path)
69-
70- self.pacat = None
71- self.parec = None
72- self.loopback_id = None
73-
74- dprint("Starting source redirector")
75- def sources_cb(sources):
76- for k, v in sources.iteritems():
77- props = v["proplist"]
78- if "bluetooth.protocol" in props:
79- if props["bluetooth.protocol"] == "a2dp_source":
80- if v["owner_module"] == self.module_id:
81- dprint("Found source", k)
82- self.start_redirect(k)
83- return
84- dprint("Source not found :(")
85-
86- self.pa_utils.ListSources(sources_cb)
87-
88- def start_redirect(self, source):
89-
90- def on_load(res):
91- dprint("module-loopback load result", res)
92- if res < 0:
93- self.parec = Popen(["parec", "-d", str(source)], stdout=PIPE)
94- self.pacat = Popen(["pacat", "--client-name=Blueman", "--stream-name=%s" % self.device.Address, "--property=application.icon_name=blueman"], stdin=self.parec.stdout)
95- else:
96- self.loopback_id = res
97-
98- self.pa_utils.LoadModule("module-loopback", "source=%d" % source, on_load)
99-
100- def on_source_prop_change(self, key, value):
101- if key == "State":
102- if value == "disconnected":
103- if self.pacat:
104- self.pacat.terminate()
105- if self.parec:
106- self.parec.terminate()
107- if self.loopback_id:
108- self.pa_utils.UnloadModule(self.loopback_id, lambda x: dprint("Loopback module unload result", x))
109-
110- self.signals.DisconnectAll()
111-
112- SourceRedirector.instances.remove(self.module_id)
113-
114- del self.pa_utils
115-
116- def __del__(self):
117- dprint("Destroying redirector")
118-
119-class Module(gobject.GObject):
120- __gsignals__ = {
121- 'loaded' : (gobject.SIGNAL_NO_HOOKS, gobject.TYPE_NONE, ()),
122- }
123- def __init__(self):
124- gobject.GObject.__init__(self)
125- self.refcount = 0
126- self.id = None
127-
128- def unload(self):
129- dprint(self.id)
130- pa = PulseAudioUtils()
131- id = self.id
132- pa.UnloadModule(self.id, lambda x: dprint("Unload %s result %s" % (id, x)))
133- self.id = None
134- self.refcount = 0
135-
136- def ref(self):
137- self.refcount+=1
138-
139- dprint(self.id, self.refcount)
140-
141- def unref(self):
142- self.refcount-=1
143-
144- dprint(self.id, self.refcount)
145-
146- if self.refcount <= 0 and self.id:
147- self.unload()
148-
149- def load(self, args, cb):
150- if self.id != None:
151- self.unload()
152-
153- def load_cb(res):
154- if res > 0:
155- self.refcount = 1
156- self.id = res
157- if cb:
158- cb(res)
159- self.emit("loaded")
160- else:
161- self.refcount = 0
162- self.id = None
163-
164- PulseAudioUtils().LoadModule("module-bluetooth-device",
165- args,
166- load_cb)
167-
168-class PulseAudio(AppletPlugin):
169- __author__ = "Walmis"
170- __description__ = _("Automatically manages Pulseaudio Bluetooth sinks/sources.\n"
171- "<b>Note:</b> Requires pulseaudio 0.9.15 or higher")
172- __icon__ = "audio-card"
173- __options__ = {
174- "checked" : {"type": bool, "default": False},
175- "make_default_sink": {"type":bool,
176- "default": True,
177- "name": _("Make default sink"),
178- "desc": _("Make the a2dp audio sink the default after connection")},
179- "move_streams": {"type": bool,
180- "default": True,
181- "name": _("Move streams"),
182- "desc": _("Move existing audio streams to bluetooth device")}
183- }
184- def on_load(self, applet):
185- self.signals = SignalTracker()
186- if not self.get_option("checked"):
187- self.set_option("checked", True)
188- if not have("pactl"):
189- applet.Plugins.SetConfig("PulseAudio", False)
190- return
191-
192- self.bus = dbus.SystemBus()
193-
194- self.connected_sources = []
195- self.connected_sinks = []
196- self.connected_hs = []
197-
198- self.loaded_modules = {}
199-
200- self.pulse_utils = PulseAudioUtils()
201- version = self.pulse_utils.GetVersion()
202- dprint("PulseAudio version:", version)
203-
204- if version[0] == 0:
205- if tuple(version) < (0, 9, 15):
206- raise Exception("PulseAudio too old, required 0.9.15 or higher")
207-
208- self.signals.Handle("dbus",
209- self.bus,
210- self.on_sink_prop_change,
211- "PropertyChanged",
212- "org.bluez.AudioSink",
213- path_keyword="device")
214-
215- self.signals.Handle("dbus",
216- self.bus,
217- self.on_source_prop_change,
218- "PropertyChanged",
219- "org.bluez.AudioSource",
220- path_keyword="device")
221-
222- self.signals.Handle("dbus",
223- self.bus,
224- self.on_hsp_prop_change,
225- "PropertyChanged",
226- "org.bluez.Headset",
227- path_keyword="device")
228-
229-
230- self.signals.Handle(self.pulse_utils, "event", self.on_pulse_event)
231-
232- def on_pulse_event(self, pa_utils, event, idx):
233- if (EventType.CARD | EventType.CHANGE) == event:
234- dprint(event)
235- def card_cb(c):
236- dprint(c)
237- m = self.loaded_modules[c["proplist"]["bluez.path"]]
238- if c["owner_module"] == m.id:
239- if c["active_profile"] == "a2dp_source":
240- SourceRedirector(m.id, c["proplist"]["bluez.path"], pa_utils)
241-
242- pa_utils.GetCard(idx, card_cb)
243-
244-
245- def on_unload(self):
246- self.signals.DisconnectAll()
247-
248- def load_module(self, dev_path, args, cb=None):
249- if not dev_path in self.loaded_modules:
250- m = Module()
251- m.load(args, cb)
252- self.loaded_modules[dev_path] = m
253- else:
254- self.loaded_modules[dev_path].ref()
255-
256- def try_unload_module(self, dev_path):
257- try:
258- m = self.loaded_modules[dev_path]
259- m.unref()
260- if m.refcount == 0:
261- del self.loaded_modules[dev_path]
262- except Exception, e:
263- dprint(e)
264-
265- def on_source_prop_change(self, key, value, device):
266- dprint(key, value)
267-
268- if key == "State":
269- if value == "connected":
270- if not device in self.connected_sources:
271- self.connected_sources.append(device)
272- d = Device(device)
273- self.load_module(device, "path=%s address=%s profile=a2dp_source source_properties=device.icon_name=blueman card_properties=device.icon_name=blueman" % (device, d.Address))
274-
275- elif value == "disconnected":
276- self.try_unload_module(device)
277- if device in self.connected_sources:
278- self.connected_sources.remove(device)
279-
280- elif value == "playing":
281- try:
282- m = self.loaded_modules[device]
283- def on_loaded(m):
284- SourceRedirector(m.id, device, self.pulse_utils)
285- m.disconnect(sig)
286-
287- if not m.id:
288- sig = m.connect("loaded", on_loaded)
289- else:
290- SourceRedirector(m.id, device, self.pulse_utils)
291-
292- except Exception, e:
293- dprint(e)
294-
295-
296- def on_sink_prop_change(self, key, value, device):
297- if key == "Connected" and value:
298- if not device in self.connected_sinks:
299- self.connected_sinks.append(device)
300- gobject.timeout_add(500, self.setup_pa, device, "a2dp")
301-
302- elif key == "Connected" and not value:
303- if device in self.connected_sinks:
304- self.connected_sinks.remove(device)
305- self.try_unload_module(device)
306-
307- def on_hsp_prop_change(self, key, value, device):
308- if key == "Connected" and value:
309- if not device in self.connected_hs:
310- self.connected_hs.append(device)
311- self.setup_pa(device, "hsp")
312-
313- elif key == "Connected" and not value:
314- self.try_unload_module(device)
315- if device in self.connected_hs:
316- self.connected_hs.remove(device)
317-
318- def move_pa_streams(self, sink_id):
319- def inputs_cb(inputs):
320- for k, v in inputs.iteritems():
321- dprint("moving stream", v["name"], "to sink", sink_id)
322- self.pulse_utils.MoveSinkInput(k, sink_id, None)
323-
324- self.pulse_utils.ListSinkInputs(inputs_cb)
325-
326- def setup_pa_sinks(self, module_id):
327- dprint("module", module_id)
328-
329- def sinks_cb(sinks):
330- for k, v in sinks.iteritems():
331- if v["owner_module"] == module_id:
332- if self.get_option("make_default_sink"):
333- dprint("Making sink", v["name"], "the default")
334- self.pulse_utils.SetDefaultSink(v["name"], None)
335- if self.get_option("move_streams"):
336- self.move_pa_streams(k)
337-
338-
339- self.pulse_utils.ListSinks(sinks_cb)
340-
341- def setup_pa(self, device_path, profile):
342- device = Device(device_path)
343-
344-
345- def load_cb(res):
346- dprint("Load result", res)
347-
348- if res < 0:
349- Notification(_("Bluetooth Audio"),
350- _("Failed to initialize PulseAudio Bluetooth module. Bluetooth audio over PulseAudio will not work."),
351- pixbuf=get_notification_icon("gtk-dialog-error"),
352- status_icon=self.Applet.Plugins.StatusIcon)
353- else:
354- Notification(_("Bluetooth Audio"),
355- _("Successfully connected to a Bluetooth audio device. This device will now be available in the PulseAudio mixer"),
356- pixbuf=get_notification_icon("audio-card"),
357- status_icon=self.Applet.Plugins.StatusIcon)
358- if profile == "a2dp":
359- self.setup_pa_sinks(res)
360-
361- #connect to other services, so pulseaudio profile switcher could work
362- for s in ("headset", "audiosink", "audiosource"):
363- try:
364- device.Services[s].Connect()
365- except KeyError:
366- pass
367- except Exception, e:
368- print e
369-
370- version = self.pulse_utils.GetVersion()
371- if version[0] == 1 or version[2] >= 18:
372- args = "address=%s profile=%s sink_properties=device.icon_name=blueman card_properties=device.icon_name=blueman"
373- else:
374- args = "address=%s profile=%s"
375-
376- self.load_module(device_path, args % (device.Address, profile), load_cb)
377-
378-
379-
380
381=== removed directory '.pc/03_filemanager_fix.patch'
382=== removed directory '.pc/03_filemanager_fix.patch/apps'
383=== removed file '.pc/03_filemanager_fix.patch/apps/blueman-browse'
384--- .pc/03_filemanager_fix.patch/apps/blueman-browse 2014-01-21 08:54:58 +0000
385+++ .pc/03_filemanager_fix.patch/apps/blueman-browse 1970-01-01 00:00:00 +0000
386@@ -1,79 +0,0 @@
387-#!/usr/bin/python
388-
389-import os, sys
390-
391-#support running uninstalled
392-_dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
393-if os.path.exists(os.path.join(_dirname, "CHANGELOG.md")):
394- sys.path.insert(0, _dirname)
395-
396-import gtk
397-import gobject
398-from optparse import OptionParser
399-import gettext
400-import time
401-
402-from blueman.bluez.Manager import Manager
403-from blueman.gui.DeviceSelectorDialog import DeviceSelectorDialog
404-from blueman.Functions import *
405-from blueman.Constants import *
406-from blueman.main.Config import Config
407-
408-
409-class Browse:
410- def __init__(self):
411- setup_icon_path()
412-
413- usage = "Usage: %prog [options]"
414- parser = OptionParser(usage)
415- parser.add_option("-d", "--device", dest="device",
416- action="store", help=_("Browse this device"), metavar="ADDRESS")
417-
418- (options, args) = parser.parse_args()
419- self.options = options
420- self.args = args
421-
422- if options.device == None:
423- dev = self.select_device()
424- if not dev:
425- exit()
426-
427- addr = dev.Address
428-
429- else:
430- addr = options.device
431- addr = addr.strip(" ")
432- conf = Config("transfer")
433- if conf.props.browse_command == None:
434- conf.props.browse_command = DEF_BROWSE_COMMAND
435- if "nautilus" in DEF_BROWSE_COMMAND:
436- if not have("nautilus"):
437- conf.props.browse_command = "thunar obex://[%d]"
438-
439- cmd = conf.props.browse_command.replace("%d", addr)
440- args = cmd.split(" ")
441- try:
442- spawn(args, True)
443- except Exception as e:
444- dprint(e)
445- d = gtk.MessageDialog(None, buttons=gtk.BUTTONS_OK, type=gtk.MESSAGE_ERROR)
446- d.props.text = _("Failed to launch \"%s\"") % args[0]
447- d.props.secondary_text = "%s\n\n" % e + _("You can enter an alternate browser in service settings")
448- d.run()
449- d.destroy()
450-
451- def select_device(self):
452- d = DeviceSelectorDialog()
453- resp = d.run()
454- d.destroy()
455- if resp == gtk.RESPONSE_ACCEPT:
456- sel = d.GetSelection()
457- if sel:
458- return sel[1]
459- else:
460- return None
461- else:
462- return None
463-
464-
465-Browse()
466
467=== removed file '.pc/applied-patches'
468--- .pc/applied-patches 2014-01-21 08:54:58 +0000
469+++ .pc/applied-patches 1970-01-01 00:00:00 +0000
470@@ -1,4 +0,0 @@
471-dhcpclient_priority
472-01_dont_autostart_lxde.patch
473-02_dont_crash_on_non-bluetooth_card.patch
474-03_filemanager_fix.patch
475
476=== removed directory '.pc/dhcpclient_priority'
477=== removed directory '.pc/dhcpclient_priority/blueman'
478=== removed directory '.pc/dhcpclient_priority/blueman/plugins'
479=== removed directory '.pc/dhcpclient_priority/blueman/plugins/applet'
480=== removed file '.pc/dhcpclient_priority/blueman/plugins/applet/DhcpClient.py'
481--- .pc/dhcpclient_priority/blueman/plugins/applet/DhcpClient.py 2014-03-10 22:01:00 +0000
482+++ .pc/dhcpclient_priority/blueman/plugins/applet/DhcpClient.py 1970-01-01 00:00:00 +0000
483@@ -1,82 +0,0 @@
484-# Copyright (C) 2009 Valmantas Paliksa <walmis at balticum-tv dot lt>
485-#
486-# Licensed under the GNU General Public License Version 3
487-#
488-# This program is free software: you can redistribute it and/or modify
489-# it under the terms of the GNU General Public License as published by
490-# the Free Software Foundation, either version 3 of the License, or
491-# (at your option) any later version.
492-#
493-# This program is distributed in the hope that it will be useful,
494-# but WITHOUT ANY WARRANTY; without even the implied warranty of
495-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
496-# GNU General Public License for more details.
497-#
498-# You should have received a copy of the GNU General Public License
499-# along with this program. If not, see <http://www.gnu.org/licenses/>.
500-
501-from blueman.gui.Notification import Notification
502-from blueman.plugins.AppletPlugin import AppletPlugin
503-from blueman.main.Mechanism import Mechanism
504-from blueman.main.SignalTracker import SignalTracker
505-from blueman.Functions import *
506-import dbus
507-
508-class DhcpClient(AppletPlugin):
509- __description__ = _("Provides a basic dhcp client for Bluetooth PAN connections.")
510- __icon__= "network"
511- __author__ = "Walmis"
512-
513- def on_load(self, applet):
514- self.Signals = SignalTracker()
515-
516- self.add_dbus_method(self.DhcpClient, in_signature="s")
517-
518- self.Signals.Handle("dbus", dbus.SystemBus(),
519- self.on_network_prop_changed,
520- "PropertyChanged",
521- "org.bluez.Network",
522- path_keyword="path")
523-
524- self.quering = []
525-
526- def on_unload(self):
527- self.Signals.DisconnectAll()
528-
529- def DhcpClient(self, interface):
530- self.dhcp_acquire(interface)
531-
532- def on_network_prop_changed(self, key, value, path):
533- if key == "Interface":
534- if value != "":
535- self.dhcp_acquire(value)
536-
537- def dhcp_acquire(self, device):
538- if device not in self.quering:
539- self.quering.append(device)
540- else:
541- return
542-
543- if device != "":
544- def reply(ip_address):
545-
546- Notification(_("Bluetooth Network"), _("Interface %(0)s bound to IP address %(1)s") % {"0": device, "1": ip_address},
547- pixbuf=get_icon("gtk-network", 48),
548- status_icon=self.Applet.Plugins.StatusIcon)
549-
550- self.quering.remove(device)
551-
552- def err(msg):
553- dprint(msg)
554- Notification(_("Bluetooth Network"), _("Failed to obtain an IP address on %s") % (device),
555- pixbuf=get_icon("gtk-network", 48),
556- status_icon=self.Applet.Plugins.StatusIcon)
557-
558- self.quering.remove(device)
559-
560- Notification(_("Bluetooth Network"), _("Trying to obtain an IP address on %s\nPlease wait..." % device),
561- pixbuf=get_icon("gtk-network", 48),
562- status_icon=self.Applet.Plugins.StatusIcon)
563-
564- m = Mechanism()
565- m.DhcpClient(device, reply_handler=reply, error_handler=err, timeout=120)
566
567=== modified file 'CHANGELOG.md'
568--- CHANGELOG.md 2013-12-31 11:47:00 +0000
569+++ CHANGELOG.md 2014-08-11 05:53:12 +0000
570@@ -10,3 +10,11 @@
571 * Fix thunar fallback (Jan HutaÅ™)
572 * Update autoconf to support aarch64 (Dennis Gilmore)
573 * Do not power new adapters despite rfkill (@lkr / Leesa)
574+* Switch to GTK+ 3 (using introspection)
575+* Fix handling of network devices (especially fixes DhcpClient plugin)
576+* Update translations (too many to list them)
577+* Prefer the GTK theme's bluetooth icons over the shipped ones (@Teknocrat)
578+* Fix nonexistent dbus exception (Martín Ferrari)
579+* Fix a rare problem when the manager device menu cannot get the current selection (@kolen / Konstantin Mochalov)
580+* dhcpcd client support (@Teknocrat)
581+* Fix pulseaudio device discovery (see #64 and the linked Ubuntu bugs for details and contributors)
582
583=== removed file 'Makefile'
584--- Makefile 2014-07-01 12:11:00 +0000
585+++ Makefile 1970-01-01 00:00:00 +0000
586@@ -1,886 +0,0 @@
587-# Makefile.in generated by automake 1.14.1 from Makefile.am.
588-# Makefile. Generated from Makefile.in by configure.
589-
590-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
591-
592-# This Makefile.in is free software; the Free Software Foundation
593-# gives unlimited permission to copy and/or distribute it,
594-# with or without modifications, as long as this notice is preserved.
595-
596-# This program is distributed in the hope that it will be useful,
597-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
598-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
599-# PARTICULAR PURPOSE.
600-
601-
602-
603-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
604-am__make_running_with_option = \
605- case $${target_option-} in \
606- ?) ;; \
607- *) echo "am__make_running_with_option: internal error: invalid" \
608- "target option '$${target_option-}' specified" >&2; \
609- exit 1;; \
610- esac; \
611- has_opt=no; \
612- sane_makeflags=$$MAKEFLAGS; \
613- if $(am__is_gnu_make); then \
614- sane_makeflags=$$MFLAGS; \
615- else \
616- case $$MAKEFLAGS in \
617- *\\[\ \ ]*) \
618- bs=\\; \
619- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
620- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
621- esac; \
622- fi; \
623- skip_next=no; \
624- strip_trailopt () \
625- { \
626- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
627- }; \
628- for flg in $$sane_makeflags; do \
629- test $$skip_next = yes && { skip_next=no; continue; }; \
630- case $$flg in \
631- *=*|--*) continue;; \
632- -*I) strip_trailopt 'I'; skip_next=yes;; \
633- -*I?*) strip_trailopt 'I';; \
634- -*O) strip_trailopt 'O'; skip_next=yes;; \
635- -*O?*) strip_trailopt 'O';; \
636- -*l) strip_trailopt 'l'; skip_next=yes;; \
637- -*l?*) strip_trailopt 'l';; \
638- -[dEDm]) skip_next=yes;; \
639- -[JT]) skip_next=yes;; \
640- esac; \
641- case $$flg in \
642- *$$target_option*) has_opt=yes; break;; \
643- esac; \
644- done; \
645- test $$has_opt = yes
646-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
647-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
648-pkgincludedir = $(includedir)/blueman
649-pkglibdir = $(libdir)/blueman
650-pkglibexecdir = $(libexecdir)/blueman
651-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
652-install_sh_DATA = $(install_sh) -c -m 644
653-install_sh_PROGRAM = $(install_sh) -c
654-install_sh_SCRIPT = $(install_sh) -c
655-INSTALL_HEADER = $(INSTALL_DATA)
656-transform = $(program_transform_name)
657-NORMAL_INSTALL = :
658-PRE_INSTALL = :
659-POST_INSTALL = :
660-NORMAL_UNINSTALL = :
661-PRE_UNINSTALL = :
662-POST_UNINSTALL = :
663-build_triplet = x86_64-unknown-linux-gnu
664-host_triplet = x86_64-unknown-linux-gnu
665-subdir = .
666-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
667- $(top_srcdir)/configure $(am__configure_deps) \
668- $(srcdir)/config.h.in COPYING compile config.guess config.sub \
669- install-sh missing ltmain.sh
670-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
671-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
672- $(top_srcdir)/configure.ac
673-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
674- $(ACLOCAL_M4)
675-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
676- configure.lineno config.status.lineno
677-mkinstalldirs = $(install_sh) -d
678-CONFIG_HEADER = config.h
679-CONFIG_CLEAN_FILES =
680-CONFIG_CLEAN_VPATH_FILES =
681-AM_V_P = $(am__v_P_$(V))
682-am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY))
683-am__v_P_0 = false
684-am__v_P_1 = :
685-AM_V_GEN = $(am__v_GEN_$(V))
686-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
687-am__v_GEN_0 = @echo " GEN " $@;
688-am__v_GEN_1 =
689-AM_V_at = $(am__v_at_$(V))
690-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
691-am__v_at_0 = @
692-am__v_at_1 =
693-SOURCES =
694-DIST_SOURCES =
695-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
696- ctags-recursive dvi-recursive html-recursive info-recursive \
697- install-data-recursive install-dvi-recursive \
698- install-exec-recursive install-html-recursive \
699- install-info-recursive install-pdf-recursive \
700- install-ps-recursive install-recursive installcheck-recursive \
701- installdirs-recursive pdf-recursive ps-recursive \
702- tags-recursive uninstall-recursive
703-am__can_run_installinfo = \
704- case $$AM_UPDATE_INFO_DIR in \
705- n|no|NO) false;; \
706- *) (install-info --version) >/dev/null 2>&1;; \
707- esac
708-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
709- distclean-recursive maintainer-clean-recursive
710-am__recursive_targets = \
711- $(RECURSIVE_TARGETS) \
712- $(RECURSIVE_CLEAN_TARGETS) \
713- $(am__extra_recursive_targets)
714-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
715- cscope distdir dist dist-all distcheck
716-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
717- $(LISP)config.h.in
718-# Read a list of newline-separated strings from the standard input,
719-# and print each of them once, without duplicates. Input order is
720-# *not* preserved.
721-am__uniquify_input = $(AWK) '\
722- BEGIN { nonempty = 0; } \
723- { items[$$0] = 1; nonempty = 1; } \
724- END { if (nonempty) { for (i in items) print i; }; } \
725-'
726-# Make sure the list of sources is unique. This is necessary because,
727-# e.g., the same source file might be shared among _SOURCES variables
728-# for different programs/libraries.
729-am__define_uniq_tagged_files = \
730- list='$(am__tagged_files)'; \
731- unique=`for i in $$list; do \
732- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
733- done | $(am__uniquify_input)`
734-ETAGS = etags
735-CTAGS = ctags
736-CSCOPE = cscope
737-DIST_SUBDIRS = $(SUBDIRS)
738-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
739-distdir = $(PACKAGE)-$(VERSION)
740-top_distdir = $(distdir)
741-am__remove_distdir = \
742- if test -d "$(distdir)"; then \
743- find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
744- && rm -rf "$(distdir)" \
745- || { sleep 5 && rm -rf "$(distdir)"; }; \
746- else :; fi
747-am__post_remove_distdir = $(am__remove_distdir)
748-am__relativize = \
749- dir0=`pwd`; \
750- sed_first='s,^\([^/]*\)/.*$$,\1,'; \
751- sed_rest='s,^[^/]*/*,,'; \
752- sed_last='s,^.*/\([^/]*\)$$,\1,'; \
753- sed_butlast='s,/*[^/]*$$,,'; \
754- while test -n "$$dir1"; do \
755- first=`echo "$$dir1" | sed -e "$$sed_first"`; \
756- if test "$$first" != "."; then \
757- if test "$$first" = ".."; then \
758- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
759- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
760- else \
761- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
762- if test "$$first2" = "$$first"; then \
763- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
764- else \
765- dir2="../$$dir2"; \
766- fi; \
767- dir0="$$dir0"/"$$first"; \
768- fi; \
769- fi; \
770- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
771- done; \
772- reldir="$$dir2"
773-DIST_ARCHIVES = $(distdir).tar.gz
774-GZIP_ENV = --best
775-DIST_TARGETS = dist-gzip
776-distuninstallcheck_listfiles = find . -type f -print
777-am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
778- | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
779-distcleancheck_listfiles = find . -type f -print
780-pkgdatadir = /usr/local/share/blueman
781-ACLOCAL = ${SHELL} /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb/missing aclocal-1.14
782-ALL_LINGUAS =
783-AMTAR = $${TAR-tar}
784-AM_DEFAULT_VERBOSITY = 1
785-AR = ar
786-AUTOCONF = ${SHELL} /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb/missing autoconf
787-AUTOHEADER = ${SHELL} /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb/missing autoheader
788-AUTOMAKE = ${SHELL} /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb/missing automake-1.14
789-AWK = gawk
790-BINDIR = /usr/local/bin
791-BLUEZ_CFLAGS = -pthread -I/usr/include/startup-notification-1.0 -I/usr/include/gtk-2.0 -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include -I/usr/include/gio-unix-2.0/ -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libdrm -I/usr/include/libpng12 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng12 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pygtk-2.0
792-BLUEZ_LIBS = -lbluetooth -lstartup-notification-1 -lgtk-x11-2.0 -lgdk-x11-2.0 -lpangocairo-1.0 -latk-1.0 -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lpangoft2-1.0 -lpango-1.0 -lfontconfig -lfreetype -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0
793-CATALOGS =
794-CATOBJEXT = .gmo
795-CC = gcc
796-CCDEPMODE = depmode=gcc3
797-CFLAGS = -g -O2
798-CPP = gcc -E
799-CPPFLAGS =
800-CYGPATH_W = echo
801-DATADIR = /usr/local/share
802-DATADIRNAME = share
803-DEFS = -DHAVE_CONFIG_H
804-DEPDIR = .deps
805-DLLTOOL = false
806-DSYMUTIL =
807-DUMPBIN =
808-ECHO_C =
809-ECHO_N = -n
810-ECHO_T =
811-EGREP = /bin/grep -E
812-EXEEXT =
813-FGREP = /bin/grep -F
814-GETTEXT_PACKAGE = blueman
815-GMOFILES =
816-GMSGFMT = /usr/bin/msgfmt
817-GREP = /bin/grep
818-INSTALL = /usr/bin/install -c
819-INSTALL_DATA = ${INSTALL} -m 644
820-INSTALL_PROGRAM = ${INSTALL}
821-INSTALL_SCRIPT = ${INSTALL}
822-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
823-INSTOBJEXT = .mo
824-INTLLIBS =
825-INTLTOOL_EXTRACT = /usr/bin/intltool-extract
826-INTLTOOL_MERGE = /usr/bin/intltool-merge
827-INTLTOOL_PERL = /usr/bin/perl
828-INTLTOOL_UPDATE = /usr/bin/intltool-update
829-INTLTOOL_V_MERGE = $(INTLTOOL__v_MERGE_$(V))
830-INTLTOOL_V_MERGE_OPTIONS = $(intltool__v_merge_options_$(V))
831-INTLTOOL__v_MERGE_ = $(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))
832-INTLTOOL__v_MERGE_0 = @echo " ITMRG " $@;
833-LD = /usr/bin/ld -m elf_x86_64
834-LDFLAGS =
835-LIBEXECDIR = /usr/local/libexec
836-LIBOBJS =
837-LIBS =
838-LIBTOOL = $(SHELL) $(top_builddir)/libtool
839-LIPO =
840-LN_S = ln -s
841-LOCALEDIR = /usr/local/share/locale
842-LTLIBOBJS =
843-MAINT =
844-MAKEINFO = ${SHELL} /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb/missing makeinfo
845-MANIFEST_TOOL = :
846-MKDIR_P = /bin/mkdir -p
847-MKINSTALLDIRS = ./mkinstalldirs
848-MSGFMT = /usr/bin/msgfmt
849-MSGFMT_OPTS = -c
850-MSGMERGE = /usr/bin/msgmerge
851-NM = /usr/bin/nm -B
852-NMEDIT =
853-OBJDUMP = objdump
854-OBJEXT = o
855-OTOOL =
856-OTOOL64 =
857-PACKAGE = blueman
858-PACKAGE_BUGREPORT =
859-PACKAGE_NAME = blueman
860-PACKAGE_STRING = blueman 1.23
861-PACKAGE_TARNAME = blueman
862-PACKAGE_URL =
863-PACKAGE_VERSION = 1.23
864-PATH_SEPARATOR = :
865-PKGLIBDIR = /usr/local/lib/blueman
866-PKG_CONFIG = /usr/bin/pkg-config
867-PKG_CONFIG_LIBDIR =
868-PKG_CONFIG_PATH =
869-POFILES =
870-POSUB = po
871-PO_IN_DATADIR_FALSE =
872-PO_IN_DATADIR_TRUE =
873-PYGTK_CFLAGS = -pthread -I/usr/include/gtk-2.0 -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include -I/usr/include/gio-unix-2.0/ -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libdrm -I/usr/include/libpng12 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng12 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/pygtk-2.0
874-PYGTK_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -lpangocairo-1.0 -latk-1.0 -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lfontconfig -lfreetype
875-PYNOTIFY_CFLAGS = -I/usr/include/gnome-python-2.0
876-PYNOTIFY_LIBS =
877-PYREXC = /usr/bin/pyrexc
878-PYTHON = /usr/bin/python
879-PYTHONDIR = /usr/local/lib/python2.7/dist-packages
880-PYTHON_EXEC_PREFIX = ${exec_prefix}
881-PYTHON_INCLUDES = -I/usr/include/python2.7 -I/usr/include/x86_64-linux-gnu/python2.7
882-PYTHON_LIBS = -lpthread -ldl -lutil -lm -lpython2.7
883-PYTHON_PLATFORM = linux2
884-PYTHON_PREFIX = ${prefix}
885-PYTHON_VERSION = 2.7
886-RANLIB = ranlib
887-SED = /bin/sed
888-SET_MAKE =
889-SHELL = /bin/bash
890-STRIP = strip
891-SYSCONFDIR = /etc
892-USE_NLS = yes
893-VERSION = 1.23
894-XGETTEXT = /usr/bin/xgettext
895-abs_builddir = /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb
896-abs_srcdir = /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb
897-abs_top_builddir = /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb
898-abs_top_srcdir = /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb
899-ac_ct_AR = ar
900-ac_ct_CC = gcc
901-ac_ct_DUMPBIN =
902-am__include = include
903-am__leading_dot = .
904-am__quote =
905-am__tar = $${TAR-tar} chof - "$$tardir"
906-am__untar = $${TAR-tar} xf -
907-bindir = ${exec_prefix}/bin
908-build = x86_64-unknown-linux-gnu
909-build_alias =
910-build_cpu = x86_64
911-build_os = linux-gnu
912-build_vendor = unknown
913-builddir = .
914-datadir = ${datarootdir}
915-datarootdir = ${prefix}/share
916-dhconfig = /etc/dhcp3/dhcpd.conf
917-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
918-dvidir = ${docdir}
919-exec_prefix = ${prefix}
920-hal_en = no
921-host = x86_64-unknown-linux-gnu
922-host_alias =
923-host_cpu = x86_64
924-host_os = linux-gnu
925-host_vendor = unknown
926-htmldir = ${docdir}
927-includedir = ${prefix}/include
928-infodir = ${datarootdir}/info
929-install_sh = ${SHELL} /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb/install-sh
930-intltool__v_merge_options_ = $(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))
931-intltool__v_merge_options_0 = -q
932-libdir = ${exec_prefix}/lib
933-libexecdir = ${exec_prefix}/libexec
934-localedir = ${datarootdir}/locale
935-localstatedir = ${prefix}/var
936-mandir = ${datarootdir}/man
937-mkdir_p = $(MKDIR_P)
938-oldincludedir = /usr/include
939-pdfdir = ${docdir}
940-pkgpyexecdir = ${pyexecdir}/blueman
941-pkgpythondir = ${pythondir}/blueman
942-polkit_val = yes
943-prefix = /usr/local
944-program_transform_name = s,x,x,
945-psdir = ${docdir}
946-pyexecdir = ${exec_prefix}/lib/python2.7/dist-packages
947-pythondir = ${prefix}/lib/python2.7/dist-packages
948-sbindir = ${exec_prefix}/sbin
949-sharedstatedir = ${prefix}/com
950-srcdir = .
951-sysconfdir = /etc
952-target_alias =
953-top_build_prefix =
954-top_builddir = .
955-top_srcdir = .
956-SUBDIRS = \
957- apps \
958- blueman \
959- data \
960- module \
961- sendto \
962- po
963-
964-EXTRA_DIST = \
965- intltool-extract.in \
966- intltool-update.in \
967- intltool-merge.in
968-
969-DISTCLEANFILES = \
970- intltool-extract \
971- intltool-update \
972- intltool-merge
973-
974-MAINTAINERCLEANFILES = \
975- Makefile.in \
976- aclocal.m4 \
977- configure \
978- config.h.in \
979- depcomp \
980- missing \
981- install-sh \
982- intltool-extract.in \
983- intltool-update.in \
984- intltool-merge.in
985-
986-all: config.h
987- $(MAKE) $(AM_MAKEFLAGS) all-recursive
988-
989-.SUFFIXES:
990-am--refresh: Makefile
991- @:
992-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
993- @for dep in $?; do \
994- case '$(am__configure_deps)' in \
995- *$$dep*) \
996- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
997- $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
998- && exit 0; \
999- exit 1;; \
1000- esac; \
1001- done; \
1002- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
1003- $(am__cd) $(top_srcdir) && \
1004- $(AUTOMAKE) --foreign Makefile
1005-.PRECIOUS: Makefile
1006-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
1007- @case '$?' in \
1008- *config.status*) \
1009- echo ' $(SHELL) ./config.status'; \
1010- $(SHELL) ./config.status;; \
1011- *) \
1012- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
1013- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
1014- esac;
1015-
1016-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
1017- $(SHELL) ./config.status --recheck
1018-
1019-$(top_srcdir)/configure: $(am__configure_deps)
1020- $(am__cd) $(srcdir) && $(AUTOCONF)
1021-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
1022- $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
1023-$(am__aclocal_m4_deps):
1024-
1025-config.h: stamp-h1
1026- @test -f $@ || rm -f stamp-h1
1027- @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
1028-
1029-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
1030- @rm -f stamp-h1
1031- cd $(top_builddir) && $(SHELL) ./config.status config.h
1032-$(srcdir)/config.h.in: $(am__configure_deps)
1033- ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
1034- rm -f stamp-h1
1035- touch $@
1036-
1037-distclean-hdr:
1038- -rm -f config.h stamp-h1
1039-
1040-mostlyclean-libtool:
1041- -rm -f *.lo
1042-
1043-clean-libtool:
1044- -rm -rf .libs _libs
1045-
1046-distclean-libtool:
1047- -rm -f libtool config.lt
1048-
1049-# This directory's subdirectories are mostly independent; you can cd
1050-# into them and run 'make' without going through this Makefile.
1051-# To change the values of 'make' variables: instead of editing Makefiles,
1052-# (1) if the variable is set in 'config.status', edit 'config.status'
1053-# (which will cause the Makefiles to be regenerated when you run 'make');
1054-# (2) otherwise, pass the desired values on the 'make' command line.
1055-$(am__recursive_targets):
1056- @fail=; \
1057- if $(am__make_keepgoing); then \
1058- failcom='fail=yes'; \
1059- else \
1060- failcom='exit 1'; \
1061- fi; \
1062- dot_seen=no; \
1063- target=`echo $@ | sed s/-recursive//`; \
1064- case "$@" in \
1065- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
1066- *) list='$(SUBDIRS)' ;; \
1067- esac; \
1068- for subdir in $$list; do \
1069- echo "Making $$target in $$subdir"; \
1070- if test "$$subdir" = "."; then \
1071- dot_seen=yes; \
1072- local_target="$$target-am"; \
1073- else \
1074- local_target="$$target"; \
1075- fi; \
1076- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
1077- || eval $$failcom; \
1078- done; \
1079- if test "$$dot_seen" = "no"; then \
1080- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
1081- fi; test -z "$$fail"
1082-
1083-ID: $(am__tagged_files)
1084- $(am__define_uniq_tagged_files); mkid -fID $$unique
1085-tags: tags-recursive
1086-TAGS: tags
1087-
1088-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
1089- set x; \
1090- here=`pwd`; \
1091- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
1092- include_option=--etags-include; \
1093- empty_fix=.; \
1094- else \
1095- include_option=--include; \
1096- empty_fix=; \
1097- fi; \
1098- list='$(SUBDIRS)'; for subdir in $$list; do \
1099- if test "$$subdir" = .; then :; else \
1100- test ! -f $$subdir/TAGS || \
1101- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
1102- fi; \
1103- done; \
1104- $(am__define_uniq_tagged_files); \
1105- shift; \
1106- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
1107- test -n "$$unique" || unique=$$empty_fix; \
1108- if test $$# -gt 0; then \
1109- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
1110- "$$@" $$unique; \
1111- else \
1112- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
1113- $$unique; \
1114- fi; \
1115- fi
1116-ctags: ctags-recursive
1117-
1118-CTAGS: ctags
1119-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
1120- $(am__define_uniq_tagged_files); \
1121- test -z "$(CTAGS_ARGS)$$unique" \
1122- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
1123- $$unique
1124-
1125-GTAGS:
1126- here=`$(am__cd) $(top_builddir) && pwd` \
1127- && $(am__cd) $(top_srcdir) \
1128- && gtags -i $(GTAGS_ARGS) "$$here"
1129-cscope: cscope.files
1130- test ! -s cscope.files \
1131- || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
1132-clean-cscope:
1133- -rm -f cscope.files
1134-cscope.files: clean-cscope cscopelist
1135-cscopelist: cscopelist-recursive
1136-
1137-cscopelist-am: $(am__tagged_files)
1138- list='$(am__tagged_files)'; \
1139- case "$(srcdir)" in \
1140- [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
1141- *) sdir=$(subdir)/$(srcdir) ;; \
1142- esac; \
1143- for i in $$list; do \
1144- if test -f "$$i"; then \
1145- echo "$(subdir)/$$i"; \
1146- else \
1147- echo "$$sdir/$$i"; \
1148- fi; \
1149- done >> $(top_builddir)/cscope.files
1150-
1151-distclean-tags:
1152- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
1153- -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
1154-
1155-distdir: $(DISTFILES)
1156- $(am__remove_distdir)
1157- test -d "$(distdir)" || mkdir "$(distdir)"
1158- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
1159- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
1160- list='$(DISTFILES)'; \
1161- dist_files=`for file in $$list; do echo $$file; done | \
1162- sed -e "s|^$$srcdirstrip/||;t" \
1163- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
1164- case $$dist_files in \
1165- */*) $(MKDIR_P) `echo "$$dist_files" | \
1166- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
1167- sort -u` ;; \
1168- esac; \
1169- for file in $$dist_files; do \
1170- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
1171- if test -d $$d/$$file; then \
1172- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
1173- if test -d "$(distdir)/$$file"; then \
1174- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
1175- fi; \
1176- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
1177- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
1178- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
1179- fi; \
1180- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
1181- else \
1182- test -f "$(distdir)/$$file" \
1183- || cp -p $$d/$$file "$(distdir)/$$file" \
1184- || exit 1; \
1185- fi; \
1186- done
1187- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
1188- if test "$$subdir" = .; then :; else \
1189- $(am__make_dryrun) \
1190- || test -d "$(distdir)/$$subdir" \
1191- || $(MKDIR_P) "$(distdir)/$$subdir" \
1192- || exit 1; \
1193- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
1194- $(am__relativize); \
1195- new_distdir=$$reldir; \
1196- dir1=$$subdir; dir2="$(top_distdir)"; \
1197- $(am__relativize); \
1198- new_top_distdir=$$reldir; \
1199- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
1200- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
1201- ($(am__cd) $$subdir && \
1202- $(MAKE) $(AM_MAKEFLAGS) \
1203- top_distdir="$$new_top_distdir" \
1204- distdir="$$new_distdir" \
1205- am__remove_distdir=: \
1206- am__skip_length_check=: \
1207- am__skip_mode_fix=: \
1208- distdir) \
1209- || exit 1; \
1210- fi; \
1211- done
1212- -test -n "$(am__skip_mode_fix)" \
1213- || find "$(distdir)" -type d ! -perm -755 \
1214- -exec chmod u+rwx,go+rx {} \; -o \
1215- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
1216- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
1217- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
1218- || chmod -R a+r "$(distdir)"
1219-dist-gzip: distdir
1220- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
1221- $(am__post_remove_distdir)
1222-
1223-dist-bzip2: distdir
1224- tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
1225- $(am__post_remove_distdir)
1226-
1227-dist-lzip: distdir
1228- tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
1229- $(am__post_remove_distdir)
1230-
1231-dist-xz: distdir
1232- tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
1233- $(am__post_remove_distdir)
1234-
1235-dist-tarZ: distdir
1236- @echo WARNING: "Support for shar distribution archives is" \
1237- "deprecated." >&2
1238- @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
1239- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
1240- $(am__post_remove_distdir)
1241-
1242-dist-shar: distdir
1243- @echo WARNING: "Support for distribution archives compressed with" \
1244- "legacy program 'compress' is deprecated." >&2
1245- @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
1246- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
1247- $(am__post_remove_distdir)
1248-
1249-dist-zip: distdir
1250- -rm -f $(distdir).zip
1251- zip -rq $(distdir).zip $(distdir)
1252- $(am__post_remove_distdir)
1253-
1254-dist dist-all:
1255- $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
1256- $(am__post_remove_distdir)
1257-
1258-# This target untars the dist file and tries a VPATH configuration. Then
1259-# it guarantees that the distribution is self-contained by making another
1260-# tarfile.
1261-distcheck: dist
1262- case '$(DIST_ARCHIVES)' in \
1263- *.tar.gz*) \
1264- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
1265- *.tar.bz2*) \
1266- bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
1267- *.tar.lz*) \
1268- lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
1269- *.tar.xz*) \
1270- xz -dc $(distdir).tar.xz | $(am__untar) ;;\
1271- *.tar.Z*) \
1272- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
1273- *.shar.gz*) \
1274- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
1275- *.zip*) \
1276- unzip $(distdir).zip ;;\
1277- esac
1278- chmod -R a-w $(distdir)
1279- chmod u+w $(distdir)
1280- mkdir $(distdir)/_build $(distdir)/_inst
1281- chmod a-w $(distdir)
1282- test -d $(distdir)/_build || exit 0; \
1283- dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
1284- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
1285- && am__cwd=`pwd` \
1286- && $(am__cd) $(distdir)/_build \
1287- && ../configure \
1288- $(AM_DISTCHECK_CONFIGURE_FLAGS) \
1289- $(DISTCHECK_CONFIGURE_FLAGS) \
1290- --srcdir=.. --prefix="$$dc_install_base" \
1291- && $(MAKE) $(AM_MAKEFLAGS) \
1292- && $(MAKE) $(AM_MAKEFLAGS) dvi \
1293- && $(MAKE) $(AM_MAKEFLAGS) check \
1294- && $(MAKE) $(AM_MAKEFLAGS) install \
1295- && $(MAKE) $(AM_MAKEFLAGS) installcheck \
1296- && $(MAKE) $(AM_MAKEFLAGS) uninstall \
1297- && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
1298- distuninstallcheck \
1299- && chmod -R a-w "$$dc_install_base" \
1300- && ({ \
1301- (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
1302- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
1303- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
1304- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
1305- distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
1306- } || { rm -rf "$$dc_destdir"; exit 1; }) \
1307- && rm -rf "$$dc_destdir" \
1308- && $(MAKE) $(AM_MAKEFLAGS) dist \
1309- && rm -rf $(DIST_ARCHIVES) \
1310- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
1311- && cd "$$am__cwd" \
1312- || exit 1
1313- $(am__post_remove_distdir)
1314- @(echo "$(distdir) archives ready for distribution: "; \
1315- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
1316- sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
1317-distuninstallcheck:
1318- @test -n '$(distuninstallcheck_dir)' || { \
1319- echo 'ERROR: trying to run $@ with an empty' \
1320- '$$(distuninstallcheck_dir)' >&2; \
1321- exit 1; \
1322- }; \
1323- $(am__cd) '$(distuninstallcheck_dir)' || { \
1324- echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
1325- exit 1; \
1326- }; \
1327- test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
1328- || { echo "ERROR: files left after uninstall:" ; \
1329- if test -n "$(DESTDIR)"; then \
1330- echo " (check DESTDIR support)"; \
1331- fi ; \
1332- $(distuninstallcheck_listfiles) ; \
1333- exit 1; } >&2
1334-distcleancheck: distclean
1335- @if test '$(srcdir)' = . ; then \
1336- echo "ERROR: distcleancheck can only run from a VPATH build" ; \
1337- exit 1 ; \
1338- fi
1339- @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
1340- || { echo "ERROR: files left in build directory after distclean:" ; \
1341- $(distcleancheck_listfiles) ; \
1342- exit 1; } >&2
1343-check-am: all-am
1344-check: check-recursive
1345-all-am: Makefile config.h
1346-installdirs: installdirs-recursive
1347-installdirs-am:
1348-install: install-recursive
1349-install-exec: install-exec-recursive
1350-install-data: install-data-recursive
1351-uninstall: uninstall-recursive
1352-
1353-install-am: all-am
1354- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
1355-
1356-installcheck: installcheck-recursive
1357-install-strip:
1358- if test -z '$(STRIP)'; then \
1359- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
1360- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
1361- install; \
1362- else \
1363- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
1364- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
1365- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
1366- fi
1367-mostlyclean-generic:
1368-
1369-clean-generic:
1370-
1371-distclean-generic:
1372- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
1373- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
1374- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
1375-
1376-maintainer-clean-generic:
1377- @echo "This command is intended for maintainers to use"
1378- @echo "it deletes files that may require special tools to rebuild."
1379- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
1380-clean: clean-recursive
1381-
1382-clean-am: clean-generic clean-libtool mostlyclean-am
1383-
1384-distclean: distclean-recursive
1385- -rm -f $(am__CONFIG_DISTCLEAN_FILES)
1386- -rm -f Makefile
1387-distclean-am: clean-am distclean-generic distclean-hdr \
1388- distclean-libtool distclean-tags
1389-
1390-dvi: dvi-recursive
1391-
1392-dvi-am:
1393-
1394-html: html-recursive
1395-
1396-html-am:
1397-
1398-info: info-recursive
1399-
1400-info-am:
1401-
1402-install-data-am:
1403-
1404-install-dvi: install-dvi-recursive
1405-
1406-install-dvi-am:
1407-
1408-install-exec-am:
1409-
1410-install-html: install-html-recursive
1411-
1412-install-html-am:
1413-
1414-install-info: install-info-recursive
1415-
1416-install-info-am:
1417-
1418-install-man:
1419-
1420-install-pdf: install-pdf-recursive
1421-
1422-install-pdf-am:
1423-
1424-install-ps: install-ps-recursive
1425-
1426-install-ps-am:
1427-
1428-installcheck-am:
1429-
1430-maintainer-clean: maintainer-clean-recursive
1431- -rm -f $(am__CONFIG_DISTCLEAN_FILES)
1432- -rm -rf $(top_srcdir)/autom4te.cache
1433- -rm -f Makefile
1434-maintainer-clean-am: distclean-am maintainer-clean-generic
1435-
1436-mostlyclean: mostlyclean-recursive
1437-
1438-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
1439-
1440-pdf: pdf-recursive
1441-
1442-pdf-am:
1443-
1444-ps: ps-recursive
1445-
1446-ps-am:
1447-
1448-uninstall-am:
1449-
1450-.MAKE: $(am__recursive_targets) all install-am install-strip
1451-
1452-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
1453- am--refresh check check-am clean clean-cscope clean-generic \
1454- clean-libtool cscope cscopelist-am ctags ctags-am dist \
1455- dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
1456- dist-xz dist-zip distcheck distclean distclean-generic \
1457- distclean-hdr distclean-libtool distclean-tags distcleancheck \
1458- distdir distuninstallcheck dvi dvi-am html html-am info \
1459- info-am install install-am install-data install-data-am \
1460- install-dvi install-dvi-am install-exec install-exec-am \
1461- install-html install-html-am install-info install-info-am \
1462- install-man install-pdf install-pdf-am install-ps \
1463- install-ps-am install-strip installcheck installcheck-am \
1464- installdirs installdirs-am maintainer-clean \
1465- maintainer-clean-generic mostlyclean mostlyclean-generic \
1466- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
1467- uninstall-am
1468-
1469-
1470-# Tell versions [3.59,3.63) of GNU make to not export all variables.
1471-# Otherwise a system limit (for SysV at least) may be exceeded.
1472-.NOEXPORT:
1473
1474=== modified file 'Makefile.in'
1475--- Makefile.in 2014-04-09 16:54:36 +0000
1476+++ Makefile.in 2014-08-11 05:53:12 +0000
1477@@ -284,15 +284,13 @@
1478 POSUB = @POSUB@
1479 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
1480 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
1481-PYGTK_CFLAGS = @PYGTK_CFLAGS@
1482-PYGTK_LIBS = @PYGTK_LIBS@
1483-PYNOTIFY_CFLAGS = @PYNOTIFY_CFLAGS@
1484-PYNOTIFY_LIBS = @PYNOTIFY_LIBS@
1485+PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
1486+PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
1487 PYREXC = @PYREXC@
1488 PYTHON = @PYTHON@
1489 PYTHONDIR = @PYTHONDIR@
1490+PYTHON_CFLAGS = @PYTHON_CFLAGS@
1491 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
1492-PYTHON_INCLUDES = @PYTHON_INCLUDES@
1493 PYTHON_LIBS = @PYTHON_LIBS@
1494 PYTHON_PLATFORM = @PYTHON_PLATFORM@
1495 PYTHON_PREFIX = @PYTHON_PREFIX@
1496
1497=== modified file 'README.md'
1498--- README.md 2014-03-10 22:01:00 +0000
1499+++ README.md 2014-08-11 05:53:12 +0000
1500@@ -31,14 +31,13 @@
1501 * [dbus](http://www.freedesktop.org/wiki/Software/dbus/)
1502 * [dbus-python](http://www.freedesktop.org/wiki/Software/DBusBindings/#python)
1503 * [GLib 2](http://www.gtk.org/) (>= 2.32)
1504-* [GTK+ 2](http://www.gtk.org/) (>= 2.16)
1505+* [GTK+ 3](http://www.gtk.org/)
1506 * [libappindicator](https://launchpad.net/libappindicator) (optional)
1507-* [notification-daemon](http://galago-project.org/)
1508-* [notify-python](http://galago-project.org/)
1509+* [notification-daemon](https://git.gnome.org/browse/notification-daemon) or any desktop specific replacement
1510+* [libnotify](https://git.gnome.org/browse/libnotify)
1511 * [obex-data-server](http://wiki.muiline.com/obex-data-server) (>= 0.4.3)
1512 * [pulseaudio](http://www.freedesktop.org/wiki/Software/PulseAudio/)
1513 * [PyGObject](https://wiki.gnome.org/PyGObject)
1514-* [PyGTK](http://www.pygtk.org/) (>= 2.16)
1515 * [Python 2](http://www.python.org/) (>= 2.6)
1516 * [startup-notification](http://www.freedesktop.org/wiki/Software/startup-notification/)
1517
1518@@ -64,18 +63,19 @@
1519
1520 Development snapshots of blueman 2:
1521
1522-* [Arch Linux](https://www.archlinux.org/packages/?name=blueman)
1523 * [Debian GNU/Linux](http://packages.debian.org/search?keywords=blueman)
1524 * [Ubuntu](http://packages.ubuntu.com/search?keywords=blueman)
1525
1526 Older versions:
1527
1528+* [Arch Linux](https://aur.archlinux.org/packages/blueman-bzr)
1529 * CentOS
1530 * [Fedora](https://apps.fedoraproject.org/packages/blueman)
1531 * [Gentoo Linux](http://packages.gentoo.org/package/net-wireless/blueman)
1532 * Linux Mint
1533 * [Mageia](http://mageia.madb.org/package/show/name/blueman)
1534 * [openSUSE](http://software.opensuse.org/package/blueman?search_term=blueman)
1535+* OpenMandriva
1536
1537 ## Contributing
1538
1539
1540=== modified file 'acinclude.m4'
1541--- acinclude.m4 2014-01-21 08:54:58 +0000
1542+++ acinclude.m4 2014-08-11 05:53:12 +0000
1543@@ -88,8 +88,8 @@
1544 [AC_REQUIRE([AM_PATH_PYTHON])
1545 AC_MSG_CHECKING(for headers required to compile python extensions)
1546 dnl deduce PYTHON_INCLUDES
1547-py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
1548-py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
1549+py_prefix=`$PYTHON -c "import sys; print(sys.prefix)"`
1550+py_exec_prefix=`$PYTHON -c "import sys; print(sys.exec_prefix)"`
1551 PYTHON_INCLUDES=`python-config --includes`
1552 if test "$py_prefix" != "$py_exec_prefix"; then
1553 PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
1554
1555=== removed file 'apps/Makefile'
1556--- apps/Makefile 2014-07-01 12:11:00 +0000
1557+++ apps/Makefile 1970-01-01 00:00:00 +0000
1558@@ -1,600 +0,0 @@
1559-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1560-# apps/Makefile. Generated from Makefile.in by configure.
1561-
1562-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
1563-
1564-# This Makefile.in is free software; the Free Software Foundation
1565-# gives unlimited permission to copy and/or distribute it,
1566-# with or without modifications, as long as this notice is preserved.
1567-
1568-# This program is distributed in the hope that it will be useful,
1569-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
1570-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
1571-# PARTICULAR PURPOSE.
1572-
1573-
1574-
1575-
1576-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
1577-am__make_running_with_option = \
1578- case $${target_option-} in \
1579- ?) ;; \
1580- *) echo "am__make_running_with_option: internal error: invalid" \
1581- "target option '$${target_option-}' specified" >&2; \
1582- exit 1;; \
1583- esac; \
1584- has_opt=no; \
1585- sane_makeflags=$$MAKEFLAGS; \
1586- if $(am__is_gnu_make); then \
1587- sane_makeflags=$$MFLAGS; \
1588- else \
1589- case $$MAKEFLAGS in \
1590- *\\[\ \ ]*) \
1591- bs=\\; \
1592- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
1593- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
1594- esac; \
1595- fi; \
1596- skip_next=no; \
1597- strip_trailopt () \
1598- { \
1599- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
1600- }; \
1601- for flg in $$sane_makeflags; do \
1602- test $$skip_next = yes && { skip_next=no; continue; }; \
1603- case $$flg in \
1604- *=*|--*) continue;; \
1605- -*I) strip_trailopt 'I'; skip_next=yes;; \
1606- -*I?*) strip_trailopt 'I';; \
1607- -*O) strip_trailopt 'O'; skip_next=yes;; \
1608- -*O?*) strip_trailopt 'O';; \
1609- -*l) strip_trailopt 'l'; skip_next=yes;; \
1610- -*l?*) strip_trailopt 'l';; \
1611- -[dEDm]) skip_next=yes;; \
1612- -[JT]) skip_next=yes;; \
1613- esac; \
1614- case $$flg in \
1615- *$$target_option*) has_opt=yes; break;; \
1616- esac; \
1617- done; \
1618- test $$has_opt = yes
1619-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
1620-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
1621-pkgincludedir = $(includedir)/blueman
1622-pkglibdir = $(libdir)/blueman
1623-pkglibexecdir = $(libexecdir)/blueman
1624-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
1625-install_sh_DATA = $(install_sh) -c -m 644
1626-install_sh_PROGRAM = $(install_sh) -c
1627-install_sh_SCRIPT = $(install_sh) -c
1628-INSTALL_HEADER = $(INSTALL_DATA)
1629-transform = $(program_transform_name)
1630-NORMAL_INSTALL = :
1631-PRE_INSTALL = :
1632-POST_INSTALL = :
1633-NORMAL_UNINSTALL = :
1634-PRE_UNINSTALL = :
1635-POST_UNINSTALL = :
1636-build_triplet = x86_64-unknown-linux-gnu
1637-host_triplet = x86_64-unknown-linux-gnu
1638-subdir = apps
1639-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
1640-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
1641-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
1642- $(top_srcdir)/configure.ac
1643-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1644- $(ACLOCAL_M4)
1645-mkinstalldirs = $(install_sh) -d
1646-CONFIG_HEADER = $(top_builddir)/config.h
1647-CONFIG_CLEAN_FILES =
1648-CONFIG_CLEAN_VPATH_FILES =
1649-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
1650-am__vpath_adj = case $$p in \
1651- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
1652- *) f=$$p;; \
1653- esac;
1654-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
1655-am__install_max = 40
1656-am__nobase_strip_setup = \
1657- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
1658-am__nobase_strip = \
1659- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
1660-am__nobase_list = $(am__nobase_strip_setup); \
1661- for p in $$list; do echo "$$p $$p"; done | \
1662- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
1663- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
1664- if (++n[$$2] == $(am__install_max)) \
1665- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
1666- END { for (dir in files) print dir, files[dir] }'
1667-am__base_list = \
1668- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
1669- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
1670-am__uninstall_files_from_dir = { \
1671- test -z "$$files" \
1672- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
1673- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
1674- $(am__cd) "$$dir" && rm -f $$files; }; \
1675- }
1676-am__installdirs = "$(DESTDIR)$(appsdir)" "$(DESTDIR)$(polkitdir)"
1677-SCRIPTS = $(apps_SCRIPTS) $(polkit_SCRIPTS)
1678-AM_V_P = $(am__v_P_$(V))
1679-am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY))
1680-am__v_P_0 = false
1681-am__v_P_1 = :
1682-AM_V_GEN = $(am__v_GEN_$(V))
1683-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
1684-am__v_GEN_0 = @echo " GEN " $@;
1685-am__v_GEN_1 =
1686-AM_V_at = $(am__v_at_$(V))
1687-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
1688-am__v_at_0 = @
1689-am__v_at_1 =
1690-SOURCES =
1691-DIST_SOURCES =
1692-am__can_run_installinfo = \
1693- case $$AM_UPDATE_INFO_DIR in \
1694- n|no|NO) false;; \
1695- *) (install-info --version) >/dev/null 2>&1;; \
1696- esac
1697-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
1698-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
1699-pkgdatadir = /usr/local/share/blueman
1700-ACLOCAL = ${SHELL} /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb/missing aclocal-1.14
1701-ALL_LINGUAS =
1702-AMTAR = $${TAR-tar}
1703-AM_DEFAULT_VERBOSITY = 1
1704-AR = ar
1705-AUTOCONF = ${SHELL} /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb/missing autoconf
1706-AUTOHEADER = ${SHELL} /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb/missing autoheader
1707-AUTOMAKE = ${SHELL} /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb/missing automake-1.14
1708-AWK = gawk
1709-BINDIR = /usr/local/bin
1710-BLUEZ_CFLAGS = -pthread -I/usr/include/startup-notification-1.0 -I/usr/include/gtk-2.0 -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include -I/usr/include/gio-unix-2.0/ -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libdrm -I/usr/include/libpng12 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng12 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pygtk-2.0
1711-BLUEZ_LIBS = -lbluetooth -lstartup-notification-1 -lgtk-x11-2.0 -lgdk-x11-2.0 -lpangocairo-1.0 -latk-1.0 -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lpangoft2-1.0 -lpango-1.0 -lfontconfig -lfreetype -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0
1712-CATALOGS =
1713-CATOBJEXT = .gmo
1714-CC = gcc
1715-CCDEPMODE = depmode=gcc3
1716-CFLAGS = -g -O2
1717-CPP = gcc -E
1718-CPPFLAGS =
1719-CYGPATH_W = echo
1720-DATADIR = /usr/local/share
1721-DATADIRNAME = share
1722-DEFS = -DHAVE_CONFIG_H
1723-DEPDIR = .deps
1724-DLLTOOL = false
1725-DSYMUTIL =
1726-DUMPBIN =
1727-ECHO_C =
1728-ECHO_N = -n
1729-ECHO_T =
1730-EGREP = /bin/grep -E
1731-EXEEXT =
1732-FGREP = /bin/grep -F
1733-GETTEXT_PACKAGE = blueman
1734-GMOFILES =
1735-GMSGFMT = /usr/bin/msgfmt
1736-GREP = /bin/grep
1737-INSTALL = /usr/bin/install -c
1738-INSTALL_DATA = ${INSTALL} -m 644
1739-INSTALL_PROGRAM = ${INSTALL}
1740-INSTALL_SCRIPT = ${INSTALL}
1741-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
1742-INSTOBJEXT = .mo
1743-INTLLIBS =
1744-INTLTOOL_EXTRACT = /usr/bin/intltool-extract
1745-INTLTOOL_MERGE = /usr/bin/intltool-merge
1746-INTLTOOL_PERL = /usr/bin/perl
1747-INTLTOOL_UPDATE = /usr/bin/intltool-update
1748-INTLTOOL_V_MERGE = $(INTLTOOL__v_MERGE_$(V))
1749-INTLTOOL_V_MERGE_OPTIONS = $(intltool__v_merge_options_$(V))
1750-INTLTOOL__v_MERGE_ = $(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))
1751-INTLTOOL__v_MERGE_0 = @echo " ITMRG " $@;
1752-LD = /usr/bin/ld -m elf_x86_64
1753-LDFLAGS =
1754-LIBEXECDIR = /usr/local/libexec
1755-LIBOBJS =
1756-LIBS =
1757-LIBTOOL = $(SHELL) $(top_builddir)/libtool
1758-LIPO =
1759-LN_S = ln -s
1760-LOCALEDIR = /usr/local/share/locale
1761-LTLIBOBJS =
1762-MAINT =
1763-MAKEINFO = ${SHELL} /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb/missing makeinfo
1764-MANIFEST_TOOL = :
1765-MKDIR_P = /bin/mkdir -p
1766-MKINSTALLDIRS = ./mkinstalldirs
1767-MSGFMT = /usr/bin/msgfmt
1768-MSGFMT_OPTS = -c
1769-MSGMERGE = /usr/bin/msgmerge
1770-NM = /usr/bin/nm -B
1771-NMEDIT =
1772-OBJDUMP = objdump
1773-OBJEXT = o
1774-OTOOL =
1775-OTOOL64 =
1776-PACKAGE = blueman
1777-PACKAGE_BUGREPORT =
1778-PACKAGE_NAME = blueman
1779-PACKAGE_STRING = blueman 1.23
1780-PACKAGE_TARNAME = blueman
1781-PACKAGE_URL =
1782-PACKAGE_VERSION = 1.23
1783-PATH_SEPARATOR = :
1784-PKGLIBDIR = /usr/local/lib/blueman
1785-PKG_CONFIG = /usr/bin/pkg-config
1786-PKG_CONFIG_LIBDIR =
1787-PKG_CONFIG_PATH =
1788-POFILES =
1789-POSUB = po
1790-PO_IN_DATADIR_FALSE =
1791-PO_IN_DATADIR_TRUE =
1792-PYGTK_CFLAGS = -pthread -I/usr/include/gtk-2.0 -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include -I/usr/include/gio-unix-2.0/ -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libdrm -I/usr/include/libpng12 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng12 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/pygtk-2.0
1793-PYGTK_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -lpangocairo-1.0 -latk-1.0 -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lfontconfig -lfreetype
1794-PYNOTIFY_CFLAGS = -I/usr/include/gnome-python-2.0
1795-PYNOTIFY_LIBS =
1796-PYREXC = /usr/bin/pyrexc
1797-PYTHON = /usr/bin/python
1798-PYTHONDIR = /usr/local/lib/python2.7/dist-packages
1799-PYTHON_EXEC_PREFIX = ${exec_prefix}
1800-PYTHON_INCLUDES = -I/usr/include/python2.7 -I/usr/include/x86_64-linux-gnu/python2.7
1801-PYTHON_LIBS = -lpthread -ldl -lutil -lm -lpython2.7
1802-PYTHON_PLATFORM = linux2
1803-PYTHON_PREFIX = ${prefix}
1804-PYTHON_VERSION = 2.7
1805-RANLIB = ranlib
1806-SED = /bin/sed
1807-SET_MAKE =
1808-SHELL = /bin/bash
1809-STRIP = strip
1810-SYSCONFDIR = /etc
1811-USE_NLS = yes
1812-VERSION = 1.23
1813-XGETTEXT = /usr/bin/xgettext
1814-abs_builddir = /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb/apps
1815-abs_srcdir = /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb/apps
1816-abs_top_builddir = /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb
1817-abs_top_srcdir = /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb
1818-ac_ct_AR = ar
1819-ac_ct_CC = gcc
1820-ac_ct_DUMPBIN =
1821-am__include = include
1822-am__leading_dot = .
1823-am__quote =
1824-am__tar = $${TAR-tar} chof - "$$tardir"
1825-am__untar = $${TAR-tar} xf -
1826-bindir = ${exec_prefix}/bin
1827-build = x86_64-unknown-linux-gnu
1828-build_alias =
1829-build_cpu = x86_64
1830-build_os = linux-gnu
1831-build_vendor = unknown
1832-builddir = .
1833-datadir = ${datarootdir}
1834-datarootdir = ${prefix}/share
1835-dhconfig = /etc/dhcp3/dhcpd.conf
1836-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
1837-dvidir = ${docdir}
1838-exec_prefix = ${prefix}
1839-hal_en = no
1840-host = x86_64-unknown-linux-gnu
1841-host_alias =
1842-host_cpu = x86_64
1843-host_os = linux-gnu
1844-host_vendor = unknown
1845-htmldir = ${docdir}
1846-includedir = ${prefix}/include
1847-infodir = ${datarootdir}/info
1848-install_sh = ${SHELL} /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb/install-sh
1849-intltool__v_merge_options_ = $(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))
1850-intltool__v_merge_options_0 = -q
1851-libdir = ${exec_prefix}/lib
1852-libexecdir = ${exec_prefix}/libexec
1853-localedir = ${datarootdir}/locale
1854-localstatedir = ${prefix}/var
1855-mandir = ${datarootdir}/man
1856-mkdir_p = $(MKDIR_P)
1857-oldincludedir = /usr/include
1858-pdfdir = ${docdir}
1859-pkgpyexecdir = ${pyexecdir}/blueman
1860-pkgpythondir = ${pythondir}/blueman
1861-polkit_val = yes
1862-prefix = /usr/local
1863-program_transform_name = s,x,x,
1864-psdir = ${docdir}
1865-pyexecdir = ${exec_prefix}/lib/python2.7/dist-packages
1866-pythondir = ${prefix}/lib/python2.7/dist-packages
1867-sbindir = ${exec_prefix}/sbin
1868-sharedstatedir = ${prefix}/com
1869-srcdir = .
1870-sysconfdir = /etc
1871-target_alias =
1872-top_build_prefix = ../
1873-top_builddir = ..
1874-top_srcdir = ..
1875-APPS = \
1876- blueman-adapters \
1877- blueman-applet \
1878- blueman-manager \
1879- blueman-services \
1880- blueman-sendto \
1881- blueman-assistant \
1882- blueman-browse
1883-
1884-appsdir = $(bindir)
1885-apps_SCRIPTS = $(APPS)
1886-polkitdir = $(libexecdir)
1887-polkit_SCRIPTS = \
1888- blueman-mechanism
1889-
1890-EXTRA_DIST = $(APPS) blueman-mechanism
1891-all: all-am
1892-
1893-.SUFFIXES:
1894-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
1895- @for dep in $?; do \
1896- case '$(am__configure_deps)' in \
1897- *$$dep*) \
1898- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
1899- && { if test -f $@; then exit 0; else break; fi; }; \
1900- exit 1;; \
1901- esac; \
1902- done; \
1903- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign apps/Makefile'; \
1904- $(am__cd) $(top_srcdir) && \
1905- $(AUTOMAKE) --foreign apps/Makefile
1906-.PRECIOUS: Makefile
1907-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
1908- @case '$?' in \
1909- *config.status*) \
1910- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
1911- *) \
1912- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
1913- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
1914- esac;
1915-
1916-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
1917- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
1918-
1919-$(top_srcdir)/configure: $(am__configure_deps)
1920- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
1921-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
1922- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
1923-$(am__aclocal_m4_deps):
1924-install-appsSCRIPTS: $(apps_SCRIPTS)
1925- @$(NORMAL_INSTALL)
1926- @list='$(apps_SCRIPTS)'; test -n "$(appsdir)" || list=; \
1927- if test -n "$$list"; then \
1928- echo " $(MKDIR_P) '$(DESTDIR)$(appsdir)'"; \
1929- $(MKDIR_P) "$(DESTDIR)$(appsdir)" || exit 1; \
1930- fi; \
1931- for p in $$list; do \
1932- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
1933- if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
1934- done | \
1935- sed -e 'p;s,.*/,,;n' \
1936- -e 'h;s|.*|.|' \
1937- -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
1938- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
1939- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
1940- if ($$2 == $$4) { files[d] = files[d] " " $$1; \
1941- if (++n[d] == $(am__install_max)) { \
1942- print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
1943- else { print "f", d "/" $$4, $$1 } } \
1944- END { for (d in files) print "f", d, files[d] }' | \
1945- while read type dir files; do \
1946- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
1947- test -z "$$files" || { \
1948- echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(appsdir)$$dir'"; \
1949- $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(appsdir)$$dir" || exit $$?; \
1950- } \
1951- ; done
1952-
1953-uninstall-appsSCRIPTS:
1954- @$(NORMAL_UNINSTALL)
1955- @list='$(apps_SCRIPTS)'; test -n "$(appsdir)" || exit 0; \
1956- files=`for p in $$list; do echo "$$p"; done | \
1957- sed -e 's,.*/,,;$(transform)'`; \
1958- dir='$(DESTDIR)$(appsdir)'; $(am__uninstall_files_from_dir)
1959-install-polkitSCRIPTS: $(polkit_SCRIPTS)
1960- @$(NORMAL_INSTALL)
1961- @list='$(polkit_SCRIPTS)'; test -n "$(polkitdir)" || list=; \
1962- if test -n "$$list"; then \
1963- echo " $(MKDIR_P) '$(DESTDIR)$(polkitdir)'"; \
1964- $(MKDIR_P) "$(DESTDIR)$(polkitdir)" || exit 1; \
1965- fi; \
1966- for p in $$list; do \
1967- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
1968- if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
1969- done | \
1970- sed -e 'p;s,.*/,,;n' \
1971- -e 'h;s|.*|.|' \
1972- -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
1973- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
1974- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
1975- if ($$2 == $$4) { files[d] = files[d] " " $$1; \
1976- if (++n[d] == $(am__install_max)) { \
1977- print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
1978- else { print "f", d "/" $$4, $$1 } } \
1979- END { for (d in files) print "f", d, files[d] }' | \
1980- while read type dir files; do \
1981- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
1982- test -z "$$files" || { \
1983- echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(polkitdir)$$dir'"; \
1984- $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(polkitdir)$$dir" || exit $$?; \
1985- } \
1986- ; done
1987-
1988-uninstall-polkitSCRIPTS:
1989- @$(NORMAL_UNINSTALL)
1990- @list='$(polkit_SCRIPTS)'; test -n "$(polkitdir)" || exit 0; \
1991- files=`for p in $$list; do echo "$$p"; done | \
1992- sed -e 's,.*/,,;$(transform)'`; \
1993- dir='$(DESTDIR)$(polkitdir)'; $(am__uninstall_files_from_dir)
1994-
1995-mostlyclean-libtool:
1996- -rm -f *.lo
1997-
1998-clean-libtool:
1999- -rm -rf .libs _libs
2000-tags TAGS:
2001-
2002-ctags CTAGS:
2003-
2004-cscope cscopelist:
2005-
2006-
2007-distdir: $(DISTFILES)
2008- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
2009- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
2010- list='$(DISTFILES)'; \
2011- dist_files=`for file in $$list; do echo $$file; done | \
2012- sed -e "s|^$$srcdirstrip/||;t" \
2013- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
2014- case $$dist_files in \
2015- */*) $(MKDIR_P) `echo "$$dist_files" | \
2016- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
2017- sort -u` ;; \
2018- esac; \
2019- for file in $$dist_files; do \
2020- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
2021- if test -d $$d/$$file; then \
2022- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
2023- if test -d "$(distdir)/$$file"; then \
2024- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
2025- fi; \
2026- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
2027- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
2028- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
2029- fi; \
2030- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
2031- else \
2032- test -f "$(distdir)/$$file" \
2033- || cp -p $$d/$$file "$(distdir)/$$file" \
2034- || exit 1; \
2035- fi; \
2036- done
2037-check-am: all-am
2038-check: check-am
2039-all-am: Makefile $(SCRIPTS)
2040-installdirs:
2041- for dir in "$(DESTDIR)$(appsdir)" "$(DESTDIR)$(polkitdir)"; do \
2042- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
2043- done
2044-install: install-am
2045-install-exec: install-exec-am
2046-install-data: install-data-am
2047-uninstall: uninstall-am
2048-
2049-install-am: all-am
2050- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
2051-
2052-installcheck: installcheck-am
2053-install-strip:
2054- if test -z '$(STRIP)'; then \
2055- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
2056- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
2057- install; \
2058- else \
2059- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
2060- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
2061- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
2062- fi
2063-mostlyclean-generic:
2064-
2065-clean-generic:
2066-
2067-distclean-generic:
2068- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
2069- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
2070-
2071-maintainer-clean-generic:
2072- @echo "This command is intended for maintainers to use"
2073- @echo "it deletes files that may require special tools to rebuild."
2074-clean: clean-am
2075-
2076-clean-am: clean-generic clean-libtool mostlyclean-am
2077-
2078-distclean: distclean-am
2079- -rm -f Makefile
2080-distclean-am: clean-am distclean-generic
2081-
2082-dvi: dvi-am
2083-
2084-dvi-am:
2085-
2086-html: html-am
2087-
2088-html-am:
2089-
2090-info: info-am
2091-
2092-info-am:
2093-
2094-install-data-am: install-appsSCRIPTS install-polkitSCRIPTS
2095-
2096-install-dvi: install-dvi-am
2097-
2098-install-dvi-am:
2099-
2100-install-exec-am:
2101-
2102-install-html: install-html-am
2103-
2104-install-html-am:
2105-
2106-install-info: install-info-am
2107-
2108-install-info-am:
2109-
2110-install-man:
2111-
2112-install-pdf: install-pdf-am
2113-
2114-install-pdf-am:
2115-
2116-install-ps: install-ps-am
2117-
2118-install-ps-am:
2119-
2120-installcheck-am:
2121-
2122-maintainer-clean: maintainer-clean-am
2123- -rm -f Makefile
2124-maintainer-clean-am: distclean-am maintainer-clean-generic
2125-
2126-mostlyclean: mostlyclean-am
2127-
2128-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
2129-
2130-pdf: pdf-am
2131-
2132-pdf-am:
2133-
2134-ps: ps-am
2135-
2136-ps-am:
2137-
2138-uninstall-am: uninstall-appsSCRIPTS uninstall-polkitSCRIPTS
2139-
2140-.MAKE: install-am install-strip
2141-
2142-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
2143- cscopelist-am ctags-am distclean distclean-generic \
2144- distclean-libtool distdir dvi dvi-am html html-am info info-am \
2145- install install-am install-appsSCRIPTS install-data \
2146- install-data-am install-dvi install-dvi-am install-exec \
2147- install-exec-am install-html install-html-am install-info \
2148- install-info-am install-man install-pdf install-pdf-am \
2149- install-polkitSCRIPTS install-ps install-ps-am install-strip \
2150- installcheck installcheck-am installdirs maintainer-clean \
2151- maintainer-clean-generic mostlyclean mostlyclean-generic \
2152- mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
2153- uninstall-am uninstall-appsSCRIPTS uninstall-polkitSCRIPTS
2154-
2155-
2156-# Tell versions [3.59,3.63) of GNU make to not export all variables.
2157-# Otherwise a system limit (for SysV at least) may be exceeded.
2158-.NOEXPORT:
2159
2160=== modified file 'apps/Makefile.in'
2161--- apps/Makefile.in 2014-04-09 16:54:36 +0000
2162+++ apps/Makefile.in 2014-08-11 05:53:12 +0000
2163@@ -231,15 +231,13 @@
2164 POSUB = @POSUB@
2165 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
2166 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
2167-PYGTK_CFLAGS = @PYGTK_CFLAGS@
2168-PYGTK_LIBS = @PYGTK_LIBS@
2169-PYNOTIFY_CFLAGS = @PYNOTIFY_CFLAGS@
2170-PYNOTIFY_LIBS = @PYNOTIFY_LIBS@
2171+PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
2172+PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
2173 PYREXC = @PYREXC@
2174 PYTHON = @PYTHON@
2175 PYTHONDIR = @PYTHONDIR@
2176+PYTHON_CFLAGS = @PYTHON_CFLAGS@
2177 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
2178-PYTHON_INCLUDES = @PYTHON_INCLUDES@
2179 PYTHON_LIBS = @PYTHON_LIBS@
2180 PYTHON_PLATFORM = @PYTHON_PLATFORM@
2181 PYTHON_PREFIX = @PYTHON_PREFIX@
2182
2183=== modified file 'apps/blueman-adapters'
2184--- apps/blueman-adapters 2013-12-31 11:47:00 +0000
2185+++ apps/blueman-adapters 2014-08-11 05:53:12 +0000
2186@@ -1,11 +1,11 @@
2187 #!/usr/bin/python
2188
2189-import gtk
2190 import dbus
2191 import dbus.glib
2192-import pango
2193+from gi.repository import Pango
2194 import os.path
2195 import sys
2196+import signal
2197
2198 #support running uninstalled
2199 _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
2200@@ -19,6 +19,12 @@
2201
2202 enable_rgba_colormap()
2203
2204+import gi
2205+gi.require_version("Gtk", "3.0")
2206+from gi.repository import Gtk
2207+
2208+# Workaround introspection bug, gnome bug 622084
2209+signal.signal(signal.SIGINT, signal.SIG_DFL)
2210
2211 class BluemanAdapters:
2212 def __init__(self, selected_hci_dev):
2213@@ -26,7 +32,7 @@
2214 self.bus = dbus.SystemBus()
2215 self.bus.watch_name_owner('org.bluez', self.on_dbus_name_owner_change)
2216
2217- builder = gtk.Builder()
2218+ builder = Gtk.Builder()
2219 builder.set_translation_domain("blueman")
2220 builder.add_from_file(UI_PATH + "/adapters.ui")
2221 self.dialog = builder.get_object("dialog")
2222@@ -42,9 +48,9 @@
2223
2224 try:
2225 self.signals = SignalTracker()
2226- self.manager = Bluez.Manager('gobject')
2227+ self.manager = Bluez.Manager()
2228 self.signals.Handle("bluez", self.manager, self.on_adapter_added, 'AdapterAdded')
2229- adapters = self.manager.ListAdapters()
2230+ adapters = self.manager.list_adapters()
2231 for adapter in adapters:
2232 self.add_to_notebook(adapter)
2233 except Exception as e:
2234@@ -60,7 +66,7 @@
2235 else:
2236 print('Error: the selected adapter does not exist')
2237 self.dialog.show()
2238- gtk.main()
2239+ Gtk.main()
2240
2241 def on_dialog_response(self, dialog, response_id):
2242 for hci, settings in self.tabs.items():
2243@@ -68,21 +74,22 @@
2244 #save changes
2245 adapter = settings['adapter']
2246 adapter.SetProperty('Name', settings['name'])
2247- gtk.main_quit()
2248+ adapter.set('Name', settings['name'])
2249+ Gtk.main_quit()
2250
2251 def on_adapter_added(self, adapter_path):
2252 def on_property_changed(name, value):
2253 if name == 'Powered' and value:
2254- adapter.UnHandleSignal(on_property_changed, "PropertyChanged")
2255+ adapter.unhandle_signal(on_property_changed, "PropertyChanged")
2256 self.add_to_notebook(adapter)
2257
2258 adapter = Bluez.Adapter(adapter_path)
2259- adapter.HandleSignal(on_property_changed, "PropertyChanged")
2260+ adapter.handle_signal(on_property_changed, "PropertyChanged")
2261
2262 def on_dbus_name_owner_change(self, owner):
2263 print('org.bluez owner changed to '+owner)
2264 if owner == '':
2265- self.Manager = None
2266+ self.manager = None
2267 #fixme: show error dialog and exit
2268
2269 def build_adapter_tab(self, adapter):
2270@@ -99,7 +106,7 @@
2271 if not radio.props.active:
2272 return
2273 adapter_settings['discoverable'] = False
2274- adapter.SetProperty('Discoverable', False)
2275+ adapter.set('Discoverable', False)
2276 hscale.set_sensitive(False)
2277 #we need to triger "format-value" signal
2278 hscale.set_value(1)
2279@@ -109,7 +116,7 @@
2280 if not radio.props.active:
2281 return
2282 adapter_settings['discoverable'] = True
2283- adapter.SetProperty('Discoverable', True)
2284+ adapter.set('Discoverable', True)
2285 hscale.set_sensitive(False)
2286 #we need to triger "format-value" signal
2287 hscale.set_value(1)
2288@@ -119,7 +126,7 @@
2289 if not radio.props.active:
2290 return
2291 adapter_settings['discoverable'] = True
2292- adapter.SetProperty('Discoverable', True)
2293+ adapter.set('Discoverable', True)
2294 hscale.set_sensitive(True)
2295 hscale.set_value(3)
2296
2297@@ -138,13 +145,13 @@
2298 if val == 0 and adapter_settings['discoverable']:
2299 always_radio.props.active = True
2300 timeout = int(val * 60)
2301- adapter.SetProperty('DiscoverableTimeout', timeout)
2302+ adapter.set('DiscoverableTimeout', timeout)
2303
2304 def on_name_changed(entry):
2305 adapter_settings['name'] = entry.get_text()
2306 adapter_settings['changed'] = True
2307
2308- props = adapter.GetProperties()
2309+ props = adapter.get_properties()
2310 adapter_settings['adapter'] = adapter
2311 adapter_settings['signals'] = SignalTracker()
2312 adapter_settings['signals'].Handle(adapter, on_property_changed, "PropertyChanged")
2313@@ -155,7 +162,7 @@
2314 adapter_settings['discoverable_timeout'] = props['DiscoverableTimeout'] / 60
2315 adapter_settings['changed'] = False
2316
2317- builder = gtk.Builder()
2318+ builder = Gtk.Builder()
2319 builder.set_translation_domain("blueman")
2320 builder.add_from_file(UI_PATH + "/adapters-tab.ui")
2321 adapter_settings['vbox'] = builder.get_object("vbox1")
2322@@ -163,7 +170,6 @@
2323 hscale = builder.get_object("hscale")
2324 hscale.set_range(0, 30)
2325 hscale.set_increments(1, 1)
2326- hscale.set_update_policy(gtk.UPDATE_DISCONTINUOUS)
2327 if adapter_settings['discoverable']:
2328 hscale.set_value(adapter_settings['discoverable_timeout'])
2329 hscale.set_sensitive(adapter_settings['discoverable_timeout'] > 0)
2330@@ -190,7 +196,7 @@
2331 return adapter_settings
2332
2333 def add_to_notebook(self, adapter):
2334- hci_dev = os.path.basename(adapter.GetObjectPath())
2335+ hci_dev = os.path.basename(adapter.get_object_path())
2336 hci_dev_num = int(hci_dev[3:])
2337
2338 if not hci_dev in self.tabs:
2339@@ -204,13 +210,13 @@
2340 name = settings['name']
2341 if name == '':
2342 name = _('Adapter') + ' %d' % (hci_dev_num + 1)
2343- label = gtk.Label(name)
2344+ label = Gtk.Label(label=name)
2345 label.set_max_width_chars(20)
2346- label.set_ellipsize(pango.ELLIPSIZE_END)
2347+ label.set_ellipsize(Pango.EllipsizeMode.END)
2348 self.notebook.insert_page(settings['vbox'], label, hci_dev_num)
2349
2350 def remove_from_notebook(self, adapter):
2351- hci_dev = os.path.basename(adapter.GetObjectPath())
2352+ hci_dev = os.path.basename(adapter.get_object_path())
2353 hci_dev_num = int(hci_dev[3:])
2354
2355 self.tabs[hci_dev]['visible'] = False
2356
2357=== modified file 'apps/blueman-applet'
2358--- apps/blueman-applet 2013-12-31 11:47:00 +0000
2359+++ apps/blueman-applet 2014-08-11 05:53:12 +0000
2360@@ -3,12 +3,16 @@
2361 import sys
2362 import os.path
2363 import os
2364-import pynotify
2365+import signal
2366 import dbus
2367 import dbus.glib
2368-import gobject
2369-import gtk
2370-import gtk.gdk
2371+from blueman.Constants import *
2372+import gi
2373+gi.require_version("Gtk", "3.0")
2374+from gi.repository import Gtk
2375+from gi.repository import Gdk
2376+from gi.repository import GObject
2377+from gi.repository import Notify
2378 import __builtin__
2379
2380 #support running uninstalled
2381@@ -16,7 +20,6 @@
2382 if os.path.exists(os.path.join(_dirname, "CHANGELOG.md")):
2383 sys.path.insert(0, _dirname)
2384
2385-from blueman.Constants import *
2386 from blueman.Functions import *
2387
2388 from blueman.main.DbusService import DbusService
2389@@ -31,11 +34,13 @@
2390
2391 from blueman.main.PluginManager import PersistentPluginManager
2392
2393+# Workaround introspection bug, gnome bug 622084
2394+signal.signal(signal.SIGINT, signal.SIG_DFL)
2395
2396 class BluemanApplet(object):
2397 def __init__(self):
2398 setup_icon_path()
2399- if not pynotify.init("Blueman"):
2400+ if not Notify.init("Blueman"):
2401 dprint("Error: Failed to init pynotify")
2402
2403 check_single_instance("blueman-applet")
2404@@ -52,17 +57,16 @@
2405 self.bus = dbus.SystemBus()
2406 self.bus.watch_name_owner("org.bluez", self.on_dbus_name_owner_change)
2407
2408- self.bus.add_signal_receiver(self.on_adapter_property_changed, "PropertyChanged", "org.bluez.Adapter",
2409- "org.bluez", path_keyword="path")
2410+ Bluez.Adapter().handle_signal(self.on_adapter_property_changed, 'PropertyChanged', path_keyword='path')
2411
2412- gtk.main()
2413+ Gtk.main()
2414
2415
2416 def manager_init(self):
2417 try:
2418
2419 self.Signals.DisconnectAll()
2420- self.Manager = Bluez.Manager("gobject")
2421+ self.Manager = Bluez.Manager()
2422 self.Plugins.Run("on_manager_state_changed", True)
2423
2424 self.Signals.Handle("bluez", self.Manager, self.on_adapter_removed, "AdapterRemoved")
2425
2426=== modified file 'apps/blueman-assistant'
2427--- apps/blueman-assistant 2013-12-31 11:47:00 +0000
2428+++ apps/blueman-assistant 2014-08-11 05:53:12 +0000
2429@@ -12,8 +12,8 @@
2430
2431 import os
2432 import sys
2433-import gtk
2434 import random
2435+import signal
2436 import dbus.glib
2437 from optparse import OptionParser
2438
2439@@ -22,15 +22,23 @@
2440 if os.path.exists(os.path.join(_dirname, "CHANGELOG.md")):
2441 sys.path.insert(0, _dirname)
2442
2443+from blueman.Constants import *
2444 from blueman.Functions import *
2445 from blueman.gui.DeviceSelectorWidget import DeviceSelectorWidget
2446 from blueman.bluez.Agent import Agent, AgentMethod
2447 from blueman.bluez.Manager import Manager
2448+from blueman.bluez.BlueZInterface import BlueZInterface
2449 from blueman.main.FakeDevice import FakeDevice
2450 from blueman.main.Device import Device
2451 from blueman.main.AppletService import AppletService
2452 from blueman.Sdp import *
2453
2454+import gi
2455+gi.require_version("Gtk", "3.0")
2456+from gi.repository import Gtk
2457+
2458+# Workaround introspection bug, gnome bug 622084
2459+signal.signal(signal.SIGINT, signal.SIG_DFL)
2460
2461 class Assistant(Agent):
2462 def __init__(self):
2463@@ -54,7 +62,7 @@
2464 self.Passkey = ""
2465 self.Service = None
2466
2467- self.Builder = gtk.Builder()
2468+ self.Builder = Gtk.Builder()
2469 self.Builder.set_translation_domain("blueman")
2470 self.Builder.add_from_file(UI_PATH + "/assistant.ui")
2471 self.assistant = self.Builder.get_object("assistant")
2472@@ -109,25 +117,25 @@
2473 self.dev_widget.show()
2474
2475 if not self.dev_widget.List.IsValidAdapter():
2476- d = gtk.MessageDialog(type=gtk.MESSAGE_ERROR, )
2477+ d = Gtk.MessageDialog(type=Gtk.MessageType.ERROR, )
2478 d.props.text = _("No adapters found")
2479 d.props.icon_name = "blueman"
2480 d.props.title = "Blueman Assistant"
2481- d.add_button(gtk.STOCK_CLOSE, gtk.RESPONSE_CANCEL)
2482+ d.add_button(Gtk.STOCK_CLOSE, Gtk.ResponseType.CANCEL)
2483 d.run()
2484 exit(1)
2485
2486 self.assistant.show()
2487
2488 if options.device != None:
2489- m = Manager("gobject")
2490+ m = Manager()
2491 try:
2492- adapter = m.GetAdapter()
2493+ adapter = m.get_adapter()
2494 except:
2495 print("Error: No Adapters present")
2496 exit(1)
2497 try:
2498- d = adapter.FindDevice(options.device)
2499+ d = adapter.find_device(options.device)
2500 self.Device = Device(d)
2501 self.Adapter = adapter
2502 if self.Device.Paired:
2503@@ -148,7 +156,7 @@
2504 else:
2505 self.dev_widget.List.DiscoverDevices()
2506
2507- gtk.main()
2508+ Gtk.main()
2509
2510 def on_row_activated(self, treeview, path, view_column, *args):
2511 self.assistant.set_current_page(self.next_page_fn(self.assistant.get_current_page(), None))
2512@@ -167,7 +175,7 @@
2513 else:
2514 return PAGE_PASSKEY
2515 elif page == PAGE_PASSKEY:
2516- if not self.Device.Fake and not self.Device.Paired and self.PairType == 2:
2517+ if self.Device and not self.Device.Fake and not self.Device.Paired and self.PairType == 2:
2518 return PAGE_CONNECT
2519 #self.assistant.set_page_complete(pages[PAGE_PASSKEY], True)
2520 return PAGE_PAIRING
2521@@ -239,7 +247,7 @@
2522 return self.Passkey
2523
2524 def on_close(self, assistant):
2525- gtk.main_quit()
2526+ Gtk.main_quit()
2527
2528 def on_service_toggled(self, rb, sv_name, *args):
2529 if rb.props.active:
2530@@ -262,26 +270,41 @@
2531 pages[PAGE_PAIRING].set_markup(
2532 _("<b>Pairing in progress...</b>\n\nEnter passkey <b>%s</b> on the device.") % self.Passkey)
2533
2534- def ok(dev):
2535- self.Device = Device(dev)
2536-
2537- def refresh_cb(*args):
2538- self.assistant.set_current_page(PAGE_CONNECT)
2539-
2540- self.applet.RefreshServices(self.Device.GetObjectPath(), reply_handler=refresh_cb,
2541- error_handler=refresh_cb)
2542-
2543- def err(err):
2544- print(err)
2545- pages[PAGE_FINISH].set_markup(_("<b>Failed to add device</b>"))
2546- self.assistant.set_page_header_image(pages[PAGE_FINISH], get_icon("gtk-no", 32))
2547- self.assistant.set_current_page(PAGE_FINISH)
2548-
2549- if self.PairType != 2:
2550- self.Adapter.CreatePairedDevice(self.Device.Address, self.GetObjectPath(), "", reply_handler=ok,
2551- error_handler=err)
2552+ if BlueZInterface.get_interface_version()[0] < 5:
2553+ def ok(dev):
2554+ self.Device = Device(dev)
2555+
2556+ def refresh_cb(*args):
2557+ self.assistant.set_current_page(PAGE_CONNECT)
2558+
2559+ self.applet.RefreshServices(self.Device.get_object_path(), reply_handler=refresh_cb,
2560+ error_handler=refresh_cb)
2561+
2562+ def err(err):
2563+ print(err)
2564+ pages[PAGE_FINISH].set_markup(_("<b>Failed to add device</b>"))
2565+ self.assistant.set_page_header_image(pages[PAGE_FINISH], get_icon("gtk-no", 32))
2566+ self.assistant.set_current_page(PAGE_FINISH)
2567+
2568+ if self.PairType != 2:
2569+ self.Adapter.create_paired_device(self.Device.Address, self.get_object_path(), "", reply_handler=ok,
2570+ error_handler=err)
2571+ else:
2572+ self.Adapter.create_device(self.Device.Address, reply_handler=ok, error_handler=err)
2573 else:
2574- self.Adapter.CreateDevice(self.Device.Address, reply_handler=ok, error_handler=err)
2575+ if self.PairType != 2:
2576+ def ok():
2577+ self.Device = Device(device)
2578+ self.assistant.set_current_page(PAGE_CONNECT)
2579+
2580+ def err(err):
2581+ print(err)
2582+ pages[PAGE_FINISH].set_markup(_("<b>Failed to add device</b>"))
2583+ self.assistant.set_page_header_image(pages[PAGE_FINISH], get_icon("gtk-no", 32))
2584+ self.assistant.set_current_page(PAGE_FINISH)
2585+
2586+ device = self.Adapter.find_device(self.Device.Address)
2587+ device.pair(reply_handler=ok, error_handler=err)
2588
2589 elif num == PAGE_CONNECT:
2590 self.svc_vbox.foreach(lambda x, y: self.svc_vbox.remove(x), None)
2591@@ -290,61 +313,59 @@
2592 uuids = self.Device.UUIDs
2593 rbs = []
2594
2595- def get_first_item():
2596- try:
2597- return rbs[0]
2598- except:
2599- return None
2600-
2601 for name, service in self.Device.Services.items():
2602 if name == "serial":
2603 for uuid in uuids:
2604 uuid16 = uuid128_to_uuid16(uuid)
2605 if uuid16 == DIALUP_NET_SVCLASS_ID:
2606- rbs.append(gtk.RadioButton(get_first_item(), uuid16_to_name(uuid16)))
2607+ rbs.append(Gtk.RadioButton(uuid16_to_name(uuid16)))
2608 rbs[-1].connect("toggled", self.on_service_toggled, name, uuid)
2609- self.svc_vbox.pack_start(rbs[-1], False)
2610+ self.svc_vbox.pack_start(rbs[-1], False, False, 0)
2611
2612 if uuid16 == SERIAL_PORT_SVCLASS_ID:
2613- rbs.append(gtk.RadioButton(get_first_item(), uuid16_to_name(uuid16)))
2614+ rbs.append(Gtk.RadioButton(uuid16_to_name(uuid16)))
2615 rbs[-1].connect("toggled", self.on_service_toggled, name, uuid)
2616- self.svc_vbox.pack_start(rbs[-1], False)
2617+ self.svc_vbox.pack_start(rbs[-1], False, False, 0)
2618 elif name == "input":
2619- rbs.append(gtk.RadioButton(get_first_item(), _("Input Service")))
2620+ rbs.append(Gtk.RadioButton(_("Input Service")))
2621 rbs[-1].connect("toggled", self.on_service_toggled, name)
2622- self.svc_vbox.pack_start(rbs[-1], False)
2623+ self.svc_vbox.pack_start(rbs[-1], False, False, 0)
2624
2625 elif name == "network":
2626 for uuid in uuids:
2627 uuid16 = uuid128_to_uuid16(uuid)
2628 if uuid16 == GN_SVCLASS_ID:
2629- rbs.append(gtk.RadioButton(get_first_item(), _("Group Network")))
2630+ rbs.append(Gtk.RadioButton(_("Group Network")))
2631 rbs[-1].connect("toggled", self.on_service_toggled, name, uuid)
2632- self.svc_vbox.pack_start(rbs[-1], False)
2633+ self.svc_vbox.pack_start(rbs[-1], False, False, 0)
2634
2635 if uuid16 == NAP_SVCLASS_ID:
2636- rbs.append(gtk.RadioButton(get_first_item(), _("Network Access Point")))
2637+ rbs.append(Gtk.RadioButton(_("Network Access Point")))
2638 rbs[-1].connect("toggled", self.on_service_toggled, name, uuid)
2639- self.svc_vbox.pack_start(rbs[-1], False)
2640+ self.svc_vbox.pack_start(rbs[-1], False, False, 0)
2641
2642 elif name == "audiosink":
2643- rbs.append(gtk.RadioButton(get_first_item(), _("A2DP Sink (Send Audio)")))
2644+ rbs.append(Gtk.RadioButton(_("A2DP Sink (Send Audio)")))
2645 rbs[-1].connect("toggled", self.on_service_toggled, name)
2646- self.svc_vbox.pack_start(rbs[-1], False)
2647+ self.svc_vbox.pack_start(rbs[-1], False, False, 0)
2648
2649 elif name == "audiosource":
2650- rbs.append(gtk.RadioButton(get_first_item(), _("A2DP Source (Receive Audio)")))
2651+ rbs.append(Gtk.RadioButton(_("A2DP Source (Receive Audio)")))
2652 rbs[-1].connect("toggled", self.on_service_toggled, name)
2653- self.svc_vbox.pack_start(rbs[-1], False)
2654+ self.svc_vbox.pack_start(rbs[-1], False, False, 0)
2655
2656 elif name == "headset":
2657- rbs.append(gtk.RadioButton(get_first_item(), _("Headset Service")))
2658+ rbs.append(Gtk.RadioButton(_("Headset Service")))
2659 rbs[-1].connect("toggled", self.on_service_toggled, name)
2660- self.svc_vbox.pack_start(rbs[-1], False)
2661-
2662- rbs.append(gtk.RadioButton(get_first_item(), _("Don't connect")))
2663+ self.svc_vbox.pack_start(rbs[-1], False, False, 0)
2664+
2665+ if len(rbs) > 1: rbs[-1].join_group(rbs[0])
2666+
2667+ rbs.append(Gtk.RadioButton(_("Don't connect")))
2668+ rbs[-1].join_group(rbs[0])
2669 rbs[-1].connect("toggled", self.on_service_toggled, None)
2670 self.svc_vbox.pack_start(rbs[-1], False, False, 8)
2671+
2672 self.svc_vbox.show_all()
2673
2674 rbs[0].emit("toggled")
2675@@ -370,14 +391,14 @@
2676
2677 if self.Service[0] == "network":
2678 uuid = self.Service[1][0]
2679- self.applet.ServiceProxy(svc.GetInterfaceName(), svc.GetObjectPath(), "Connect", [uuid],
2680+ self.applet.ServiceProxy(svc.get_interface_name(), svc.get_object_path(), "Connect", [uuid],
2681 reply_handler=success, error_handler=fail)
2682
2683 elif self.Service[0] == "serial":
2684 uuid = self.Service[1][0]
2685- self.applet.RfcommConnect(self.Device.GetObjectPath(), uuid, reply_handler=success, error_handler=fail)
2686+ self.applet.RfcommConnect(self.Device.get_object_path(), uuid, reply_handler=success, error_handler=fail)
2687 else:
2688- self.applet.ServiceProxy(svc.GetInterfaceName(), svc.GetObjectPath(), "Connect", [],
2689+ self.applet.ServiceProxy(svc.get_interface_name(), svc.get_object_path(), "Connect", [],
2690 reply_handler=success, error_handler=fail)
2691
2692
2693
2694=== modified file 'apps/blueman-browse'
2695--- apps/blueman-browse 2014-01-21 08:54:58 +0000
2696+++ apps/blueman-browse 2014-08-11 05:53:12 +0000
2697@@ -7,16 +7,17 @@
2698 if os.path.exists(os.path.join(_dirname, "CHANGELOG.md")):
2699 sys.path.insert(0, _dirname)
2700
2701-import gtk
2702-import gobject
2703 from optparse import OptionParser
2704 import gettext
2705 import time
2706
2707+from blueman.Constants import *
2708+import gi
2709+gi.require_version("Gtk", "3.0")
2710+
2711 from blueman.bluez.Manager import Manager
2712 from blueman.gui.DeviceSelectorDialog import DeviceSelectorDialog
2713 from blueman.Functions import *
2714-from blueman.Constants import *
2715 from blueman.main.Config import Config
2716
2717
2718@@ -48,12 +49,7 @@
2719 conf.props.browse_command = DEF_BROWSE_COMMAND
2720 if "nautilus" in DEF_BROWSE_COMMAND:
2721 if not have("nautilus"):
2722- if have("thunar"):
2723- conf.props.browse_command = "thunar obex://[%d]"
2724- elif have ("pcmanfm"):
2725- conf.props.browse_command = "pcmanfm obex://[%d]"
2726- else:
2727- conf.props.browse_command = "xdg-open obex://[%d]"
2728+ conf.props.browse_command = "thunar obex://[%d]"
2729
2730 cmd = conf.props.browse_command.replace("%d", addr)
2731 args = cmd.split(" ")
2732@@ -61,7 +57,7 @@
2733 spawn(args, True)
2734 except Exception as e:
2735 dprint(e)
2736- d = gtk.MessageDialog(None, buttons=gtk.BUTTONS_OK, type=gtk.MESSAGE_ERROR)
2737+ d = Gtk.MessageDialog(None, buttons=Gtk.ButtonsType.OK, type=Gtk.MessageType.ERROR)
2738 d.props.text = _("Failed to launch \"%s\"") % args[0]
2739 d.props.secondary_text = "%s\n\n" % e + _("You can enter an alternate browser in service settings")
2740 d.run()
2741@@ -71,7 +67,7 @@
2742 d = DeviceSelectorDialog()
2743 resp = d.run()
2744 d.destroy()
2745- if resp == gtk.RESPONSE_ACCEPT:
2746+ if resp == Gtk.ResponseType.ACCEPT:
2747 sel = d.GetSelection()
2748 if sel:
2749 return sel[1]
2750
2751=== modified file 'apps/blueman-manager'
2752--- apps/blueman-manager 2013-12-31 11:47:00 +0000
2753+++ apps/blueman-manager 2014-08-11 05:53:12 +0000
2754@@ -1,37 +1,21 @@
2755 #!/usr/bin/python
2756
2757-# Copyright (C) 2008 Valmantas Paliksa <walmis at balticum-tv dot lt>
2758-# Copyright (C) 2008 Tadas Dailyda <tadas at dailyda dot com>
2759-#
2760-# Licensed under the GNU General Public License Version 3
2761-#
2762-# This program is free software: you can redistribute it and/or modify
2763-# it under the terms of the GNU General Public License as published by
2764-# the Free Software Foundation, either version 3 of the License, or
2765-# (at your option) any later version.
2766-#
2767-# This program is distributed in the hope that it will be useful,
2768-# but WITHOUT ANY WARRANTY; without even the implied warranty of
2769-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2770-# GNU General Public License for more details.
2771-#
2772-# You should have received a copy of the GNU General Public License
2773-# along with this program. If not, see <http://www.gnu.org/licenses/>.
2774-#
2775-
2776-
2777 import os.path
2778 import sys
2779-import gtk
2780+import signal
2781 import dbus, dbus.glib
2782-import gobject
2783+from blueman.Constants import *
2784+import gi
2785+gi.require_version("Gtk", "3.0")
2786+from gi.repository import Gtk
2787+from gi.repository import GObject
2788+from blueman.bluez.BlueZInterface import BlueZInterface
2789
2790 #support running uninstalled
2791 _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
2792 if os.path.exists(os.path.join(_dirname, "CHANGELOG.md")):
2793 sys.path.insert(0, _dirname)
2794
2795-from blueman.Constants import *
2796 from blueman.Functions import *
2797 from blueman.main.Device import Device
2798 from blueman.bluez.Device import Device as BluezDevice
2799@@ -48,13 +32,16 @@
2800 import blueman.plugins.manager
2801 from blueman.plugins.ManagerPlugin import ManagerPlugin
2802
2803+# Workaround introspection bug, gnome bug 622084
2804+signal.signal(signal.SIGINT, signal.SIG_DFL)
2805+
2806 enable_rgba_colormap()
2807
2808
2809 class Blueman:
2810 def __init__(self):
2811
2812- self.Builder = gtk.Builder()
2813+ self.Builder = Gtk.Builder()
2814 self.Builder.set_translation_domain("blueman")
2815 self.Builder.add_from_file(UI_PATH + "/manager-main.ui")
2816
2817@@ -65,9 +52,15 @@
2818
2819 vbox = self.Builder.get_object("vbox1")
2820 area = MessageArea()
2821- vbox.pack_start(area, False)
2822+ vbox.pack_start(area, False, False, 0)
2823 vbox.reorder_child(area, 3)
2824
2825+ # Add padding for resize grip or it will overlap
2826+ if self.window.get_has_resize_grip():
2827+ align3 = self.Builder.get_object("alignment3")
2828+ top, bottom, left, right = align3.get_padding()
2829+ align3.set_padding(top, bottom, left, right + 10)
2830+
2831 def do_present(time):
2832 if self.window.props.visible:
2833 self.window.present_with_time(time)
2834@@ -82,7 +75,7 @@
2835 (x, y) = self.window.get_position()
2836 self.Config.props.window_posx = x
2837 self.Config.props.window_posy = y
2838- gtk.main_quit()
2839+ Gtk.main_quit()
2840
2841 def on_property_changed(config, key, value):
2842 if key == "show_toolbar":
2843@@ -105,7 +98,7 @@
2844 if not status:
2845 self.window.hide()
2846 check_bluetooth_status(_("Bluetooth needs to be turned on for the device manager to function"),
2847- lambda: gtk.main_quit())
2848+ lambda: Gtk.main_quit())
2849 else:
2850 self.window.show()
2851
2852@@ -113,20 +106,19 @@
2853 dprint('org.bluez owner changed to ', owner)
2854 if owner == '':
2855 self.window.hide()
2856- d = gtk.MessageDialog(self.window, type=gtk.MESSAGE_ERROR)
2857+ d = Gtk.MessageDialog(self.window, type=Gtk.MessageType.ERROR, buttons=Gtk.ButtonsType.CLOSE)
2858 d.props.icon_name = "blueman"
2859 d.props.text = _("Connection to BlueZ failed")
2860
2861 d.props.secondary_text = _(
2862 "Bluez daemon is not running, blueman-manager cannot continue.\nThis probably means that there were no Bluetooth adapters detected or Bluetooth daemon was not started.")
2863
2864- d.add_button(gtk.STOCK_CLOSE, gtk.RESPONSE_NO)
2865 d.run()
2866 d.destroy()
2867 try:
2868 exit(1)
2869 except:
2870- gtk.main_quit()
2871+ Gtk.main_quit()
2872 else:
2873
2874 setup_icon_path()
2875@@ -185,13 +177,14 @@
2876 self.window.show()
2877
2878 dbus.SystemBus().watch_name_owner('org.bluez', on_bluez_name_owner_changed)
2879- gtk.main()
2880+ Gtk.main()
2881
2882 def on_adapter_changed(self, list, adapter):
2883 if adapter != None:
2884 self.List.DisplayKnownDevices(autoselect=True)
2885
2886 def add_device(self, device):
2887+ # BlueZ 4 only!
2888
2889 def ok(device):
2890 dev = Device(device)
2891@@ -206,10 +199,10 @@
2892 adapter = self.List.Adapter
2893
2894 prog = ManagerProgressbar(self, text=_("Adding"))
2895- prog.connect("cancelled", lambda x: self.List.Adapter.GetInterface().CancelDeviceCreation(device.Address))
2896+ prog.connect("cancelled", lambda x: self.List.Adapter.get_interface().CancelDeviceCreation(device.Address))
2897
2898 prog.start()
2899- adapter.CreateDevice(device.Address, reply_handler=ok, error_handler=err)
2900+ adapter.create_device(device.Address, reply_handler=ok, error_handler=err)
2901
2902 def inquiry(self):
2903 def prop_changed(List, adapter, (key, value)):
2904@@ -242,51 +235,54 @@
2905 spawn(["blueman-assistant", "--device=%s" % device.Address], sn=sn)
2906
2907 def bond(self, device):
2908- def ok(device):
2909- dev = Device(BluezDevice(device))
2910- self.List.add_device(dev)
2911- prog.message(_("Success"))
2912- MessageArea.close()
2913-
2914- def err(*args):
2915- dprint(args)
2916- prog.message(_("Failure"))
2917- MessageArea.show_message(e_(str(args[0])))
2918-
2919- applet = AppletService()
2920-
2921- address = device.GetProperties()["Address"]
2922- adapter = self.List.Adapter
2923-
2924- prog = ManagerProgressbar(self, text=_("Pairing"))
2925- prog.connect("cancelled", lambda x: applet.CancelDeviceCreation(adapter.GetObjectPath(), device.Address))
2926- prog.start()
2927-
2928- name = adapter_path_to_name(self.List.Adapter.GetObjectPath())
2929-
2930- applet.CreateDevice(adapter.GetObjectPath(), device.Address, True, gtk.get_current_event_time(),
2931- reply_handler=ok, error_handler=err, timeout=120)
2932+ if BlueZInterface.get_interface_version()[0] < 5:
2933+ def ok(device):
2934+ dev = Device(BluezDevice(device))
2935+ self.List.add_device(dev)
2936+ prog.message(_("Success"))
2937+ MessageArea.close()
2938+
2939+ def err(*args):
2940+ dprint(args)
2941+ prog.message(_("Failure"))
2942+ MessageArea.show_message(e_(str(args[0])))
2943+
2944+ applet = AppletService()
2945+
2946+ address = device.get_properties()["Address"]
2947+ adapter = self.List.Adapter
2948+
2949+ prog = ManagerProgressbar(self, text=_("Pairing"))
2950+ prog.connect("cancelled", lambda x: applet.CancelDeviceCreation(adapter.get_object_path(), device.Address))
2951+ prog.start()
2952+
2953+ name = adapter_path_to_name(self.List.Adapter.get_object_path())
2954+
2955+ applet.CreateDevice(adapter.get_object_path(), device.Address, True, Gtk.get_current_event_time(),
2956+ reply_handler=ok, error_handler=err, timeout=120)
2957+ else:
2958+ self.List.Adapter.find_device(device.Address).pair()
2959
2960 def adapter_properties(self):
2961 adapter = self.List.Adapter
2962- name = os.path.basename(adapter.GetObjectPath())
2963+ name = os.path.basename(adapter.get_object_path())
2964 sn = startup_notification("Blueman Adapters", _("Starting Adapter Preferences"), bin_name="blueman-adapters",
2965 icon="blueman")
2966 spawn(["blueman-adapters", name], sn=sn)
2967
2968 def toggle_trust(self, device):
2969- props = device.GetProperties()
2970+ props = device.get_properties()
2971 device.Trusted = not device.Trusted
2972
2973 def send(self, device, File=None):
2974 sn = startup_notification("Blueman Sendto", _("Starting File Sender"), bin_name="blueman-sendto",
2975 icon="blueman")
2976 adapter = self.List.Adapter
2977- props = adapter.GetProperties()
2978+ props = adapter.get_properties()
2979 spawn(["blueman-sendto", "--source=%s" % props["Address"], "--device=%s" % device.Address], sn=sn)
2980
2981 def remove(self, device):
2982- self.List.Adapter.RemoveDevice(device.Device)
2983+ self.List.Adapter.remove_device(device.Device)
2984
2985 def browse(self, device):
2986 spawn(["blueman-browse", "-d %s" % device.Address])
2987
2988=== modified file 'apps/blueman-mechanism'
2989--- apps/blueman-mechanism 2013-12-31 11:47:00 +0000
2990+++ apps/blueman-mechanism 2014-08-11 05:53:12 +0000
2991@@ -15,10 +15,10 @@
2992 import blueman.Functions
2993 import __builtin__
2994
2995-import gobject
2996+from gi.repository import GObject
2997 import syslog
2998
2999-loop = gobject.MainLoop()
3000+loop = GObject.MainLoop()
3001
3002 from blueman.Lib import set_probe_debug
3003 from blueman.Constants import POLKIT
3004@@ -80,7 +80,7 @@
3005 def __init__(self):
3006 self.time = 0
3007 self.stopped = False
3008- gobject.timeout_add(1000, self.tick)
3009+ GObject.timeout_add(1000, self.tick)
3010
3011 def tick(self):
3012 if not self.stopped:
3013
3014=== modified file 'apps/blueman-sendto'
3015--- apps/blueman-sendto 2013-12-31 11:47:00 +0000
3016+++ apps/blueman-sendto 2014-08-11 05:53:12 +0000
3017@@ -1,21 +1,24 @@
3018 #!/usr/bin/python
3019 # coding=utf-8
3020
3021-import os, sys
3022+import os, sys, signal
3023
3024 #support running uninstalled
3025 _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
3026 if os.path.exists(os.path.join(_dirname, "CHANGELOG.md")):
3027 sys.path.insert(0, _dirname)
3028
3029-import gtk
3030-import gobject
3031 import dbus.glib
3032 from optparse import OptionParser
3033 import gettext
3034 import urllib
3035 import time
3036
3037+from blueman.Constants import *
3038+import gi
3039+gi.require_version("Gtk", "3.0")
3040+from gi.repository import Gtk
3041+
3042 from blueman.bluez.Adapter import Adapter
3043 from blueman.main.Device import Device
3044 from blueman.main.FakeDevice import FakeDevice
3045@@ -28,17 +31,20 @@
3046
3047 from blueman.ods.OdsManager import OdsManager
3048
3049+# Workaround introspection bug, gnome bug 622084
3050+signal.signal(signal.SIGINT, signal.SIG_DFL)
3051+
3052 enable_rgba_colormap()
3053
3054
3055-class Sender(gobject.GObject):
3056+class Sender(GObject.GObject):
3057 __gsignals__ = {
3058- 'result': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, (gobject.TYPE_BOOLEAN,)),
3059+ 'result': (GObject.SignalFlags.RUN_FIRST, None, (GObject.TYPE_BOOLEAN,)),
3060 }
3061
3062 def __init__(self, device, adapter, files):
3063- gobject.GObject.__init__(self)
3064- self.Builder = gtk.Builder()
3065+ GObject.GObject.__init__(self)
3066+ self.Builder = Gtk.Builder()
3067 self.Builder.set_translation_domain("blueman")
3068 self.Builder.add_from_file(UI_PATH + "/send-dialog.ui")
3069 self.window = self.Builder.get_object("window")
3070@@ -88,8 +94,8 @@
3071 try:
3072 self.manager = OdsManager()
3073 except:
3074- d = gtk.MessageDialog(self.window,
3075- type=gtk.MESSAGE_ERROR, buttons=gtk.BUTTONS_OK)
3076+ d = Gtk.MessageDialog(self.window,
3077+ type=Gtk.MessageType.ERROR, buttons=Gtk.ButtonsType.OK)
3078 d.props.text = _("obex-data-server not available")
3079 d.props.secondary_text = _("obex-data-server is probably not installed")
3080 d.run()
3081@@ -116,8 +122,8 @@
3082
3083 def on_error(msg):
3084 dprint("Failed to create session")
3085- d = gtk.MessageDialog(self.window,
3086- type=gtk.MESSAGE_ERROR, buttons=(gtk.BUTTONS_CLOSE))
3087+ d = Gtk.MessageDialog(self.window,
3088+ type=Gtk.MessageType.ERROR, buttons=(Gtk.ButtonsType.CLOSE))
3089 d.props.text = _("Error occurred")
3090 d.props.icon_name = "blueman"
3091 d.props.secondary_text = str(msg).split(":")[1].strip(" ")
3092@@ -126,7 +132,7 @@
3093 d.destroy()
3094 exit(1)
3095
3096- props = self.adapter.GetProperties()
3097+ props = self.adapter.get_properties()
3098 self.manager.create_session(self.device.Address, props["Address"], error_handler=on_error)
3099
3100 def on_cancel(self, button):
3101@@ -153,12 +159,12 @@
3102
3103 #first transfer
3104 if self.total_transferred == 0:
3105- self.pb.props.text = _("Sending File") + (" %(0)s/%(1)s (%(2).2f %(3)s/s) " + _("ETA:") + " %(4)s") % {
3106- "1": self.num_files,
3107- "0": (self.num_files - len(self.files) + 1),
3108- "2": 0.0,
3109- "3": "B/s",
3110- "4": "∞"}
3111+ self.pb.props.text = _(u"Sending File") + (u" %(0)s/%(1)s (%(2).2f %(3)s/s) " + _(u"ETA:") + u" %(4)s") % {
3112+ u"1": self.num_files,
3113+ u"0": (self.num_files - len(self.files) + 1),
3114+ u"2": 0.0,
3115+ u"3": u"B/s",
3116+ u"4": u"∞"}
3117
3118 self.l_file.props.label = filename
3119 self._last_bytes = 0
3120@@ -185,7 +191,7 @@
3121 else:
3122 eta = ngettext("%.0f Second", "%.0f Seconds", round(x)) % x
3123 except ZeroDivisionError:
3124- eta = "∞"
3125+ eta = u"∞"
3126
3127 self.pb.props.text = _("Sending File") + (" %(0)s/%(1)s (%(2).2f %(3)s/s) " + _("ETA:") + " %(4)s") % {
3128 "1": self.num_files,
3129@@ -235,26 +241,26 @@
3130 dprint("session err", name, msg)
3131 if not self.error_dialog:
3132 self.speed.reset()
3133- d = gtk.MessageDialog(self.window,
3134- type=gtk.MESSAGE_ERROR)
3135+ d = Gtk.MessageDialog(self.window,
3136+ type=Gtk.MessageType.ERROR)
3137 d.props.text = msg
3138 d.props.modal = True
3139 d.props.secondary_text = _("Error occurred while sending file %s") % os.path.basename(self.files[-1])
3140 d.props.icon_name = "blueman"
3141
3142 if len(self.files) > 1:
3143- d.add_button(_("Skip"), gtk.RESPONSE_NO)
3144- d.add_button(_("Retry"), gtk.RESPONSE_YES)
3145- d.add_button(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)
3146+ d.add_button(_("Skip"), Gtk.ResponseType.NO)
3147+ d.add_button(_("Retry"), Gtk.ResponseType.YES)
3148+ d.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL)
3149
3150
3151 def on_response(dialog, resp):
3152 dialog.destroy()
3153 self.error_dialog = None
3154
3155- if resp == gtk.STOCK_CANCEL:
3156+ if resp == Gtk.STOCK_CANCEL:
3157 self.on_cancel(None)
3158- elif resp == gtk.RESPONSE_NO:
3159+ elif resp == Gtk.ResponseType.NO:
3160 self.total_bytes -= os.path.getsize(self.files[-1])
3161 self.total_transferred -= self.transferred
3162 self.transferred = 0
3163@@ -262,7 +268,7 @@
3164 if not self.session or not self.session.Connected:
3165 self.create_session()
3166 self.process_queue()
3167- elif resp == gtk.RESPONSE_YES:
3168+ elif resp == Gtk.ResponseType.YES:
3169 self.total_transferred -= self.transferred
3170 self.transferred = 0
3171 if not self.session or not self.session.Connected:
3172@@ -321,20 +327,20 @@
3173 self.do_send()
3174
3175 else:
3176- m = Manager("gobject")
3177+ m = Manager()
3178 try:
3179 if options.source is not None:
3180 try:
3181- adapter = m.GetAdapter(options.source)
3182+ adapter = m.get_adapter(options.source)
3183 except:
3184- adapter = m.GetAdapter()
3185+ adapter = m.get_adapter()
3186 else:
3187- adapter = m.GetAdapter()
3188+ adapter = m.get_adapter()
3189 except:
3190 print("Error: No Adapters present")
3191 exit()
3192 try:
3193- d = adapter.FindDevice(options.device)
3194+ d = adapter.find_device(options.device)
3195 except:
3196 info = {}
3197 info["Address"] = options.device
3198@@ -345,10 +351,10 @@
3199 d = FakeDevice(info)
3200
3201 self.device = Device(d)
3202- self.adapter = adapter.GetObjectPath()
3203+ self.adapter = adapter.get_object_path()
3204 self.do_send()
3205
3206- gtk.main()
3207+ Gtk.main()
3208
3209 def do_send(self):
3210 if len(self.args) == 0:
3211@@ -360,18 +366,18 @@
3212 sender = Sender(self.device, self.adapter, self.args)
3213
3214 def on_result(sender, res):
3215- gtk.main_quit()
3216+ Gtk.main_quit()
3217
3218 sender.connect("result", on_result)
3219
3220 def select_files(self):
3221- d = gtk.FileChooserDialog(_("Select files to send"), buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT,
3222- gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
3223+ d = Gtk.FileChooserDialog(_("Select files to send"), buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.REJECT,
3224+ Gtk.STOCK_OK, Gtk.ResponseType.ACCEPT))
3225 d.props.icon_name = "blueman-send-file"
3226 d.set_select_multiple(True)
3227 resp = d.run()
3228
3229- if resp == gtk.RESPONSE_ACCEPT:
3230+ if resp == Gtk.ResponseType.ACCEPT:
3231 self.files = d.get_filenames()
3232 d.destroy()
3233 return True
3234@@ -383,7 +389,7 @@
3235 d = DeviceSelectorDialog()
3236 resp = d.run()
3237 d.destroy()
3238- if resp == gtk.RESPONSE_ACCEPT:
3239+ if resp == Gtk.ResponseType.ACCEPT:
3240 sel = d.GetSelection()
3241 if sel:
3242 self.device = sel[1]
3243
3244=== modified file 'apps/blueman-services'
3245--- apps/blueman-services 2013-12-31 11:47:00 +0000
3246+++ apps/blueman-services 2014-08-11 05:53:12 +0000
3247@@ -7,11 +7,14 @@
3248 if os.path.exists(os.path.join(_dirname, "CHANGELOG.md")):
3249 sys.path.insert(0, _dirname)
3250
3251-import gtk
3252 from blueman.gui.GenericList import GenericList
3253
3254+from blueman.Constants import *
3255+import gi
3256+gi.require_version("Gtk", "3.0")
3257+from gi.repository import Gtk
3258+
3259 from blueman.Functions import *
3260-from blueman.Constants import *
3261
3262 import blueman.plugins.services
3263 from blueman.plugins.ServicePlugin import ServicePlugin
3264@@ -24,7 +27,7 @@
3265 class BluemanServices:
3266 def __init__(self):
3267
3268- self.Builder = gtk.Builder()
3269+ self.Builder = Gtk.Builder()
3270 self.Builder.set_translation_domain("blueman")
3271 self.Builder.add_from_file(UI_PATH + "/services.ui")
3272
3273@@ -35,11 +38,11 @@
3274
3275 check_single_instance("blueman-services", lambda time: self.Dialog.present_with_time(time))
3276
3277- self.Dialog.connect("delete-event", lambda x, y: gtk.main_quit())
3278+ self.Dialog.connect("delete-event", lambda x, y: Gtk.main_quit())
3279
3280 data = [
3281- ["picture", 'GdkPixbuf', gtk.CellRendererPixbuf(), {"pixbuf": 0}, None],
3282- ["caption", str, gtk.CellRendererText(), {"markup": 1}, None, {"expand": True}],
3283+ ["picture", 'GdkPixbuf', Gtk.CellRendererPixbuf(), {"pixbuf": 0}, None],
3284+ ["caption", str, Gtk.CellRendererText(), {"markup": 1}, None, {"expand": True}],
3285 ["id", str],
3286 ]
3287
3288@@ -62,10 +65,10 @@
3289 ls.selection.select_path(0)
3290
3291 self.Builder.get_object("b_apply").connect("clicked", self.on_apply_clicked)
3292- self.Builder.get_object("b_close").connect("clicked", lambda x: gtk.main_quit())
3293+ self.Builder.get_object("b_close").connect("clicked", lambda x: Gtk.main_quit())
3294
3295 self.Dialog.show()
3296- gtk.main()
3297+ Gtk.main()
3298
3299 def option_changed(self):
3300 rets = self.plugin_exec("on_query_apply_state")
3301@@ -148,7 +151,8 @@
3302 def on_selection_changed(self, selection):
3303 iter = self.List.selected()
3304 if self.List.get_cursor()[0]:
3305- self.Config.props.services_last_item = self.List.get_cursor()[0][0]
3306+ # GtkTreePath returns row when used as string
3307+ self.Config.props.services_last_item = int(str(self.List.get_cursor()[0]))
3308 row = self.List.get(iter, "id")
3309 id = row["id"]
3310
3311
3312=== modified file 'autogen.sh'
3313--- autogen.sh 2013-12-31 11:47:00 +0000
3314+++ autogen.sh 2014-08-11 05:53:12 +0000
3315@@ -12,7 +12,7 @@
3316 exit 1
3317 }
3318
3319-if test -z "$AUTOGEN_SUBDIR_MODE"; then
3320+if test -z "$AUTOGEN_SUBDIR_MODE" && test -z "$NOCONFIGURE"; then
3321 if test -z "$*"; then
3322 echo "I am going to run ./configure with no arguments - if you wish "
3323 echo "to pass any to it, please specify them on the $0 command line."
3324@@ -27,7 +27,7 @@
3325 automake --add-missing --copy || exit $?
3326 autoconf || exit $?
3327
3328-if test -z "$AUTOGEN_SUBDIR_MODE"; then
3329+if test -z "$AUTOGEN_SUBDIR_MODE" && test -z "$NOCONFIGURE"; then
3330 $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
3331
3332 echo
3333
3334=== modified file 'autom4te.cache/output.0'
3335--- autom4te.cache/output.0 2014-07-01 12:11:00 +0000
3336+++ autom4te.cache/output.0 2014-08-11 05:53:12 +0000
3337@@ -632,12 +632,10 @@
3338 am__EXEEXT_TRUE
3339 LTLIBOBJS
3340 LIB@&t@OBJS
3341+PYGOBJECT_LIBS
3342+PYGOBJECT_CFLAGS
3343 BLUEZ_LIBS
3344 BLUEZ_CFLAGS
3345-PYNOTIFY_LIBS
3346-PYNOTIFY_CFLAGS
3347-PYGTK_LIBS
3348-PYGTK_CFLAGS
3349 HAVE_NST_FALSE
3350 HAVE_NST_TRUE
3351 ENABLE_HAL_FALSE
3352@@ -655,7 +653,7 @@
3353 SYSCONFDIR
3354 PYREXC
3355 PYTHON_LIBS
3356-PYTHON_INCLUDES
3357+PYTHON_CFLAGS
3358 pkgpyexecdir
3359 pyexecdir
3360 pkgpythondir
3361@@ -864,13 +862,13 @@
3362 PKG_CONFIG_PATH
3363 PKG_CONFIG_LIBDIR
3364 PYTHON
3365+PYTHON_CFLAGS
3366+PYTHON_LIBS
3367 PYREXC
3368-PYGTK_CFLAGS
3369-PYGTK_LIBS
3370-PYNOTIFY_CFLAGS
3371-PYNOTIFY_LIBS
3372 BLUEZ_CFLAGS
3373-BLUEZ_LIBS'
3374+BLUEZ_LIBS
3375+PYGOBJECT_CFLAGS
3376+PYGOBJECT_LIBS'
3377
3378
3379 # Initialize some variables set by options.
3380@@ -1534,17 +1532,17 @@
3381 PKG_CONFIG_LIBDIR
3382 path overriding pkg-config's built-in search path
3383 PYTHON the Python interpreter
3384+ PYTHON_CFLAGS
3385+ C compiler flags for PYTHON, overriding pkg-config
3386+ PYTHON_LIBS linker flags for PYTHON, overriding pkg-config
3387 PYREXC Pyrex compiler
3388- PYGTK_CFLAGS
3389- C compiler flags for PYGTK, overriding pkg-config
3390- PYGTK_LIBS linker flags for PYGTK, overriding pkg-config
3391- PYNOTIFY_CFLAGS
3392- C compiler flags for PYNOTIFY, overriding pkg-config
3393- PYNOTIFY_LIBS
3394- linker flags for PYNOTIFY, overriding pkg-config
3395 BLUEZ_CFLAGS
3396 C compiler flags for BLUEZ, overriding pkg-config
3397 BLUEZ_LIBS linker flags for BLUEZ, overriding pkg-config
3398+ PYGOBJECT_CFLAGS
3399+ C compiler flags for PYGOBJECT, overriding pkg-config
3400+ PYGOBJECT_LIBS
3401+ linker flags for PYGOBJECT, overriding pkg-config
3402
3403 Use these variables to override the choices made by `configure' or to help
3404 it to find libraries and programs with nonstandard names/locations.
3405@@ -13272,34 +13270,103 @@
3406 fi
3407
3408
3409-
3410-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for headers required to compile python extensions" >&5
3411-$as_echo_n "checking for headers required to compile python extensions... " >&6; }
3412-py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
3413-py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
3414-PYTHON_INCLUDES=`python-config --includes`
3415-if test "$py_prefix" != "$py_exec_prefix"; then
3416- PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
3417-fi
3418-
3419-save_CPPFLAGS="$CPPFLAGS"
3420-CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
3421-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3422-/* end confdefs.h. */
3423-#include <Python.h>
3424-_ACEOF
3425-if ac_fn_c_try_cpp "$LINENO"; then :
3426- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
3427-$as_echo "found" >&6; }
3428-
3429-else
3430- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
3431-$as_echo "not found" >&6; }
3432-as_fn_error $? "Could not find Python headers" "$LINENO" 5
3433-fi
3434-rm -f conftest.err conftest.i conftest.$ac_ext
3435-CPPFLAGS="$save_CPPFLAGS"
3436-
3437+if test "${PYTHON_VERSION}" \< "3.0"; then
3438+
3439+pkg_failed=no
3440+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYTHON" >&5
3441+$as_echo_n "checking for PYTHON... " >&6; }
3442+
3443+if test -n "$PYTHON_CFLAGS"; then
3444+ pkg_cv_PYTHON_CFLAGS="$PYTHON_CFLAGS"
3445+ elif test -n "$PKG_CONFIG"; then
3446+ if test -n "$PKG_CONFIG" && \
3447+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-\${PYTHON_VERSION}\""; } >&5
3448+ ($PKG_CONFIG --exists --print-errors "python-${PYTHON_VERSION}") 2>&5
3449+ ac_status=$?
3450+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3451+ test $ac_status = 0; }; then
3452+ pkg_cv_PYTHON_CFLAGS=`$PKG_CONFIG --cflags "python-${PYTHON_VERSION}" 2>/dev/null`
3453+ test "x$?" != "x0" && pkg_failed=yes
3454+else
3455+ pkg_failed=yes
3456+fi
3457+ else
3458+ pkg_failed=untried
3459+fi
3460+if test -n "$PYTHON_LIBS"; then
3461+ pkg_cv_PYTHON_LIBS="$PYTHON_LIBS"
3462+ elif test -n "$PKG_CONFIG"; then
3463+ if test -n "$PKG_CONFIG" && \
3464+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-\${PYTHON_VERSION}\""; } >&5
3465+ ($PKG_CONFIG --exists --print-errors "python-${PYTHON_VERSION}") 2>&5
3466+ ac_status=$?
3467+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3468+ test $ac_status = 0; }; then
3469+ pkg_cv_PYTHON_LIBS=`$PKG_CONFIG --libs "python-${PYTHON_VERSION}" 2>/dev/null`
3470+ test "x$?" != "x0" && pkg_failed=yes
3471+else
3472+ pkg_failed=yes
3473+fi
3474+ else
3475+ pkg_failed=untried
3476+fi
3477+
3478+
3479+
3480+if test $pkg_failed = yes; then
3481+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3482+$as_echo "no" >&6; }
3483+
3484+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
3485+ _pkg_short_errors_supported=yes
3486+else
3487+ _pkg_short_errors_supported=no
3488+fi
3489+ if test $_pkg_short_errors_supported = yes; then
3490+ PYTHON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "python-${PYTHON_VERSION}" 2>&1`
3491+ else
3492+ PYTHON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "python-${PYTHON_VERSION}" 2>&1`
3493+ fi
3494+ # Put the nasty error message in config.log where it belongs
3495+ echo "$PYTHON_PKG_ERRORS" >&5
3496+
3497+ as_fn_error $? "Package requirements (python-${PYTHON_VERSION}) were not met:
3498+
3499+$PYTHON_PKG_ERRORS
3500+
3501+Consider adjusting the PKG_CONFIG_PATH environment variable if you
3502+installed software in a non-standard prefix.
3503+
3504+Alternatively, you may set the environment variables PYTHON_CFLAGS
3505+and PYTHON_LIBS to avoid the need to call pkg-config.
3506+See the pkg-config man page for more details." "$LINENO" 5
3507+elif test $pkg_failed = untried; then
3508+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3509+$as_echo "no" >&6; }
3510+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3511+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3512+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
3513+is in your PATH or set the PKG_CONFIG environment variable to the full
3514+path to pkg-config.
3515+
3516+Alternatively, you may set the environment variables PYTHON_CFLAGS
3517+and PYTHON_LIBS to avoid the need to call pkg-config.
3518+See the pkg-config man page for more details.
3519+
3520+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
3521+See \`config.log' for more details" "$LINENO" 5; }
3522+else
3523+ PYTHON_CFLAGS=$pkg_cv_PYTHON_CFLAGS
3524+ PYTHON_LIBS=$pkg_cv_PYTHON_LIBS
3525+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3526+$as_echo "yes" >&6; }
3527+
3528+fi
3529+
3530+
3531+else
3532+ as_fn_error $? "Blueman does not support python 3" "$LINENO" 5
3533+fi
3534
3535 @%:@ Check whether --enable-shared was given.
3536 if test "${enable_shared+set}" = set; then :
3537@@ -13358,9 +13425,6 @@
3538
3539
3540
3541-PYTHON_LIBS=`python-config --libs`
3542-
3543-
3544
3545 if test "x$PYREXC" = "x"; then
3546 # Extract the first word of "pyrexc", so it can be a program name with args.
3547@@ -13410,12 +13474,12 @@
3548 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${PYREXC}" >&5
3549 $as_echo "${PYREXC}" >&6; }
3550 if test "x$PYREXC" = "x"; then
3551- as_fn_error $? "Fatal: pyrexc not found.
3552+ as_fn_error $? "\"Fatal: pyrexc not found.
3553
3554 Get Pyrex from
3555 * your system's packages (recommended)
3556 * upstream at http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/
3557-" "$LINENO" 5
3558+\"" "$LINENO" 5
3559 fi
3560
3561
3562@@ -13708,10 +13772,9 @@
3563 fi
3564
3565
3566-have_nst=yes
3567 @%:@ Check whether --enable-sendto was given.
3568 if test "${enable_sendto+set}" = set; then :
3569- enableval=$enable_sendto;
3570+ enableval=$enable_sendto; have_nst=$enableval
3571 else
3572 have_nst=yes
3573 fi
3574@@ -13730,188 +13793,6 @@
3575 if test $deps_check = 1; then
3576
3577
3578-pkg_failed=no
3579-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYGTK" >&5
3580-$as_echo_n "checking for PYGTK... " >&6; }
3581-
3582-if test -n "$PYGTK_CFLAGS"; then
3583- pkg_cv_PYGTK_CFLAGS="$PYGTK_CFLAGS"
3584- elif test -n "$PKG_CONFIG"; then
3585- if test -n "$PKG_CONFIG" && \
3586- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0 >= 2.12.0\""; } >&5
3587- ($PKG_CONFIG --exists --print-errors "pygtk-2.0 >= 2.12.0") 2>&5
3588- ac_status=$?
3589- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3590- test $ac_status = 0; }; then
3591- pkg_cv_PYGTK_CFLAGS=`$PKG_CONFIG --cflags "pygtk-2.0 >= 2.12.0" 2>/dev/null`
3592- test "x$?" != "x0" && pkg_failed=yes
3593-else
3594- pkg_failed=yes
3595-fi
3596- else
3597- pkg_failed=untried
3598-fi
3599-if test -n "$PYGTK_LIBS"; then
3600- pkg_cv_PYGTK_LIBS="$PYGTK_LIBS"
3601- elif test -n "$PKG_CONFIG"; then
3602- if test -n "$PKG_CONFIG" && \
3603- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0 >= 2.12.0\""; } >&5
3604- ($PKG_CONFIG --exists --print-errors "pygtk-2.0 >= 2.12.0") 2>&5
3605- ac_status=$?
3606- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3607- test $ac_status = 0; }; then
3608- pkg_cv_PYGTK_LIBS=`$PKG_CONFIG --libs "pygtk-2.0 >= 2.12.0" 2>/dev/null`
3609- test "x$?" != "x0" && pkg_failed=yes
3610-else
3611- pkg_failed=yes
3612-fi
3613- else
3614- pkg_failed=untried
3615-fi
3616-
3617-
3618-
3619-if test $pkg_failed = yes; then
3620- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3621-$as_echo "no" >&6; }
3622-
3623-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
3624- _pkg_short_errors_supported=yes
3625-else
3626- _pkg_short_errors_supported=no
3627-fi
3628- if test $_pkg_short_errors_supported = yes; then
3629- PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pygtk-2.0 >= 2.12.0" 2>&1`
3630- else
3631- PYGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pygtk-2.0 >= 2.12.0" 2>&1`
3632- fi
3633- # Put the nasty error message in config.log where it belongs
3634- echo "$PYGTK_PKG_ERRORS" >&5
3635-
3636- as_fn_error $? "Package requirements (pygtk-2.0 >= 2.12.0) were not met:
3637-
3638-$PYGTK_PKG_ERRORS
3639-
3640-Consider adjusting the PKG_CONFIG_PATH environment variable if you
3641-installed software in a non-standard prefix.
3642-
3643-Alternatively, you may set the environment variables PYGTK_CFLAGS
3644-and PYGTK_LIBS to avoid the need to call pkg-config.
3645-See the pkg-config man page for more details." "$LINENO" 5
3646-elif test $pkg_failed = untried; then
3647- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3648-$as_echo "no" >&6; }
3649- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3650-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3651-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
3652-is in your PATH or set the PKG_CONFIG environment variable to the full
3653-path to pkg-config.
3654-
3655-Alternatively, you may set the environment variables PYGTK_CFLAGS
3656-and PYGTK_LIBS to avoid the need to call pkg-config.
3657-See the pkg-config man page for more details.
3658-
3659-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
3660-See \`config.log' for more details" "$LINENO" 5; }
3661-else
3662- PYGTK_CFLAGS=$pkg_cv_PYGTK_CFLAGS
3663- PYGTK_LIBS=$pkg_cv_PYGTK_LIBS
3664- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3665-$as_echo "yes" >&6; }
3666-
3667-fi
3668-
3669-pkg_failed=no
3670-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYNOTIFY" >&5
3671-$as_echo_n "checking for PYNOTIFY... " >&6; }
3672-
3673-if test -n "$PYNOTIFY_CFLAGS"; then
3674- pkg_cv_PYNOTIFY_CFLAGS="$PYNOTIFY_CFLAGS"
3675- elif test -n "$PKG_CONFIG"; then
3676- if test -n "$PKG_CONFIG" && \
3677- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"notify-python\""; } >&5
3678- ($PKG_CONFIG --exists --print-errors "notify-python") 2>&5
3679- ac_status=$?
3680- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3681- test $ac_status = 0; }; then
3682- pkg_cv_PYNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "notify-python" 2>/dev/null`
3683- test "x$?" != "x0" && pkg_failed=yes
3684-else
3685- pkg_failed=yes
3686-fi
3687- else
3688- pkg_failed=untried
3689-fi
3690-if test -n "$PYNOTIFY_LIBS"; then
3691- pkg_cv_PYNOTIFY_LIBS="$PYNOTIFY_LIBS"
3692- elif test -n "$PKG_CONFIG"; then
3693- if test -n "$PKG_CONFIG" && \
3694- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"notify-python\""; } >&5
3695- ($PKG_CONFIG --exists --print-errors "notify-python") 2>&5
3696- ac_status=$?
3697- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3698- test $ac_status = 0; }; then
3699- pkg_cv_PYNOTIFY_LIBS=`$PKG_CONFIG --libs "notify-python" 2>/dev/null`
3700- test "x$?" != "x0" && pkg_failed=yes
3701-else
3702- pkg_failed=yes
3703-fi
3704- else
3705- pkg_failed=untried
3706-fi
3707-
3708-
3709-
3710-if test $pkg_failed = yes; then
3711- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3712-$as_echo "no" >&6; }
3713-
3714-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
3715- _pkg_short_errors_supported=yes
3716-else
3717- _pkg_short_errors_supported=no
3718-fi
3719- if test $_pkg_short_errors_supported = yes; then
3720- PYNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "notify-python" 2>&1`
3721- else
3722- PYNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "notify-python" 2>&1`
3723- fi
3724- # Put the nasty error message in config.log where it belongs
3725- echo "$PYNOTIFY_PKG_ERRORS" >&5
3726-
3727- as_fn_error $? "Package requirements (notify-python) were not met:
3728-
3729-$PYNOTIFY_PKG_ERRORS
3730-
3731-Consider adjusting the PKG_CONFIG_PATH environment variable if you
3732-installed software in a non-standard prefix.
3733-
3734-Alternatively, you may set the environment variables PYNOTIFY_CFLAGS
3735-and PYNOTIFY_LIBS to avoid the need to call pkg-config.
3736-See the pkg-config man page for more details." "$LINENO" 5
3737-elif test $pkg_failed = untried; then
3738- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3739-$as_echo "no" >&6; }
3740- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3741-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3742-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
3743-is in your PATH or set the PKG_CONFIG environment variable to the full
3744-path to pkg-config.
3745-
3746-Alternatively, you may set the environment variables PYNOTIFY_CFLAGS
3747-and PYNOTIFY_LIBS to avoid the need to call pkg-config.
3748-See the pkg-config man page for more details.
3749-
3750-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
3751-See \`config.log' for more details" "$LINENO" 5; }
3752-else
3753- PYNOTIFY_CFLAGS=$pkg_cv_PYNOTIFY_CFLAGS
3754- PYNOTIFY_LIBS=$pkg_cv_PYNOTIFY_LIBS
3755- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3756-$as_echo "yes" >&6; }
3757-
3758-fi
3759-
3760 py_mod_var=`echo dbus'_' | sed 'y%./+-%__p_%'`
3761 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python module dbus" >&5
3762 $as_echo_n "checking for python module dbus... " >&6; }
3763@@ -13948,43 +13829,8 @@
3764 fi
3765
3766
3767-py_mod_var=`echo gobject'_' | sed 'y%./+-%__p_%'`
3768-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python module gobject" >&5
3769-$as_echo_n "checking for python module gobject... " >&6; }
3770-if eval \${py_cv_mod_$py_mod_var+:} false; then :
3771- $as_echo_n "(cached) " >&6
3772-else
3773-
3774-prog="
3775-import sys
3776-try:
3777- import gobject
3778-except ImportError:
3779- sys.exit(1)
3780-except:
3781- sys.exit(0)
3782-sys.exit(0)"
3783-if $PYTHON -c "$prog" 1>&5 2>&5
3784- then
3785- eval "py_cv_mod_$py_mod_var=yes"
3786- else
3787- eval "py_cv_mod_$py_mod_var=no"
3788- fi
3789-
3790-fi
3791-
3792-py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
3793-if test "x$py_val" != xno; then
3794- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3795-$as_echo "yes" >&6; }
3796- else
3797- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3798-$as_echo "no" >&6; }
3799- as_fn_error $? "Could not find Python module gobject" "$LINENO" 5
3800-fi
3801-
3802-
3803-fi
3804+fi
3805+
3806
3807
3808 pkg_failed=no
3809@@ -13997,17 +13843,13 @@
3810 if test -n "$PKG_CONFIG" && \
3811 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez >= 4.61
3812 libstartup-notification-1.0 >= 0.9
3813- gtk+-2.0 >= 2.12
3814- pygobject-2.0 >= 2.12
3815- gobject-2.0 >= 2.12
3816+ gtk+-3.0
3817 glib-2.0 >= 2.32
3818 gthread-2.0 >= 2.32
3819 \""; } >&5
3820 ($PKG_CONFIG --exists --print-errors "bluez >= 4.61
3821 libstartup-notification-1.0 >= 0.9
3822- gtk+-2.0 >= 2.12
3823- pygobject-2.0 >= 2.12
3824- gobject-2.0 >= 2.12
3825+ gtk+-3.0
3826 glib-2.0 >= 2.32
3827 gthread-2.0 >= 2.32
3828 ") 2>&5
3829@@ -14016,9 +13858,7 @@
3830 test $ac_status = 0; }; then
3831 pkg_cv_BLUEZ_CFLAGS=`$PKG_CONFIG --cflags "bluez >= 4.61
3832 libstartup-notification-1.0 >= 0.9
3833- gtk+-2.0 >= 2.12
3834- pygobject-2.0 >= 2.12
3835- gobject-2.0 >= 2.12
3836+ gtk+-3.0
3837 glib-2.0 >= 2.32
3838 gthread-2.0 >= 2.32
3839 " 2>/dev/null`
3840@@ -14035,17 +13875,13 @@
3841 if test -n "$PKG_CONFIG" && \
3842 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez >= 4.61
3843 libstartup-notification-1.0 >= 0.9
3844- gtk+-2.0 >= 2.12
3845- pygobject-2.0 >= 2.12
3846- gobject-2.0 >= 2.12
3847+ gtk+-3.0
3848 glib-2.0 >= 2.32
3849 gthread-2.0 >= 2.32
3850 \""; } >&5
3851 ($PKG_CONFIG --exists --print-errors "bluez >= 4.61
3852 libstartup-notification-1.0 >= 0.9
3853- gtk+-2.0 >= 2.12
3854- pygobject-2.0 >= 2.12
3855- gobject-2.0 >= 2.12
3856+ gtk+-3.0
3857 glib-2.0 >= 2.32
3858 gthread-2.0 >= 2.32
3859 ") 2>&5
3860@@ -14054,9 +13890,7 @@
3861 test $ac_status = 0; }; then
3862 pkg_cv_BLUEZ_LIBS=`$PKG_CONFIG --libs "bluez >= 4.61
3863 libstartup-notification-1.0 >= 0.9
3864- gtk+-2.0 >= 2.12
3865- pygobject-2.0 >= 2.12
3866- gobject-2.0 >= 2.12
3867+ gtk+-3.0
3868 glib-2.0 >= 2.32
3869 gthread-2.0 >= 2.32
3870 " 2>/dev/null`
3871@@ -14082,18 +13916,14 @@
3872 if test $_pkg_short_errors_supported = yes; then
3873 BLUEZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "bluez >= 4.61
3874 libstartup-notification-1.0 >= 0.9
3875- gtk+-2.0 >= 2.12
3876- pygobject-2.0 >= 2.12
3877- gobject-2.0 >= 2.12
3878+ gtk+-3.0
3879 glib-2.0 >= 2.32
3880 gthread-2.0 >= 2.32
3881 " 2>&1`
3882 else
3883 BLUEZ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "bluez >= 4.61
3884 libstartup-notification-1.0 >= 0.9
3885- gtk+-2.0 >= 2.12
3886- pygobject-2.0 >= 2.12
3887- gobject-2.0 >= 2.12
3888+ gtk+-3.0
3889 glib-2.0 >= 2.32
3890 gthread-2.0 >= 2.32
3891 " 2>&1`
3892@@ -14103,9 +13933,7 @@
3893
3894 as_fn_error $? "Package requirements (bluez >= 4.61
3895 libstartup-notification-1.0 >= 0.9
3896- gtk+-2.0 >= 2.12
3897- pygobject-2.0 >= 2.12
3898- gobject-2.0 >= 2.12
3899+ gtk+-3.0
3900 glib-2.0 >= 2.32
3901 gthread-2.0 >= 2.32
3902 ) were not met:
3903@@ -14144,6 +13972,262 @@
3904
3905
3906
3907+pkg_failed=no
3908+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYGOBJECT" >&5
3909+$as_echo_n "checking for PYGOBJECT... " >&6; }
3910+
3911+if test -n "$PYGOBJECT_CFLAGS"; then
3912+ pkg_cv_PYGOBJECT_CFLAGS="$PYGOBJECT_CFLAGS"
3913+ elif test -n "$PKG_CONFIG"; then
3914+ if test -n "$PKG_CONFIG" && \
3915+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-2.0 >= 2.12\""; } >&5
3916+ ($PKG_CONFIG --exists --print-errors "pygobject-2.0 >= 2.12") 2>&5
3917+ ac_status=$?
3918+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3919+ test $ac_status = 0; }; then
3920+ pkg_cv_PYGOBJECT_CFLAGS=`$PKG_CONFIG --cflags "pygobject-2.0 >= 2.12" 2>/dev/null`
3921+ test "x$?" != "x0" && pkg_failed=yes
3922+else
3923+ pkg_failed=yes
3924+fi
3925+ else
3926+ pkg_failed=untried
3927+fi
3928+if test -n "$PYGOBJECT_LIBS"; then
3929+ pkg_cv_PYGOBJECT_LIBS="$PYGOBJECT_LIBS"
3930+ elif test -n "$PKG_CONFIG"; then
3931+ if test -n "$PKG_CONFIG" && \
3932+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-2.0 >= 2.12\""; } >&5
3933+ ($PKG_CONFIG --exists --print-errors "pygobject-2.0 >= 2.12") 2>&5
3934+ ac_status=$?
3935+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3936+ test $ac_status = 0; }; then
3937+ pkg_cv_PYGOBJECT_LIBS=`$PKG_CONFIG --libs "pygobject-2.0 >= 2.12" 2>/dev/null`
3938+ test "x$?" != "x0" && pkg_failed=yes
3939+else
3940+ pkg_failed=yes
3941+fi
3942+ else
3943+ pkg_failed=untried
3944+fi
3945+
3946+
3947+
3948+if test $pkg_failed = yes; then
3949+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3950+$as_echo "no" >&6; }
3951+
3952+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
3953+ _pkg_short_errors_supported=yes
3954+else
3955+ _pkg_short_errors_supported=no
3956+fi
3957+ if test $_pkg_short_errors_supported = yes; then
3958+ PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pygobject-2.0 >= 2.12" 2>&1`
3959+ else
3960+ PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pygobject-2.0 >= 2.12" 2>&1`
3961+ fi
3962+ # Put the nasty error message in config.log where it belongs
3963+ echo "$PYGOBJECT_PKG_ERRORS" >&5
3964+
3965+
3966+pkg_failed=no
3967+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYGOBJECT" >&5
3968+$as_echo_n "checking for PYGOBJECT... " >&6; }
3969+
3970+if test -n "$PYGOBJECT_CFLAGS"; then
3971+ pkg_cv_PYGOBJECT_CFLAGS="$PYGOBJECT_CFLAGS"
3972+ elif test -n "$PKG_CONFIG"; then
3973+ if test -n "$PKG_CONFIG" && \
3974+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-3.0\""; } >&5
3975+ ($PKG_CONFIG --exists --print-errors "pygobject-3.0") 2>&5
3976+ ac_status=$?
3977+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3978+ test $ac_status = 0; }; then
3979+ pkg_cv_PYGOBJECT_CFLAGS=`$PKG_CONFIG --cflags "pygobject-3.0" 2>/dev/null`
3980+ test "x$?" != "x0" && pkg_failed=yes
3981+else
3982+ pkg_failed=yes
3983+fi
3984+ else
3985+ pkg_failed=untried
3986+fi
3987+if test -n "$PYGOBJECT_LIBS"; then
3988+ pkg_cv_PYGOBJECT_LIBS="$PYGOBJECT_LIBS"
3989+ elif test -n "$PKG_CONFIG"; then
3990+ if test -n "$PKG_CONFIG" && \
3991+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-3.0\""; } >&5
3992+ ($PKG_CONFIG --exists --print-errors "pygobject-3.0") 2>&5
3993+ ac_status=$?
3994+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3995+ test $ac_status = 0; }; then
3996+ pkg_cv_PYGOBJECT_LIBS=`$PKG_CONFIG --libs "pygobject-3.0" 2>/dev/null`
3997+ test "x$?" != "x0" && pkg_failed=yes
3998+else
3999+ pkg_failed=yes
4000+fi
4001+ else
4002+ pkg_failed=untried
4003+fi
4004+
4005+
4006+
4007+if test $pkg_failed = yes; then
4008+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4009+$as_echo "no" >&6; }
4010+
4011+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
4012+ _pkg_short_errors_supported=yes
4013+else
4014+ _pkg_short_errors_supported=no
4015+fi
4016+ if test $_pkg_short_errors_supported = yes; then
4017+ PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pygobject-3.0" 2>&1`
4018+ else
4019+ PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pygobject-3.0" 2>&1`
4020+ fi
4021+ # Put the nasty error message in config.log where it belongs
4022+ echo "$PYGOBJECT_PKG_ERRORS" >&5
4023+
4024+ as_fn_error $? "Package requirements (pygobject-3.0) were not met:
4025+
4026+$PYGOBJECT_PKG_ERRORS
4027+
4028+Consider adjusting the PKG_CONFIG_PATH environment variable if you
4029+installed software in a non-standard prefix.
4030+
4031+Alternatively, you may set the environment variables PYGOBJECT_CFLAGS
4032+and PYGOBJECT_LIBS to avoid the need to call pkg-config.
4033+See the pkg-config man page for more details." "$LINENO" 5
4034+elif test $pkg_failed = untried; then
4035+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4036+$as_echo "no" >&6; }
4037+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4038+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4039+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
4040+is in your PATH or set the PKG_CONFIG environment variable to the full
4041+path to pkg-config.
4042+
4043+Alternatively, you may set the environment variables PYGOBJECT_CFLAGS
4044+and PYGOBJECT_LIBS to avoid the need to call pkg-config.
4045+See the pkg-config man page for more details.
4046+
4047+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
4048+See \`config.log' for more details" "$LINENO" 5; }
4049+else
4050+ PYGOBJECT_CFLAGS=$pkg_cv_PYGOBJECT_CFLAGS
4051+ PYGOBJECT_LIBS=$pkg_cv_PYGOBJECT_LIBS
4052+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4053+$as_echo "yes" >&6; }
4054+
4055+fi
4056+
4057+elif test $pkg_failed = untried; then
4058+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4059+$as_echo "no" >&6; }
4060+
4061+pkg_failed=no
4062+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYGOBJECT" >&5
4063+$as_echo_n "checking for PYGOBJECT... " >&6; }
4064+
4065+if test -n "$PYGOBJECT_CFLAGS"; then
4066+ pkg_cv_PYGOBJECT_CFLAGS="$PYGOBJECT_CFLAGS"
4067+ elif test -n "$PKG_CONFIG"; then
4068+ if test -n "$PKG_CONFIG" && \
4069+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-3.0\""; } >&5
4070+ ($PKG_CONFIG --exists --print-errors "pygobject-3.0") 2>&5
4071+ ac_status=$?
4072+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4073+ test $ac_status = 0; }; then
4074+ pkg_cv_PYGOBJECT_CFLAGS=`$PKG_CONFIG --cflags "pygobject-3.0" 2>/dev/null`
4075+ test "x$?" != "x0" && pkg_failed=yes
4076+else
4077+ pkg_failed=yes
4078+fi
4079+ else
4080+ pkg_failed=untried
4081+fi
4082+if test -n "$PYGOBJECT_LIBS"; then
4083+ pkg_cv_PYGOBJECT_LIBS="$PYGOBJECT_LIBS"
4084+ elif test -n "$PKG_CONFIG"; then
4085+ if test -n "$PKG_CONFIG" && \
4086+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-3.0\""; } >&5
4087+ ($PKG_CONFIG --exists --print-errors "pygobject-3.0") 2>&5
4088+ ac_status=$?
4089+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4090+ test $ac_status = 0; }; then
4091+ pkg_cv_PYGOBJECT_LIBS=`$PKG_CONFIG --libs "pygobject-3.0" 2>/dev/null`
4092+ test "x$?" != "x0" && pkg_failed=yes
4093+else
4094+ pkg_failed=yes
4095+fi
4096+ else
4097+ pkg_failed=untried
4098+fi
4099+
4100+
4101+
4102+if test $pkg_failed = yes; then
4103+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4104+$as_echo "no" >&6; }
4105+
4106+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
4107+ _pkg_short_errors_supported=yes
4108+else
4109+ _pkg_short_errors_supported=no
4110+fi
4111+ if test $_pkg_short_errors_supported = yes; then
4112+ PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pygobject-3.0" 2>&1`
4113+ else
4114+ PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pygobject-3.0" 2>&1`
4115+ fi
4116+ # Put the nasty error message in config.log where it belongs
4117+ echo "$PYGOBJECT_PKG_ERRORS" >&5
4118+
4119+ as_fn_error $? "Package requirements (pygobject-3.0) were not met:
4120+
4121+$PYGOBJECT_PKG_ERRORS
4122+
4123+Consider adjusting the PKG_CONFIG_PATH environment variable if you
4124+installed software in a non-standard prefix.
4125+
4126+Alternatively, you may set the environment variables PYGOBJECT_CFLAGS
4127+and PYGOBJECT_LIBS to avoid the need to call pkg-config.
4128+See the pkg-config man page for more details." "$LINENO" 5
4129+elif test $pkg_failed = untried; then
4130+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4131+$as_echo "no" >&6; }
4132+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4133+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4134+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
4135+is in your PATH or set the PKG_CONFIG environment variable to the full
4136+path to pkg-config.
4137+
4138+Alternatively, you may set the environment variables PYGOBJECT_CFLAGS
4139+and PYGOBJECT_LIBS to avoid the need to call pkg-config.
4140+See the pkg-config man page for more details.
4141+
4142+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
4143+See \`config.log' for more details" "$LINENO" 5; }
4144+else
4145+ PYGOBJECT_CFLAGS=$pkg_cv_PYGOBJECT_CFLAGS
4146+ PYGOBJECT_LIBS=$pkg_cv_PYGOBJECT_LIBS
4147+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4148+$as_echo "yes" >&6; }
4149+
4150+fi
4151+
4152+else
4153+ PYGOBJECT_CFLAGS=$pkg_cv_PYGOBJECT_CFLAGS
4154+ PYGOBJECT_LIBS=$pkg_cv_PYGOBJECT_LIBS
4155+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4156+$as_echo "yes" >&6; }
4157+
4158+fi
4159+
4160+
4161+
4162+
4163 ac_config_files="$ac_config_files Makefile apps/Makefile sendto/Makefile blueman/Makefile blueman/Constants.py blueman/bluez/Makefile blueman/gui/Makefile blueman/gui/applet/Makefile blueman/gui/manager/Makefile blueman/plugins/Makefile blueman/plugins/services/Makefile blueman/plugins/applet/Makefile blueman/plugins/mechanism/Makefile blueman/plugins/manager/Makefile blueman/plugins/config/Makefile blueman/main/Makefile blueman/main/applet/Makefile blueman/ods/Makefile blueman/iniparse/Makefile data/Makefile data/configs/Makefile data/icons/Makefile data/icons/hicolor/Makefile data/icons/hicolor/16x16/Makefile data/icons/hicolor/16x16/actions/Makefile data/icons/hicolor/16x16/devices/Makefile data/icons/hicolor/16x16/status/Makefile data/icons/hicolor/32x32/Makefile data/icons/hicolor/32x32/actions/Makefile data/icons/hicolor/48x48/Makefile data/icons/hicolor/48x48/actions/Makefile data/icons/hicolor/48x48/devices/Makefile data/icons/hicolor/48x48/status/Makefile data/icons/hicolor/scalable/Makefile data/icons/hicolor/scalable/devices/Makefile data/icons/hicolor/scalable/actions/Makefile data/icons/hicolor/scalable/status/Makefile data/icons/main_icon/Makefile data/ui/Makefile data/man/Makefile data/configs/blueman-applet.service data/configs/org.blueman.Mechanism.service module/Makefile po/Makefile.in"
4164
4165 cat >confcache <<\_ACEOF
4166
4167=== modified file 'autom4te.cache/output.1'
4168--- autom4te.cache/output.1 2014-07-01 12:11:00 +0000
4169+++ autom4te.cache/output.1 2014-08-11 05:53:12 +0000
4170@@ -632,12 +632,10 @@
4171 am__EXEEXT_TRUE
4172 LTLIBOBJS
4173 LIB@&t@OBJS
4174+PYGOBJECT_LIBS
4175+PYGOBJECT_CFLAGS
4176 BLUEZ_LIBS
4177 BLUEZ_CFLAGS
4178-PYNOTIFY_LIBS
4179-PYNOTIFY_CFLAGS
4180-PYGTK_LIBS
4181-PYGTK_CFLAGS
4182 HAVE_NST_FALSE
4183 HAVE_NST_TRUE
4184 ENABLE_HAL_FALSE
4185@@ -655,7 +653,7 @@
4186 SYSCONFDIR
4187 PYREXC
4188 PYTHON_LIBS
4189-PYTHON_INCLUDES
4190+PYTHON_CFLAGS
4191 pkgpyexecdir
4192 pyexecdir
4193 pkgpythondir
4194@@ -864,13 +862,13 @@
4195 PKG_CONFIG_PATH
4196 PKG_CONFIG_LIBDIR
4197 PYTHON
4198+PYTHON_CFLAGS
4199+PYTHON_LIBS
4200 PYREXC
4201-PYGTK_CFLAGS
4202-PYGTK_LIBS
4203-PYNOTIFY_CFLAGS
4204-PYNOTIFY_LIBS
4205 BLUEZ_CFLAGS
4206-BLUEZ_LIBS'
4207+BLUEZ_LIBS
4208+PYGOBJECT_CFLAGS
4209+PYGOBJECT_LIBS'
4210
4211
4212 # Initialize some variables set by options.
4213@@ -1534,17 +1532,17 @@
4214 PKG_CONFIG_LIBDIR
4215 path overriding pkg-config's built-in search path
4216 PYTHON the Python interpreter
4217+ PYTHON_CFLAGS
4218+ C compiler flags for PYTHON, overriding pkg-config
4219+ PYTHON_LIBS linker flags for PYTHON, overriding pkg-config
4220 PYREXC Pyrex compiler
4221- PYGTK_CFLAGS
4222- C compiler flags for PYGTK, overriding pkg-config
4223- PYGTK_LIBS linker flags for PYGTK, overriding pkg-config
4224- PYNOTIFY_CFLAGS
4225- C compiler flags for PYNOTIFY, overriding pkg-config
4226- PYNOTIFY_LIBS
4227- linker flags for PYNOTIFY, overriding pkg-config
4228 BLUEZ_CFLAGS
4229 C compiler flags for BLUEZ, overriding pkg-config
4230 BLUEZ_LIBS linker flags for BLUEZ, overriding pkg-config
4231+ PYGOBJECT_CFLAGS
4232+ C compiler flags for PYGOBJECT, overriding pkg-config
4233+ PYGOBJECT_LIBS
4234+ linker flags for PYGOBJECT, overriding pkg-config
4235
4236 Use these variables to override the choices made by `configure' or to help
4237 it to find libraries and programs with nonstandard names/locations.
4238@@ -13268,34 +13266,103 @@
4239 fi
4240
4241
4242-
4243-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for headers required to compile python extensions" >&5
4244-$as_echo_n "checking for headers required to compile python extensions... " >&6; }
4245-py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
4246-py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
4247-PYTHON_INCLUDES=`python-config --includes`
4248-if test "$py_prefix" != "$py_exec_prefix"; then
4249- PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
4250-fi
4251-
4252-save_CPPFLAGS="$CPPFLAGS"
4253-CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
4254-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4255-/* end confdefs.h. */
4256-#include <Python.h>
4257-_ACEOF
4258-if ac_fn_c_try_cpp "$LINENO"; then :
4259- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
4260-$as_echo "found" >&6; }
4261-
4262-else
4263- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
4264-$as_echo "not found" >&6; }
4265-as_fn_error $? "Could not find Python headers" "$LINENO" 5
4266-fi
4267-rm -f conftest.err conftest.i conftest.$ac_ext
4268-CPPFLAGS="$save_CPPFLAGS"
4269-
4270+if test "${PYTHON_VERSION}" \< "3.0"; then
4271+
4272+pkg_failed=no
4273+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYTHON" >&5
4274+$as_echo_n "checking for PYTHON... " >&6; }
4275+
4276+if test -n "$PYTHON_CFLAGS"; then
4277+ pkg_cv_PYTHON_CFLAGS="$PYTHON_CFLAGS"
4278+ elif test -n "$PKG_CONFIG"; then
4279+ if test -n "$PKG_CONFIG" && \
4280+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-\${PYTHON_VERSION}\""; } >&5
4281+ ($PKG_CONFIG --exists --print-errors "python-${PYTHON_VERSION}") 2>&5
4282+ ac_status=$?
4283+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4284+ test $ac_status = 0; }; then
4285+ pkg_cv_PYTHON_CFLAGS=`$PKG_CONFIG --cflags "python-${PYTHON_VERSION}" 2>/dev/null`
4286+ test "x$?" != "x0" && pkg_failed=yes
4287+else
4288+ pkg_failed=yes
4289+fi
4290+ else
4291+ pkg_failed=untried
4292+fi
4293+if test -n "$PYTHON_LIBS"; then
4294+ pkg_cv_PYTHON_LIBS="$PYTHON_LIBS"
4295+ elif test -n "$PKG_CONFIG"; then
4296+ if test -n "$PKG_CONFIG" && \
4297+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-\${PYTHON_VERSION}\""; } >&5
4298+ ($PKG_CONFIG --exists --print-errors "python-${PYTHON_VERSION}") 2>&5
4299+ ac_status=$?
4300+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4301+ test $ac_status = 0; }; then
4302+ pkg_cv_PYTHON_LIBS=`$PKG_CONFIG --libs "python-${PYTHON_VERSION}" 2>/dev/null`
4303+ test "x$?" != "x0" && pkg_failed=yes
4304+else
4305+ pkg_failed=yes
4306+fi
4307+ else
4308+ pkg_failed=untried
4309+fi
4310+
4311+
4312+
4313+if test $pkg_failed = yes; then
4314+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4315+$as_echo "no" >&6; }
4316+
4317+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
4318+ _pkg_short_errors_supported=yes
4319+else
4320+ _pkg_short_errors_supported=no
4321+fi
4322+ if test $_pkg_short_errors_supported = yes; then
4323+ PYTHON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "python-${PYTHON_VERSION}" 2>&1`
4324+ else
4325+ PYTHON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "python-${PYTHON_VERSION}" 2>&1`
4326+ fi
4327+ # Put the nasty error message in config.log where it belongs
4328+ echo "$PYTHON_PKG_ERRORS" >&5
4329+
4330+ as_fn_error $? "Package requirements (python-${PYTHON_VERSION}) were not met:
4331+
4332+$PYTHON_PKG_ERRORS
4333+
4334+Consider adjusting the PKG_CONFIG_PATH environment variable if you
4335+installed software in a non-standard prefix.
4336+
4337+Alternatively, you may set the environment variables PYTHON_CFLAGS
4338+and PYTHON_LIBS to avoid the need to call pkg-config.
4339+See the pkg-config man page for more details." "$LINENO" 5
4340+elif test $pkg_failed = untried; then
4341+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4342+$as_echo "no" >&6; }
4343+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4344+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4345+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
4346+is in your PATH or set the PKG_CONFIG environment variable to the full
4347+path to pkg-config.
4348+
4349+Alternatively, you may set the environment variables PYTHON_CFLAGS
4350+and PYTHON_LIBS to avoid the need to call pkg-config.
4351+See the pkg-config man page for more details.
4352+
4353+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
4354+See \`config.log' for more details" "$LINENO" 5; }
4355+else
4356+ PYTHON_CFLAGS=$pkg_cv_PYTHON_CFLAGS
4357+ PYTHON_LIBS=$pkg_cv_PYTHON_LIBS
4358+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4359+$as_echo "yes" >&6; }
4360+
4361+fi
4362+
4363+
4364+else
4365+ as_fn_error $? "Blueman does not support python 3" "$LINENO" 5
4366+fi
4367
4368 @%:@ Check whether --enable-shared was given.
4369 if test "${enable_shared+set}" = set; then :
4370@@ -13354,9 +13421,6 @@
4371
4372
4373
4374-PYTHON_LIBS=`python-config --libs`
4375-
4376-
4377
4378 if test "x$PYREXC" = "x"; then
4379 # Extract the first word of "pyrexc", so it can be a program name with args.
4380@@ -13406,12 +13470,12 @@
4381 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${PYREXC}" >&5
4382 $as_echo "${PYREXC}" >&6; }
4383 if test "x$PYREXC" = "x"; then
4384- as_fn_error $? "Fatal: pyrexc not found.
4385+ as_fn_error $? "\"Fatal: pyrexc not found.
4386
4387 Get Pyrex from
4388 * your system's packages (recommended)
4389 * upstream at http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/
4390-" "$LINENO" 5
4391+\"" "$LINENO" 5
4392 fi
4393
4394
4395@@ -13704,10 +13768,9 @@
4396 fi
4397
4398
4399-have_nst=yes
4400 @%:@ Check whether --enable-sendto was given.
4401 if test "${enable_sendto+set}" = set; then :
4402- enableval=$enable_sendto;
4403+ enableval=$enable_sendto; have_nst=$enableval
4404 else
4405 have_nst=yes
4406 fi
4407@@ -13726,188 +13789,6 @@
4408 if test $deps_check = 1; then
4409
4410
4411-pkg_failed=no
4412-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYGTK" >&5
4413-$as_echo_n "checking for PYGTK... " >&6; }
4414-
4415-if test -n "$PYGTK_CFLAGS"; then
4416- pkg_cv_PYGTK_CFLAGS="$PYGTK_CFLAGS"
4417- elif test -n "$PKG_CONFIG"; then
4418- if test -n "$PKG_CONFIG" && \
4419- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0 >= 2.12.0\""; } >&5
4420- ($PKG_CONFIG --exists --print-errors "pygtk-2.0 >= 2.12.0") 2>&5
4421- ac_status=$?
4422- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4423- test $ac_status = 0; }; then
4424- pkg_cv_PYGTK_CFLAGS=`$PKG_CONFIG --cflags "pygtk-2.0 >= 2.12.0" 2>/dev/null`
4425- test "x$?" != "x0" && pkg_failed=yes
4426-else
4427- pkg_failed=yes
4428-fi
4429- else
4430- pkg_failed=untried
4431-fi
4432-if test -n "$PYGTK_LIBS"; then
4433- pkg_cv_PYGTK_LIBS="$PYGTK_LIBS"
4434- elif test -n "$PKG_CONFIG"; then
4435- if test -n "$PKG_CONFIG" && \
4436- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0 >= 2.12.0\""; } >&5
4437- ($PKG_CONFIG --exists --print-errors "pygtk-2.0 >= 2.12.0") 2>&5
4438- ac_status=$?
4439- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4440- test $ac_status = 0; }; then
4441- pkg_cv_PYGTK_LIBS=`$PKG_CONFIG --libs "pygtk-2.0 >= 2.12.0" 2>/dev/null`
4442- test "x$?" != "x0" && pkg_failed=yes
4443-else
4444- pkg_failed=yes
4445-fi
4446- else
4447- pkg_failed=untried
4448-fi
4449-
4450-
4451-
4452-if test $pkg_failed = yes; then
4453- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4454-$as_echo "no" >&6; }
4455-
4456-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
4457- _pkg_short_errors_supported=yes
4458-else
4459- _pkg_short_errors_supported=no
4460-fi
4461- if test $_pkg_short_errors_supported = yes; then
4462- PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pygtk-2.0 >= 2.12.0" 2>&1`
4463- else
4464- PYGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pygtk-2.0 >= 2.12.0" 2>&1`
4465- fi
4466- # Put the nasty error message in config.log where it belongs
4467- echo "$PYGTK_PKG_ERRORS" >&5
4468-
4469- as_fn_error $? "Package requirements (pygtk-2.0 >= 2.12.0) were not met:
4470-
4471-$PYGTK_PKG_ERRORS
4472-
4473-Consider adjusting the PKG_CONFIG_PATH environment variable if you
4474-installed software in a non-standard prefix.
4475-
4476-Alternatively, you may set the environment variables PYGTK_CFLAGS
4477-and PYGTK_LIBS to avoid the need to call pkg-config.
4478-See the pkg-config man page for more details." "$LINENO" 5
4479-elif test $pkg_failed = untried; then
4480- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4481-$as_echo "no" >&6; }
4482- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4483-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4484-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
4485-is in your PATH or set the PKG_CONFIG environment variable to the full
4486-path to pkg-config.
4487-
4488-Alternatively, you may set the environment variables PYGTK_CFLAGS
4489-and PYGTK_LIBS to avoid the need to call pkg-config.
4490-See the pkg-config man page for more details.
4491-
4492-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
4493-See \`config.log' for more details" "$LINENO" 5; }
4494-else
4495- PYGTK_CFLAGS=$pkg_cv_PYGTK_CFLAGS
4496- PYGTK_LIBS=$pkg_cv_PYGTK_LIBS
4497- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4498-$as_echo "yes" >&6; }
4499-
4500-fi
4501-
4502-pkg_failed=no
4503-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYNOTIFY" >&5
4504-$as_echo_n "checking for PYNOTIFY... " >&6; }
4505-
4506-if test -n "$PYNOTIFY_CFLAGS"; then
4507- pkg_cv_PYNOTIFY_CFLAGS="$PYNOTIFY_CFLAGS"
4508- elif test -n "$PKG_CONFIG"; then
4509- if test -n "$PKG_CONFIG" && \
4510- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"notify-python\""; } >&5
4511- ($PKG_CONFIG --exists --print-errors "notify-python") 2>&5
4512- ac_status=$?
4513- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4514- test $ac_status = 0; }; then
4515- pkg_cv_PYNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "notify-python" 2>/dev/null`
4516- test "x$?" != "x0" && pkg_failed=yes
4517-else
4518- pkg_failed=yes
4519-fi
4520- else
4521- pkg_failed=untried
4522-fi
4523-if test -n "$PYNOTIFY_LIBS"; then
4524- pkg_cv_PYNOTIFY_LIBS="$PYNOTIFY_LIBS"
4525- elif test -n "$PKG_CONFIG"; then
4526- if test -n "$PKG_CONFIG" && \
4527- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"notify-python\""; } >&5
4528- ($PKG_CONFIG --exists --print-errors "notify-python") 2>&5
4529- ac_status=$?
4530- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4531- test $ac_status = 0; }; then
4532- pkg_cv_PYNOTIFY_LIBS=`$PKG_CONFIG --libs "notify-python" 2>/dev/null`
4533- test "x$?" != "x0" && pkg_failed=yes
4534-else
4535- pkg_failed=yes
4536-fi
4537- else
4538- pkg_failed=untried
4539-fi
4540-
4541-
4542-
4543-if test $pkg_failed = yes; then
4544- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4545-$as_echo "no" >&6; }
4546-
4547-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
4548- _pkg_short_errors_supported=yes
4549-else
4550- _pkg_short_errors_supported=no
4551-fi
4552- if test $_pkg_short_errors_supported = yes; then
4553- PYNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "notify-python" 2>&1`
4554- else
4555- PYNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "notify-python" 2>&1`
4556- fi
4557- # Put the nasty error message in config.log where it belongs
4558- echo "$PYNOTIFY_PKG_ERRORS" >&5
4559-
4560- as_fn_error $? "Package requirements (notify-python) were not met:
4561-
4562-$PYNOTIFY_PKG_ERRORS
4563-
4564-Consider adjusting the PKG_CONFIG_PATH environment variable if you
4565-installed software in a non-standard prefix.
4566-
4567-Alternatively, you may set the environment variables PYNOTIFY_CFLAGS
4568-and PYNOTIFY_LIBS to avoid the need to call pkg-config.
4569-See the pkg-config man page for more details." "$LINENO" 5
4570-elif test $pkg_failed = untried; then
4571- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4572-$as_echo "no" >&6; }
4573- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4574-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4575-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
4576-is in your PATH or set the PKG_CONFIG environment variable to the full
4577-path to pkg-config.
4578-
4579-Alternatively, you may set the environment variables PYNOTIFY_CFLAGS
4580-and PYNOTIFY_LIBS to avoid the need to call pkg-config.
4581-See the pkg-config man page for more details.
4582-
4583-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
4584-See \`config.log' for more details" "$LINENO" 5; }
4585-else
4586- PYNOTIFY_CFLAGS=$pkg_cv_PYNOTIFY_CFLAGS
4587- PYNOTIFY_LIBS=$pkg_cv_PYNOTIFY_LIBS
4588- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4589-$as_echo "yes" >&6; }
4590-
4591-fi
4592-
4593 py_mod_var=`echo dbus'_' | sed 'y%./+-%__p_%'`
4594 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python module dbus" >&5
4595 $as_echo_n "checking for python module dbus... " >&6; }
4596@@ -13944,43 +13825,8 @@
4597 fi
4598
4599
4600-py_mod_var=`echo gobject'_' | sed 'y%./+-%__p_%'`
4601-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python module gobject" >&5
4602-$as_echo_n "checking for python module gobject... " >&6; }
4603-if eval \${py_cv_mod_$py_mod_var+:} false; then :
4604- $as_echo_n "(cached) " >&6
4605-else
4606-
4607-prog="
4608-import sys
4609-try:
4610- import gobject
4611-except ImportError:
4612- sys.exit(1)
4613-except:
4614- sys.exit(0)
4615-sys.exit(0)"
4616-if $PYTHON -c "$prog" 1>&5 2>&5
4617- then
4618- eval "py_cv_mod_$py_mod_var=yes"
4619- else
4620- eval "py_cv_mod_$py_mod_var=no"
4621- fi
4622-
4623-fi
4624-
4625-py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
4626-if test "x$py_val" != xno; then
4627- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4628-$as_echo "yes" >&6; }
4629- else
4630- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4631-$as_echo "no" >&6; }
4632- as_fn_error $? "Could not find Python module gobject" "$LINENO" 5
4633-fi
4634-
4635-
4636-fi
4637+fi
4638+
4639
4640
4641 pkg_failed=no
4642@@ -13993,17 +13839,13 @@
4643 if test -n "$PKG_CONFIG" && \
4644 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez >= 4.61
4645 libstartup-notification-1.0 >= 0.9
4646- gtk+-2.0 >= 2.12
4647- pygobject-2.0 >= 2.12
4648- gobject-2.0 >= 2.12
4649+ gtk+-3.0
4650 glib-2.0 >= 2.32
4651 gthread-2.0 >= 2.32
4652 \""; } >&5
4653 ($PKG_CONFIG --exists --print-errors "bluez >= 4.61
4654 libstartup-notification-1.0 >= 0.9
4655- gtk+-2.0 >= 2.12
4656- pygobject-2.0 >= 2.12
4657- gobject-2.0 >= 2.12
4658+ gtk+-3.0
4659 glib-2.0 >= 2.32
4660 gthread-2.0 >= 2.32
4661 ") 2>&5
4662@@ -14012,9 +13854,7 @@
4663 test $ac_status = 0; }; then
4664 pkg_cv_BLUEZ_CFLAGS=`$PKG_CONFIG --cflags "bluez >= 4.61
4665 libstartup-notification-1.0 >= 0.9
4666- gtk+-2.0 >= 2.12
4667- pygobject-2.0 >= 2.12
4668- gobject-2.0 >= 2.12
4669+ gtk+-3.0
4670 glib-2.0 >= 2.32
4671 gthread-2.0 >= 2.32
4672 " 2>/dev/null`
4673@@ -14031,17 +13871,13 @@
4674 if test -n "$PKG_CONFIG" && \
4675 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez >= 4.61
4676 libstartup-notification-1.0 >= 0.9
4677- gtk+-2.0 >= 2.12
4678- pygobject-2.0 >= 2.12
4679- gobject-2.0 >= 2.12
4680+ gtk+-3.0
4681 glib-2.0 >= 2.32
4682 gthread-2.0 >= 2.32
4683 \""; } >&5
4684 ($PKG_CONFIG --exists --print-errors "bluez >= 4.61
4685 libstartup-notification-1.0 >= 0.9
4686- gtk+-2.0 >= 2.12
4687- pygobject-2.0 >= 2.12
4688- gobject-2.0 >= 2.12
4689+ gtk+-3.0
4690 glib-2.0 >= 2.32
4691 gthread-2.0 >= 2.32
4692 ") 2>&5
4693@@ -14050,9 +13886,7 @@
4694 test $ac_status = 0; }; then
4695 pkg_cv_BLUEZ_LIBS=`$PKG_CONFIG --libs "bluez >= 4.61
4696 libstartup-notification-1.0 >= 0.9
4697- gtk+-2.0 >= 2.12
4698- pygobject-2.0 >= 2.12
4699- gobject-2.0 >= 2.12
4700+ gtk+-3.0
4701 glib-2.0 >= 2.32
4702 gthread-2.0 >= 2.32
4703 " 2>/dev/null`
4704@@ -14078,18 +13912,14 @@
4705 if test $_pkg_short_errors_supported = yes; then
4706 BLUEZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "bluez >= 4.61
4707 libstartup-notification-1.0 >= 0.9
4708- gtk+-2.0 >= 2.12
4709- pygobject-2.0 >= 2.12
4710- gobject-2.0 >= 2.12
4711+ gtk+-3.0
4712 glib-2.0 >= 2.32
4713 gthread-2.0 >= 2.32
4714 " 2>&1`
4715 else
4716 BLUEZ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "bluez >= 4.61
4717 libstartup-notification-1.0 >= 0.9
4718- gtk+-2.0 >= 2.12
4719- pygobject-2.0 >= 2.12
4720- gobject-2.0 >= 2.12
4721+ gtk+-3.0
4722 glib-2.0 >= 2.32
4723 gthread-2.0 >= 2.32
4724 " 2>&1`
4725@@ -14099,9 +13929,7 @@
4726
4727 as_fn_error $? "Package requirements (bluez >= 4.61
4728 libstartup-notification-1.0 >= 0.9
4729- gtk+-2.0 >= 2.12
4730- pygobject-2.0 >= 2.12
4731- gobject-2.0 >= 2.12
4732+ gtk+-3.0
4733 glib-2.0 >= 2.32
4734 gthread-2.0 >= 2.32
4735 ) were not met:
4736@@ -14140,6 +13968,262 @@
4737
4738
4739
4740+pkg_failed=no
4741+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYGOBJECT" >&5
4742+$as_echo_n "checking for PYGOBJECT... " >&6; }
4743+
4744+if test -n "$PYGOBJECT_CFLAGS"; then
4745+ pkg_cv_PYGOBJECT_CFLAGS="$PYGOBJECT_CFLAGS"
4746+ elif test -n "$PKG_CONFIG"; then
4747+ if test -n "$PKG_CONFIG" && \
4748+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-2.0 >= 2.12\""; } >&5
4749+ ($PKG_CONFIG --exists --print-errors "pygobject-2.0 >= 2.12") 2>&5
4750+ ac_status=$?
4751+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4752+ test $ac_status = 0; }; then
4753+ pkg_cv_PYGOBJECT_CFLAGS=`$PKG_CONFIG --cflags "pygobject-2.0 >= 2.12" 2>/dev/null`
4754+ test "x$?" != "x0" && pkg_failed=yes
4755+else
4756+ pkg_failed=yes
4757+fi
4758+ else
4759+ pkg_failed=untried
4760+fi
4761+if test -n "$PYGOBJECT_LIBS"; then
4762+ pkg_cv_PYGOBJECT_LIBS="$PYGOBJECT_LIBS"
4763+ elif test -n "$PKG_CONFIG"; then
4764+ if test -n "$PKG_CONFIG" && \
4765+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-2.0 >= 2.12\""; } >&5
4766+ ($PKG_CONFIG --exists --print-errors "pygobject-2.0 >= 2.12") 2>&5
4767+ ac_status=$?
4768+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4769+ test $ac_status = 0; }; then
4770+ pkg_cv_PYGOBJECT_LIBS=`$PKG_CONFIG --libs "pygobject-2.0 >= 2.12" 2>/dev/null`
4771+ test "x$?" != "x0" && pkg_failed=yes
4772+else
4773+ pkg_failed=yes
4774+fi
4775+ else
4776+ pkg_failed=untried
4777+fi
4778+
4779+
4780+
4781+if test $pkg_failed = yes; then
4782+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4783+$as_echo "no" >&6; }
4784+
4785+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
4786+ _pkg_short_errors_supported=yes
4787+else
4788+ _pkg_short_errors_supported=no
4789+fi
4790+ if test $_pkg_short_errors_supported = yes; then
4791+ PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pygobject-2.0 >= 2.12" 2>&1`
4792+ else
4793+ PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pygobject-2.0 >= 2.12" 2>&1`
4794+ fi
4795+ # Put the nasty error message in config.log where it belongs
4796+ echo "$PYGOBJECT_PKG_ERRORS" >&5
4797+
4798+
4799+pkg_failed=no
4800+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYGOBJECT" >&5
4801+$as_echo_n "checking for PYGOBJECT... " >&6; }
4802+
4803+if test -n "$PYGOBJECT_CFLAGS"; then
4804+ pkg_cv_PYGOBJECT_CFLAGS="$PYGOBJECT_CFLAGS"
4805+ elif test -n "$PKG_CONFIG"; then
4806+ if test -n "$PKG_CONFIG" && \
4807+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-3.0\""; } >&5
4808+ ($PKG_CONFIG --exists --print-errors "pygobject-3.0") 2>&5
4809+ ac_status=$?
4810+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4811+ test $ac_status = 0; }; then
4812+ pkg_cv_PYGOBJECT_CFLAGS=`$PKG_CONFIG --cflags "pygobject-3.0" 2>/dev/null`
4813+ test "x$?" != "x0" && pkg_failed=yes
4814+else
4815+ pkg_failed=yes
4816+fi
4817+ else
4818+ pkg_failed=untried
4819+fi
4820+if test -n "$PYGOBJECT_LIBS"; then
4821+ pkg_cv_PYGOBJECT_LIBS="$PYGOBJECT_LIBS"
4822+ elif test -n "$PKG_CONFIG"; then
4823+ if test -n "$PKG_CONFIG" && \
4824+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-3.0\""; } >&5
4825+ ($PKG_CONFIG --exists --print-errors "pygobject-3.0") 2>&5
4826+ ac_status=$?
4827+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4828+ test $ac_status = 0; }; then
4829+ pkg_cv_PYGOBJECT_LIBS=`$PKG_CONFIG --libs "pygobject-3.0" 2>/dev/null`
4830+ test "x$?" != "x0" && pkg_failed=yes
4831+else
4832+ pkg_failed=yes
4833+fi
4834+ else
4835+ pkg_failed=untried
4836+fi
4837+
4838+
4839+
4840+if test $pkg_failed = yes; then
4841+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4842+$as_echo "no" >&6; }
4843+
4844+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
4845+ _pkg_short_errors_supported=yes
4846+else
4847+ _pkg_short_errors_supported=no
4848+fi
4849+ if test $_pkg_short_errors_supported = yes; then
4850+ PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pygobject-3.0" 2>&1`
4851+ else
4852+ PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pygobject-3.0" 2>&1`
4853+ fi
4854+ # Put the nasty error message in config.log where it belongs
4855+ echo "$PYGOBJECT_PKG_ERRORS" >&5
4856+
4857+ as_fn_error $? "Package requirements (pygobject-3.0) were not met:
4858+
4859+$PYGOBJECT_PKG_ERRORS
4860+
4861+Consider adjusting the PKG_CONFIG_PATH environment variable if you
4862+installed software in a non-standard prefix.
4863+
4864+Alternatively, you may set the environment variables PYGOBJECT_CFLAGS
4865+and PYGOBJECT_LIBS to avoid the need to call pkg-config.
4866+See the pkg-config man page for more details." "$LINENO" 5
4867+elif test $pkg_failed = untried; then
4868+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4869+$as_echo "no" >&6; }
4870+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4871+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4872+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
4873+is in your PATH or set the PKG_CONFIG environment variable to the full
4874+path to pkg-config.
4875+
4876+Alternatively, you may set the environment variables PYGOBJECT_CFLAGS
4877+and PYGOBJECT_LIBS to avoid the need to call pkg-config.
4878+See the pkg-config man page for more details.
4879+
4880+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
4881+See \`config.log' for more details" "$LINENO" 5; }
4882+else
4883+ PYGOBJECT_CFLAGS=$pkg_cv_PYGOBJECT_CFLAGS
4884+ PYGOBJECT_LIBS=$pkg_cv_PYGOBJECT_LIBS
4885+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4886+$as_echo "yes" >&6; }
4887+
4888+fi
4889+
4890+elif test $pkg_failed = untried; then
4891+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4892+$as_echo "no" >&6; }
4893+
4894+pkg_failed=no
4895+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYGOBJECT" >&5
4896+$as_echo_n "checking for PYGOBJECT... " >&6; }
4897+
4898+if test -n "$PYGOBJECT_CFLAGS"; then
4899+ pkg_cv_PYGOBJECT_CFLAGS="$PYGOBJECT_CFLAGS"
4900+ elif test -n "$PKG_CONFIG"; then
4901+ if test -n "$PKG_CONFIG" && \
4902+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-3.0\""; } >&5
4903+ ($PKG_CONFIG --exists --print-errors "pygobject-3.0") 2>&5
4904+ ac_status=$?
4905+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4906+ test $ac_status = 0; }; then
4907+ pkg_cv_PYGOBJECT_CFLAGS=`$PKG_CONFIG --cflags "pygobject-3.0" 2>/dev/null`
4908+ test "x$?" != "x0" && pkg_failed=yes
4909+else
4910+ pkg_failed=yes
4911+fi
4912+ else
4913+ pkg_failed=untried
4914+fi
4915+if test -n "$PYGOBJECT_LIBS"; then
4916+ pkg_cv_PYGOBJECT_LIBS="$PYGOBJECT_LIBS"
4917+ elif test -n "$PKG_CONFIG"; then
4918+ if test -n "$PKG_CONFIG" && \
4919+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-3.0\""; } >&5
4920+ ($PKG_CONFIG --exists --print-errors "pygobject-3.0") 2>&5
4921+ ac_status=$?
4922+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4923+ test $ac_status = 0; }; then
4924+ pkg_cv_PYGOBJECT_LIBS=`$PKG_CONFIG --libs "pygobject-3.0" 2>/dev/null`
4925+ test "x$?" != "x0" && pkg_failed=yes
4926+else
4927+ pkg_failed=yes
4928+fi
4929+ else
4930+ pkg_failed=untried
4931+fi
4932+
4933+
4934+
4935+if test $pkg_failed = yes; then
4936+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4937+$as_echo "no" >&6; }
4938+
4939+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
4940+ _pkg_short_errors_supported=yes
4941+else
4942+ _pkg_short_errors_supported=no
4943+fi
4944+ if test $_pkg_short_errors_supported = yes; then
4945+ PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pygobject-3.0" 2>&1`
4946+ else
4947+ PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pygobject-3.0" 2>&1`
4948+ fi
4949+ # Put the nasty error message in config.log where it belongs
4950+ echo "$PYGOBJECT_PKG_ERRORS" >&5
4951+
4952+ as_fn_error $? "Package requirements (pygobject-3.0) were not met:
4953+
4954+$PYGOBJECT_PKG_ERRORS
4955+
4956+Consider adjusting the PKG_CONFIG_PATH environment variable if you
4957+installed software in a non-standard prefix.
4958+
4959+Alternatively, you may set the environment variables PYGOBJECT_CFLAGS
4960+and PYGOBJECT_LIBS to avoid the need to call pkg-config.
4961+See the pkg-config man page for more details." "$LINENO" 5
4962+elif test $pkg_failed = untried; then
4963+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4964+$as_echo "no" >&6; }
4965+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4966+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4967+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
4968+is in your PATH or set the PKG_CONFIG environment variable to the full
4969+path to pkg-config.
4970+
4971+Alternatively, you may set the environment variables PYGOBJECT_CFLAGS
4972+and PYGOBJECT_LIBS to avoid the need to call pkg-config.
4973+See the pkg-config man page for more details.
4974+
4975+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
4976+See \`config.log' for more details" "$LINENO" 5; }
4977+else
4978+ PYGOBJECT_CFLAGS=$pkg_cv_PYGOBJECT_CFLAGS
4979+ PYGOBJECT_LIBS=$pkg_cv_PYGOBJECT_LIBS
4980+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4981+$as_echo "yes" >&6; }
4982+
4983+fi
4984+
4985+else
4986+ PYGOBJECT_CFLAGS=$pkg_cv_PYGOBJECT_CFLAGS
4987+ PYGOBJECT_LIBS=$pkg_cv_PYGOBJECT_LIBS
4988+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4989+$as_echo "yes" >&6; }
4990+
4991+fi
4992+
4993+
4994+
4995+
4996 ac_config_files="$ac_config_files Makefile apps/Makefile sendto/Makefile blueman/Makefile blueman/Constants.py blueman/bluez/Makefile blueman/gui/Makefile blueman/gui/applet/Makefile blueman/gui/manager/Makefile blueman/plugins/Makefile blueman/plugins/services/Makefile blueman/plugins/applet/Makefile blueman/plugins/mechanism/Makefile blueman/plugins/manager/Makefile blueman/plugins/config/Makefile blueman/main/Makefile blueman/main/applet/Makefile blueman/ods/Makefile blueman/iniparse/Makefile data/Makefile data/configs/Makefile data/icons/Makefile data/icons/hicolor/Makefile data/icons/hicolor/16x16/Makefile data/icons/hicolor/16x16/actions/Makefile data/icons/hicolor/16x16/devices/Makefile data/icons/hicolor/16x16/status/Makefile data/icons/hicolor/32x32/Makefile data/icons/hicolor/32x32/actions/Makefile data/icons/hicolor/48x48/Makefile data/icons/hicolor/48x48/actions/Makefile data/icons/hicolor/48x48/devices/Makefile data/icons/hicolor/48x48/status/Makefile data/icons/hicolor/scalable/Makefile data/icons/hicolor/scalable/devices/Makefile data/icons/hicolor/scalable/actions/Makefile data/icons/hicolor/scalable/status/Makefile data/icons/main_icon/Makefile data/ui/Makefile data/man/Makefile data/configs/blueman-applet.service data/configs/org.blueman.Mechanism.service module/Makefile po/Makefile.in"
4997
4998 cat >confcache <<\_ACEOF
4999
5000=== modified file 'autom4te.cache/requests'
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: