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
=== removed directory '.pc/01_dont_autostart_lxde.patch'
=== removed directory '.pc/01_dont_autostart_lxde.patch/data'
=== removed file '.pc/01_dont_autostart_lxde.patch/data/blueman.desktop.in'
--- .pc/01_dont_autostart_lxde.patch/data/blueman.desktop.in 2013-07-03 21:40:14 +0000
+++ .pc/01_dont_autostart_lxde.patch/data/blueman.desktop.in 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
1[Desktop Entry]
2Encoding=UTF-8
3_Name=Blueman Applet
4_Comment=Blueman Bluetooth Manager
5Icon=blueman
6Exec=blueman-applet
7Terminal=false
8Type=Application
9Categories=
100
=== removed directory '.pc/02_dont_crash_on_non-bluetooth_card.patch'
=== removed directory '.pc/02_dont_crash_on_non-bluetooth_card.patch/blueman'
=== removed directory '.pc/02_dont_crash_on_non-bluetooth_card.patch/blueman/plugins'
=== removed directory '.pc/02_dont_crash_on_non-bluetooth_card.patch/blueman/plugins/applet'
=== removed file '.pc/02_dont_crash_on_non-bluetooth_card.patch/blueman/plugins/applet/PulseAudio.py'
--- .pc/02_dont_crash_on_non-bluetooth_card.patch/blueman/plugins/applet/PulseAudio.py 2014-07-03 07:37:37 +0000
+++ .pc/02_dont_crash_on_non-bluetooth_card.patch/blueman/plugins/applet/PulseAudio.py 1970-01-01 00:00:00 +0000
@@ -1,355 +0,0 @@
1# Copyright (C) 2008 Valmantas Paliksa <walmis at balticum-tv dot lt>
2# Copyright (C) 2008 Tadas Dailyda <tadas at dailyda dot com>
3#
4# Licensed under the GNU General Public License Version 3
5#
6# This program is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19from blueman.Functions import *
20from blueman.plugins.AppletPlugin import AppletPlugin
21from blueman.bluez.Device import Device as BluezDevice
22from blueman.main.Device import Device
23from blueman.gui.Notification import Notification
24from blueman.main.PulseAudioUtils import PulseAudioUtils, EventType
25from subprocess import Popen, PIPE
26import gobject
27
28import dbus
29from blueman.main.SignalTracker import SignalTracker
30
31class SourceRedirector:
32 instances = []
33 def __init__(self, module_id, device_path, pa_utils):
34 if module_id in SourceRedirector.instances:
35 return
36 else:
37 SourceRedirector.instances.append(module_id)
38
39 self.module_id = module_id
40 self.pa_utils = pa_utils
41 self.device = Device(device_path)
42 self.signals = SignalTracker()
43 self.bus = dbus.SystemBus()
44 self.signals.Handle("dbus", self.bus, self.on_source_prop_change, "PropertyChanged", "org.bluez.AudioSource", path=device_path)
45
46 self.pacat = None
47 self.parec = None
48 self.loopback_id = None
49
50 dprint("Starting source redirector")
51 def sources_cb(sources):
52 for k, v in sources.iteritems():
53 props = v["proplist"]
54 if "bluetooth.protocol" in props:
55 if props["bluetooth.protocol"] == "a2dp_source":
56 if v["owner_module"] == self.module_id:
57 dprint("Found source", k)
58 self.start_redirect(k)
59 return
60 dprint("Source not found :(")
61
62 self.pa_utils.ListSources(sources_cb)
63
64 def start_redirect(self, source):
65
66 def on_load(res):
67 dprint("module-loopback load result", res)
68 if res < 0:
69 self.parec = Popen(["parec", "-d", str(source)], stdout=PIPE)
70 self.pacat = Popen(["pacat", "--client-name=Blueman", "--stream-name=%s" % self.device.Address, "--property=application.icon_name=blueman"], stdin=self.parec.stdout)
71 else:
72 self.loopback_id = res
73
74 self.pa_utils.LoadModule("module-loopback", "source=%d" % source, on_load)
75
76 def on_source_prop_change(self, key, value):
77 if key == "State":
78 if value == "disconnected":
79 if self.pacat:
80 self.pacat.terminate()
81 if self.parec:
82 self.parec.terminate()
83 if self.loopback_id:
84 self.pa_utils.UnloadModule(self.loopback_id, lambda x: dprint("Loopback module unload result", x))
85
86 self.signals.DisconnectAll()
87
88 SourceRedirector.instances.remove(self.module_id)
89
90 del self.pa_utils
91
92 def __del__(self):
93 dprint("Destroying redirector")
94
95class Module(gobject.GObject):
96 __gsignals__ = {
97 'loaded' : (gobject.SIGNAL_NO_HOOKS, gobject.TYPE_NONE, ()),
98 }
99 def __init__(self):
100 gobject.GObject.__init__(self)
101 self.refcount = 0
102 self.id = None
103
104 def unload(self):
105 dprint(self.id)
106 pa = PulseAudioUtils()
107 id = self.id
108 pa.UnloadModule(self.id, lambda x: dprint("Unload %s result %s" % (id, x)))
109 self.id = None
110 self.refcount = 0
111
112 def ref(self):
113 self.refcount+=1
114
115 dprint(self.id, self.refcount)
116
117 def unref(self):
118 self.refcount-=1
119
120 dprint(self.id, self.refcount)
121
122 if self.refcount <= 0 and self.id:
123 self.unload()
124
125 def load(self, args, cb):
126 if self.id != None:
127 self.unload()
128
129 def load_cb(res):
130 if res > 0:
131 self.refcount = 1
132 self.id = res
133 if cb:
134 cb(res)
135 self.emit("loaded")
136 else:
137 self.refcount = 0
138 self.id = None
139
140 PulseAudioUtils().LoadModule("module-bluetooth-device",
141 args,
142 load_cb)
143
144class PulseAudio(AppletPlugin):
145 __author__ = "Walmis"
146 __description__ = _("Automatically manages Pulseaudio Bluetooth sinks/sources.\n"
147 "<b>Note:</b> Requires pulseaudio 0.9.15 or higher")
148 __icon__ = "audio-card"
149 __options__ = {
150 "checked" : {"type": bool, "default": False},
151 "make_default_sink": {"type":bool,
152 "default": True,
153 "name": _("Make default sink"),
154 "desc": _("Make the a2dp audio sink the default after connection")},
155 "move_streams": {"type": bool,
156 "default": True,
157 "name": _("Move streams"),
158 "desc": _("Move existing audio streams to bluetooth device")}
159 }
160 def on_load(self, applet):
161 self.signals = SignalTracker()
162 if not self.get_option("checked"):
163 self.set_option("checked", True)
164 if not have("pactl"):
165 applet.Plugins.SetConfig("PulseAudio", False)
166 return
167
168 self.bus = dbus.SystemBus()
169
170 self.connected_sources = []
171 self.connected_sinks = []
172 self.connected_hs = []
173
174 self.loaded_modules = {}
175
176 self.pulse_utils = PulseAudioUtils()
177 version = self.pulse_utils.GetVersion()
178 dprint("PulseAudio version:", version)
179
180 if version[0] == 0:
181 if tuple(version) < (0, 9, 15):
182 raise Exception("PulseAudio too old, required 0.9.15 or higher")
183
184 self.signals.Handle("dbus",
185 self.bus,
186 self.on_sink_prop_change,
187 "PropertyChanged",
188 "org.bluez.AudioSink",
189 path_keyword="device")
190
191 self.signals.Handle("dbus",
192 self.bus,
193 self.on_source_prop_change,
194 "PropertyChanged",
195 "org.bluez.AudioSource",
196 path_keyword="device")
197
198 self.signals.Handle("dbus",
199 self.bus,
200 self.on_hsp_prop_change,
201 "PropertyChanged",
202 "org.bluez.Headset",
203 path_keyword="device")
204
205
206 self.signals.Handle(self.pulse_utils, "event", self.on_pulse_event)
207
208 def on_pulse_event(self, pa_utils, event, idx):
209 if (EventType.CARD | EventType.CHANGE) == event:
210 dprint(event)
211 def card_cb(c):
212 dprint(c)
213 m = self.loaded_modules[c["proplist"]["bluez.path"]]
214 if c["owner_module"] == m.id:
215 if c["active_profile"] == "a2dp_source":
216 SourceRedirector(m.id, c["proplist"]["bluez.path"], pa_utils)
217
218 pa_utils.GetCard(idx, card_cb)
219
220
221 def on_unload(self):
222 self.signals.DisconnectAll()
223
224 def load_module(self, dev_path, args, cb=None):
225 if not dev_path in self.loaded_modules:
226 m = Module()
227 m.load(args, cb)
228 self.loaded_modules[dev_path] = m
229 else:
230 self.loaded_modules[dev_path].ref()
231
232 def try_unload_module(self, dev_path):
233 try:
234 m = self.loaded_modules[dev_path]
235 m.unref()
236 if m.refcount == 0:
237 del self.loaded_modules[dev_path]
238 except Exception, e:
239 dprint(e)
240
241 def on_source_prop_change(self, key, value, device):
242 dprint(key, value)
243
244 if key == "State":
245 if value == "connected":
246 if not device in self.connected_sources:
247 self.connected_sources.append(device)
248 d = Device(device)
249 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))
250
251 elif value == "disconnected":
252 self.try_unload_module(device)
253 if device in self.connected_sources:
254 self.connected_sources.remove(device)
255
256 elif value == "playing":
257 try:
258 m = self.loaded_modules[device]
259 def on_loaded(m):
260 SourceRedirector(m.id, device, self.pulse_utils)
261 m.disconnect(sig)
262
263 if not m.id:
264 sig = m.connect("loaded", on_loaded)
265 else:
266 SourceRedirector(m.id, device, self.pulse_utils)
267
268 except Exception, e:
269 dprint(e)
270
271
272 def on_sink_prop_change(self, key, value, device):
273 if key == "Connected" and value:
274 if not device in self.connected_sinks:
275 self.connected_sinks.append(device)
276 gobject.timeout_add(500, self.setup_pa, device, "a2dp")
277
278 elif key == "Connected" and not value:
279 if device in self.connected_sinks:
280 self.connected_sinks.remove(device)
281 self.try_unload_module(device)
282
283 def on_hsp_prop_change(self, key, value, device):
284 if key == "Connected" and value:
285 if not device in self.connected_hs:
286 self.connected_hs.append(device)
287 self.setup_pa(device, "hsp")
288
289 elif key == "Connected" and not value:
290 self.try_unload_module(device)
291 if device in self.connected_hs:
292 self.connected_hs.remove(device)
293
294 def move_pa_streams(self, sink_id):
295 def inputs_cb(inputs):
296 for k, v in inputs.iteritems():
297 dprint("moving stream", v["name"], "to sink", sink_id)
298 self.pulse_utils.MoveSinkInput(k, sink_id, None)
299
300 self.pulse_utils.ListSinkInputs(inputs_cb)
301
302 def setup_pa_sinks(self, module_id):
303 dprint("module", module_id)
304
305 def sinks_cb(sinks):
306 for k, v in sinks.iteritems():
307 if v["owner_module"] == module_id:
308 if self.get_option("make_default_sink"):
309 dprint("Making sink", v["name"], "the default")
310 self.pulse_utils.SetDefaultSink(v["name"], None)
311 if self.get_option("move_streams"):
312 self.move_pa_streams(k)
313
314
315 self.pulse_utils.ListSinks(sinks_cb)
316
317 def setup_pa(self, device_path, profile):
318 device = Device(device_path)
319
320
321 def load_cb(res):
322 dprint("Load result", res)
323
324 if res < 0:
325 Notification(_("Bluetooth Audio"),
326 _("Failed to initialize PulseAudio Bluetooth module. Bluetooth audio over PulseAudio will not work."),
327 pixbuf=get_notification_icon("gtk-dialog-error"),
328 status_icon=self.Applet.Plugins.StatusIcon)
329 else:
330 Notification(_("Bluetooth Audio"),
331 _("Successfully connected to a Bluetooth audio device. This device will now be available in the PulseAudio mixer"),
332 pixbuf=get_notification_icon("audio-card"),
333 status_icon=self.Applet.Plugins.StatusIcon)
334 if profile == "a2dp":
335 self.setup_pa_sinks(res)
336
337 #connect to other services, so pulseaudio profile switcher could work
338 for s in ("headset", "audiosink", "audiosource"):
339 try:
340 device.Services[s].Connect()
341 except KeyError:
342 pass
343 except Exception, e:
344 print e
345
346 version = self.pulse_utils.GetVersion()
347 if version[0] == 1 or version[2] >= 18:
348 args = "address=%s profile=%s sink_properties=device.icon_name=blueman card_properties=device.icon_name=blueman"
349 else:
350 args = "address=%s profile=%s"
351
352 self.load_module(device_path, args % (device.Address, profile), load_cb)
353
354
355
3560
=== removed directory '.pc/03_filemanager_fix.patch'
=== removed directory '.pc/03_filemanager_fix.patch/apps'
=== removed file '.pc/03_filemanager_fix.patch/apps/blueman-browse'
--- .pc/03_filemanager_fix.patch/apps/blueman-browse 2014-01-21 08:54:58 +0000
+++ .pc/03_filemanager_fix.patch/apps/blueman-browse 1970-01-01 00:00:00 +0000
@@ -1,79 +0,0 @@
1#!/usr/bin/python
2
3import os, sys
4
5#support running uninstalled
6_dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
7if os.path.exists(os.path.join(_dirname, "CHANGELOG.md")):
8 sys.path.insert(0, _dirname)
9
10import gtk
11import gobject
12from optparse import OptionParser
13import gettext
14import time
15
16from blueman.bluez.Manager import Manager
17from blueman.gui.DeviceSelectorDialog import DeviceSelectorDialog
18from blueman.Functions import *
19from blueman.Constants import *
20from blueman.main.Config import Config
21
22
23class Browse:
24 def __init__(self):
25 setup_icon_path()
26
27 usage = "Usage: %prog [options]"
28 parser = OptionParser(usage)
29 parser.add_option("-d", "--device", dest="device",
30 action="store", help=_("Browse this device"), metavar="ADDRESS")
31
32 (options, args) = parser.parse_args()
33 self.options = options
34 self.args = args
35
36 if options.device == None:
37 dev = self.select_device()
38 if not dev:
39 exit()
40
41 addr = dev.Address
42
43 else:
44 addr = options.device
45 addr = addr.strip(" ")
46 conf = Config("transfer")
47 if conf.props.browse_command == None:
48 conf.props.browse_command = DEF_BROWSE_COMMAND
49 if "nautilus" in DEF_BROWSE_COMMAND:
50 if not have("nautilus"):
51 conf.props.browse_command = "thunar obex://[%d]"
52
53 cmd = conf.props.browse_command.replace("%d", addr)
54 args = cmd.split(" ")
55 try:
56 spawn(args, True)
57 except Exception as e:
58 dprint(e)
59 d = gtk.MessageDialog(None, buttons=gtk.BUTTONS_OK, type=gtk.MESSAGE_ERROR)
60 d.props.text = _("Failed to launch \"%s\"") % args[0]
61 d.props.secondary_text = "%s\n\n" % e + _("You can enter an alternate browser in service settings")
62 d.run()
63 d.destroy()
64
65 def select_device(self):
66 d = DeviceSelectorDialog()
67 resp = d.run()
68 d.destroy()
69 if resp == gtk.RESPONSE_ACCEPT:
70 sel = d.GetSelection()
71 if sel:
72 return sel[1]
73 else:
74 return None
75 else:
76 return None
77
78
79Browse()
800
=== removed file '.pc/applied-patches'
--- .pc/applied-patches 2014-01-21 08:54:58 +0000
+++ .pc/applied-patches 1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
1dhcpclient_priority
201_dont_autostart_lxde.patch
302_dont_crash_on_non-bluetooth_card.patch
403_filemanager_fix.patch
50
=== removed directory '.pc/dhcpclient_priority'
=== removed directory '.pc/dhcpclient_priority/blueman'
=== removed directory '.pc/dhcpclient_priority/blueman/plugins'
=== removed directory '.pc/dhcpclient_priority/blueman/plugins/applet'
=== removed file '.pc/dhcpclient_priority/blueman/plugins/applet/DhcpClient.py'
--- .pc/dhcpclient_priority/blueman/plugins/applet/DhcpClient.py 2014-03-10 22:01:00 +0000
+++ .pc/dhcpclient_priority/blueman/plugins/applet/DhcpClient.py 1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
1# Copyright (C) 2009 Valmantas Paliksa <walmis at balticum-tv dot lt>
2#
3# Licensed under the GNU General Public License Version 3
4#
5# This program is free software: you can redistribute it and/or modify
6# it under the terms of the GNU General Public License as published by
7# the Free Software Foundation, either version 3 of the License, or
8# (at your option) any later version.
9#
10# This program is distributed in the hope that it will be useful,
11# but WITHOUT ANY WARRANTY; without even the implied warranty of
12# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13# GNU General Public License for more details.
14#
15# You should have received a copy of the GNU General Public License
16# along with this program. If not, see <http://www.gnu.org/licenses/>.
17
18from blueman.gui.Notification import Notification
19from blueman.plugins.AppletPlugin import AppletPlugin
20from blueman.main.Mechanism import Mechanism
21from blueman.main.SignalTracker import SignalTracker
22from blueman.Functions import *
23import dbus
24
25class DhcpClient(AppletPlugin):
26 __description__ = _("Provides a basic dhcp client for Bluetooth PAN connections.")
27 __icon__= "network"
28 __author__ = "Walmis"
29
30 def on_load(self, applet):
31 self.Signals = SignalTracker()
32
33 self.add_dbus_method(self.DhcpClient, in_signature="s")
34
35 self.Signals.Handle("dbus", dbus.SystemBus(),
36 self.on_network_prop_changed,
37 "PropertyChanged",
38 "org.bluez.Network",
39 path_keyword="path")
40
41 self.quering = []
42
43 def on_unload(self):
44 self.Signals.DisconnectAll()
45
46 def DhcpClient(self, interface):
47 self.dhcp_acquire(interface)
48
49 def on_network_prop_changed(self, key, value, path):
50 if key == "Interface":
51 if value != "":
52 self.dhcp_acquire(value)
53
54 def dhcp_acquire(self, device):
55 if device not in self.quering:
56 self.quering.append(device)
57 else:
58 return
59
60 if device != "":
61 def reply(ip_address):
62
63 Notification(_("Bluetooth Network"), _("Interface %(0)s bound to IP address %(1)s") % {"0": device, "1": ip_address},
64 pixbuf=get_icon("gtk-network", 48),
65 status_icon=self.Applet.Plugins.StatusIcon)
66
67 self.quering.remove(device)
68
69 def err(msg):
70 dprint(msg)
71 Notification(_("Bluetooth Network"), _("Failed to obtain an IP address on %s") % (device),
72 pixbuf=get_icon("gtk-network", 48),
73 status_icon=self.Applet.Plugins.StatusIcon)
74
75 self.quering.remove(device)
76
77 Notification(_("Bluetooth Network"), _("Trying to obtain an IP address on %s\nPlease wait..." % device),
78 pixbuf=get_icon("gtk-network", 48),
79 status_icon=self.Applet.Plugins.StatusIcon)
80
81 m = Mechanism()
82 m.DhcpClient(device, reply_handler=reply, error_handler=err, timeout=120)
830
=== modified file 'CHANGELOG.md'
--- CHANGELOG.md 2013-12-31 11:47:00 +0000
+++ CHANGELOG.md 2014-08-11 05:53:12 +0000
@@ -10,3 +10,11 @@
10* Fix thunar fallback (Jan HutaÅ™)10* Fix thunar fallback (Jan HutaÅ™)
11* Update autoconf to support aarch64 (Dennis Gilmore)11* Update autoconf to support aarch64 (Dennis Gilmore)
12* Do not power new adapters despite rfkill (@lkr / Leesa)12* Do not power new adapters despite rfkill (@lkr / Leesa)
13* Switch to GTK+ 3 (using introspection)
14* Fix handling of network devices (especially fixes DhcpClient plugin)
15* Update translations (too many to list them)
16* Prefer the GTK theme's bluetooth icons over the shipped ones (@Teknocrat)
17* Fix nonexistent dbus exception (Martín Ferrari)
18* Fix a rare problem when the manager device menu cannot get the current selection (@kolen / Konstantin Mochalov)
19* dhcpcd client support (@Teknocrat)
20* Fix pulseaudio device discovery (see #64 and the linked Ubuntu bugs for details and contributors)
1321
=== removed file 'Makefile'
--- Makefile 2014-07-01 12:11:00 +0000
+++ Makefile 1970-01-01 00:00:00 +0000
@@ -1,886 +0,0 @@
1# Makefile.in generated by automake 1.14.1 from Makefile.am.
2# Makefile. Generated from Makefile.in by configure.
3
4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5
6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it,
8# with or without modifications, as long as this notice is preserved.
9
10# This program is distributed in the hope that it will be useful,
11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13# PARTICULAR PURPOSE.
14
15
16
17am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
18am__make_running_with_option = \
19 case $${target_option-} in \
20 ?) ;; \
21 *) echo "am__make_running_with_option: internal error: invalid" \
22 "target option '$${target_option-}' specified" >&2; \
23 exit 1;; \
24 esac; \
25 has_opt=no; \
26 sane_makeflags=$$MAKEFLAGS; \
27 if $(am__is_gnu_make); then \
28 sane_makeflags=$$MFLAGS; \
29 else \
30 case $$MAKEFLAGS in \
31 *\\[\ \ ]*) \
32 bs=\\; \
33 sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
34 | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
35 esac; \
36 fi; \
37 skip_next=no; \
38 strip_trailopt () \
39 { \
40 flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
41 }; \
42 for flg in $$sane_makeflags; do \
43 test $$skip_next = yes && { skip_next=no; continue; }; \
44 case $$flg in \
45 *=*|--*) continue;; \
46 -*I) strip_trailopt 'I'; skip_next=yes;; \
47 -*I?*) strip_trailopt 'I';; \
48 -*O) strip_trailopt 'O'; skip_next=yes;; \
49 -*O?*) strip_trailopt 'O';; \
50 -*l) strip_trailopt 'l'; skip_next=yes;; \
51 -*l?*) strip_trailopt 'l';; \
52 -[dEDm]) skip_next=yes;; \
53 -[JT]) skip_next=yes;; \
54 esac; \
55 case $$flg in \
56 *$$target_option*) has_opt=yes; break;; \
57 esac; \
58 done; \
59 test $$has_opt = yes
60am__make_dryrun = (target_option=n; $(am__make_running_with_option))
61am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
62pkgincludedir = $(includedir)/blueman
63pkglibdir = $(libdir)/blueman
64pkglibexecdir = $(libexecdir)/blueman
65am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
66install_sh_DATA = $(install_sh) -c -m 644
67install_sh_PROGRAM = $(install_sh) -c
68install_sh_SCRIPT = $(install_sh) -c
69INSTALL_HEADER = $(INSTALL_DATA)
70transform = $(program_transform_name)
71NORMAL_INSTALL = :
72PRE_INSTALL = :
73POST_INSTALL = :
74NORMAL_UNINSTALL = :
75PRE_UNINSTALL = :
76POST_UNINSTALL = :
77build_triplet = x86_64-unknown-linux-gnu
78host_triplet = x86_64-unknown-linux-gnu
79subdir = .
80DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
81 $(top_srcdir)/configure $(am__configure_deps) \
82 $(srcdir)/config.h.in COPYING compile config.guess config.sub \
83 install-sh missing ltmain.sh
84ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
85am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
86 $(top_srcdir)/configure.ac
87am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
88 $(ACLOCAL_M4)
89am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
90 configure.lineno config.status.lineno
91mkinstalldirs = $(install_sh) -d
92CONFIG_HEADER = config.h
93CONFIG_CLEAN_FILES =
94CONFIG_CLEAN_VPATH_FILES =
95AM_V_P = $(am__v_P_$(V))
96am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY))
97am__v_P_0 = false
98am__v_P_1 = :
99AM_V_GEN = $(am__v_GEN_$(V))
100am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
101am__v_GEN_0 = @echo " GEN " $@;
102am__v_GEN_1 =
103AM_V_at = $(am__v_at_$(V))
104am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
105am__v_at_0 = @
106am__v_at_1 =
107SOURCES =
108DIST_SOURCES =
109RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
110 ctags-recursive dvi-recursive html-recursive info-recursive \
111 install-data-recursive install-dvi-recursive \
112 install-exec-recursive install-html-recursive \
113 install-info-recursive install-pdf-recursive \
114 install-ps-recursive install-recursive installcheck-recursive \
115 installdirs-recursive pdf-recursive ps-recursive \
116 tags-recursive uninstall-recursive
117am__can_run_installinfo = \
118 case $$AM_UPDATE_INFO_DIR in \
119 n|no|NO) false;; \
120 *) (install-info --version) >/dev/null 2>&1;; \
121 esac
122RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
123 distclean-recursive maintainer-clean-recursive
124am__recursive_targets = \
125 $(RECURSIVE_TARGETS) \
126 $(RECURSIVE_CLEAN_TARGETS) \
127 $(am__extra_recursive_targets)
128AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
129 cscope distdir dist dist-all distcheck
130am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
131 $(LISP)config.h.in
132# Read a list of newline-separated strings from the standard input,
133# and print each of them once, without duplicates. Input order is
134# *not* preserved.
135am__uniquify_input = $(AWK) '\
136 BEGIN { nonempty = 0; } \
137 { items[$$0] = 1; nonempty = 1; } \
138 END { if (nonempty) { for (i in items) print i; }; } \
139'
140# Make sure the list of sources is unique. This is necessary because,
141# e.g., the same source file might be shared among _SOURCES variables
142# for different programs/libraries.
143am__define_uniq_tagged_files = \
144 list='$(am__tagged_files)'; \
145 unique=`for i in $$list; do \
146 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
147 done | $(am__uniquify_input)`
148ETAGS = etags
149CTAGS = ctags
150CSCOPE = cscope
151DIST_SUBDIRS = $(SUBDIRS)
152DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
153distdir = $(PACKAGE)-$(VERSION)
154top_distdir = $(distdir)
155am__remove_distdir = \
156 if test -d "$(distdir)"; then \
157 find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
158 && rm -rf "$(distdir)" \
159 || { sleep 5 && rm -rf "$(distdir)"; }; \
160 else :; fi
161am__post_remove_distdir = $(am__remove_distdir)
162am__relativize = \
163 dir0=`pwd`; \
164 sed_first='s,^\([^/]*\)/.*$$,\1,'; \
165 sed_rest='s,^[^/]*/*,,'; \
166 sed_last='s,^.*/\([^/]*\)$$,\1,'; \
167 sed_butlast='s,/*[^/]*$$,,'; \
168 while test -n "$$dir1"; do \
169 first=`echo "$$dir1" | sed -e "$$sed_first"`; \
170 if test "$$first" != "."; then \
171 if test "$$first" = ".."; then \
172 dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
173 dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
174 else \
175 first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
176 if test "$$first2" = "$$first"; then \
177 dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
178 else \
179 dir2="../$$dir2"; \
180 fi; \
181 dir0="$$dir0"/"$$first"; \
182 fi; \
183 fi; \
184 dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
185 done; \
186 reldir="$$dir2"
187DIST_ARCHIVES = $(distdir).tar.gz
188GZIP_ENV = --best
189DIST_TARGETS = dist-gzip
190distuninstallcheck_listfiles = find . -type f -print
191am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
192 | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
193distcleancheck_listfiles = find . -type f -print
194pkgdatadir = /usr/local/share/blueman
195ACLOCAL = ${SHELL} /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb/missing aclocal-1.14
196ALL_LINGUAS =
197AMTAR = $${TAR-tar}
198AM_DEFAULT_VERBOSITY = 1
199AR = ar
200AUTOCONF = ${SHELL} /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb/missing autoconf
201AUTOHEADER = ${SHELL} /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb/missing autoheader
202AUTOMAKE = ${SHELL} /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb/missing automake-1.14
203AWK = gawk
204BINDIR = /usr/local/bin
205BLUEZ_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
206BLUEZ_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
207CATALOGS =
208CATOBJEXT = .gmo
209CC = gcc
210CCDEPMODE = depmode=gcc3
211CFLAGS = -g -O2
212CPP = gcc -E
213CPPFLAGS =
214CYGPATH_W = echo
215DATADIR = /usr/local/share
216DATADIRNAME = share
217DEFS = -DHAVE_CONFIG_H
218DEPDIR = .deps
219DLLTOOL = false
220DSYMUTIL =
221DUMPBIN =
222ECHO_C =
223ECHO_N = -n
224ECHO_T =
225EGREP = /bin/grep -E
226EXEEXT =
227FGREP = /bin/grep -F
228GETTEXT_PACKAGE = blueman
229GMOFILES =
230GMSGFMT = /usr/bin/msgfmt
231GREP = /bin/grep
232INSTALL = /usr/bin/install -c
233INSTALL_DATA = ${INSTALL} -m 644
234INSTALL_PROGRAM = ${INSTALL}
235INSTALL_SCRIPT = ${INSTALL}
236INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
237INSTOBJEXT = .mo
238INTLLIBS =
239INTLTOOL_EXTRACT = /usr/bin/intltool-extract
240INTLTOOL_MERGE = /usr/bin/intltool-merge
241INTLTOOL_PERL = /usr/bin/perl
242INTLTOOL_UPDATE = /usr/bin/intltool-update
243INTLTOOL_V_MERGE = $(INTLTOOL__v_MERGE_$(V))
244INTLTOOL_V_MERGE_OPTIONS = $(intltool__v_merge_options_$(V))
245INTLTOOL__v_MERGE_ = $(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))
246INTLTOOL__v_MERGE_0 = @echo " ITMRG " $@;
247LD = /usr/bin/ld -m elf_x86_64
248LDFLAGS =
249LIBEXECDIR = /usr/local/libexec
250LIBOBJS =
251LIBS =
252LIBTOOL = $(SHELL) $(top_builddir)/libtool
253LIPO =
254LN_S = ln -s
255LOCALEDIR = /usr/local/share/locale
256LTLIBOBJS =
257MAINT =
258MAKEINFO = ${SHELL} /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb/missing makeinfo
259MANIFEST_TOOL = :
260MKDIR_P = /bin/mkdir -p
261MKINSTALLDIRS = ./mkinstalldirs
262MSGFMT = /usr/bin/msgfmt
263MSGFMT_OPTS = -c
264MSGMERGE = /usr/bin/msgmerge
265NM = /usr/bin/nm -B
266NMEDIT =
267OBJDUMP = objdump
268OBJEXT = o
269OTOOL =
270OTOOL64 =
271PACKAGE = blueman
272PACKAGE_BUGREPORT =
273PACKAGE_NAME = blueman
274PACKAGE_STRING = blueman 1.23
275PACKAGE_TARNAME = blueman
276PACKAGE_URL =
277PACKAGE_VERSION = 1.23
278PATH_SEPARATOR = :
279PKGLIBDIR = /usr/local/lib/blueman
280PKG_CONFIG = /usr/bin/pkg-config
281PKG_CONFIG_LIBDIR =
282PKG_CONFIG_PATH =
283POFILES =
284POSUB = po
285PO_IN_DATADIR_FALSE =
286PO_IN_DATADIR_TRUE =
287PYGTK_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
288PYGTK_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
289PYNOTIFY_CFLAGS = -I/usr/include/gnome-python-2.0
290PYNOTIFY_LIBS =
291PYREXC = /usr/bin/pyrexc
292PYTHON = /usr/bin/python
293PYTHONDIR = /usr/local/lib/python2.7/dist-packages
294PYTHON_EXEC_PREFIX = ${exec_prefix}
295PYTHON_INCLUDES = -I/usr/include/python2.7 -I/usr/include/x86_64-linux-gnu/python2.7
296PYTHON_LIBS = -lpthread -ldl -lutil -lm -lpython2.7
297PYTHON_PLATFORM = linux2
298PYTHON_PREFIX = ${prefix}
299PYTHON_VERSION = 2.7
300RANLIB = ranlib
301SED = /bin/sed
302SET_MAKE =
303SHELL = /bin/bash
304STRIP = strip
305SYSCONFDIR = /etc
306USE_NLS = yes
307VERSION = 1.23
308XGETTEXT = /usr/bin/xgettext
309abs_builddir = /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb
310abs_srcdir = /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb
311abs_top_builddir = /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb
312abs_top_srcdir = /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb
313ac_ct_AR = ar
314ac_ct_CC = gcc
315ac_ct_DUMPBIN =
316am__include = include
317am__leading_dot = .
318am__quote =
319am__tar = $${TAR-tar} chof - "$$tardir"
320am__untar = $${TAR-tar} xf -
321bindir = ${exec_prefix}/bin
322build = x86_64-unknown-linux-gnu
323build_alias =
324build_cpu = x86_64
325build_os = linux-gnu
326build_vendor = unknown
327builddir = .
328datadir = ${datarootdir}
329datarootdir = ${prefix}/share
330dhconfig = /etc/dhcp3/dhcpd.conf
331docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
332dvidir = ${docdir}
333exec_prefix = ${prefix}
334hal_en = no
335host = x86_64-unknown-linux-gnu
336host_alias =
337host_cpu = x86_64
338host_os = linux-gnu
339host_vendor = unknown
340htmldir = ${docdir}
341includedir = ${prefix}/include
342infodir = ${datarootdir}/info
343install_sh = ${SHELL} /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb/install-sh
344intltool__v_merge_options_ = $(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))
345intltool__v_merge_options_0 = -q
346libdir = ${exec_prefix}/lib
347libexecdir = ${exec_prefix}/libexec
348localedir = ${datarootdir}/locale
349localstatedir = ${prefix}/var
350mandir = ${datarootdir}/man
351mkdir_p = $(MKDIR_P)
352oldincludedir = /usr/include
353pdfdir = ${docdir}
354pkgpyexecdir = ${pyexecdir}/blueman
355pkgpythondir = ${pythondir}/blueman
356polkit_val = yes
357prefix = /usr/local
358program_transform_name = s,x,x,
359psdir = ${docdir}
360pyexecdir = ${exec_prefix}/lib/python2.7/dist-packages
361pythondir = ${prefix}/lib/python2.7/dist-packages
362sbindir = ${exec_prefix}/sbin
363sharedstatedir = ${prefix}/com
364srcdir = .
365sysconfdir = /etc
366target_alias =
367top_build_prefix =
368top_builddir = .
369top_srcdir = .
370SUBDIRS = \
371 apps \
372 blueman \
373 data \
374 module \
375 sendto \
376 po
377
378EXTRA_DIST = \
379 intltool-extract.in \
380 intltool-update.in \
381 intltool-merge.in
382
383DISTCLEANFILES = \
384 intltool-extract \
385 intltool-update \
386 intltool-merge
387
388MAINTAINERCLEANFILES = \
389 Makefile.in \
390 aclocal.m4 \
391 configure \
392 config.h.in \
393 depcomp \
394 missing \
395 install-sh \
396 intltool-extract.in \
397 intltool-update.in \
398 intltool-merge.in
399
400all: config.h
401 $(MAKE) $(AM_MAKEFLAGS) all-recursive
402
403.SUFFIXES:
404am--refresh: Makefile
405 @:
406$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
407 @for dep in $?; do \
408 case '$(am__configure_deps)' in \
409 *$$dep*) \
410 echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
411 $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
412 && exit 0; \
413 exit 1;; \
414 esac; \
415 done; \
416 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
417 $(am__cd) $(top_srcdir) && \
418 $(AUTOMAKE) --foreign Makefile
419.PRECIOUS: Makefile
420Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
421 @case '$?' in \
422 *config.status*) \
423 echo ' $(SHELL) ./config.status'; \
424 $(SHELL) ./config.status;; \
425 *) \
426 echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
427 cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
428 esac;
429
430$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
431 $(SHELL) ./config.status --recheck
432
433$(top_srcdir)/configure: $(am__configure_deps)
434 $(am__cd) $(srcdir) && $(AUTOCONF)
435$(ACLOCAL_M4): $(am__aclocal_m4_deps)
436 $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
437$(am__aclocal_m4_deps):
438
439config.h: stamp-h1
440 @test -f $@ || rm -f stamp-h1
441 @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
442
443stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
444 @rm -f stamp-h1
445 cd $(top_builddir) && $(SHELL) ./config.status config.h
446$(srcdir)/config.h.in: $(am__configure_deps)
447 ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
448 rm -f stamp-h1
449 touch $@
450
451distclean-hdr:
452 -rm -f config.h stamp-h1
453
454mostlyclean-libtool:
455 -rm -f *.lo
456
457clean-libtool:
458 -rm -rf .libs _libs
459
460distclean-libtool:
461 -rm -f libtool config.lt
462
463# This directory's subdirectories are mostly independent; you can cd
464# into them and run 'make' without going through this Makefile.
465# To change the values of 'make' variables: instead of editing Makefiles,
466# (1) if the variable is set in 'config.status', edit 'config.status'
467# (which will cause the Makefiles to be regenerated when you run 'make');
468# (2) otherwise, pass the desired values on the 'make' command line.
469$(am__recursive_targets):
470 @fail=; \
471 if $(am__make_keepgoing); then \
472 failcom='fail=yes'; \
473 else \
474 failcom='exit 1'; \
475 fi; \
476 dot_seen=no; \
477 target=`echo $@ | sed s/-recursive//`; \
478 case "$@" in \
479 distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
480 *) list='$(SUBDIRS)' ;; \
481 esac; \
482 for subdir in $$list; do \
483 echo "Making $$target in $$subdir"; \
484 if test "$$subdir" = "."; then \
485 dot_seen=yes; \
486 local_target="$$target-am"; \
487 else \
488 local_target="$$target"; \
489 fi; \
490 ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
491 || eval $$failcom; \
492 done; \
493 if test "$$dot_seen" = "no"; then \
494 $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
495 fi; test -z "$$fail"
496
497ID: $(am__tagged_files)
498 $(am__define_uniq_tagged_files); mkid -fID $$unique
499tags: tags-recursive
500TAGS: tags
501
502tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
503 set x; \
504 here=`pwd`; \
505 if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
506 include_option=--etags-include; \
507 empty_fix=.; \
508 else \
509 include_option=--include; \
510 empty_fix=; \
511 fi; \
512 list='$(SUBDIRS)'; for subdir in $$list; do \
513 if test "$$subdir" = .; then :; else \
514 test ! -f $$subdir/TAGS || \
515 set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
516 fi; \
517 done; \
518 $(am__define_uniq_tagged_files); \
519 shift; \
520 if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
521 test -n "$$unique" || unique=$$empty_fix; \
522 if test $$# -gt 0; then \
523 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
524 "$$@" $$unique; \
525 else \
526 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
527 $$unique; \
528 fi; \
529 fi
530ctags: ctags-recursive
531
532CTAGS: ctags
533ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
534 $(am__define_uniq_tagged_files); \
535 test -z "$(CTAGS_ARGS)$$unique" \
536 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
537 $$unique
538
539GTAGS:
540 here=`$(am__cd) $(top_builddir) && pwd` \
541 && $(am__cd) $(top_srcdir) \
542 && gtags -i $(GTAGS_ARGS) "$$here"
543cscope: cscope.files
544 test ! -s cscope.files \
545 || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
546clean-cscope:
547 -rm -f cscope.files
548cscope.files: clean-cscope cscopelist
549cscopelist: cscopelist-recursive
550
551cscopelist-am: $(am__tagged_files)
552 list='$(am__tagged_files)'; \
553 case "$(srcdir)" in \
554 [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
555 *) sdir=$(subdir)/$(srcdir) ;; \
556 esac; \
557 for i in $$list; do \
558 if test -f "$$i"; then \
559 echo "$(subdir)/$$i"; \
560 else \
561 echo "$$sdir/$$i"; \
562 fi; \
563 done >> $(top_builddir)/cscope.files
564
565distclean-tags:
566 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
567 -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
568
569distdir: $(DISTFILES)
570 $(am__remove_distdir)
571 test -d "$(distdir)" || mkdir "$(distdir)"
572 @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
573 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
574 list='$(DISTFILES)'; \
575 dist_files=`for file in $$list; do echo $$file; done | \
576 sed -e "s|^$$srcdirstrip/||;t" \
577 -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
578 case $$dist_files in \
579 */*) $(MKDIR_P) `echo "$$dist_files" | \
580 sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
581 sort -u` ;; \
582 esac; \
583 for file in $$dist_files; do \
584 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
585 if test -d $$d/$$file; then \
586 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
587 if test -d "$(distdir)/$$file"; then \
588 find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
589 fi; \
590 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
591 cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
592 find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
593 fi; \
594 cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
595 else \
596 test -f "$(distdir)/$$file" \
597 || cp -p $$d/$$file "$(distdir)/$$file" \
598 || exit 1; \
599 fi; \
600 done
601 @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
602 if test "$$subdir" = .; then :; else \
603 $(am__make_dryrun) \
604 || test -d "$(distdir)/$$subdir" \
605 || $(MKDIR_P) "$(distdir)/$$subdir" \
606 || exit 1; \
607 dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
608 $(am__relativize); \
609 new_distdir=$$reldir; \
610 dir1=$$subdir; dir2="$(top_distdir)"; \
611 $(am__relativize); \
612 new_top_distdir=$$reldir; \
613 echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
614 echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
615 ($(am__cd) $$subdir && \
616 $(MAKE) $(AM_MAKEFLAGS) \
617 top_distdir="$$new_top_distdir" \
618 distdir="$$new_distdir" \
619 am__remove_distdir=: \
620 am__skip_length_check=: \
621 am__skip_mode_fix=: \
622 distdir) \
623 || exit 1; \
624 fi; \
625 done
626 -test -n "$(am__skip_mode_fix)" \
627 || find "$(distdir)" -type d ! -perm -755 \
628 -exec chmod u+rwx,go+rx {} \; -o \
629 ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
630 ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
631 ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
632 || chmod -R a+r "$(distdir)"
633dist-gzip: distdir
634 tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
635 $(am__post_remove_distdir)
636
637dist-bzip2: distdir
638 tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
639 $(am__post_remove_distdir)
640
641dist-lzip: distdir
642 tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
643 $(am__post_remove_distdir)
644
645dist-xz: distdir
646 tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
647 $(am__post_remove_distdir)
648
649dist-tarZ: distdir
650 @echo WARNING: "Support for shar distribution archives is" \
651 "deprecated." >&2
652 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
653 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
654 $(am__post_remove_distdir)
655
656dist-shar: distdir
657 @echo WARNING: "Support for distribution archives compressed with" \
658 "legacy program 'compress' is deprecated." >&2
659 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
660 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
661 $(am__post_remove_distdir)
662
663dist-zip: distdir
664 -rm -f $(distdir).zip
665 zip -rq $(distdir).zip $(distdir)
666 $(am__post_remove_distdir)
667
668dist dist-all:
669 $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
670 $(am__post_remove_distdir)
671
672# This target untars the dist file and tries a VPATH configuration. Then
673# it guarantees that the distribution is self-contained by making another
674# tarfile.
675distcheck: dist
676 case '$(DIST_ARCHIVES)' in \
677 *.tar.gz*) \
678 GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
679 *.tar.bz2*) \
680 bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
681 *.tar.lz*) \
682 lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
683 *.tar.xz*) \
684 xz -dc $(distdir).tar.xz | $(am__untar) ;;\
685 *.tar.Z*) \
686 uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
687 *.shar.gz*) \
688 GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
689 *.zip*) \
690 unzip $(distdir).zip ;;\
691 esac
692 chmod -R a-w $(distdir)
693 chmod u+w $(distdir)
694 mkdir $(distdir)/_build $(distdir)/_inst
695 chmod a-w $(distdir)
696 test -d $(distdir)/_build || exit 0; \
697 dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
698 && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
699 && am__cwd=`pwd` \
700 && $(am__cd) $(distdir)/_build \
701 && ../configure \
702 $(AM_DISTCHECK_CONFIGURE_FLAGS) \
703 $(DISTCHECK_CONFIGURE_FLAGS) \
704 --srcdir=.. --prefix="$$dc_install_base" \
705 && $(MAKE) $(AM_MAKEFLAGS) \
706 && $(MAKE) $(AM_MAKEFLAGS) dvi \
707 && $(MAKE) $(AM_MAKEFLAGS) check \
708 && $(MAKE) $(AM_MAKEFLAGS) install \
709 && $(MAKE) $(AM_MAKEFLAGS) installcheck \
710 && $(MAKE) $(AM_MAKEFLAGS) uninstall \
711 && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
712 distuninstallcheck \
713 && chmod -R a-w "$$dc_install_base" \
714 && ({ \
715 (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
716 && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
717 && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
718 && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
719 distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
720 } || { rm -rf "$$dc_destdir"; exit 1; }) \
721 && rm -rf "$$dc_destdir" \
722 && $(MAKE) $(AM_MAKEFLAGS) dist \
723 && rm -rf $(DIST_ARCHIVES) \
724 && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
725 && cd "$$am__cwd" \
726 || exit 1
727 $(am__post_remove_distdir)
728 @(echo "$(distdir) archives ready for distribution: "; \
729 list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
730 sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
731distuninstallcheck:
732 @test -n '$(distuninstallcheck_dir)' || { \
733 echo 'ERROR: trying to run $@ with an empty' \
734 '$$(distuninstallcheck_dir)' >&2; \
735 exit 1; \
736 }; \
737 $(am__cd) '$(distuninstallcheck_dir)' || { \
738 echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
739 exit 1; \
740 }; \
741 test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
742 || { echo "ERROR: files left after uninstall:" ; \
743 if test -n "$(DESTDIR)"; then \
744 echo " (check DESTDIR support)"; \
745 fi ; \
746 $(distuninstallcheck_listfiles) ; \
747 exit 1; } >&2
748distcleancheck: distclean
749 @if test '$(srcdir)' = . ; then \
750 echo "ERROR: distcleancheck can only run from a VPATH build" ; \
751 exit 1 ; \
752 fi
753 @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
754 || { echo "ERROR: files left in build directory after distclean:" ; \
755 $(distcleancheck_listfiles) ; \
756 exit 1; } >&2
757check-am: all-am
758check: check-recursive
759all-am: Makefile config.h
760installdirs: installdirs-recursive
761installdirs-am:
762install: install-recursive
763install-exec: install-exec-recursive
764install-data: install-data-recursive
765uninstall: uninstall-recursive
766
767install-am: all-am
768 @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
769
770installcheck: installcheck-recursive
771install-strip:
772 if test -z '$(STRIP)'; then \
773 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
774 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
775 install; \
776 else \
777 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
778 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
779 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
780 fi
781mostlyclean-generic:
782
783clean-generic:
784
785distclean-generic:
786 -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
787 -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
788 -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
789
790maintainer-clean-generic:
791 @echo "This command is intended for maintainers to use"
792 @echo "it deletes files that may require special tools to rebuild."
793 -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
794clean: clean-recursive
795
796clean-am: clean-generic clean-libtool mostlyclean-am
797
798distclean: distclean-recursive
799 -rm -f $(am__CONFIG_DISTCLEAN_FILES)
800 -rm -f Makefile
801distclean-am: clean-am distclean-generic distclean-hdr \
802 distclean-libtool distclean-tags
803
804dvi: dvi-recursive
805
806dvi-am:
807
808html: html-recursive
809
810html-am:
811
812info: info-recursive
813
814info-am:
815
816install-data-am:
817
818install-dvi: install-dvi-recursive
819
820install-dvi-am:
821
822install-exec-am:
823
824install-html: install-html-recursive
825
826install-html-am:
827
828install-info: install-info-recursive
829
830install-info-am:
831
832install-man:
833
834install-pdf: install-pdf-recursive
835
836install-pdf-am:
837
838install-ps: install-ps-recursive
839
840install-ps-am:
841
842installcheck-am:
843
844maintainer-clean: maintainer-clean-recursive
845 -rm -f $(am__CONFIG_DISTCLEAN_FILES)
846 -rm -rf $(top_srcdir)/autom4te.cache
847 -rm -f Makefile
848maintainer-clean-am: distclean-am maintainer-clean-generic
849
850mostlyclean: mostlyclean-recursive
851
852mostlyclean-am: mostlyclean-generic mostlyclean-libtool
853
854pdf: pdf-recursive
855
856pdf-am:
857
858ps: ps-recursive
859
860ps-am:
861
862uninstall-am:
863
864.MAKE: $(am__recursive_targets) all install-am install-strip
865
866.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
867 am--refresh check check-am clean clean-cscope clean-generic \
868 clean-libtool cscope cscopelist-am ctags ctags-am dist \
869 dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
870 dist-xz dist-zip distcheck distclean distclean-generic \
871 distclean-hdr distclean-libtool distclean-tags distcleancheck \
872 distdir distuninstallcheck dvi dvi-am html html-am info \
873 info-am install install-am install-data install-data-am \
874 install-dvi install-dvi-am install-exec install-exec-am \
875 install-html install-html-am install-info install-info-am \
876 install-man install-pdf install-pdf-am install-ps \
877 install-ps-am install-strip installcheck installcheck-am \
878 installdirs installdirs-am maintainer-clean \
879 maintainer-clean-generic mostlyclean mostlyclean-generic \
880 mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
881 uninstall-am
882
883
884# Tell versions [3.59,3.63) of GNU make to not export all variables.
885# Otherwise a system limit (for SysV at least) may be exceeded.
886.NOEXPORT:
8870
=== modified file 'Makefile.in'
--- Makefile.in 2014-04-09 16:54:36 +0000
+++ Makefile.in 2014-08-11 05:53:12 +0000
@@ -284,15 +284,13 @@
284POSUB = @POSUB@284POSUB = @POSUB@
285PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@285PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
286PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@286PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
287PYGTK_CFLAGS = @PYGTK_CFLAGS@287PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
288PYGTK_LIBS = @PYGTK_LIBS@288PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
289PYNOTIFY_CFLAGS = @PYNOTIFY_CFLAGS@
290PYNOTIFY_LIBS = @PYNOTIFY_LIBS@
291PYREXC = @PYREXC@289PYREXC = @PYREXC@
292PYTHON = @PYTHON@290PYTHON = @PYTHON@
293PYTHONDIR = @PYTHONDIR@291PYTHONDIR = @PYTHONDIR@
292PYTHON_CFLAGS = @PYTHON_CFLAGS@
294PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@293PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
295PYTHON_INCLUDES = @PYTHON_INCLUDES@
296PYTHON_LIBS = @PYTHON_LIBS@294PYTHON_LIBS = @PYTHON_LIBS@
297PYTHON_PLATFORM = @PYTHON_PLATFORM@295PYTHON_PLATFORM = @PYTHON_PLATFORM@
298PYTHON_PREFIX = @PYTHON_PREFIX@296PYTHON_PREFIX = @PYTHON_PREFIX@
299297
=== modified file 'README.md'
--- README.md 2014-03-10 22:01:00 +0000
+++ README.md 2014-08-11 05:53:12 +0000
@@ -31,14 +31,13 @@
31* [dbus](http://www.freedesktop.org/wiki/Software/dbus/)31* [dbus](http://www.freedesktop.org/wiki/Software/dbus/)
32* [dbus-python](http://www.freedesktop.org/wiki/Software/DBusBindings/#python)32* [dbus-python](http://www.freedesktop.org/wiki/Software/DBusBindings/#python)
33* [GLib 2](http://www.gtk.org/) (>= 2.32)33* [GLib 2](http://www.gtk.org/) (>= 2.32)
34* [GTK+ 2](http://www.gtk.org/) (>= 2.16)34* [GTK+ 3](http://www.gtk.org/)
35* [libappindicator](https://launchpad.net/libappindicator) (optional)35* [libappindicator](https://launchpad.net/libappindicator) (optional)
36* [notification-daemon](http://galago-project.org/)36* [notification-daemon](https://git.gnome.org/browse/notification-daemon) or any desktop specific replacement
37* [notify-python](http://galago-project.org/)37* [libnotify](https://git.gnome.org/browse/libnotify)
38* [obex-data-server](http://wiki.muiline.com/obex-data-server) (>= 0.4.3)38* [obex-data-server](http://wiki.muiline.com/obex-data-server) (>= 0.4.3)
39* [pulseaudio](http://www.freedesktop.org/wiki/Software/PulseAudio/)39* [pulseaudio](http://www.freedesktop.org/wiki/Software/PulseAudio/)
40* [PyGObject](https://wiki.gnome.org/PyGObject)40* [PyGObject](https://wiki.gnome.org/PyGObject)
41* [PyGTK](http://www.pygtk.org/) (>= 2.16)
42* [Python 2](http://www.python.org/) (>= 2.6)41* [Python 2](http://www.python.org/) (>= 2.6)
43* [startup-notification](http://www.freedesktop.org/wiki/Software/startup-notification/)42* [startup-notification](http://www.freedesktop.org/wiki/Software/startup-notification/)
4443
@@ -64,18 +63,19 @@
6463
65Development snapshots of blueman 2:64Development snapshots of blueman 2:
6665
67* [Arch Linux](https://www.archlinux.org/packages/?name=blueman)
68* [Debian GNU/Linux](http://packages.debian.org/search?keywords=blueman)66* [Debian GNU/Linux](http://packages.debian.org/search?keywords=blueman)
69* [Ubuntu](http://packages.ubuntu.com/search?keywords=blueman)67* [Ubuntu](http://packages.ubuntu.com/search?keywords=blueman)
7068
71Older versions:69Older versions:
7270
71* [Arch Linux](https://aur.archlinux.org/packages/blueman-bzr)
73* CentOS72* CentOS
74* [Fedora](https://apps.fedoraproject.org/packages/blueman)73* [Fedora](https://apps.fedoraproject.org/packages/blueman)
75* [Gentoo Linux](http://packages.gentoo.org/package/net-wireless/blueman)74* [Gentoo Linux](http://packages.gentoo.org/package/net-wireless/blueman)
76* Linux Mint75* Linux Mint
77* [Mageia](http://mageia.madb.org/package/show/name/blueman)76* [Mageia](http://mageia.madb.org/package/show/name/blueman)
78* [openSUSE](http://software.opensuse.org/package/blueman?search_term=blueman)77* [openSUSE](http://software.opensuse.org/package/blueman?search_term=blueman)
78* OpenMandriva
7979
80## Contributing80## Contributing
8181
8282
=== modified file 'acinclude.m4'
--- acinclude.m4 2014-01-21 08:54:58 +0000
+++ acinclude.m4 2014-08-11 05:53:12 +0000
@@ -88,8 +88,8 @@
88[AC_REQUIRE([AM_PATH_PYTHON])88[AC_REQUIRE([AM_PATH_PYTHON])
89AC_MSG_CHECKING(for headers required to compile python extensions)89AC_MSG_CHECKING(for headers required to compile python extensions)
90dnl deduce PYTHON_INCLUDES90dnl deduce PYTHON_INCLUDES
91py_prefix=`$PYTHON -c "import sys; print sys.prefix"`91py_prefix=`$PYTHON -c "import sys; print(sys.prefix)"`
92py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`92py_exec_prefix=`$PYTHON -c "import sys; print(sys.exec_prefix)"`
93PYTHON_INCLUDES=`python-config --includes`93PYTHON_INCLUDES=`python-config --includes`
94if test "$py_prefix" != "$py_exec_prefix"; then94if test "$py_prefix" != "$py_exec_prefix"; then
95 PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"95 PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
9696
=== removed file 'apps/Makefile'
--- apps/Makefile 2014-07-01 12:11:00 +0000
+++ apps/Makefile 1970-01-01 00:00:00 +0000
@@ -1,600 +0,0 @@
1# Makefile.in generated by automake 1.14.1 from Makefile.am.
2# apps/Makefile. Generated from Makefile.in by configure.
3
4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5
6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it,
8# with or without modifications, as long as this notice is preserved.
9
10# This program is distributed in the hope that it will be useful,
11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13# PARTICULAR PURPOSE.
14
15
16
17
18am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
19am__make_running_with_option = \
20 case $${target_option-} in \
21 ?) ;; \
22 *) echo "am__make_running_with_option: internal error: invalid" \
23 "target option '$${target_option-}' specified" >&2; \
24 exit 1;; \
25 esac; \
26 has_opt=no; \
27 sane_makeflags=$$MAKEFLAGS; \
28 if $(am__is_gnu_make); then \
29 sane_makeflags=$$MFLAGS; \
30 else \
31 case $$MAKEFLAGS in \
32 *\\[\ \ ]*) \
33 bs=\\; \
34 sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
35 | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
36 esac; \
37 fi; \
38 skip_next=no; \
39 strip_trailopt () \
40 { \
41 flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
42 }; \
43 for flg in $$sane_makeflags; do \
44 test $$skip_next = yes && { skip_next=no; continue; }; \
45 case $$flg in \
46 *=*|--*) continue;; \
47 -*I) strip_trailopt 'I'; skip_next=yes;; \
48 -*I?*) strip_trailopt 'I';; \
49 -*O) strip_trailopt 'O'; skip_next=yes;; \
50 -*O?*) strip_trailopt 'O';; \
51 -*l) strip_trailopt 'l'; skip_next=yes;; \
52 -*l?*) strip_trailopt 'l';; \
53 -[dEDm]) skip_next=yes;; \
54 -[JT]) skip_next=yes;; \
55 esac; \
56 case $$flg in \
57 *$$target_option*) has_opt=yes; break;; \
58 esac; \
59 done; \
60 test $$has_opt = yes
61am__make_dryrun = (target_option=n; $(am__make_running_with_option))
62am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
63pkgincludedir = $(includedir)/blueman
64pkglibdir = $(libdir)/blueman
65pkglibexecdir = $(libexecdir)/blueman
66am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
67install_sh_DATA = $(install_sh) -c -m 644
68install_sh_PROGRAM = $(install_sh) -c
69install_sh_SCRIPT = $(install_sh) -c
70INSTALL_HEADER = $(INSTALL_DATA)
71transform = $(program_transform_name)
72NORMAL_INSTALL = :
73PRE_INSTALL = :
74POST_INSTALL = :
75NORMAL_UNINSTALL = :
76PRE_UNINSTALL = :
77POST_UNINSTALL = :
78build_triplet = x86_64-unknown-linux-gnu
79host_triplet = x86_64-unknown-linux-gnu
80subdir = apps
81DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
82ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
83am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
84 $(top_srcdir)/configure.ac
85am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
86 $(ACLOCAL_M4)
87mkinstalldirs = $(install_sh) -d
88CONFIG_HEADER = $(top_builddir)/config.h
89CONFIG_CLEAN_FILES =
90CONFIG_CLEAN_VPATH_FILES =
91am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
92am__vpath_adj = case $$p in \
93 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
94 *) f=$$p;; \
95 esac;
96am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
97am__install_max = 40
98am__nobase_strip_setup = \
99 srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
100am__nobase_strip = \
101 for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
102am__nobase_list = $(am__nobase_strip_setup); \
103 for p in $$list; do echo "$$p $$p"; done | \
104 sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
105 $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
106 if (++n[$$2] == $(am__install_max)) \
107 { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
108 END { for (dir in files) print dir, files[dir] }'
109am__base_list = \
110 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
111 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
112am__uninstall_files_from_dir = { \
113 test -z "$$files" \
114 || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
115 || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
116 $(am__cd) "$$dir" && rm -f $$files; }; \
117 }
118am__installdirs = "$(DESTDIR)$(appsdir)" "$(DESTDIR)$(polkitdir)"
119SCRIPTS = $(apps_SCRIPTS) $(polkit_SCRIPTS)
120AM_V_P = $(am__v_P_$(V))
121am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY))
122am__v_P_0 = false
123am__v_P_1 = :
124AM_V_GEN = $(am__v_GEN_$(V))
125am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
126am__v_GEN_0 = @echo " GEN " $@;
127am__v_GEN_1 =
128AM_V_at = $(am__v_at_$(V))
129am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
130am__v_at_0 = @
131am__v_at_1 =
132SOURCES =
133DIST_SOURCES =
134am__can_run_installinfo = \
135 case $$AM_UPDATE_INFO_DIR in \
136 n|no|NO) false;; \
137 *) (install-info --version) >/dev/null 2>&1;; \
138 esac
139am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
140DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
141pkgdatadir = /usr/local/share/blueman
142ACLOCAL = ${SHELL} /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb/missing aclocal-1.14
143ALL_LINGUAS =
144AMTAR = $${TAR-tar}
145AM_DEFAULT_VERBOSITY = 1
146AR = ar
147AUTOCONF = ${SHELL} /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb/missing autoconf
148AUTOHEADER = ${SHELL} /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb/missing autoheader
149AUTOMAKE = ${SHELL} /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb/missing automake-1.14
150AWK = gawk
151BINDIR = /usr/local/bin
152BLUEZ_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
153BLUEZ_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
154CATALOGS =
155CATOBJEXT = .gmo
156CC = gcc
157CCDEPMODE = depmode=gcc3
158CFLAGS = -g -O2
159CPP = gcc -E
160CPPFLAGS =
161CYGPATH_W = echo
162DATADIR = /usr/local/share
163DATADIRNAME = share
164DEFS = -DHAVE_CONFIG_H
165DEPDIR = .deps
166DLLTOOL = false
167DSYMUTIL =
168DUMPBIN =
169ECHO_C =
170ECHO_N = -n
171ECHO_T =
172EGREP = /bin/grep -E
173EXEEXT =
174FGREP = /bin/grep -F
175GETTEXT_PACKAGE = blueman
176GMOFILES =
177GMSGFMT = /usr/bin/msgfmt
178GREP = /bin/grep
179INSTALL = /usr/bin/install -c
180INSTALL_DATA = ${INSTALL} -m 644
181INSTALL_PROGRAM = ${INSTALL}
182INSTALL_SCRIPT = ${INSTALL}
183INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
184INSTOBJEXT = .mo
185INTLLIBS =
186INTLTOOL_EXTRACT = /usr/bin/intltool-extract
187INTLTOOL_MERGE = /usr/bin/intltool-merge
188INTLTOOL_PERL = /usr/bin/perl
189INTLTOOL_UPDATE = /usr/bin/intltool-update
190INTLTOOL_V_MERGE = $(INTLTOOL__v_MERGE_$(V))
191INTLTOOL_V_MERGE_OPTIONS = $(intltool__v_merge_options_$(V))
192INTLTOOL__v_MERGE_ = $(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))
193INTLTOOL__v_MERGE_0 = @echo " ITMRG " $@;
194LD = /usr/bin/ld -m elf_x86_64
195LDFLAGS =
196LIBEXECDIR = /usr/local/libexec
197LIBOBJS =
198LIBS =
199LIBTOOL = $(SHELL) $(top_builddir)/libtool
200LIPO =
201LN_S = ln -s
202LOCALEDIR = /usr/local/share/locale
203LTLIBOBJS =
204MAINT =
205MAKEINFO = ${SHELL} /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb/missing makeinfo
206MANIFEST_TOOL = :
207MKDIR_P = /bin/mkdir -p
208MKINSTALLDIRS = ./mkinstalldirs
209MSGFMT = /usr/bin/msgfmt
210MSGFMT_OPTS = -c
211MSGMERGE = /usr/bin/msgmerge
212NM = /usr/bin/nm -B
213NMEDIT =
214OBJDUMP = objdump
215OBJEXT = o
216OTOOL =
217OTOOL64 =
218PACKAGE = blueman
219PACKAGE_BUGREPORT =
220PACKAGE_NAME = blueman
221PACKAGE_STRING = blueman 1.23
222PACKAGE_TARNAME = blueman
223PACKAGE_URL =
224PACKAGE_VERSION = 1.23
225PATH_SEPARATOR = :
226PKGLIBDIR = /usr/local/lib/blueman
227PKG_CONFIG = /usr/bin/pkg-config
228PKG_CONFIG_LIBDIR =
229PKG_CONFIG_PATH =
230POFILES =
231POSUB = po
232PO_IN_DATADIR_FALSE =
233PO_IN_DATADIR_TRUE =
234PYGTK_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
235PYGTK_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
236PYNOTIFY_CFLAGS = -I/usr/include/gnome-python-2.0
237PYNOTIFY_LIBS =
238PYREXC = /usr/bin/pyrexc
239PYTHON = /usr/bin/python
240PYTHONDIR = /usr/local/lib/python2.7/dist-packages
241PYTHON_EXEC_PREFIX = ${exec_prefix}
242PYTHON_INCLUDES = -I/usr/include/python2.7 -I/usr/include/x86_64-linux-gnu/python2.7
243PYTHON_LIBS = -lpthread -ldl -lutil -lm -lpython2.7
244PYTHON_PLATFORM = linux2
245PYTHON_PREFIX = ${prefix}
246PYTHON_VERSION = 2.7
247RANLIB = ranlib
248SED = /bin/sed
249SET_MAKE =
250SHELL = /bin/bash
251STRIP = strip
252SYSCONFDIR = /etc
253USE_NLS = yes
254VERSION = 1.23
255XGETTEXT = /usr/bin/xgettext
256abs_builddir = /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb/apps
257abs_srcdir = /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb/apps
258abs_top_builddir = /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb
259abs_top_srcdir = /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb
260ac_ct_AR = ar
261ac_ct_CC = gcc
262ac_ct_DUMPBIN =
263am__include = include
264am__leading_dot = .
265am__quote =
266am__tar = $${TAR-tar} chof - "$$tardir"
267am__untar = $${TAR-tar} xf -
268bindir = ${exec_prefix}/bin
269build = x86_64-unknown-linux-gnu
270build_alias =
271build_cpu = x86_64
272build_os = linux-gnu
273build_vendor = unknown
274builddir = .
275datadir = ${datarootdir}
276datarootdir = ${prefix}/share
277dhconfig = /etc/dhcp3/dhcpd.conf
278docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
279dvidir = ${docdir}
280exec_prefix = ${prefix}
281hal_en = no
282host = x86_64-unknown-linux-gnu
283host_alias =
284host_cpu = x86_64
285host_os = linux-gnu
286host_vendor = unknown
287htmldir = ${docdir}
288includedir = ${prefix}/include
289infodir = ${datarootdir}/info
290install_sh = ${SHELL} /home/schramm/src/blueman-deb/blueman-1.23-git201406261335-deb/install-sh
291intltool__v_merge_options_ = $(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))
292intltool__v_merge_options_0 = -q
293libdir = ${exec_prefix}/lib
294libexecdir = ${exec_prefix}/libexec
295localedir = ${datarootdir}/locale
296localstatedir = ${prefix}/var
297mandir = ${datarootdir}/man
298mkdir_p = $(MKDIR_P)
299oldincludedir = /usr/include
300pdfdir = ${docdir}
301pkgpyexecdir = ${pyexecdir}/blueman
302pkgpythondir = ${pythondir}/blueman
303polkit_val = yes
304prefix = /usr/local
305program_transform_name = s,x,x,
306psdir = ${docdir}
307pyexecdir = ${exec_prefix}/lib/python2.7/dist-packages
308pythondir = ${prefix}/lib/python2.7/dist-packages
309sbindir = ${exec_prefix}/sbin
310sharedstatedir = ${prefix}/com
311srcdir = .
312sysconfdir = /etc
313target_alias =
314top_build_prefix = ../
315top_builddir = ..
316top_srcdir = ..
317APPS = \
318 blueman-adapters \
319 blueman-applet \
320 blueman-manager \
321 blueman-services \
322 blueman-sendto \
323 blueman-assistant \
324 blueman-browse
325
326appsdir = $(bindir)
327apps_SCRIPTS = $(APPS)
328polkitdir = $(libexecdir)
329polkit_SCRIPTS = \
330 blueman-mechanism
331
332EXTRA_DIST = $(APPS) blueman-mechanism
333all: all-am
334
335.SUFFIXES:
336$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
337 @for dep in $?; do \
338 case '$(am__configure_deps)' in \
339 *$$dep*) \
340 ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
341 && { if test -f $@; then exit 0; else break; fi; }; \
342 exit 1;; \
343 esac; \
344 done; \
345 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign apps/Makefile'; \
346 $(am__cd) $(top_srcdir) && \
347 $(AUTOMAKE) --foreign apps/Makefile
348.PRECIOUS: Makefile
349Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
350 @case '$?' in \
351 *config.status*) \
352 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
353 *) \
354 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
355 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
356 esac;
357
358$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
359 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
360
361$(top_srcdir)/configure: $(am__configure_deps)
362 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
363$(ACLOCAL_M4): $(am__aclocal_m4_deps)
364 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
365$(am__aclocal_m4_deps):
366install-appsSCRIPTS: $(apps_SCRIPTS)
367 @$(NORMAL_INSTALL)
368 @list='$(apps_SCRIPTS)'; test -n "$(appsdir)" || list=; \
369 if test -n "$$list"; then \
370 echo " $(MKDIR_P) '$(DESTDIR)$(appsdir)'"; \
371 $(MKDIR_P) "$(DESTDIR)$(appsdir)" || exit 1; \
372 fi; \
373 for p in $$list; do \
374 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
375 if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
376 done | \
377 sed -e 'p;s,.*/,,;n' \
378 -e 'h;s|.*|.|' \
379 -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
380 $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
381 { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
382 if ($$2 == $$4) { files[d] = files[d] " " $$1; \
383 if (++n[d] == $(am__install_max)) { \
384 print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
385 else { print "f", d "/" $$4, $$1 } } \
386 END { for (d in files) print "f", d, files[d] }' | \
387 while read type dir files; do \
388 if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
389 test -z "$$files" || { \
390 echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(appsdir)$$dir'"; \
391 $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(appsdir)$$dir" || exit $$?; \
392 } \
393 ; done
394
395uninstall-appsSCRIPTS:
396 @$(NORMAL_UNINSTALL)
397 @list='$(apps_SCRIPTS)'; test -n "$(appsdir)" || exit 0; \
398 files=`for p in $$list; do echo "$$p"; done | \
399 sed -e 's,.*/,,;$(transform)'`; \
400 dir='$(DESTDIR)$(appsdir)'; $(am__uninstall_files_from_dir)
401install-polkitSCRIPTS: $(polkit_SCRIPTS)
402 @$(NORMAL_INSTALL)
403 @list='$(polkit_SCRIPTS)'; test -n "$(polkitdir)" || list=; \
404 if test -n "$$list"; then \
405 echo " $(MKDIR_P) '$(DESTDIR)$(polkitdir)'"; \
406 $(MKDIR_P) "$(DESTDIR)$(polkitdir)" || exit 1; \
407 fi; \
408 for p in $$list; do \
409 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
410 if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
411 done | \
412 sed -e 'p;s,.*/,,;n' \
413 -e 'h;s|.*|.|' \
414 -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
415 $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
416 { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
417 if ($$2 == $$4) { files[d] = files[d] " " $$1; \
418 if (++n[d] == $(am__install_max)) { \
419 print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
420 else { print "f", d "/" $$4, $$1 } } \
421 END { for (d in files) print "f", d, files[d] }' | \
422 while read type dir files; do \
423 if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
424 test -z "$$files" || { \
425 echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(polkitdir)$$dir'"; \
426 $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(polkitdir)$$dir" || exit $$?; \
427 } \
428 ; done
429
430uninstall-polkitSCRIPTS:
431 @$(NORMAL_UNINSTALL)
432 @list='$(polkit_SCRIPTS)'; test -n "$(polkitdir)" || exit 0; \
433 files=`for p in $$list; do echo "$$p"; done | \
434 sed -e 's,.*/,,;$(transform)'`; \
435 dir='$(DESTDIR)$(polkitdir)'; $(am__uninstall_files_from_dir)
436
437mostlyclean-libtool:
438 -rm -f *.lo
439
440clean-libtool:
441 -rm -rf .libs _libs
442tags TAGS:
443
444ctags CTAGS:
445
446cscope cscopelist:
447
448
449distdir: $(DISTFILES)
450 @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
451 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
452 list='$(DISTFILES)'; \
453 dist_files=`for file in $$list; do echo $$file; done | \
454 sed -e "s|^$$srcdirstrip/||;t" \
455 -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
456 case $$dist_files in \
457 */*) $(MKDIR_P) `echo "$$dist_files" | \
458 sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
459 sort -u` ;; \
460 esac; \
461 for file in $$dist_files; do \
462 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
463 if test -d $$d/$$file; then \
464 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
465 if test -d "$(distdir)/$$file"; then \
466 find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
467 fi; \
468 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
469 cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
470 find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
471 fi; \
472 cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
473 else \
474 test -f "$(distdir)/$$file" \
475 || cp -p $$d/$$file "$(distdir)/$$file" \
476 || exit 1; \
477 fi; \
478 done
479check-am: all-am
480check: check-am
481all-am: Makefile $(SCRIPTS)
482installdirs:
483 for dir in "$(DESTDIR)$(appsdir)" "$(DESTDIR)$(polkitdir)"; do \
484 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
485 done
486install: install-am
487install-exec: install-exec-am
488install-data: install-data-am
489uninstall: uninstall-am
490
491install-am: all-am
492 @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
493
494installcheck: installcheck-am
495install-strip:
496 if test -z '$(STRIP)'; then \
497 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
498 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
499 install; \
500 else \
501 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
502 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
503 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
504 fi
505mostlyclean-generic:
506
507clean-generic:
508
509distclean-generic:
510 -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
511 -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
512
513maintainer-clean-generic:
514 @echo "This command is intended for maintainers to use"
515 @echo "it deletes files that may require special tools to rebuild."
516clean: clean-am
517
518clean-am: clean-generic clean-libtool mostlyclean-am
519
520distclean: distclean-am
521 -rm -f Makefile
522distclean-am: clean-am distclean-generic
523
524dvi: dvi-am
525
526dvi-am:
527
528html: html-am
529
530html-am:
531
532info: info-am
533
534info-am:
535
536install-data-am: install-appsSCRIPTS install-polkitSCRIPTS
537
538install-dvi: install-dvi-am
539
540install-dvi-am:
541
542install-exec-am:
543
544install-html: install-html-am
545
546install-html-am:
547
548install-info: install-info-am
549
550install-info-am:
551
552install-man:
553
554install-pdf: install-pdf-am
555
556install-pdf-am:
557
558install-ps: install-ps-am
559
560install-ps-am:
561
562installcheck-am:
563
564maintainer-clean: maintainer-clean-am
565 -rm -f Makefile
566maintainer-clean-am: distclean-am maintainer-clean-generic
567
568mostlyclean: mostlyclean-am
569
570mostlyclean-am: mostlyclean-generic mostlyclean-libtool
571
572pdf: pdf-am
573
574pdf-am:
575
576ps: ps-am
577
578ps-am:
579
580uninstall-am: uninstall-appsSCRIPTS uninstall-polkitSCRIPTS
581
582.MAKE: install-am install-strip
583
584.PHONY: all all-am check check-am clean clean-generic clean-libtool \
585 cscopelist-am ctags-am distclean distclean-generic \
586 distclean-libtool distdir dvi dvi-am html html-am info info-am \
587 install install-am install-appsSCRIPTS install-data \
588 install-data-am install-dvi install-dvi-am install-exec \
589 install-exec-am install-html install-html-am install-info \
590 install-info-am install-man install-pdf install-pdf-am \
591 install-polkitSCRIPTS install-ps install-ps-am install-strip \
592 installcheck installcheck-am installdirs maintainer-clean \
593 maintainer-clean-generic mostlyclean mostlyclean-generic \
594 mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
595 uninstall-am uninstall-appsSCRIPTS uninstall-polkitSCRIPTS
596
597
598# Tell versions [3.59,3.63) of GNU make to not export all variables.
599# Otherwise a system limit (for SysV at least) may be exceeded.
600.NOEXPORT:
6010
=== modified file 'apps/Makefile.in'
--- apps/Makefile.in 2014-04-09 16:54:36 +0000
+++ apps/Makefile.in 2014-08-11 05:53:12 +0000
@@ -231,15 +231,13 @@
231POSUB = @POSUB@231POSUB = @POSUB@
232PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@232PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
233PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@233PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
234PYGTK_CFLAGS = @PYGTK_CFLAGS@234PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
235PYGTK_LIBS = @PYGTK_LIBS@235PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
236PYNOTIFY_CFLAGS = @PYNOTIFY_CFLAGS@
237PYNOTIFY_LIBS = @PYNOTIFY_LIBS@
238PYREXC = @PYREXC@236PYREXC = @PYREXC@
239PYTHON = @PYTHON@237PYTHON = @PYTHON@
240PYTHONDIR = @PYTHONDIR@238PYTHONDIR = @PYTHONDIR@
239PYTHON_CFLAGS = @PYTHON_CFLAGS@
241PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@240PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
242PYTHON_INCLUDES = @PYTHON_INCLUDES@
243PYTHON_LIBS = @PYTHON_LIBS@241PYTHON_LIBS = @PYTHON_LIBS@
244PYTHON_PLATFORM = @PYTHON_PLATFORM@242PYTHON_PLATFORM = @PYTHON_PLATFORM@
245PYTHON_PREFIX = @PYTHON_PREFIX@243PYTHON_PREFIX = @PYTHON_PREFIX@
246244
=== modified file 'apps/blueman-adapters'
--- apps/blueman-adapters 2013-12-31 11:47:00 +0000
+++ apps/blueman-adapters 2014-08-11 05:53:12 +0000
@@ -1,11 +1,11 @@
1#!/usr/bin/python1#!/usr/bin/python
22
3import gtk
4import dbus3import dbus
5import dbus.glib4import dbus.glib
6import pango5from gi.repository import Pango
7import os.path6import os.path
8import sys7import sys
8import signal
99
10#support running uninstalled10#support running uninstalled
11_dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))11_dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
@@ -19,6 +19,12 @@
1919
20enable_rgba_colormap()20enable_rgba_colormap()
2121
22import gi
23gi.require_version("Gtk", "3.0")
24from gi.repository import Gtk
25
26# Workaround introspection bug, gnome bug 622084
27signal.signal(signal.SIGINT, signal.SIG_DFL)
2228
23class BluemanAdapters:29class BluemanAdapters:
24 def __init__(self, selected_hci_dev):30 def __init__(self, selected_hci_dev):
@@ -26,7 +32,7 @@
26 self.bus = dbus.SystemBus()32 self.bus = dbus.SystemBus()
27 self.bus.watch_name_owner('org.bluez', self.on_dbus_name_owner_change)33 self.bus.watch_name_owner('org.bluez', self.on_dbus_name_owner_change)
2834
29 builder = gtk.Builder()35 builder = Gtk.Builder()
30 builder.set_translation_domain("blueman")36 builder.set_translation_domain("blueman")
31 builder.add_from_file(UI_PATH + "/adapters.ui")37 builder.add_from_file(UI_PATH + "/adapters.ui")
32 self.dialog = builder.get_object("dialog")38 self.dialog = builder.get_object("dialog")
@@ -42,9 +48,9 @@
4248
43 try:49 try:
44 self.signals = SignalTracker()50 self.signals = SignalTracker()
45 self.manager = Bluez.Manager('gobject')51 self.manager = Bluez.Manager()
46 self.signals.Handle("bluez", self.manager, self.on_adapter_added, 'AdapterAdded')52 self.signals.Handle("bluez", self.manager, self.on_adapter_added, 'AdapterAdded')
47 adapters = self.manager.ListAdapters()53 adapters = self.manager.list_adapters()
48 for adapter in adapters:54 for adapter in adapters:
49 self.add_to_notebook(adapter)55 self.add_to_notebook(adapter)
50 except Exception as e:56 except Exception as e:
@@ -60,7 +66,7 @@
60 else:66 else:
61 print('Error: the selected adapter does not exist')67 print('Error: the selected adapter does not exist')
62 self.dialog.show()68 self.dialog.show()
63 gtk.main()69 Gtk.main()
6470
65 def on_dialog_response(self, dialog, response_id):71 def on_dialog_response(self, dialog, response_id):
66 for hci, settings in self.tabs.items():72 for hci, settings in self.tabs.items():
@@ -68,21 +74,22 @@
68 #save changes74 #save changes
69 adapter = settings['adapter']75 adapter = settings['adapter']
70 adapter.SetProperty('Name', settings['name'])76 adapter.SetProperty('Name', settings['name'])
71 gtk.main_quit()77 adapter.set('Name', settings['name'])
78 Gtk.main_quit()
7279
73 def on_adapter_added(self, adapter_path):80 def on_adapter_added(self, adapter_path):
74 def on_property_changed(name, value):81 def on_property_changed(name, value):
75 if name == 'Powered' and value:82 if name == 'Powered' and value:
76 adapter.UnHandleSignal(on_property_changed, "PropertyChanged")83 adapter.unhandle_signal(on_property_changed, "PropertyChanged")
77 self.add_to_notebook(adapter)84 self.add_to_notebook(adapter)
7885
79 adapter = Bluez.Adapter(adapter_path)86 adapter = Bluez.Adapter(adapter_path)
80 adapter.HandleSignal(on_property_changed, "PropertyChanged")87 adapter.handle_signal(on_property_changed, "PropertyChanged")
8188
82 def on_dbus_name_owner_change(self, owner):89 def on_dbus_name_owner_change(self, owner):
83 print('org.bluez owner changed to '+owner)90 print('org.bluez owner changed to '+owner)
84 if owner == '':91 if owner == '':
85 self.Manager = None92 self.manager = None
86 #fixme: show error dialog and exit93 #fixme: show error dialog and exit
8794
88 def build_adapter_tab(self, adapter):95 def build_adapter_tab(self, adapter):
@@ -99,7 +106,7 @@
99 if not radio.props.active:106 if not radio.props.active:
100 return107 return
101 adapter_settings['discoverable'] = False108 adapter_settings['discoverable'] = False
102 adapter.SetProperty('Discoverable', False)109 adapter.set('Discoverable', False)
103 hscale.set_sensitive(False)110 hscale.set_sensitive(False)
104 #we need to triger "format-value" signal111 #we need to triger "format-value" signal
105 hscale.set_value(1)112 hscale.set_value(1)
@@ -109,7 +116,7 @@
109 if not radio.props.active:116 if not radio.props.active:
110 return117 return
111 adapter_settings['discoverable'] = True118 adapter_settings['discoverable'] = True
112 adapter.SetProperty('Discoverable', True)119 adapter.set('Discoverable', True)
113 hscale.set_sensitive(False)120 hscale.set_sensitive(False)
114 #we need to triger "format-value" signal121 #we need to triger "format-value" signal
115 hscale.set_value(1)122 hscale.set_value(1)
@@ -119,7 +126,7 @@
119 if not radio.props.active:126 if not radio.props.active:
120 return127 return
121 adapter_settings['discoverable'] = True128 adapter_settings['discoverable'] = True
122 adapter.SetProperty('Discoverable', True)129 adapter.set('Discoverable', True)
123 hscale.set_sensitive(True)130 hscale.set_sensitive(True)
124 hscale.set_value(3)131 hscale.set_value(3)
125132
@@ -138,13 +145,13 @@
138 if val == 0 and adapter_settings['discoverable']:145 if val == 0 and adapter_settings['discoverable']:
139 always_radio.props.active = True146 always_radio.props.active = True
140 timeout = int(val * 60)147 timeout = int(val * 60)
141 adapter.SetProperty('DiscoverableTimeout', timeout)148 adapter.set('DiscoverableTimeout', timeout)
142149
143 def on_name_changed(entry):150 def on_name_changed(entry):
144 adapter_settings['name'] = entry.get_text()151 adapter_settings['name'] = entry.get_text()
145 adapter_settings['changed'] = True152 adapter_settings['changed'] = True
146153
147 props = adapter.GetProperties()154 props = adapter.get_properties()
148 adapter_settings['adapter'] = adapter155 adapter_settings['adapter'] = adapter
149 adapter_settings['signals'] = SignalTracker()156 adapter_settings['signals'] = SignalTracker()
150 adapter_settings['signals'].Handle(adapter, on_property_changed, "PropertyChanged")157 adapter_settings['signals'].Handle(adapter, on_property_changed, "PropertyChanged")
@@ -155,7 +162,7 @@
155 adapter_settings['discoverable_timeout'] = props['DiscoverableTimeout'] / 60162 adapter_settings['discoverable_timeout'] = props['DiscoverableTimeout'] / 60
156 adapter_settings['changed'] = False163 adapter_settings['changed'] = False
157164
158 builder = gtk.Builder()165 builder = Gtk.Builder()
159 builder.set_translation_domain("blueman")166 builder.set_translation_domain("blueman")
160 builder.add_from_file(UI_PATH + "/adapters-tab.ui")167 builder.add_from_file(UI_PATH + "/adapters-tab.ui")
161 adapter_settings['vbox'] = builder.get_object("vbox1")168 adapter_settings['vbox'] = builder.get_object("vbox1")
@@ -163,7 +170,6 @@
163 hscale = builder.get_object("hscale")170 hscale = builder.get_object("hscale")
164 hscale.set_range(0, 30)171 hscale.set_range(0, 30)
165 hscale.set_increments(1, 1)172 hscale.set_increments(1, 1)
166 hscale.set_update_policy(gtk.UPDATE_DISCONTINUOUS)
167 if adapter_settings['discoverable']:173 if adapter_settings['discoverable']:
168 hscale.set_value(adapter_settings['discoverable_timeout'])174 hscale.set_value(adapter_settings['discoverable_timeout'])
169 hscale.set_sensitive(adapter_settings['discoverable_timeout'] > 0)175 hscale.set_sensitive(adapter_settings['discoverable_timeout'] > 0)
@@ -190,7 +196,7 @@
190 return adapter_settings196 return adapter_settings
191197
192 def add_to_notebook(self, adapter):198 def add_to_notebook(self, adapter):
193 hci_dev = os.path.basename(adapter.GetObjectPath())199 hci_dev = os.path.basename(adapter.get_object_path())
194 hci_dev_num = int(hci_dev[3:])200 hci_dev_num = int(hci_dev[3:])
195201
196 if not hci_dev in self.tabs:202 if not hci_dev in self.tabs:
@@ -204,13 +210,13 @@
204 name = settings['name']210 name = settings['name']
205 if name == '':211 if name == '':
206 name = _('Adapter') + ' %d' % (hci_dev_num + 1)212 name = _('Adapter') + ' %d' % (hci_dev_num + 1)
207 label = gtk.Label(name)213 label = Gtk.Label(label=name)
208 label.set_max_width_chars(20)214 label.set_max_width_chars(20)
209 label.set_ellipsize(pango.ELLIPSIZE_END)215 label.set_ellipsize(Pango.EllipsizeMode.END)
210 self.notebook.insert_page(settings['vbox'], label, hci_dev_num)216 self.notebook.insert_page(settings['vbox'], label, hci_dev_num)
211217
212 def remove_from_notebook(self, adapter):218 def remove_from_notebook(self, adapter):
213 hci_dev = os.path.basename(adapter.GetObjectPath())219 hci_dev = os.path.basename(adapter.get_object_path())
214 hci_dev_num = int(hci_dev[3:])220 hci_dev_num = int(hci_dev[3:])
215221
216 self.tabs[hci_dev]['visible'] = False222 self.tabs[hci_dev]['visible'] = False
217223
=== modified file 'apps/blueman-applet'
--- apps/blueman-applet 2013-12-31 11:47:00 +0000
+++ apps/blueman-applet 2014-08-11 05:53:12 +0000
@@ -3,12 +3,16 @@
3import sys3import sys
4import os.path4import os.path
5import os5import os
6import pynotify6import signal
7import dbus7import dbus
8import dbus.glib8import dbus.glib
9import gobject9from blueman.Constants import *
10import gtk10import gi
11import gtk.gdk11gi.require_version("Gtk", "3.0")
12from gi.repository import Gtk
13from gi.repository import Gdk
14from gi.repository import GObject
15from gi.repository import Notify
12import __builtin__16import __builtin__
1317
14#support running uninstalled18#support running uninstalled
@@ -16,7 +20,6 @@
16if os.path.exists(os.path.join(_dirname, "CHANGELOG.md")):20if os.path.exists(os.path.join(_dirname, "CHANGELOG.md")):
17 sys.path.insert(0, _dirname)21 sys.path.insert(0, _dirname)
1822
19from blueman.Constants import *
20from blueman.Functions import *23from blueman.Functions import *
2124
22from blueman.main.DbusService import DbusService25from blueman.main.DbusService import DbusService
@@ -31,11 +34,13 @@
3134
32from blueman.main.PluginManager import PersistentPluginManager35from blueman.main.PluginManager import PersistentPluginManager
3336
37# Workaround introspection bug, gnome bug 622084
38signal.signal(signal.SIGINT, signal.SIG_DFL)
3439
35class BluemanApplet(object):40class BluemanApplet(object):
36 def __init__(self):41 def __init__(self):
37 setup_icon_path()42 setup_icon_path()
38 if not pynotify.init("Blueman"):43 if not Notify.init("Blueman"):
39 dprint("Error: Failed to init pynotify")44 dprint("Error: Failed to init pynotify")
4045
41 check_single_instance("blueman-applet")46 check_single_instance("blueman-applet")
@@ -52,17 +57,16 @@
52 self.bus = dbus.SystemBus()57 self.bus = dbus.SystemBus()
53 self.bus.watch_name_owner("org.bluez", self.on_dbus_name_owner_change)58 self.bus.watch_name_owner("org.bluez", self.on_dbus_name_owner_change)
5459
55 self.bus.add_signal_receiver(self.on_adapter_property_changed, "PropertyChanged", "org.bluez.Adapter",60 Bluez.Adapter().handle_signal(self.on_adapter_property_changed, 'PropertyChanged', path_keyword='path')
56 "org.bluez", path_keyword="path")
5761
58 gtk.main()62 Gtk.main()
5963
6064
61 def manager_init(self):65 def manager_init(self):
62 try:66 try:
6367
64 self.Signals.DisconnectAll()68 self.Signals.DisconnectAll()
65 self.Manager = Bluez.Manager("gobject")69 self.Manager = Bluez.Manager()
66 self.Plugins.Run("on_manager_state_changed", True)70 self.Plugins.Run("on_manager_state_changed", True)
6771
68 self.Signals.Handle("bluez", self.Manager, self.on_adapter_removed, "AdapterRemoved")72 self.Signals.Handle("bluez", self.Manager, self.on_adapter_removed, "AdapterRemoved")
6973
=== modified file 'apps/blueman-assistant'
--- apps/blueman-assistant 2013-12-31 11:47:00 +0000
+++ apps/blueman-assistant 2014-08-11 05:53:12 +0000
@@ -12,8 +12,8 @@
1212
13import os13import os
14import sys14import sys
15import gtk
16import random15import random
16import signal
17import dbus.glib17import dbus.glib
18from optparse import OptionParser18from optparse import OptionParser
1919
@@ -22,15 +22,23 @@
22if os.path.exists(os.path.join(_dirname, "CHANGELOG.md")):22if os.path.exists(os.path.join(_dirname, "CHANGELOG.md")):
23 sys.path.insert(0, _dirname)23 sys.path.insert(0, _dirname)
2424
25from blueman.Constants import *
25from blueman.Functions import *26from blueman.Functions import *
26from blueman.gui.DeviceSelectorWidget import DeviceSelectorWidget27from blueman.gui.DeviceSelectorWidget import DeviceSelectorWidget
27from blueman.bluez.Agent import Agent, AgentMethod28from blueman.bluez.Agent import Agent, AgentMethod
28from blueman.bluez.Manager import Manager29from blueman.bluez.Manager import Manager
30from blueman.bluez.BlueZInterface import BlueZInterface
29from blueman.main.FakeDevice import FakeDevice31from blueman.main.FakeDevice import FakeDevice
30from blueman.main.Device import Device32from blueman.main.Device import Device
31from blueman.main.AppletService import AppletService33from blueman.main.AppletService import AppletService
32from blueman.Sdp import *34from blueman.Sdp import *
3335
36import gi
37gi.require_version("Gtk", "3.0")
38from gi.repository import Gtk
39
40# Workaround introspection bug, gnome bug 622084
41signal.signal(signal.SIGINT, signal.SIG_DFL)
3442
35class Assistant(Agent):43class Assistant(Agent):
36 def __init__(self):44 def __init__(self):
@@ -54,7 +62,7 @@
54 self.Passkey = ""62 self.Passkey = ""
55 self.Service = None63 self.Service = None
5664
57 self.Builder = gtk.Builder()65 self.Builder = Gtk.Builder()
58 self.Builder.set_translation_domain("blueman")66 self.Builder.set_translation_domain("blueman")
59 self.Builder.add_from_file(UI_PATH + "/assistant.ui")67 self.Builder.add_from_file(UI_PATH + "/assistant.ui")
60 self.assistant = self.Builder.get_object("assistant")68 self.assistant = self.Builder.get_object("assistant")
@@ -109,25 +117,25 @@
109 self.dev_widget.show()117 self.dev_widget.show()
110118
111 if not self.dev_widget.List.IsValidAdapter():119 if not self.dev_widget.List.IsValidAdapter():
112 d = gtk.MessageDialog(type=gtk.MESSAGE_ERROR, )120 d = Gtk.MessageDialog(type=Gtk.MessageType.ERROR, )
113 d.props.text = _("No adapters found")121 d.props.text = _("No adapters found")
114 d.props.icon_name = "blueman"122 d.props.icon_name = "blueman"
115 d.props.title = "Blueman Assistant"123 d.props.title = "Blueman Assistant"
116 d.add_button(gtk.STOCK_CLOSE, gtk.RESPONSE_CANCEL)124 d.add_button(Gtk.STOCK_CLOSE, Gtk.ResponseType.CANCEL)
117 d.run()125 d.run()
118 exit(1)126 exit(1)
119127
120 self.assistant.show()128 self.assistant.show()
121129
122 if options.device != None:130 if options.device != None:
123 m = Manager("gobject")131 m = Manager()
124 try:132 try:
125 adapter = m.GetAdapter()133 adapter = m.get_adapter()
126 except:134 except:
127 print("Error: No Adapters present")135 print("Error: No Adapters present")
128 exit(1)136 exit(1)
129 try:137 try:
130 d = adapter.FindDevice(options.device)138 d = adapter.find_device(options.device)
131 self.Device = Device(d)139 self.Device = Device(d)
132 self.Adapter = adapter140 self.Adapter = adapter
133 if self.Device.Paired:141 if self.Device.Paired:
@@ -148,7 +156,7 @@
148 else:156 else:
149 self.dev_widget.List.DiscoverDevices()157 self.dev_widget.List.DiscoverDevices()
150158
151 gtk.main()159 Gtk.main()
152160
153 def on_row_activated(self, treeview, path, view_column, *args):161 def on_row_activated(self, treeview, path, view_column, *args):
154 self.assistant.set_current_page(self.next_page_fn(self.assistant.get_current_page(), None))162 self.assistant.set_current_page(self.next_page_fn(self.assistant.get_current_page(), None))
@@ -167,7 +175,7 @@
167 else:175 else:
168 return PAGE_PASSKEY176 return PAGE_PASSKEY
169 elif page == PAGE_PASSKEY:177 elif page == PAGE_PASSKEY:
170 if not self.Device.Fake and not self.Device.Paired and self.PairType == 2:178 if self.Device and not self.Device.Fake and not self.Device.Paired and self.PairType == 2:
171 return PAGE_CONNECT179 return PAGE_CONNECT
172 #self.assistant.set_page_complete(pages[PAGE_PASSKEY], True)180 #self.assistant.set_page_complete(pages[PAGE_PASSKEY], True)
173 return PAGE_PAIRING181 return PAGE_PAIRING
@@ -239,7 +247,7 @@
239 return self.Passkey247 return self.Passkey
240248
241 def on_close(self, assistant):249 def on_close(self, assistant):
242 gtk.main_quit()250 Gtk.main_quit()
243251
244 def on_service_toggled(self, rb, sv_name, *args):252 def on_service_toggled(self, rb, sv_name, *args):
245 if rb.props.active:253 if rb.props.active:
@@ -262,26 +270,41 @@
262 pages[PAGE_PAIRING].set_markup(270 pages[PAGE_PAIRING].set_markup(
263 _("<b>Pairing in progress...</b>\n\nEnter passkey <b>%s</b> on the device.") % self.Passkey)271 _("<b>Pairing in progress...</b>\n\nEnter passkey <b>%s</b> on the device.") % self.Passkey)
264272
265 def ok(dev):273 if BlueZInterface.get_interface_version()[0] < 5:
266 self.Device = Device(dev)274 def ok(dev):
267275 self.Device = Device(dev)
268 def refresh_cb(*args):276
269 self.assistant.set_current_page(PAGE_CONNECT)277 def refresh_cb(*args):
270278 self.assistant.set_current_page(PAGE_CONNECT)
271 self.applet.RefreshServices(self.Device.GetObjectPath(), reply_handler=refresh_cb,279
272 error_handler=refresh_cb)280 self.applet.RefreshServices(self.Device.get_object_path(), reply_handler=refresh_cb,
273281 error_handler=refresh_cb)
274 def err(err):282
275 print(err)283 def err(err):
276 pages[PAGE_FINISH].set_markup(_("<b>Failed to add device</b>"))284 print(err)
277 self.assistant.set_page_header_image(pages[PAGE_FINISH], get_icon("gtk-no", 32))285 pages[PAGE_FINISH].set_markup(_("<b>Failed to add device</b>"))
278 self.assistant.set_current_page(PAGE_FINISH)286 self.assistant.set_page_header_image(pages[PAGE_FINISH], get_icon("gtk-no", 32))
279287 self.assistant.set_current_page(PAGE_FINISH)
280 if self.PairType != 2:288
281 self.Adapter.CreatePairedDevice(self.Device.Address, self.GetObjectPath(), "", reply_handler=ok,289 if self.PairType != 2:
282 error_handler=err)290 self.Adapter.create_paired_device(self.Device.Address, self.get_object_path(), "", reply_handler=ok,
291 error_handler=err)
292 else:
293 self.Adapter.create_device(self.Device.Address, reply_handler=ok, error_handler=err)
283 else:294 else:
284 self.Adapter.CreateDevice(self.Device.Address, reply_handler=ok, error_handler=err)295 if self.PairType != 2:
296 def ok():
297 self.Device = Device(device)
298 self.assistant.set_current_page(PAGE_CONNECT)
299
300 def err(err):
301 print(err)
302 pages[PAGE_FINISH].set_markup(_("<b>Failed to add device</b>"))
303 self.assistant.set_page_header_image(pages[PAGE_FINISH], get_icon("gtk-no", 32))
304 self.assistant.set_current_page(PAGE_FINISH)
305
306 device = self.Adapter.find_device(self.Device.Address)
307 device.pair(reply_handler=ok, error_handler=err)
285308
286 elif num == PAGE_CONNECT:309 elif num == PAGE_CONNECT:
287 self.svc_vbox.foreach(lambda x, y: self.svc_vbox.remove(x), None)310 self.svc_vbox.foreach(lambda x, y: self.svc_vbox.remove(x), None)
@@ -290,61 +313,59 @@
290 uuids = self.Device.UUIDs313 uuids = self.Device.UUIDs
291 rbs = []314 rbs = []
292315
293 def get_first_item():
294 try:
295 return rbs[0]
296 except:
297 return None
298
299 for name, service in self.Device.Services.items():316 for name, service in self.Device.Services.items():
300 if name == "serial":317 if name == "serial":
301 for uuid in uuids:318 for uuid in uuids:
302 uuid16 = uuid128_to_uuid16(uuid)319 uuid16 = uuid128_to_uuid16(uuid)
303 if uuid16 == DIALUP_NET_SVCLASS_ID:320 if uuid16 == DIALUP_NET_SVCLASS_ID:
304 rbs.append(gtk.RadioButton(get_first_item(), uuid16_to_name(uuid16)))321 rbs.append(Gtk.RadioButton(uuid16_to_name(uuid16)))
305 rbs[-1].connect("toggled", self.on_service_toggled, name, uuid)322 rbs[-1].connect("toggled", self.on_service_toggled, name, uuid)
306 self.svc_vbox.pack_start(rbs[-1], False)323 self.svc_vbox.pack_start(rbs[-1], False, False, 0)
307324
308 if uuid16 == SERIAL_PORT_SVCLASS_ID:325 if uuid16 == SERIAL_PORT_SVCLASS_ID:
309 rbs.append(gtk.RadioButton(get_first_item(), uuid16_to_name(uuid16)))326 rbs.append(Gtk.RadioButton(uuid16_to_name(uuid16)))
310 rbs[-1].connect("toggled", self.on_service_toggled, name, uuid)327 rbs[-1].connect("toggled", self.on_service_toggled, name, uuid)
311 self.svc_vbox.pack_start(rbs[-1], False)328 self.svc_vbox.pack_start(rbs[-1], False, False, 0)
312 elif name == "input":329 elif name == "input":
313 rbs.append(gtk.RadioButton(get_first_item(), _("Input Service")))330 rbs.append(Gtk.RadioButton(_("Input Service")))
314 rbs[-1].connect("toggled", self.on_service_toggled, name)331 rbs[-1].connect("toggled", self.on_service_toggled, name)
315 self.svc_vbox.pack_start(rbs[-1], False)332 self.svc_vbox.pack_start(rbs[-1], False, False, 0)
316333
317 elif name == "network":334 elif name == "network":
318 for uuid in uuids:335 for uuid in uuids:
319 uuid16 = uuid128_to_uuid16(uuid)336 uuid16 = uuid128_to_uuid16(uuid)
320 if uuid16 == GN_SVCLASS_ID:337 if uuid16 == GN_SVCLASS_ID:
321 rbs.append(gtk.RadioButton(get_first_item(), _("Group Network")))338 rbs.append(Gtk.RadioButton(_("Group Network")))
322 rbs[-1].connect("toggled", self.on_service_toggled, name, uuid)339 rbs[-1].connect("toggled", self.on_service_toggled, name, uuid)
323 self.svc_vbox.pack_start(rbs[-1], False)340 self.svc_vbox.pack_start(rbs[-1], False, False, 0)
324341
325 if uuid16 == NAP_SVCLASS_ID:342 if uuid16 == NAP_SVCLASS_ID:
326 rbs.append(gtk.RadioButton(get_first_item(), _("Network Access Point")))343 rbs.append(Gtk.RadioButton(_("Network Access Point")))
327 rbs[-1].connect("toggled", self.on_service_toggled, name, uuid)344 rbs[-1].connect("toggled", self.on_service_toggled, name, uuid)
328 self.svc_vbox.pack_start(rbs[-1], False)345 self.svc_vbox.pack_start(rbs[-1], False, False, 0)
329346
330 elif name == "audiosink":347 elif name == "audiosink":
331 rbs.append(gtk.RadioButton(get_first_item(), _("A2DP Sink (Send Audio)")))348 rbs.append(Gtk.RadioButton(_("A2DP Sink (Send Audio)")))
332 rbs[-1].connect("toggled", self.on_service_toggled, name)349 rbs[-1].connect("toggled", self.on_service_toggled, name)
333 self.svc_vbox.pack_start(rbs[-1], False)350 self.svc_vbox.pack_start(rbs[-1], False, False, 0)
334351
335 elif name == "audiosource":352 elif name == "audiosource":
336 rbs.append(gtk.RadioButton(get_first_item(), _("A2DP Source (Receive Audio)")))353 rbs.append(Gtk.RadioButton(_("A2DP Source (Receive Audio)")))
337 rbs[-1].connect("toggled", self.on_service_toggled, name)354 rbs[-1].connect("toggled", self.on_service_toggled, name)
338 self.svc_vbox.pack_start(rbs[-1], False)355 self.svc_vbox.pack_start(rbs[-1], False, False, 0)
339356
340 elif name == "headset":357 elif name == "headset":
341 rbs.append(gtk.RadioButton(get_first_item(), _("Headset Service")))358 rbs.append(Gtk.RadioButton(_("Headset Service")))
342 rbs[-1].connect("toggled", self.on_service_toggled, name)359 rbs[-1].connect("toggled", self.on_service_toggled, name)
343 self.svc_vbox.pack_start(rbs[-1], False)360 self.svc_vbox.pack_start(rbs[-1], False, False, 0)
344361
345 rbs.append(gtk.RadioButton(get_first_item(), _("Don't connect")))362 if len(rbs) > 1: rbs[-1].join_group(rbs[0])
363
364 rbs.append(Gtk.RadioButton(_("Don't connect")))
365 rbs[-1].join_group(rbs[0])
346 rbs[-1].connect("toggled", self.on_service_toggled, None)366 rbs[-1].connect("toggled", self.on_service_toggled, None)
347 self.svc_vbox.pack_start(rbs[-1], False, False, 8)367 self.svc_vbox.pack_start(rbs[-1], False, False, 8)
368
348 self.svc_vbox.show_all()369 self.svc_vbox.show_all()
349370
350 rbs[0].emit("toggled")371 rbs[0].emit("toggled")
@@ -370,14 +391,14 @@
370391
371 if self.Service[0] == "network":392 if self.Service[0] == "network":
372 uuid = self.Service[1][0]393 uuid = self.Service[1][0]
373 self.applet.ServiceProxy(svc.GetInterfaceName(), svc.GetObjectPath(), "Connect", [uuid],394 self.applet.ServiceProxy(svc.get_interface_name(), svc.get_object_path(), "Connect", [uuid],
374 reply_handler=success, error_handler=fail)395 reply_handler=success, error_handler=fail)
375396
376 elif self.Service[0] == "serial":397 elif self.Service[0] == "serial":
377 uuid = self.Service[1][0]398 uuid = self.Service[1][0]
378 self.applet.RfcommConnect(self.Device.GetObjectPath(), uuid, reply_handler=success, error_handler=fail)399 self.applet.RfcommConnect(self.Device.get_object_path(), uuid, reply_handler=success, error_handler=fail)
379 else:400 else:
380 self.applet.ServiceProxy(svc.GetInterfaceName(), svc.GetObjectPath(), "Connect", [],401 self.applet.ServiceProxy(svc.get_interface_name(), svc.get_object_path(), "Connect", [],
381 reply_handler=success, error_handler=fail)402 reply_handler=success, error_handler=fail)
382403
383404
384405
=== modified file 'apps/blueman-browse'
--- apps/blueman-browse 2014-01-21 08:54:58 +0000
+++ apps/blueman-browse 2014-08-11 05:53:12 +0000
@@ -7,16 +7,17 @@
7if os.path.exists(os.path.join(_dirname, "CHANGELOG.md")):7if os.path.exists(os.path.join(_dirname, "CHANGELOG.md")):
8 sys.path.insert(0, _dirname)8 sys.path.insert(0, _dirname)
99
10import gtk
11import gobject
12from optparse import OptionParser10from optparse import OptionParser
13import gettext11import gettext
14import time12import time
1513
14from blueman.Constants import *
15import gi
16gi.require_version("Gtk", "3.0")
17
16from blueman.bluez.Manager import Manager18from blueman.bluez.Manager import Manager
17from blueman.gui.DeviceSelectorDialog import DeviceSelectorDialog19from blueman.gui.DeviceSelectorDialog import DeviceSelectorDialog
18from blueman.Functions import *20from blueman.Functions import *
19from blueman.Constants import *
20from blueman.main.Config import Config21from blueman.main.Config import Config
2122
2223
@@ -48,12 +49,7 @@
48 conf.props.browse_command = DEF_BROWSE_COMMAND49 conf.props.browse_command = DEF_BROWSE_COMMAND
49 if "nautilus" in DEF_BROWSE_COMMAND:50 if "nautilus" in DEF_BROWSE_COMMAND:
50 if not have("nautilus"):51 if not have("nautilus"):
51 if have("thunar"):52 conf.props.browse_command = "thunar obex://[%d]"
52 conf.props.browse_command = "thunar obex://[%d]"
53 elif have ("pcmanfm"):
54 conf.props.browse_command = "pcmanfm obex://[%d]"
55 else:
56 conf.props.browse_command = "xdg-open obex://[%d]"
5753
58 cmd = conf.props.browse_command.replace("%d", addr)54 cmd = conf.props.browse_command.replace("%d", addr)
59 args = cmd.split(" ")55 args = cmd.split(" ")
@@ -61,7 +57,7 @@
61 spawn(args, True)57 spawn(args, True)
62 except Exception as e:58 except Exception as e:
63 dprint(e)59 dprint(e)
64 d = gtk.MessageDialog(None, buttons=gtk.BUTTONS_OK, type=gtk.MESSAGE_ERROR)60 d = Gtk.MessageDialog(None, buttons=Gtk.ButtonsType.OK, type=Gtk.MessageType.ERROR)
65 d.props.text = _("Failed to launch \"%s\"") % args[0]61 d.props.text = _("Failed to launch \"%s\"") % args[0]
66 d.props.secondary_text = "%s\n\n" % e + _("You can enter an alternate browser in service settings")62 d.props.secondary_text = "%s\n\n" % e + _("You can enter an alternate browser in service settings")
67 d.run()63 d.run()
@@ -71,7 +67,7 @@
71 d = DeviceSelectorDialog()67 d = DeviceSelectorDialog()
72 resp = d.run()68 resp = d.run()
73 d.destroy()69 d.destroy()
74 if resp == gtk.RESPONSE_ACCEPT:70 if resp == Gtk.ResponseType.ACCEPT:
75 sel = d.GetSelection()71 sel = d.GetSelection()
76 if sel:72 if sel:
77 return sel[1]73 return sel[1]
7874
=== modified file 'apps/blueman-manager'
--- apps/blueman-manager 2013-12-31 11:47:00 +0000
+++ apps/blueman-manager 2014-08-11 05:53:12 +0000
@@ -1,37 +1,21 @@
1#!/usr/bin/python1#!/usr/bin/python
22
3# Copyright (C) 2008 Valmantas Paliksa <walmis at balticum-tv dot lt>
4# Copyright (C) 2008 Tadas Dailyda <tadas at dailyda dot com>
5#
6# Licensed under the GNU General Public License Version 3
7#
8# This program is free software: you can redistribute it and/or modify
9# it under the terms of the GNU General Public License as published by
10# the Free Software Foundation, either version 3 of the License, or
11# (at your option) any later version.
12#
13# This program is distributed in the hope that it will be useful,
14# but WITHOUT ANY WARRANTY; without even the implied warranty of
15# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16# GNU General Public License for more details.
17#
18# You should have received a copy of the GNU General Public License
19# along with this program. If not, see <http://www.gnu.org/licenses/>.
20#
21
22
23import os.path3import os.path
24import sys4import sys
25import gtk5import signal
26import dbus, dbus.glib6import dbus, dbus.glib
27import gobject7from blueman.Constants import *
8import gi
9gi.require_version("Gtk", "3.0")
10from gi.repository import Gtk
11from gi.repository import GObject
12from blueman.bluez.BlueZInterface import BlueZInterface
2813
29#support running uninstalled14#support running uninstalled
30_dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))15_dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
31if os.path.exists(os.path.join(_dirname, "CHANGELOG.md")):16if os.path.exists(os.path.join(_dirname, "CHANGELOG.md")):
32 sys.path.insert(0, _dirname)17 sys.path.insert(0, _dirname)
3318
34from blueman.Constants import *
35from blueman.Functions import *19from blueman.Functions import *
36from blueman.main.Device import Device20from blueman.main.Device import Device
37from blueman.bluez.Device import Device as BluezDevice21from blueman.bluez.Device import Device as BluezDevice
@@ -48,13 +32,16 @@
48import blueman.plugins.manager32import blueman.plugins.manager
49from blueman.plugins.ManagerPlugin import ManagerPlugin33from blueman.plugins.ManagerPlugin import ManagerPlugin
5034
35# Workaround introspection bug, gnome bug 622084
36signal.signal(signal.SIGINT, signal.SIG_DFL)
37
51enable_rgba_colormap()38enable_rgba_colormap()
5239
5340
54class Blueman:41class Blueman:
55 def __init__(self):42 def __init__(self):
5643
57 self.Builder = gtk.Builder()44 self.Builder = Gtk.Builder()
58 self.Builder.set_translation_domain("blueman")45 self.Builder.set_translation_domain("blueman")
59 self.Builder.add_from_file(UI_PATH + "/manager-main.ui")46 self.Builder.add_from_file(UI_PATH + "/manager-main.ui")
6047
@@ -65,9 +52,15 @@
6552
66 vbox = self.Builder.get_object("vbox1")53 vbox = self.Builder.get_object("vbox1")
67 area = MessageArea()54 area = MessageArea()
68 vbox.pack_start(area, False)55 vbox.pack_start(area, False, False, 0)
69 vbox.reorder_child(area, 3)56 vbox.reorder_child(area, 3)
7057
58 # Add padding for resize grip or it will overlap
59 if self.window.get_has_resize_grip():
60 align3 = self.Builder.get_object("alignment3")
61 top, bottom, left, right = align3.get_padding()
62 align3.set_padding(top, bottom, left, right + 10)
63
71 def do_present(time):64 def do_present(time):
72 if self.window.props.visible:65 if self.window.props.visible:
73 self.window.present_with_time(time)66 self.window.present_with_time(time)
@@ -82,7 +75,7 @@
82 (x, y) = self.window.get_position()75 (x, y) = self.window.get_position()
83 self.Config.props.window_posx = x76 self.Config.props.window_posx = x
84 self.Config.props.window_posy = y77 self.Config.props.window_posy = y
85 gtk.main_quit()78 Gtk.main_quit()
8679
87 def on_property_changed(config, key, value):80 def on_property_changed(config, key, value):
88 if key == "show_toolbar":81 if key == "show_toolbar":
@@ -105,7 +98,7 @@
105 if not status:98 if not status:
106 self.window.hide()99 self.window.hide()
107 check_bluetooth_status(_("Bluetooth needs to be turned on for the device manager to function"),100 check_bluetooth_status(_("Bluetooth needs to be turned on for the device manager to function"),
108 lambda: gtk.main_quit())101 lambda: Gtk.main_quit())
109 else:102 else:
110 self.window.show()103 self.window.show()
111104
@@ -113,20 +106,19 @@
113 dprint('org.bluez owner changed to ', owner)106 dprint('org.bluez owner changed to ', owner)
114 if owner == '':107 if owner == '':
115 self.window.hide()108 self.window.hide()
116 d = gtk.MessageDialog(self.window, type=gtk.MESSAGE_ERROR)109 d = Gtk.MessageDialog(self.window, type=Gtk.MessageType.ERROR, buttons=Gtk.ButtonsType.CLOSE)
117 d.props.icon_name = "blueman"110 d.props.icon_name = "blueman"
118 d.props.text = _("Connection to BlueZ failed")111 d.props.text = _("Connection to BlueZ failed")
119112
120 d.props.secondary_text = _(113 d.props.secondary_text = _(
121 "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.")114 "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.")
122115
123 d.add_button(gtk.STOCK_CLOSE, gtk.RESPONSE_NO)
124 d.run()116 d.run()
125 d.destroy()117 d.destroy()
126 try:118 try:
127 exit(1)119 exit(1)
128 except:120 except:
129 gtk.main_quit()121 Gtk.main_quit()
130 else:122 else:
131123
132 setup_icon_path()124 setup_icon_path()
@@ -185,13 +177,14 @@
185 self.window.show()177 self.window.show()
186178
187 dbus.SystemBus().watch_name_owner('org.bluez', on_bluez_name_owner_changed)179 dbus.SystemBus().watch_name_owner('org.bluez', on_bluez_name_owner_changed)
188 gtk.main()180 Gtk.main()
189181
190 def on_adapter_changed(self, list, adapter):182 def on_adapter_changed(self, list, adapter):
191 if adapter != None:183 if adapter != None:
192 self.List.DisplayKnownDevices(autoselect=True)184 self.List.DisplayKnownDevices(autoselect=True)
193185
194 def add_device(self, device):186 def add_device(self, device):
187 # BlueZ 4 only!
195188
196 def ok(device):189 def ok(device):
197 dev = Device(device)190 dev = Device(device)
@@ -206,10 +199,10 @@
206 adapter = self.List.Adapter199 adapter = self.List.Adapter
207200
208 prog = ManagerProgressbar(self, text=_("Adding"))201 prog = ManagerProgressbar(self, text=_("Adding"))
209 prog.connect("cancelled", lambda x: self.List.Adapter.GetInterface().CancelDeviceCreation(device.Address))202 prog.connect("cancelled", lambda x: self.List.Adapter.get_interface().CancelDeviceCreation(device.Address))
210203
211 prog.start()204 prog.start()
212 adapter.CreateDevice(device.Address, reply_handler=ok, error_handler=err)205 adapter.create_device(device.Address, reply_handler=ok, error_handler=err)
213206
214 def inquiry(self):207 def inquiry(self):
215 def prop_changed(List, adapter, (key, value)):208 def prop_changed(List, adapter, (key, value)):
@@ -242,51 +235,54 @@
242 spawn(["blueman-assistant", "--device=%s" % device.Address], sn=sn)235 spawn(["blueman-assistant", "--device=%s" % device.Address], sn=sn)
243236
244 def bond(self, device):237 def bond(self, device):
245 def ok(device):238 if BlueZInterface.get_interface_version()[0] < 5:
246 dev = Device(BluezDevice(device))239 def ok(device):
247 self.List.add_device(dev)240 dev = Device(BluezDevice(device))
248 prog.message(_("Success"))241 self.List.add_device(dev)
249 MessageArea.close()242 prog.message(_("Success"))
250243 MessageArea.close()
251 def err(*args):244
252 dprint(args)245 def err(*args):
253 prog.message(_("Failure"))246 dprint(args)
254 MessageArea.show_message(e_(str(args[0])))247 prog.message(_("Failure"))
255248 MessageArea.show_message(e_(str(args[0])))
256 applet = AppletService()249
257250 applet = AppletService()
258 address = device.GetProperties()["Address"]251
259 adapter = self.List.Adapter252 address = device.get_properties()["Address"]
260253 adapter = self.List.Adapter
261 prog = ManagerProgressbar(self, text=_("Pairing"))254
262 prog.connect("cancelled", lambda x: applet.CancelDeviceCreation(adapter.GetObjectPath(), device.Address))255 prog = ManagerProgressbar(self, text=_("Pairing"))
263 prog.start()256 prog.connect("cancelled", lambda x: applet.CancelDeviceCreation(adapter.get_object_path(), device.Address))
264257 prog.start()
265 name = adapter_path_to_name(self.List.Adapter.GetObjectPath())258
266259 name = adapter_path_to_name(self.List.Adapter.get_object_path())
267 applet.CreateDevice(adapter.GetObjectPath(), device.Address, True, gtk.get_current_event_time(),260
268 reply_handler=ok, error_handler=err, timeout=120)261 applet.CreateDevice(adapter.get_object_path(), device.Address, True, Gtk.get_current_event_time(),
262 reply_handler=ok, error_handler=err, timeout=120)
263 else:
264 self.List.Adapter.find_device(device.Address).pair()
269265
270 def adapter_properties(self):266 def adapter_properties(self):
271 adapter = self.List.Adapter267 adapter = self.List.Adapter
272 name = os.path.basename(adapter.GetObjectPath())268 name = os.path.basename(adapter.get_object_path())
273 sn = startup_notification("Blueman Adapters", _("Starting Adapter Preferences"), bin_name="blueman-adapters",269 sn = startup_notification("Blueman Adapters", _("Starting Adapter Preferences"), bin_name="blueman-adapters",
274 icon="blueman")270 icon="blueman")
275 spawn(["blueman-adapters", name], sn=sn)271 spawn(["blueman-adapters", name], sn=sn)
276272
277 def toggle_trust(self, device):273 def toggle_trust(self, device):
278 props = device.GetProperties()274 props = device.get_properties()
279 device.Trusted = not device.Trusted275 device.Trusted = not device.Trusted
280276
281 def send(self, device, File=None):277 def send(self, device, File=None):
282 sn = startup_notification("Blueman Sendto", _("Starting File Sender"), bin_name="blueman-sendto",278 sn = startup_notification("Blueman Sendto", _("Starting File Sender"), bin_name="blueman-sendto",
283 icon="blueman")279 icon="blueman")
284 adapter = self.List.Adapter280 adapter = self.List.Adapter
285 props = adapter.GetProperties()281 props = adapter.get_properties()
286 spawn(["blueman-sendto", "--source=%s" % props["Address"], "--device=%s" % device.Address], sn=sn)282 spawn(["blueman-sendto", "--source=%s" % props["Address"], "--device=%s" % device.Address], sn=sn)
287283
288 def remove(self, device):284 def remove(self, device):
289 self.List.Adapter.RemoveDevice(device.Device)285 self.List.Adapter.remove_device(device.Device)
290286
291 def browse(self, device):287 def browse(self, device):
292 spawn(["blueman-browse", "-d %s" % device.Address])288 spawn(["blueman-browse", "-d %s" % device.Address])
293289
=== modified file 'apps/blueman-mechanism'
--- apps/blueman-mechanism 2013-12-31 11:47:00 +0000
+++ apps/blueman-mechanism 2014-08-11 05:53:12 +0000
@@ -15,10 +15,10 @@
15import blueman.Functions15import blueman.Functions
16import __builtin__16import __builtin__
1717
18import gobject18from gi.repository import GObject
19import syslog19import syslog
2020
21loop = gobject.MainLoop()21loop = GObject.MainLoop()
2222
23from blueman.Lib import set_probe_debug23from blueman.Lib import set_probe_debug
24from blueman.Constants import POLKIT24from blueman.Constants import POLKIT
@@ -80,7 +80,7 @@
80 def __init__(self):80 def __init__(self):
81 self.time = 081 self.time = 0
82 self.stopped = False82 self.stopped = False
83 gobject.timeout_add(1000, self.tick)83 GObject.timeout_add(1000, self.tick)
8484
85 def tick(self):85 def tick(self):
86 if not self.stopped:86 if not self.stopped:
8787
=== modified file 'apps/blueman-sendto'
--- apps/blueman-sendto 2013-12-31 11:47:00 +0000
+++ apps/blueman-sendto 2014-08-11 05:53:12 +0000
@@ -1,21 +1,24 @@
1#!/usr/bin/python1#!/usr/bin/python
2# coding=utf-82# coding=utf-8
33
4import os, sys4import os, sys, signal
55
6#support running uninstalled6#support running uninstalled
7_dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))7_dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
8if os.path.exists(os.path.join(_dirname, "CHANGELOG.md")):8if os.path.exists(os.path.join(_dirname, "CHANGELOG.md")):
9 sys.path.insert(0, _dirname)9 sys.path.insert(0, _dirname)
1010
11import gtk
12import gobject
13import dbus.glib11import dbus.glib
14from optparse import OptionParser12from optparse import OptionParser
15import gettext13import gettext
16import urllib14import urllib
17import time15import time
1816
17from blueman.Constants import *
18import gi
19gi.require_version("Gtk", "3.0")
20from gi.repository import Gtk
21
19from blueman.bluez.Adapter import Adapter22from blueman.bluez.Adapter import Adapter
20from blueman.main.Device import Device23from blueman.main.Device import Device
21from blueman.main.FakeDevice import FakeDevice24from blueman.main.FakeDevice import FakeDevice
@@ -28,17 +31,20 @@
2831
29from blueman.ods.OdsManager import OdsManager32from blueman.ods.OdsManager import OdsManager
3033
34# Workaround introspection bug, gnome bug 622084
35signal.signal(signal.SIGINT, signal.SIG_DFL)
36
31enable_rgba_colormap()37enable_rgba_colormap()
3238
3339
34class Sender(gobject.GObject):40class Sender(GObject.GObject):
35 __gsignals__ = {41 __gsignals__ = {
36 'result': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, (gobject.TYPE_BOOLEAN,)),42 'result': (GObject.SignalFlags.RUN_FIRST, None, (GObject.TYPE_BOOLEAN,)),
37 }43 }
3844
39 def __init__(self, device, adapter, files):45 def __init__(self, device, adapter, files):
40 gobject.GObject.__init__(self)46 GObject.GObject.__init__(self)
41 self.Builder = gtk.Builder()47 self.Builder = Gtk.Builder()
42 self.Builder.set_translation_domain("blueman")48 self.Builder.set_translation_domain("blueman")
43 self.Builder.add_from_file(UI_PATH + "/send-dialog.ui")49 self.Builder.add_from_file(UI_PATH + "/send-dialog.ui")
44 self.window = self.Builder.get_object("window")50 self.window = self.Builder.get_object("window")
@@ -88,8 +94,8 @@
88 try:94 try:
89 self.manager = OdsManager()95 self.manager = OdsManager()
90 except:96 except:
91 d = gtk.MessageDialog(self.window,97 d = Gtk.MessageDialog(self.window,
92 type=gtk.MESSAGE_ERROR, buttons=gtk.BUTTONS_OK)98 type=Gtk.MessageType.ERROR, buttons=Gtk.ButtonsType.OK)
93 d.props.text = _("obex-data-server not available")99 d.props.text = _("obex-data-server not available")
94 d.props.secondary_text = _("obex-data-server is probably not installed")100 d.props.secondary_text = _("obex-data-server is probably not installed")
95 d.run()101 d.run()
@@ -116,8 +122,8 @@
116122
117 def on_error(msg):123 def on_error(msg):
118 dprint("Failed to create session")124 dprint("Failed to create session")
119 d = gtk.MessageDialog(self.window,125 d = Gtk.MessageDialog(self.window,
120 type=gtk.MESSAGE_ERROR, buttons=(gtk.BUTTONS_CLOSE))126 type=Gtk.MessageType.ERROR, buttons=(Gtk.ButtonsType.CLOSE))
121 d.props.text = _("Error occurred")127 d.props.text = _("Error occurred")
122 d.props.icon_name = "blueman"128 d.props.icon_name = "blueman"
123 d.props.secondary_text = str(msg).split(":")[1].strip(" ")129 d.props.secondary_text = str(msg).split(":")[1].strip(" ")
@@ -126,7 +132,7 @@
126 d.destroy()132 d.destroy()
127 exit(1)133 exit(1)
128134
129 props = self.adapter.GetProperties()135 props = self.adapter.get_properties()
130 self.manager.create_session(self.device.Address, props["Address"], error_handler=on_error)136 self.manager.create_session(self.device.Address, props["Address"], error_handler=on_error)
131137
132 def on_cancel(self, button):138 def on_cancel(self, button):
@@ -153,12 +159,12 @@
153159
154 #first transfer160 #first transfer
155 if self.total_transferred == 0:161 if self.total_transferred == 0:
156 self.pb.props.text = _("Sending File") + (" %(0)s/%(1)s (%(2).2f %(3)s/s) " + _("ETA:") + " %(4)s") % {162 self.pb.props.text = _(u"Sending File") + (u" %(0)s/%(1)s (%(2).2f %(3)s/s) " + _(u"ETA:") + u" %(4)s") % {
157 "1": self.num_files,163 u"1": self.num_files,
158 "0": (self.num_files - len(self.files) + 1),164 u"0": (self.num_files - len(self.files) + 1),
159 "2": 0.0,165 u"2": 0.0,
160 "3": "B/s",166 u"3": u"B/s",
161 "4": "∞"}167 u"4": u"∞"}
162168
163 self.l_file.props.label = filename169 self.l_file.props.label = filename
164 self._last_bytes = 0170 self._last_bytes = 0
@@ -185,7 +191,7 @@
185 else:191 else:
186 eta = ngettext("%.0f Second", "%.0f Seconds", round(x)) % x192 eta = ngettext("%.0f Second", "%.0f Seconds", round(x)) % x
187 except ZeroDivisionError:193 except ZeroDivisionError:
188 eta = "∞"194 eta = u"∞"
189195
190 self.pb.props.text = _("Sending File") + (" %(0)s/%(1)s (%(2).2f %(3)s/s) " + _("ETA:") + " %(4)s") % {196 self.pb.props.text = _("Sending File") + (" %(0)s/%(1)s (%(2).2f %(3)s/s) " + _("ETA:") + " %(4)s") % {
191 "1": self.num_files,197 "1": self.num_files,
@@ -235,26 +241,26 @@
235 dprint("session err", name, msg)241 dprint("session err", name, msg)
236 if not self.error_dialog:242 if not self.error_dialog:
237 self.speed.reset()243 self.speed.reset()
238 d = gtk.MessageDialog(self.window,244 d = Gtk.MessageDialog(self.window,
239 type=gtk.MESSAGE_ERROR)245 type=Gtk.MessageType.ERROR)
240 d.props.text = msg246 d.props.text = msg
241 d.props.modal = True247 d.props.modal = True
242 d.props.secondary_text = _("Error occurred while sending file %s") % os.path.basename(self.files[-1])248 d.props.secondary_text = _("Error occurred while sending file %s") % os.path.basename(self.files[-1])
243 d.props.icon_name = "blueman"249 d.props.icon_name = "blueman"
244250
245 if len(self.files) > 1:251 if len(self.files) > 1:
246 d.add_button(_("Skip"), gtk.RESPONSE_NO)252 d.add_button(_("Skip"), Gtk.ResponseType.NO)
247 d.add_button(_("Retry"), gtk.RESPONSE_YES)253 d.add_button(_("Retry"), Gtk.ResponseType.YES)
248 d.add_button(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)254 d.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL)
249255
250256
251 def on_response(dialog, resp):257 def on_response(dialog, resp):
252 dialog.destroy()258 dialog.destroy()
253 self.error_dialog = None259 self.error_dialog = None
254260
255 if resp == gtk.STOCK_CANCEL:261 if resp == Gtk.STOCK_CANCEL:
256 self.on_cancel(None)262 self.on_cancel(None)
257 elif resp == gtk.RESPONSE_NO:263 elif resp == Gtk.ResponseType.NO:
258 self.total_bytes -= os.path.getsize(self.files[-1])264 self.total_bytes -= os.path.getsize(self.files[-1])
259 self.total_transferred -= self.transferred265 self.total_transferred -= self.transferred
260 self.transferred = 0266 self.transferred = 0
@@ -262,7 +268,7 @@
262 if not self.session or not self.session.Connected:268 if not self.session or not self.session.Connected:
263 self.create_session()269 self.create_session()
264 self.process_queue()270 self.process_queue()
265 elif resp == gtk.RESPONSE_YES:271 elif resp == Gtk.ResponseType.YES:
266 self.total_transferred -= self.transferred272 self.total_transferred -= self.transferred
267 self.transferred = 0273 self.transferred = 0
268 if not self.session or not self.session.Connected:274 if not self.session or not self.session.Connected:
@@ -321,20 +327,20 @@
321 self.do_send()327 self.do_send()
322328
323 else:329 else:
324 m = Manager("gobject")330 m = Manager()
325 try:331 try:
326 if options.source is not None:332 if options.source is not None:
327 try:333 try:
328 adapter = m.GetAdapter(options.source)334 adapter = m.get_adapter(options.source)
329 except:335 except:
330 adapter = m.GetAdapter()336 adapter = m.get_adapter()
331 else:337 else:
332 adapter = m.GetAdapter()338 adapter = m.get_adapter()
333 except:339 except:
334 print("Error: No Adapters present")340 print("Error: No Adapters present")
335 exit()341 exit()
336 try:342 try:
337 d = adapter.FindDevice(options.device)343 d = adapter.find_device(options.device)
338 except:344 except:
339 info = {}345 info = {}
340 info["Address"] = options.device346 info["Address"] = options.device
@@ -345,10 +351,10 @@
345 d = FakeDevice(info)351 d = FakeDevice(info)
346352
347 self.device = Device(d)353 self.device = Device(d)
348 self.adapter = adapter.GetObjectPath()354 self.adapter = adapter.get_object_path()
349 self.do_send()355 self.do_send()
350356
351 gtk.main()357 Gtk.main()
352358
353 def do_send(self):359 def do_send(self):
354 if len(self.args) == 0:360 if len(self.args) == 0:
@@ -360,18 +366,18 @@
360 sender = Sender(self.device, self.adapter, self.args)366 sender = Sender(self.device, self.adapter, self.args)
361367
362 def on_result(sender, res):368 def on_result(sender, res):
363 gtk.main_quit()369 Gtk.main_quit()
364370
365 sender.connect("result", on_result)371 sender.connect("result", on_result)
366372
367 def select_files(self):373 def select_files(self):
368 d = gtk.FileChooserDialog(_("Select files to send"), buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT,374 d = Gtk.FileChooserDialog(_("Select files to send"), buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.REJECT,
369 gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))375 Gtk.STOCK_OK, Gtk.ResponseType.ACCEPT))
370 d.props.icon_name = "blueman-send-file"376 d.props.icon_name = "blueman-send-file"
371 d.set_select_multiple(True)377 d.set_select_multiple(True)
372 resp = d.run()378 resp = d.run()
373379
374 if resp == gtk.RESPONSE_ACCEPT:380 if resp == Gtk.ResponseType.ACCEPT:
375 self.files = d.get_filenames()381 self.files = d.get_filenames()
376 d.destroy()382 d.destroy()
377 return True383 return True
@@ -383,7 +389,7 @@
383 d = DeviceSelectorDialog()389 d = DeviceSelectorDialog()
384 resp = d.run()390 resp = d.run()
385 d.destroy()391 d.destroy()
386 if resp == gtk.RESPONSE_ACCEPT:392 if resp == Gtk.ResponseType.ACCEPT:
387 sel = d.GetSelection()393 sel = d.GetSelection()
388 if sel:394 if sel:
389 self.device = sel[1]395 self.device = sel[1]
390396
=== modified file 'apps/blueman-services'
--- apps/blueman-services 2013-12-31 11:47:00 +0000
+++ apps/blueman-services 2014-08-11 05:53:12 +0000
@@ -7,11 +7,14 @@
7if os.path.exists(os.path.join(_dirname, "CHANGELOG.md")):7if os.path.exists(os.path.join(_dirname, "CHANGELOG.md")):
8 sys.path.insert(0, _dirname)8 sys.path.insert(0, _dirname)
99
10import gtk
11from blueman.gui.GenericList import GenericList10from blueman.gui.GenericList import GenericList
1211
12from blueman.Constants import *
13import gi
14gi.require_version("Gtk", "3.0")
15from gi.repository import Gtk
16
13from blueman.Functions import *17from blueman.Functions import *
14from blueman.Constants import *
1518
16import blueman.plugins.services19import blueman.plugins.services
17from blueman.plugins.ServicePlugin import ServicePlugin20from blueman.plugins.ServicePlugin import ServicePlugin
@@ -24,7 +27,7 @@
24class BluemanServices:27class BluemanServices:
25 def __init__(self):28 def __init__(self):
2629
27 self.Builder = gtk.Builder()30 self.Builder = Gtk.Builder()
28 self.Builder.set_translation_domain("blueman")31 self.Builder.set_translation_domain("blueman")
29 self.Builder.add_from_file(UI_PATH + "/services.ui")32 self.Builder.add_from_file(UI_PATH + "/services.ui")
3033
@@ -35,11 +38,11 @@
3538
36 check_single_instance("blueman-services", lambda time: self.Dialog.present_with_time(time))39 check_single_instance("blueman-services", lambda time: self.Dialog.present_with_time(time))
3740
38 self.Dialog.connect("delete-event", lambda x, y: gtk.main_quit())41 self.Dialog.connect("delete-event", lambda x, y: Gtk.main_quit())
3942
40 data = [43 data = [
41 ["picture", 'GdkPixbuf', gtk.CellRendererPixbuf(), {"pixbuf": 0}, None],44 ["picture", 'GdkPixbuf', Gtk.CellRendererPixbuf(), {"pixbuf": 0}, None],
42 ["caption", str, gtk.CellRendererText(), {"markup": 1}, None, {"expand": True}],45 ["caption", str, Gtk.CellRendererText(), {"markup": 1}, None, {"expand": True}],
43 ["id", str],46 ["id", str],
44 ]47 ]
4548
@@ -62,10 +65,10 @@
62 ls.selection.select_path(0)65 ls.selection.select_path(0)
6366
64 self.Builder.get_object("b_apply").connect("clicked", self.on_apply_clicked)67 self.Builder.get_object("b_apply").connect("clicked", self.on_apply_clicked)
65 self.Builder.get_object("b_close").connect("clicked", lambda x: gtk.main_quit())68 self.Builder.get_object("b_close").connect("clicked", lambda x: Gtk.main_quit())
6669
67 self.Dialog.show()70 self.Dialog.show()
68 gtk.main()71 Gtk.main()
6972
70 def option_changed(self):73 def option_changed(self):
71 rets = self.plugin_exec("on_query_apply_state")74 rets = self.plugin_exec("on_query_apply_state")
@@ -148,7 +151,8 @@
148 def on_selection_changed(self, selection):151 def on_selection_changed(self, selection):
149 iter = self.List.selected()152 iter = self.List.selected()
150 if self.List.get_cursor()[0]:153 if self.List.get_cursor()[0]:
151 self.Config.props.services_last_item = self.List.get_cursor()[0][0]154 # GtkTreePath returns row when used as string
155 self.Config.props.services_last_item = int(str(self.List.get_cursor()[0]))
152 row = self.List.get(iter, "id")156 row = self.List.get(iter, "id")
153 id = row["id"]157 id = row["id"]
154158
155159
=== modified file 'autogen.sh'
--- autogen.sh 2013-12-31 11:47:00 +0000
+++ autogen.sh 2014-08-11 05:53:12 +0000
@@ -12,7 +12,7 @@
12 exit 112 exit 1
13}13}
1414
15if test -z "$AUTOGEN_SUBDIR_MODE"; then15if test -z "$AUTOGEN_SUBDIR_MODE" && test -z "$NOCONFIGURE"; then
16 if test -z "$*"; then16 if test -z "$*"; then
17 echo "I am going to run ./configure with no arguments - if you wish "17 echo "I am going to run ./configure with no arguments - if you wish "
18 echo "to pass any to it, please specify them on the $0 command line."18 echo "to pass any to it, please specify them on the $0 command line."
@@ -27,7 +27,7 @@
27automake --add-missing --copy || exit $?27automake --add-missing --copy || exit $?
28autoconf || exit $?28autoconf || exit $?
2929
30if test -z "$AUTOGEN_SUBDIR_MODE"; then30if test -z "$AUTOGEN_SUBDIR_MODE" && test -z "$NOCONFIGURE"; then
31 $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?31 $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
3232
33 echo 33 echo
3434
=== modified file 'autom4te.cache/output.0'
--- autom4te.cache/output.0 2014-07-01 12:11:00 +0000
+++ autom4te.cache/output.0 2014-08-11 05:53:12 +0000
@@ -632,12 +632,10 @@
632am__EXEEXT_TRUE632am__EXEEXT_TRUE
633LTLIBOBJS633LTLIBOBJS
634LIB@&t@OBJS634LIB@&t@OBJS
635PYGOBJECT_LIBS
636PYGOBJECT_CFLAGS
635BLUEZ_LIBS637BLUEZ_LIBS
636BLUEZ_CFLAGS638BLUEZ_CFLAGS
637PYNOTIFY_LIBS
638PYNOTIFY_CFLAGS
639PYGTK_LIBS
640PYGTK_CFLAGS
641HAVE_NST_FALSE639HAVE_NST_FALSE
642HAVE_NST_TRUE640HAVE_NST_TRUE
643ENABLE_HAL_FALSE641ENABLE_HAL_FALSE
@@ -655,7 +653,7 @@
655SYSCONFDIR653SYSCONFDIR
656PYREXC654PYREXC
657PYTHON_LIBS655PYTHON_LIBS
658PYTHON_INCLUDES656PYTHON_CFLAGS
659pkgpyexecdir657pkgpyexecdir
660pyexecdir658pyexecdir
661pkgpythondir659pkgpythondir
@@ -864,13 +862,13 @@
864PKG_CONFIG_PATH862PKG_CONFIG_PATH
865PKG_CONFIG_LIBDIR863PKG_CONFIG_LIBDIR
866PYTHON864PYTHON
865PYTHON_CFLAGS
866PYTHON_LIBS
867PYREXC867PYREXC
868PYGTK_CFLAGS
869PYGTK_LIBS
870PYNOTIFY_CFLAGS
871PYNOTIFY_LIBS
872BLUEZ_CFLAGS868BLUEZ_CFLAGS
873BLUEZ_LIBS'869BLUEZ_LIBS
870PYGOBJECT_CFLAGS
871PYGOBJECT_LIBS'
874872
875873
876# Initialize some variables set by options.874# Initialize some variables set by options.
@@ -1534,17 +1532,17 @@
1534 PKG_CONFIG_LIBDIR 1532 PKG_CONFIG_LIBDIR
1535 path overriding pkg-config's built-in search path1533 path overriding pkg-config's built-in search path
1536 PYTHON the Python interpreter1534 PYTHON the Python interpreter
1535 PYTHON_CFLAGS
1536 C compiler flags for PYTHON, overriding pkg-config
1537 PYTHON_LIBS linker flags for PYTHON, overriding pkg-config
1537 PYREXC Pyrex compiler1538 PYREXC Pyrex compiler
1538 PYGTK_CFLAGS
1539 C compiler flags for PYGTK, overriding pkg-config
1540 PYGTK_LIBS linker flags for PYGTK, overriding pkg-config
1541 PYNOTIFY_CFLAGS
1542 C compiler flags for PYNOTIFY, overriding pkg-config
1543 PYNOTIFY_LIBS
1544 linker flags for PYNOTIFY, overriding pkg-config
1545 BLUEZ_CFLAGS 1539 BLUEZ_CFLAGS
1546 C compiler flags for BLUEZ, overriding pkg-config1540 C compiler flags for BLUEZ, overriding pkg-config
1547 BLUEZ_LIBS linker flags for BLUEZ, overriding pkg-config1541 BLUEZ_LIBS linker flags for BLUEZ, overriding pkg-config
1542 PYGOBJECT_CFLAGS
1543 C compiler flags for PYGOBJECT, overriding pkg-config
1544 PYGOBJECT_LIBS
1545 linker flags for PYGOBJECT, overriding pkg-config
15481546
1549Use these variables to override the choices made by `configure' or to help1547Use these variables to override the choices made by `configure' or to help
1550it to find libraries and programs with nonstandard names/locations.1548it to find libraries and programs with nonstandard names/locations.
@@ -13272,34 +13270,103 @@
13272 fi13270 fi
1327313271
1327413272
1327513273if test "${PYTHON_VERSION}" \< "3.0"; then
13276{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for headers required to compile python extensions" >&513274
13277$as_echo_n "checking for headers required to compile python extensions... " >&6; }13275pkg_failed=no
13278py_prefix=`$PYTHON -c "import sys; print sys.prefix"`13276{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYTHON" >&5
13279py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`13277$as_echo_n "checking for PYTHON... " >&6; }
13280PYTHON_INCLUDES=`python-config --includes`13278
13281if test "$py_prefix" != "$py_exec_prefix"; then13279if test -n "$PYTHON_CFLAGS"; then
13282 PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"13280 pkg_cv_PYTHON_CFLAGS="$PYTHON_CFLAGS"
13283fi13281 elif test -n "$PKG_CONFIG"; then
1328413282 if test -n "$PKG_CONFIG" && \
13285save_CPPFLAGS="$CPPFLAGS"13283 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-\${PYTHON_VERSION}\""; } >&5
13286CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"13284 ($PKG_CONFIG --exists --print-errors "python-${PYTHON_VERSION}") 2>&5
13287cat confdefs.h - <<_ACEOF >conftest.$ac_ext13285 ac_status=$?
13288/* end confdefs.h. */13286 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13289#include <Python.h>13287 test $ac_status = 0; }; then
13290_ACEOF13288 pkg_cv_PYTHON_CFLAGS=`$PKG_CONFIG --cflags "python-${PYTHON_VERSION}" 2>/dev/null`
13291if ac_fn_c_try_cpp "$LINENO"; then :13289 test "x$?" != "x0" && pkg_failed=yes
13292 { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&513290else
13293$as_echo "found" >&6; }13291 pkg_failed=yes
1329413292fi
13295else13293 else
13296 { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&513294 pkg_failed=untried
13297$as_echo "not found" >&6; }13295fi
13298as_fn_error $? "Could not find Python headers" "$LINENO" 513296if test -n "$PYTHON_LIBS"; then
13299fi13297 pkg_cv_PYTHON_LIBS="$PYTHON_LIBS"
13300rm -f conftest.err conftest.i conftest.$ac_ext13298 elif test -n "$PKG_CONFIG"; then
13301CPPFLAGS="$save_CPPFLAGS"13299 if test -n "$PKG_CONFIG" && \
1330213300 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-\${PYTHON_VERSION}\""; } >&5
13301 ($PKG_CONFIG --exists --print-errors "python-${PYTHON_VERSION}") 2>&5
13302 ac_status=$?
13303 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13304 test $ac_status = 0; }; then
13305 pkg_cv_PYTHON_LIBS=`$PKG_CONFIG --libs "python-${PYTHON_VERSION}" 2>/dev/null`
13306 test "x$?" != "x0" && pkg_failed=yes
13307else
13308 pkg_failed=yes
13309fi
13310 else
13311 pkg_failed=untried
13312fi
13313
13314
13315
13316if test $pkg_failed = yes; then
13317 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13318$as_echo "no" >&6; }
13319
13320if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13321 _pkg_short_errors_supported=yes
13322else
13323 _pkg_short_errors_supported=no
13324fi
13325 if test $_pkg_short_errors_supported = yes; then
13326 PYTHON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "python-${PYTHON_VERSION}" 2>&1`
13327 else
13328 PYTHON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "python-${PYTHON_VERSION}" 2>&1`
13329 fi
13330 # Put the nasty error message in config.log where it belongs
13331 echo "$PYTHON_PKG_ERRORS" >&5
13332
13333 as_fn_error $? "Package requirements (python-${PYTHON_VERSION}) were not met:
13334
13335$PYTHON_PKG_ERRORS
13336
13337Consider adjusting the PKG_CONFIG_PATH environment variable if you
13338installed software in a non-standard prefix.
13339
13340Alternatively, you may set the environment variables PYTHON_CFLAGS
13341and PYTHON_LIBS to avoid the need to call pkg-config.
13342See the pkg-config man page for more details." "$LINENO" 5
13343elif test $pkg_failed = untried; then
13344 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13345$as_echo "no" >&6; }
13346 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
13347$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
13348as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
13349is in your PATH or set the PKG_CONFIG environment variable to the full
13350path to pkg-config.
13351
13352Alternatively, you may set the environment variables PYTHON_CFLAGS
13353and PYTHON_LIBS to avoid the need to call pkg-config.
13354See the pkg-config man page for more details.
13355
13356To get pkg-config, see <http://pkg-config.freedesktop.org/>.
13357See \`config.log' for more details" "$LINENO" 5; }
13358else
13359 PYTHON_CFLAGS=$pkg_cv_PYTHON_CFLAGS
13360 PYTHON_LIBS=$pkg_cv_PYTHON_LIBS
13361 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
13362$as_echo "yes" >&6; }
13363
13364fi
13365
13366
13367else
13368 as_fn_error $? "Blueman does not support python 3" "$LINENO" 5
13369fi
1330313370
13304@%:@ Check whether --enable-shared was given.13371@%:@ Check whether --enable-shared was given.
13305if test "${enable_shared+set}" = set; then :13372if test "${enable_shared+set}" = set; then :
@@ -13358,9 +13425,6 @@
1335813425
1335913426
1336013427
13361PYTHON_LIBS=`python-config --libs`
13362
13363
1336413428
13365if test "x$PYREXC" = "x"; then13429if test "x$PYREXC" = "x"; then
13366 # Extract the first word of "pyrexc", so it can be a program name with args.13430 # Extract the first word of "pyrexc", so it can be a program name with args.
@@ -13410,12 +13474,12 @@
13410{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${PYREXC}" >&513474{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${PYREXC}" >&5
13411$as_echo "${PYREXC}" >&6; }13475$as_echo "${PYREXC}" >&6; }
13412if test "x$PYREXC" = "x"; then13476if test "x$PYREXC" = "x"; then
13413 as_fn_error $? "Fatal: pyrexc not found.13477 as_fn_error $? "\"Fatal: pyrexc not found.
1341413478
13415Get Pyrex from13479Get Pyrex from
13416 * your system's packages (recommended)13480 * your system's packages (recommended)
13417 * upstream at http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/13481 * upstream at http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/
13418" "$LINENO" 513482\"" "$LINENO" 5
13419fi13483fi
1342013484
1342113485
@@ -13708,10 +13772,9 @@
13708fi13772fi
1370913773
1371013774
13711have_nst=yes
13712@%:@ Check whether --enable-sendto was given.13775@%:@ Check whether --enable-sendto was given.
13713if test "${enable_sendto+set}" = set; then :13776if test "${enable_sendto+set}" = set; then :
13714 enableval=$enable_sendto; 13777 enableval=$enable_sendto; have_nst=$enableval
13715else13778else
13716 have_nst=yes13779 have_nst=yes
13717fi13780fi
@@ -13730,188 +13793,6 @@
13730if test $deps_check = 1; then13793if test $deps_check = 1; then
1373113794
1373213795
13733pkg_failed=no
13734{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYGTK" >&5
13735$as_echo_n "checking for PYGTK... " >&6; }
13736
13737if test -n "$PYGTK_CFLAGS"; then
13738 pkg_cv_PYGTK_CFLAGS="$PYGTK_CFLAGS"
13739 elif test -n "$PKG_CONFIG"; then
13740 if test -n "$PKG_CONFIG" && \
13741 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0 >= 2.12.0\""; } >&5
13742 ($PKG_CONFIG --exists --print-errors "pygtk-2.0 >= 2.12.0") 2>&5
13743 ac_status=$?
13744 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13745 test $ac_status = 0; }; then
13746 pkg_cv_PYGTK_CFLAGS=`$PKG_CONFIG --cflags "pygtk-2.0 >= 2.12.0" 2>/dev/null`
13747 test "x$?" != "x0" && pkg_failed=yes
13748else
13749 pkg_failed=yes
13750fi
13751 else
13752 pkg_failed=untried
13753fi
13754if test -n "$PYGTK_LIBS"; then
13755 pkg_cv_PYGTK_LIBS="$PYGTK_LIBS"
13756 elif test -n "$PKG_CONFIG"; then
13757 if test -n "$PKG_CONFIG" && \
13758 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0 >= 2.12.0\""; } >&5
13759 ($PKG_CONFIG --exists --print-errors "pygtk-2.0 >= 2.12.0") 2>&5
13760 ac_status=$?
13761 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13762 test $ac_status = 0; }; then
13763 pkg_cv_PYGTK_LIBS=`$PKG_CONFIG --libs "pygtk-2.0 >= 2.12.0" 2>/dev/null`
13764 test "x$?" != "x0" && pkg_failed=yes
13765else
13766 pkg_failed=yes
13767fi
13768 else
13769 pkg_failed=untried
13770fi
13771
13772
13773
13774if test $pkg_failed = yes; then
13775 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13776$as_echo "no" >&6; }
13777
13778if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13779 _pkg_short_errors_supported=yes
13780else
13781 _pkg_short_errors_supported=no
13782fi
13783 if test $_pkg_short_errors_supported = yes; then
13784 PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pygtk-2.0 >= 2.12.0" 2>&1`
13785 else
13786 PYGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pygtk-2.0 >= 2.12.0" 2>&1`
13787 fi
13788 # Put the nasty error message in config.log where it belongs
13789 echo "$PYGTK_PKG_ERRORS" >&5
13790
13791 as_fn_error $? "Package requirements (pygtk-2.0 >= 2.12.0) were not met:
13792
13793$PYGTK_PKG_ERRORS
13794
13795Consider adjusting the PKG_CONFIG_PATH environment variable if you
13796installed software in a non-standard prefix.
13797
13798Alternatively, you may set the environment variables PYGTK_CFLAGS
13799and PYGTK_LIBS to avoid the need to call pkg-config.
13800See the pkg-config man page for more details." "$LINENO" 5
13801elif test $pkg_failed = untried; then
13802 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13803$as_echo "no" >&6; }
13804 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
13805$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
13806as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
13807is in your PATH or set the PKG_CONFIG environment variable to the full
13808path to pkg-config.
13809
13810Alternatively, you may set the environment variables PYGTK_CFLAGS
13811and PYGTK_LIBS to avoid the need to call pkg-config.
13812See the pkg-config man page for more details.
13813
13814To get pkg-config, see <http://pkg-config.freedesktop.org/>.
13815See \`config.log' for more details" "$LINENO" 5; }
13816else
13817 PYGTK_CFLAGS=$pkg_cv_PYGTK_CFLAGS
13818 PYGTK_LIBS=$pkg_cv_PYGTK_LIBS
13819 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
13820$as_echo "yes" >&6; }
13821
13822fi
13823
13824pkg_failed=no
13825{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYNOTIFY" >&5
13826$as_echo_n "checking for PYNOTIFY... " >&6; }
13827
13828if test -n "$PYNOTIFY_CFLAGS"; then
13829 pkg_cv_PYNOTIFY_CFLAGS="$PYNOTIFY_CFLAGS"
13830 elif test -n "$PKG_CONFIG"; then
13831 if test -n "$PKG_CONFIG" && \
13832 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"notify-python\""; } >&5
13833 ($PKG_CONFIG --exists --print-errors "notify-python") 2>&5
13834 ac_status=$?
13835 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13836 test $ac_status = 0; }; then
13837 pkg_cv_PYNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "notify-python" 2>/dev/null`
13838 test "x$?" != "x0" && pkg_failed=yes
13839else
13840 pkg_failed=yes
13841fi
13842 else
13843 pkg_failed=untried
13844fi
13845if test -n "$PYNOTIFY_LIBS"; then
13846 pkg_cv_PYNOTIFY_LIBS="$PYNOTIFY_LIBS"
13847 elif test -n "$PKG_CONFIG"; then
13848 if test -n "$PKG_CONFIG" && \
13849 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"notify-python\""; } >&5
13850 ($PKG_CONFIG --exists --print-errors "notify-python") 2>&5
13851 ac_status=$?
13852 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13853 test $ac_status = 0; }; then
13854 pkg_cv_PYNOTIFY_LIBS=`$PKG_CONFIG --libs "notify-python" 2>/dev/null`
13855 test "x$?" != "x0" && pkg_failed=yes
13856else
13857 pkg_failed=yes
13858fi
13859 else
13860 pkg_failed=untried
13861fi
13862
13863
13864
13865if test $pkg_failed = yes; then
13866 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13867$as_echo "no" >&6; }
13868
13869if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13870 _pkg_short_errors_supported=yes
13871else
13872 _pkg_short_errors_supported=no
13873fi
13874 if test $_pkg_short_errors_supported = yes; then
13875 PYNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "notify-python" 2>&1`
13876 else
13877 PYNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "notify-python" 2>&1`
13878 fi
13879 # Put the nasty error message in config.log where it belongs
13880 echo "$PYNOTIFY_PKG_ERRORS" >&5
13881
13882 as_fn_error $? "Package requirements (notify-python) were not met:
13883
13884$PYNOTIFY_PKG_ERRORS
13885
13886Consider adjusting the PKG_CONFIG_PATH environment variable if you
13887installed software in a non-standard prefix.
13888
13889Alternatively, you may set the environment variables PYNOTIFY_CFLAGS
13890and PYNOTIFY_LIBS to avoid the need to call pkg-config.
13891See the pkg-config man page for more details." "$LINENO" 5
13892elif test $pkg_failed = untried; then
13893 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13894$as_echo "no" >&6; }
13895 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
13896$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
13897as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
13898is in your PATH or set the PKG_CONFIG environment variable to the full
13899path to pkg-config.
13900
13901Alternatively, you may set the environment variables PYNOTIFY_CFLAGS
13902and PYNOTIFY_LIBS to avoid the need to call pkg-config.
13903See the pkg-config man page for more details.
13904
13905To get pkg-config, see <http://pkg-config.freedesktop.org/>.
13906See \`config.log' for more details" "$LINENO" 5; }
13907else
13908 PYNOTIFY_CFLAGS=$pkg_cv_PYNOTIFY_CFLAGS
13909 PYNOTIFY_LIBS=$pkg_cv_PYNOTIFY_LIBS
13910 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
13911$as_echo "yes" >&6; }
13912
13913fi
13914
13915py_mod_var=`echo dbus'_' | sed 'y%./+-%__p_%'`13796py_mod_var=`echo dbus'_' | sed 'y%./+-%__p_%'`
13916{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python module dbus" >&513797{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python module dbus" >&5
13917$as_echo_n "checking for python module dbus... " >&6; }13798$as_echo_n "checking for python module dbus... " >&6; }
@@ -13948,43 +13829,8 @@
13948fi13829fi
1394913830
1395013831
13951py_mod_var=`echo gobject'_' | sed 'y%./+-%__p_%'`13832fi
13952{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python module gobject" >&513833
13953$as_echo_n "checking for python module gobject... " >&6; }
13954if eval \${py_cv_mod_$py_mod_var+:} false; then :
13955 $as_echo_n "(cached) " >&6
13956else
13957
13958prog="
13959import sys
13960try:
13961 import gobject
13962except ImportError:
13963 sys.exit(1)
13964except:
13965 sys.exit(0)
13966sys.exit(0)"
13967if $PYTHON -c "$prog" 1>&5 2>&5
13968 then
13969 eval "py_cv_mod_$py_mod_var=yes"
13970 else
13971 eval "py_cv_mod_$py_mod_var=no"
13972 fi
13973
13974fi
13975
13976py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
13977if test "x$py_val" != xno; then
13978 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
13979$as_echo "yes" >&6; }
13980 else
13981 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13982$as_echo "no" >&6; }
13983 as_fn_error $? "Could not find Python module gobject" "$LINENO" 5
13984fi
13985
13986
13987fi
1398813834
1398913835
13990pkg_failed=no13836pkg_failed=no
@@ -13997,17 +13843,13 @@
13997 if test -n "$PKG_CONFIG" && \13843 if test -n "$PKG_CONFIG" && \
13998 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez >= 4.6113844 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez >= 4.61
13999 libstartup-notification-1.0 >= 0.913845 libstartup-notification-1.0 >= 0.9
14000 gtk+-2.0 >= 2.1213846 gtk+-3.0
14001 pygobject-2.0 >= 2.12
14002 gobject-2.0 >= 2.12
14003 glib-2.0 >= 2.3213847 glib-2.0 >= 2.32
14004 gthread-2.0 >= 2.3213848 gthread-2.0 >= 2.32
14005\""; } >&513849\""; } >&5
14006 ($PKG_CONFIG --exists --print-errors "bluez >= 4.6113850 ($PKG_CONFIG --exists --print-errors "bluez >= 4.61
14007 libstartup-notification-1.0 >= 0.913851 libstartup-notification-1.0 >= 0.9
14008 gtk+-2.0 >= 2.1213852 gtk+-3.0
14009 pygobject-2.0 >= 2.12
14010 gobject-2.0 >= 2.12
14011 glib-2.0 >= 2.3213853 glib-2.0 >= 2.32
14012 gthread-2.0 >= 2.3213854 gthread-2.0 >= 2.32
14013") 2>&513855") 2>&5
@@ -14016,9 +13858,7 @@
14016 test $ac_status = 0; }; then13858 test $ac_status = 0; }; then
14017 pkg_cv_BLUEZ_CFLAGS=`$PKG_CONFIG --cflags "bluez >= 4.6113859 pkg_cv_BLUEZ_CFLAGS=`$PKG_CONFIG --cflags "bluez >= 4.61
14018 libstartup-notification-1.0 >= 0.913860 libstartup-notification-1.0 >= 0.9
14019 gtk+-2.0 >= 2.1213861 gtk+-3.0
14020 pygobject-2.0 >= 2.12
14021 gobject-2.0 >= 2.12
14022 glib-2.0 >= 2.3213862 glib-2.0 >= 2.32
14023 gthread-2.0 >= 2.3213863 gthread-2.0 >= 2.32
14024" 2>/dev/null`13864" 2>/dev/null`
@@ -14035,17 +13875,13 @@
14035 if test -n "$PKG_CONFIG" && \13875 if test -n "$PKG_CONFIG" && \
14036 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez >= 4.6113876 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez >= 4.61
14037 libstartup-notification-1.0 >= 0.913877 libstartup-notification-1.0 >= 0.9
14038 gtk+-2.0 >= 2.1213878 gtk+-3.0
14039 pygobject-2.0 >= 2.12
14040 gobject-2.0 >= 2.12
14041 glib-2.0 >= 2.3213879 glib-2.0 >= 2.32
14042 gthread-2.0 >= 2.3213880 gthread-2.0 >= 2.32
14043\""; } >&513881\""; } >&5
14044 ($PKG_CONFIG --exists --print-errors "bluez >= 4.6113882 ($PKG_CONFIG --exists --print-errors "bluez >= 4.61
14045 libstartup-notification-1.0 >= 0.913883 libstartup-notification-1.0 >= 0.9
14046 gtk+-2.0 >= 2.1213884 gtk+-3.0
14047 pygobject-2.0 >= 2.12
14048 gobject-2.0 >= 2.12
14049 glib-2.0 >= 2.3213885 glib-2.0 >= 2.32
14050 gthread-2.0 >= 2.3213886 gthread-2.0 >= 2.32
14051") 2>&513887") 2>&5
@@ -14054,9 +13890,7 @@
14054 test $ac_status = 0; }; then13890 test $ac_status = 0; }; then
14055 pkg_cv_BLUEZ_LIBS=`$PKG_CONFIG --libs "bluez >= 4.6113891 pkg_cv_BLUEZ_LIBS=`$PKG_CONFIG --libs "bluez >= 4.61
14056 libstartup-notification-1.0 >= 0.913892 libstartup-notification-1.0 >= 0.9
14057 gtk+-2.0 >= 2.1213893 gtk+-3.0
14058 pygobject-2.0 >= 2.12
14059 gobject-2.0 >= 2.12
14060 glib-2.0 >= 2.3213894 glib-2.0 >= 2.32
14061 gthread-2.0 >= 2.3213895 gthread-2.0 >= 2.32
14062" 2>/dev/null`13896" 2>/dev/null`
@@ -14082,18 +13916,14 @@
14082 if test $_pkg_short_errors_supported = yes; then13916 if test $_pkg_short_errors_supported = yes; then
14083 BLUEZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "bluez >= 4.6113917 BLUEZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "bluez >= 4.61
14084 libstartup-notification-1.0 >= 0.913918 libstartup-notification-1.0 >= 0.9
14085 gtk+-2.0 >= 2.1213919 gtk+-3.0
14086 pygobject-2.0 >= 2.12
14087 gobject-2.0 >= 2.12
14088 glib-2.0 >= 2.3213920 glib-2.0 >= 2.32
14089 gthread-2.0 >= 2.3213921 gthread-2.0 >= 2.32
14090" 2>&1`13922" 2>&1`
14091 else 13923 else
14092 BLUEZ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "bluez >= 4.6113924 BLUEZ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "bluez >= 4.61
14093 libstartup-notification-1.0 >= 0.913925 libstartup-notification-1.0 >= 0.9
14094 gtk+-2.0 >= 2.1213926 gtk+-3.0
14095 pygobject-2.0 >= 2.12
14096 gobject-2.0 >= 2.12
14097 glib-2.0 >= 2.3213927 glib-2.0 >= 2.32
14098 gthread-2.0 >= 2.3213928 gthread-2.0 >= 2.32
14099" 2>&1`13929" 2>&1`
@@ -14103,9 +13933,7 @@
1410313933
14104 as_fn_error $? "Package requirements (bluez >= 4.6113934 as_fn_error $? "Package requirements (bluez >= 4.61
14105 libstartup-notification-1.0 >= 0.913935 libstartup-notification-1.0 >= 0.9
14106 gtk+-2.0 >= 2.1213936 gtk+-3.0
14107 pygobject-2.0 >= 2.12
14108 gobject-2.0 >= 2.12
14109 glib-2.0 >= 2.3213937 glib-2.0 >= 2.32
14110 gthread-2.0 >= 2.3213938 gthread-2.0 >= 2.32
14111) were not met:13939) were not met:
@@ -14144,6 +13972,262 @@
1414413972
1414513973
1414613974
13975pkg_failed=no
13976{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYGOBJECT" >&5
13977$as_echo_n "checking for PYGOBJECT... " >&6; }
13978
13979if test -n "$PYGOBJECT_CFLAGS"; then
13980 pkg_cv_PYGOBJECT_CFLAGS="$PYGOBJECT_CFLAGS"
13981 elif test -n "$PKG_CONFIG"; then
13982 if test -n "$PKG_CONFIG" && \
13983 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-2.0 >= 2.12\""; } >&5
13984 ($PKG_CONFIG --exists --print-errors "pygobject-2.0 >= 2.12") 2>&5
13985 ac_status=$?
13986 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13987 test $ac_status = 0; }; then
13988 pkg_cv_PYGOBJECT_CFLAGS=`$PKG_CONFIG --cflags "pygobject-2.0 >= 2.12" 2>/dev/null`
13989 test "x$?" != "x0" && pkg_failed=yes
13990else
13991 pkg_failed=yes
13992fi
13993 else
13994 pkg_failed=untried
13995fi
13996if test -n "$PYGOBJECT_LIBS"; then
13997 pkg_cv_PYGOBJECT_LIBS="$PYGOBJECT_LIBS"
13998 elif test -n "$PKG_CONFIG"; then
13999 if test -n "$PKG_CONFIG" && \
14000 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-2.0 >= 2.12\""; } >&5
14001 ($PKG_CONFIG --exists --print-errors "pygobject-2.0 >= 2.12") 2>&5
14002 ac_status=$?
14003 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14004 test $ac_status = 0; }; then
14005 pkg_cv_PYGOBJECT_LIBS=`$PKG_CONFIG --libs "pygobject-2.0 >= 2.12" 2>/dev/null`
14006 test "x$?" != "x0" && pkg_failed=yes
14007else
14008 pkg_failed=yes
14009fi
14010 else
14011 pkg_failed=untried
14012fi
14013
14014
14015
14016if test $pkg_failed = yes; then
14017 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14018$as_echo "no" >&6; }
14019
14020if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
14021 _pkg_short_errors_supported=yes
14022else
14023 _pkg_short_errors_supported=no
14024fi
14025 if test $_pkg_short_errors_supported = yes; then
14026 PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pygobject-2.0 >= 2.12" 2>&1`
14027 else
14028 PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pygobject-2.0 >= 2.12" 2>&1`
14029 fi
14030 # Put the nasty error message in config.log where it belongs
14031 echo "$PYGOBJECT_PKG_ERRORS" >&5
14032
14033
14034pkg_failed=no
14035{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYGOBJECT" >&5
14036$as_echo_n "checking for PYGOBJECT... " >&6; }
14037
14038if test -n "$PYGOBJECT_CFLAGS"; then
14039 pkg_cv_PYGOBJECT_CFLAGS="$PYGOBJECT_CFLAGS"
14040 elif test -n "$PKG_CONFIG"; then
14041 if test -n "$PKG_CONFIG" && \
14042 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-3.0\""; } >&5
14043 ($PKG_CONFIG --exists --print-errors "pygobject-3.0") 2>&5
14044 ac_status=$?
14045 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14046 test $ac_status = 0; }; then
14047 pkg_cv_PYGOBJECT_CFLAGS=`$PKG_CONFIG --cflags "pygobject-3.0" 2>/dev/null`
14048 test "x$?" != "x0" && pkg_failed=yes
14049else
14050 pkg_failed=yes
14051fi
14052 else
14053 pkg_failed=untried
14054fi
14055if test -n "$PYGOBJECT_LIBS"; then
14056 pkg_cv_PYGOBJECT_LIBS="$PYGOBJECT_LIBS"
14057 elif test -n "$PKG_CONFIG"; then
14058 if test -n "$PKG_CONFIG" && \
14059 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-3.0\""; } >&5
14060 ($PKG_CONFIG --exists --print-errors "pygobject-3.0") 2>&5
14061 ac_status=$?
14062 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14063 test $ac_status = 0; }; then
14064 pkg_cv_PYGOBJECT_LIBS=`$PKG_CONFIG --libs "pygobject-3.0" 2>/dev/null`
14065 test "x$?" != "x0" && pkg_failed=yes
14066else
14067 pkg_failed=yes
14068fi
14069 else
14070 pkg_failed=untried
14071fi
14072
14073
14074
14075if test $pkg_failed = yes; then
14076 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14077$as_echo "no" >&6; }
14078
14079if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
14080 _pkg_short_errors_supported=yes
14081else
14082 _pkg_short_errors_supported=no
14083fi
14084 if test $_pkg_short_errors_supported = yes; then
14085 PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pygobject-3.0" 2>&1`
14086 else
14087 PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pygobject-3.0" 2>&1`
14088 fi
14089 # Put the nasty error message in config.log where it belongs
14090 echo "$PYGOBJECT_PKG_ERRORS" >&5
14091
14092 as_fn_error $? "Package requirements (pygobject-3.0) were not met:
14093
14094$PYGOBJECT_PKG_ERRORS
14095
14096Consider adjusting the PKG_CONFIG_PATH environment variable if you
14097installed software in a non-standard prefix.
14098
14099Alternatively, you may set the environment variables PYGOBJECT_CFLAGS
14100and PYGOBJECT_LIBS to avoid the need to call pkg-config.
14101See the pkg-config man page for more details." "$LINENO" 5
14102elif test $pkg_failed = untried; then
14103 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14104$as_echo "no" >&6; }
14105 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
14106$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
14107as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
14108is in your PATH or set the PKG_CONFIG environment variable to the full
14109path to pkg-config.
14110
14111Alternatively, you may set the environment variables PYGOBJECT_CFLAGS
14112and PYGOBJECT_LIBS to avoid the need to call pkg-config.
14113See the pkg-config man page for more details.
14114
14115To get pkg-config, see <http://pkg-config.freedesktop.org/>.
14116See \`config.log' for more details" "$LINENO" 5; }
14117else
14118 PYGOBJECT_CFLAGS=$pkg_cv_PYGOBJECT_CFLAGS
14119 PYGOBJECT_LIBS=$pkg_cv_PYGOBJECT_LIBS
14120 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14121$as_echo "yes" >&6; }
14122
14123fi
14124
14125elif test $pkg_failed = untried; then
14126 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14127$as_echo "no" >&6; }
14128
14129pkg_failed=no
14130{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYGOBJECT" >&5
14131$as_echo_n "checking for PYGOBJECT... " >&6; }
14132
14133if test -n "$PYGOBJECT_CFLAGS"; then
14134 pkg_cv_PYGOBJECT_CFLAGS="$PYGOBJECT_CFLAGS"
14135 elif test -n "$PKG_CONFIG"; then
14136 if test -n "$PKG_CONFIG" && \
14137 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-3.0\""; } >&5
14138 ($PKG_CONFIG --exists --print-errors "pygobject-3.0") 2>&5
14139 ac_status=$?
14140 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14141 test $ac_status = 0; }; then
14142 pkg_cv_PYGOBJECT_CFLAGS=`$PKG_CONFIG --cflags "pygobject-3.0" 2>/dev/null`
14143 test "x$?" != "x0" && pkg_failed=yes
14144else
14145 pkg_failed=yes
14146fi
14147 else
14148 pkg_failed=untried
14149fi
14150if test -n "$PYGOBJECT_LIBS"; then
14151 pkg_cv_PYGOBJECT_LIBS="$PYGOBJECT_LIBS"
14152 elif test -n "$PKG_CONFIG"; then
14153 if test -n "$PKG_CONFIG" && \
14154 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-3.0\""; } >&5
14155 ($PKG_CONFIG --exists --print-errors "pygobject-3.0") 2>&5
14156 ac_status=$?
14157 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14158 test $ac_status = 0; }; then
14159 pkg_cv_PYGOBJECT_LIBS=`$PKG_CONFIG --libs "pygobject-3.0" 2>/dev/null`
14160 test "x$?" != "x0" && pkg_failed=yes
14161else
14162 pkg_failed=yes
14163fi
14164 else
14165 pkg_failed=untried
14166fi
14167
14168
14169
14170if test $pkg_failed = yes; then
14171 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14172$as_echo "no" >&6; }
14173
14174if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
14175 _pkg_short_errors_supported=yes
14176else
14177 _pkg_short_errors_supported=no
14178fi
14179 if test $_pkg_short_errors_supported = yes; then
14180 PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pygobject-3.0" 2>&1`
14181 else
14182 PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pygobject-3.0" 2>&1`
14183 fi
14184 # Put the nasty error message in config.log where it belongs
14185 echo "$PYGOBJECT_PKG_ERRORS" >&5
14186
14187 as_fn_error $? "Package requirements (pygobject-3.0) were not met:
14188
14189$PYGOBJECT_PKG_ERRORS
14190
14191Consider adjusting the PKG_CONFIG_PATH environment variable if you
14192installed software in a non-standard prefix.
14193
14194Alternatively, you may set the environment variables PYGOBJECT_CFLAGS
14195and PYGOBJECT_LIBS to avoid the need to call pkg-config.
14196See the pkg-config man page for more details." "$LINENO" 5
14197elif test $pkg_failed = untried; then
14198 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14199$as_echo "no" >&6; }
14200 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
14201$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
14202as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
14203is in your PATH or set the PKG_CONFIG environment variable to the full
14204path to pkg-config.
14205
14206Alternatively, you may set the environment variables PYGOBJECT_CFLAGS
14207and PYGOBJECT_LIBS to avoid the need to call pkg-config.
14208See the pkg-config man page for more details.
14209
14210To get pkg-config, see <http://pkg-config.freedesktop.org/>.
14211See \`config.log' for more details" "$LINENO" 5; }
14212else
14213 PYGOBJECT_CFLAGS=$pkg_cv_PYGOBJECT_CFLAGS
14214 PYGOBJECT_LIBS=$pkg_cv_PYGOBJECT_LIBS
14215 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14216$as_echo "yes" >&6; }
14217
14218fi
14219
14220else
14221 PYGOBJECT_CFLAGS=$pkg_cv_PYGOBJECT_CFLAGS
14222 PYGOBJECT_LIBS=$pkg_cv_PYGOBJECT_LIBS
14223 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14224$as_echo "yes" >&6; }
14225
14226fi
14227
14228
14229
14230
14147ac_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"14231ac_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"
1414814232
14149cat >confcache <<\_ACEOF14233cat >confcache <<\_ACEOF
1415014234
=== modified file 'autom4te.cache/output.1'
--- autom4te.cache/output.1 2014-07-01 12:11:00 +0000
+++ autom4te.cache/output.1 2014-08-11 05:53:12 +0000
@@ -632,12 +632,10 @@
632am__EXEEXT_TRUE632am__EXEEXT_TRUE
633LTLIBOBJS633LTLIBOBJS
634LIB@&t@OBJS634LIB@&t@OBJS
635PYGOBJECT_LIBS
636PYGOBJECT_CFLAGS
635BLUEZ_LIBS637BLUEZ_LIBS
636BLUEZ_CFLAGS638BLUEZ_CFLAGS
637PYNOTIFY_LIBS
638PYNOTIFY_CFLAGS
639PYGTK_LIBS
640PYGTK_CFLAGS
641HAVE_NST_FALSE639HAVE_NST_FALSE
642HAVE_NST_TRUE640HAVE_NST_TRUE
643ENABLE_HAL_FALSE641ENABLE_HAL_FALSE
@@ -655,7 +653,7 @@
655SYSCONFDIR653SYSCONFDIR
656PYREXC654PYREXC
657PYTHON_LIBS655PYTHON_LIBS
658PYTHON_INCLUDES656PYTHON_CFLAGS
659pkgpyexecdir657pkgpyexecdir
660pyexecdir658pyexecdir
661pkgpythondir659pkgpythondir
@@ -864,13 +862,13 @@
864PKG_CONFIG_PATH862PKG_CONFIG_PATH
865PKG_CONFIG_LIBDIR863PKG_CONFIG_LIBDIR
866PYTHON864PYTHON
865PYTHON_CFLAGS
866PYTHON_LIBS
867PYREXC867PYREXC
868PYGTK_CFLAGS
869PYGTK_LIBS
870PYNOTIFY_CFLAGS
871PYNOTIFY_LIBS
872BLUEZ_CFLAGS868BLUEZ_CFLAGS
873BLUEZ_LIBS'869BLUEZ_LIBS
870PYGOBJECT_CFLAGS
871PYGOBJECT_LIBS'
874872
875873
876# Initialize some variables set by options.874# Initialize some variables set by options.
@@ -1534,17 +1532,17 @@
1534 PKG_CONFIG_LIBDIR 1532 PKG_CONFIG_LIBDIR
1535 path overriding pkg-config's built-in search path1533 path overriding pkg-config's built-in search path
1536 PYTHON the Python interpreter1534 PYTHON the Python interpreter
1535 PYTHON_CFLAGS
1536 C compiler flags for PYTHON, overriding pkg-config
1537 PYTHON_LIBS linker flags for PYTHON, overriding pkg-config
1537 PYREXC Pyrex compiler1538 PYREXC Pyrex compiler
1538 PYGTK_CFLAGS
1539 C compiler flags for PYGTK, overriding pkg-config
1540 PYGTK_LIBS linker flags for PYGTK, overriding pkg-config
1541 PYNOTIFY_CFLAGS
1542 C compiler flags for PYNOTIFY, overriding pkg-config
1543 PYNOTIFY_LIBS
1544 linker flags for PYNOTIFY, overriding pkg-config
1545 BLUEZ_CFLAGS 1539 BLUEZ_CFLAGS
1546 C compiler flags for BLUEZ, overriding pkg-config1540 C compiler flags for BLUEZ, overriding pkg-config
1547 BLUEZ_LIBS linker flags for BLUEZ, overriding pkg-config1541 BLUEZ_LIBS linker flags for BLUEZ, overriding pkg-config
1542 PYGOBJECT_CFLAGS
1543 C compiler flags for PYGOBJECT, overriding pkg-config
1544 PYGOBJECT_LIBS
1545 linker flags for PYGOBJECT, overriding pkg-config
15481546
1549Use these variables to override the choices made by `configure' or to help1547Use these variables to override the choices made by `configure' or to help
1550it to find libraries and programs with nonstandard names/locations.1548it to find libraries and programs with nonstandard names/locations.
@@ -13268,34 +13266,103 @@
13268 fi13266 fi
1326913267
1327013268
1327113269if test "${PYTHON_VERSION}" \< "3.0"; then
13272{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for headers required to compile python extensions" >&513270
13273$as_echo_n "checking for headers required to compile python extensions... " >&6; }13271pkg_failed=no
13274py_prefix=`$PYTHON -c "import sys; print sys.prefix"`13272{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYTHON" >&5
13275py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`13273$as_echo_n "checking for PYTHON... " >&6; }
13276PYTHON_INCLUDES=`python-config --includes`13274
13277if test "$py_prefix" != "$py_exec_prefix"; then13275if test -n "$PYTHON_CFLAGS"; then
13278 PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"13276 pkg_cv_PYTHON_CFLAGS="$PYTHON_CFLAGS"
13279fi13277 elif test -n "$PKG_CONFIG"; then
1328013278 if test -n "$PKG_CONFIG" && \
13281save_CPPFLAGS="$CPPFLAGS"13279 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-\${PYTHON_VERSION}\""; } >&5
13282CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"13280 ($PKG_CONFIG --exists --print-errors "python-${PYTHON_VERSION}") 2>&5
13283cat confdefs.h - <<_ACEOF >conftest.$ac_ext13281 ac_status=$?
13284/* end confdefs.h. */13282 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13285#include <Python.h>13283 test $ac_status = 0; }; then
13286_ACEOF13284 pkg_cv_PYTHON_CFLAGS=`$PKG_CONFIG --cflags "python-${PYTHON_VERSION}" 2>/dev/null`
13287if ac_fn_c_try_cpp "$LINENO"; then :13285 test "x$?" != "x0" && pkg_failed=yes
13288 { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&513286else
13289$as_echo "found" >&6; }13287 pkg_failed=yes
1329013288fi
13291else13289 else
13292 { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&513290 pkg_failed=untried
13293$as_echo "not found" >&6; }13291fi
13294as_fn_error $? "Could not find Python headers" "$LINENO" 513292if test -n "$PYTHON_LIBS"; then
13295fi13293 pkg_cv_PYTHON_LIBS="$PYTHON_LIBS"
13296rm -f conftest.err conftest.i conftest.$ac_ext13294 elif test -n "$PKG_CONFIG"; then
13297CPPFLAGS="$save_CPPFLAGS"13295 if test -n "$PKG_CONFIG" && \
1329813296 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-\${PYTHON_VERSION}\""; } >&5
13297 ($PKG_CONFIG --exists --print-errors "python-${PYTHON_VERSION}") 2>&5
13298 ac_status=$?
13299 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13300 test $ac_status = 0; }; then
13301 pkg_cv_PYTHON_LIBS=`$PKG_CONFIG --libs "python-${PYTHON_VERSION}" 2>/dev/null`
13302 test "x$?" != "x0" && pkg_failed=yes
13303else
13304 pkg_failed=yes
13305fi
13306 else
13307 pkg_failed=untried
13308fi
13309
13310
13311
13312if test $pkg_failed = yes; then
13313 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13314$as_echo "no" >&6; }
13315
13316if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13317 _pkg_short_errors_supported=yes
13318else
13319 _pkg_short_errors_supported=no
13320fi
13321 if test $_pkg_short_errors_supported = yes; then
13322 PYTHON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "python-${PYTHON_VERSION}" 2>&1`
13323 else
13324 PYTHON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "python-${PYTHON_VERSION}" 2>&1`
13325 fi
13326 # Put the nasty error message in config.log where it belongs
13327 echo "$PYTHON_PKG_ERRORS" >&5
13328
13329 as_fn_error $? "Package requirements (python-${PYTHON_VERSION}) were not met:
13330
13331$PYTHON_PKG_ERRORS
13332
13333Consider adjusting the PKG_CONFIG_PATH environment variable if you
13334installed software in a non-standard prefix.
13335
13336Alternatively, you may set the environment variables PYTHON_CFLAGS
13337and PYTHON_LIBS to avoid the need to call pkg-config.
13338See the pkg-config man page for more details." "$LINENO" 5
13339elif test $pkg_failed = untried; then
13340 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13341$as_echo "no" >&6; }
13342 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
13343$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
13344as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
13345is in your PATH or set the PKG_CONFIG environment variable to the full
13346path to pkg-config.
13347
13348Alternatively, you may set the environment variables PYTHON_CFLAGS
13349and PYTHON_LIBS to avoid the need to call pkg-config.
13350See the pkg-config man page for more details.
13351
13352To get pkg-config, see <http://pkg-config.freedesktop.org/>.
13353See \`config.log' for more details" "$LINENO" 5; }
13354else
13355 PYTHON_CFLAGS=$pkg_cv_PYTHON_CFLAGS
13356 PYTHON_LIBS=$pkg_cv_PYTHON_LIBS
13357 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
13358$as_echo "yes" >&6; }
13359
13360fi
13361
13362
13363else
13364 as_fn_error $? "Blueman does not support python 3" "$LINENO" 5
13365fi
1329913366
13300@%:@ Check whether --enable-shared was given.13367@%:@ Check whether --enable-shared was given.
13301if test "${enable_shared+set}" = set; then :13368if test "${enable_shared+set}" = set; then :
@@ -13354,9 +13421,6 @@
1335413421
1335513422
1335613423
13357PYTHON_LIBS=`python-config --libs`
13358
13359
1336013424
13361if test "x$PYREXC" = "x"; then13425if test "x$PYREXC" = "x"; then
13362 # Extract the first word of "pyrexc", so it can be a program name with args.13426 # Extract the first word of "pyrexc", so it can be a program name with args.
@@ -13406,12 +13470,12 @@
13406{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${PYREXC}" >&513470{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${PYREXC}" >&5
13407$as_echo "${PYREXC}" >&6; }13471$as_echo "${PYREXC}" >&6; }
13408if test "x$PYREXC" = "x"; then13472if test "x$PYREXC" = "x"; then
13409 as_fn_error $? "Fatal: pyrexc not found.13473 as_fn_error $? "\"Fatal: pyrexc not found.
1341013474
13411Get Pyrex from13475Get Pyrex from
13412 * your system's packages (recommended)13476 * your system's packages (recommended)
13413 * upstream at http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/13477 * upstream at http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/
13414" "$LINENO" 513478\"" "$LINENO" 5
13415fi13479fi
1341613480
1341713481
@@ -13704,10 +13768,9 @@
13704fi13768fi
1370513769
1370613770
13707have_nst=yes
13708@%:@ Check whether --enable-sendto was given.13771@%:@ Check whether --enable-sendto was given.
13709if test "${enable_sendto+set}" = set; then :13772if test "${enable_sendto+set}" = set; then :
13710 enableval=$enable_sendto; 13773 enableval=$enable_sendto; have_nst=$enableval
13711else13774else
13712 have_nst=yes13775 have_nst=yes
13713fi13776fi
@@ -13726,188 +13789,6 @@
13726if test $deps_check = 1; then13789if test $deps_check = 1; then
1372713790
1372813791
13729pkg_failed=no
13730{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYGTK" >&5
13731$as_echo_n "checking for PYGTK... " >&6; }
13732
13733if test -n "$PYGTK_CFLAGS"; then
13734 pkg_cv_PYGTK_CFLAGS="$PYGTK_CFLAGS"
13735 elif test -n "$PKG_CONFIG"; then
13736 if test -n "$PKG_CONFIG" && \
13737 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0 >= 2.12.0\""; } >&5
13738 ($PKG_CONFIG --exists --print-errors "pygtk-2.0 >= 2.12.0") 2>&5
13739 ac_status=$?
13740 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13741 test $ac_status = 0; }; then
13742 pkg_cv_PYGTK_CFLAGS=`$PKG_CONFIG --cflags "pygtk-2.0 >= 2.12.0" 2>/dev/null`
13743 test "x$?" != "x0" && pkg_failed=yes
13744else
13745 pkg_failed=yes
13746fi
13747 else
13748 pkg_failed=untried
13749fi
13750if test -n "$PYGTK_LIBS"; then
13751 pkg_cv_PYGTK_LIBS="$PYGTK_LIBS"
13752 elif test -n "$PKG_CONFIG"; then
13753 if test -n "$PKG_CONFIG" && \
13754 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0 >= 2.12.0\""; } >&5
13755 ($PKG_CONFIG --exists --print-errors "pygtk-2.0 >= 2.12.0") 2>&5
13756 ac_status=$?
13757 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13758 test $ac_status = 0; }; then
13759 pkg_cv_PYGTK_LIBS=`$PKG_CONFIG --libs "pygtk-2.0 >= 2.12.0" 2>/dev/null`
13760 test "x$?" != "x0" && pkg_failed=yes
13761else
13762 pkg_failed=yes
13763fi
13764 else
13765 pkg_failed=untried
13766fi
13767
13768
13769
13770if test $pkg_failed = yes; then
13771 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13772$as_echo "no" >&6; }
13773
13774if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13775 _pkg_short_errors_supported=yes
13776else
13777 _pkg_short_errors_supported=no
13778fi
13779 if test $_pkg_short_errors_supported = yes; then
13780 PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pygtk-2.0 >= 2.12.0" 2>&1`
13781 else
13782 PYGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pygtk-2.0 >= 2.12.0" 2>&1`
13783 fi
13784 # Put the nasty error message in config.log where it belongs
13785 echo "$PYGTK_PKG_ERRORS" >&5
13786
13787 as_fn_error $? "Package requirements (pygtk-2.0 >= 2.12.0) were not met:
13788
13789$PYGTK_PKG_ERRORS
13790
13791Consider adjusting the PKG_CONFIG_PATH environment variable if you
13792installed software in a non-standard prefix.
13793
13794Alternatively, you may set the environment variables PYGTK_CFLAGS
13795and PYGTK_LIBS to avoid the need to call pkg-config.
13796See the pkg-config man page for more details." "$LINENO" 5
13797elif test $pkg_failed = untried; then
13798 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13799$as_echo "no" >&6; }
13800 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
13801$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
13802as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
13803is in your PATH or set the PKG_CONFIG environment variable to the full
13804path to pkg-config.
13805
13806Alternatively, you may set the environment variables PYGTK_CFLAGS
13807and PYGTK_LIBS to avoid the need to call pkg-config.
13808See the pkg-config man page for more details.
13809
13810To get pkg-config, see <http://pkg-config.freedesktop.org/>.
13811See \`config.log' for more details" "$LINENO" 5; }
13812else
13813 PYGTK_CFLAGS=$pkg_cv_PYGTK_CFLAGS
13814 PYGTK_LIBS=$pkg_cv_PYGTK_LIBS
13815 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
13816$as_echo "yes" >&6; }
13817
13818fi
13819
13820pkg_failed=no
13821{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYNOTIFY" >&5
13822$as_echo_n "checking for PYNOTIFY... " >&6; }
13823
13824if test -n "$PYNOTIFY_CFLAGS"; then
13825 pkg_cv_PYNOTIFY_CFLAGS="$PYNOTIFY_CFLAGS"
13826 elif test -n "$PKG_CONFIG"; then
13827 if test -n "$PKG_CONFIG" && \
13828 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"notify-python\""; } >&5
13829 ($PKG_CONFIG --exists --print-errors "notify-python") 2>&5
13830 ac_status=$?
13831 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13832 test $ac_status = 0; }; then
13833 pkg_cv_PYNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "notify-python" 2>/dev/null`
13834 test "x$?" != "x0" && pkg_failed=yes
13835else
13836 pkg_failed=yes
13837fi
13838 else
13839 pkg_failed=untried
13840fi
13841if test -n "$PYNOTIFY_LIBS"; then
13842 pkg_cv_PYNOTIFY_LIBS="$PYNOTIFY_LIBS"
13843 elif test -n "$PKG_CONFIG"; then
13844 if test -n "$PKG_CONFIG" && \
13845 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"notify-python\""; } >&5
13846 ($PKG_CONFIG --exists --print-errors "notify-python") 2>&5
13847 ac_status=$?
13848 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13849 test $ac_status = 0; }; then
13850 pkg_cv_PYNOTIFY_LIBS=`$PKG_CONFIG --libs "notify-python" 2>/dev/null`
13851 test "x$?" != "x0" && pkg_failed=yes
13852else
13853 pkg_failed=yes
13854fi
13855 else
13856 pkg_failed=untried
13857fi
13858
13859
13860
13861if test $pkg_failed = yes; then
13862 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13863$as_echo "no" >&6; }
13864
13865if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13866 _pkg_short_errors_supported=yes
13867else
13868 _pkg_short_errors_supported=no
13869fi
13870 if test $_pkg_short_errors_supported = yes; then
13871 PYNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "notify-python" 2>&1`
13872 else
13873 PYNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "notify-python" 2>&1`
13874 fi
13875 # Put the nasty error message in config.log where it belongs
13876 echo "$PYNOTIFY_PKG_ERRORS" >&5
13877
13878 as_fn_error $? "Package requirements (notify-python) were not met:
13879
13880$PYNOTIFY_PKG_ERRORS
13881
13882Consider adjusting the PKG_CONFIG_PATH environment variable if you
13883installed software in a non-standard prefix.
13884
13885Alternatively, you may set the environment variables PYNOTIFY_CFLAGS
13886and PYNOTIFY_LIBS to avoid the need to call pkg-config.
13887See the pkg-config man page for more details." "$LINENO" 5
13888elif test $pkg_failed = untried; then
13889 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13890$as_echo "no" >&6; }
13891 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
13892$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
13893as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
13894is in your PATH or set the PKG_CONFIG environment variable to the full
13895path to pkg-config.
13896
13897Alternatively, you may set the environment variables PYNOTIFY_CFLAGS
13898and PYNOTIFY_LIBS to avoid the need to call pkg-config.
13899See the pkg-config man page for more details.
13900
13901To get pkg-config, see <http://pkg-config.freedesktop.org/>.
13902See \`config.log' for more details" "$LINENO" 5; }
13903else
13904 PYNOTIFY_CFLAGS=$pkg_cv_PYNOTIFY_CFLAGS
13905 PYNOTIFY_LIBS=$pkg_cv_PYNOTIFY_LIBS
13906 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
13907$as_echo "yes" >&6; }
13908
13909fi
13910
13911py_mod_var=`echo dbus'_' | sed 'y%./+-%__p_%'`13792py_mod_var=`echo dbus'_' | sed 'y%./+-%__p_%'`
13912{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python module dbus" >&513793{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python module dbus" >&5
13913$as_echo_n "checking for python module dbus... " >&6; }13794$as_echo_n "checking for python module dbus... " >&6; }
@@ -13944,43 +13825,8 @@
13944fi13825fi
1394513826
1394613827
13947py_mod_var=`echo gobject'_' | sed 'y%./+-%__p_%'`13828fi
13948{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python module gobject" >&513829
13949$as_echo_n "checking for python module gobject... " >&6; }
13950if eval \${py_cv_mod_$py_mod_var+:} false; then :
13951 $as_echo_n "(cached) " >&6
13952else
13953
13954prog="
13955import sys
13956try:
13957 import gobject
13958except ImportError:
13959 sys.exit(1)
13960except:
13961 sys.exit(0)
13962sys.exit(0)"
13963if $PYTHON -c "$prog" 1>&5 2>&5
13964 then
13965 eval "py_cv_mod_$py_mod_var=yes"
13966 else
13967 eval "py_cv_mod_$py_mod_var=no"
13968 fi
13969
13970fi
13971
13972py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
13973if test "x$py_val" != xno; then
13974 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
13975$as_echo "yes" >&6; }
13976 else
13977 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13978$as_echo "no" >&6; }
13979 as_fn_error $? "Could not find Python module gobject" "$LINENO" 5
13980fi
13981
13982
13983fi
1398413830
1398513831
13986pkg_failed=no13832pkg_failed=no
@@ -13993,17 +13839,13 @@
13993 if test -n "$PKG_CONFIG" && \13839 if test -n "$PKG_CONFIG" && \
13994 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez >= 4.6113840 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez >= 4.61
13995 libstartup-notification-1.0 >= 0.913841 libstartup-notification-1.0 >= 0.9
13996 gtk+-2.0 >= 2.1213842 gtk+-3.0
13997 pygobject-2.0 >= 2.12
13998 gobject-2.0 >= 2.12
13999 glib-2.0 >= 2.3213843 glib-2.0 >= 2.32
14000 gthread-2.0 >= 2.3213844 gthread-2.0 >= 2.32
14001\""; } >&513845\""; } >&5
14002 ($PKG_CONFIG --exists --print-errors "bluez >= 4.6113846 ($PKG_CONFIG --exists --print-errors "bluez >= 4.61
14003 libstartup-notification-1.0 >= 0.913847 libstartup-notification-1.0 >= 0.9
14004 gtk+-2.0 >= 2.1213848 gtk+-3.0
14005 pygobject-2.0 >= 2.12
14006 gobject-2.0 >= 2.12
14007 glib-2.0 >= 2.3213849 glib-2.0 >= 2.32
14008 gthread-2.0 >= 2.3213850 gthread-2.0 >= 2.32
14009") 2>&513851") 2>&5
@@ -14012,9 +13854,7 @@
14012 test $ac_status = 0; }; then13854 test $ac_status = 0; }; then
14013 pkg_cv_BLUEZ_CFLAGS=`$PKG_CONFIG --cflags "bluez >= 4.6113855 pkg_cv_BLUEZ_CFLAGS=`$PKG_CONFIG --cflags "bluez >= 4.61
14014 libstartup-notification-1.0 >= 0.913856 libstartup-notification-1.0 >= 0.9
14015 gtk+-2.0 >= 2.1213857 gtk+-3.0
14016 pygobject-2.0 >= 2.12
14017 gobject-2.0 >= 2.12
14018 glib-2.0 >= 2.3213858 glib-2.0 >= 2.32
14019 gthread-2.0 >= 2.3213859 gthread-2.0 >= 2.32
14020" 2>/dev/null`13860" 2>/dev/null`
@@ -14031,17 +13871,13 @@
14031 if test -n "$PKG_CONFIG" && \13871 if test -n "$PKG_CONFIG" && \
14032 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez >= 4.6113872 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez >= 4.61
14033 libstartup-notification-1.0 >= 0.913873 libstartup-notification-1.0 >= 0.9
14034 gtk+-2.0 >= 2.1213874 gtk+-3.0
14035 pygobject-2.0 >= 2.12
14036 gobject-2.0 >= 2.12
14037 glib-2.0 >= 2.3213875 glib-2.0 >= 2.32
14038 gthread-2.0 >= 2.3213876 gthread-2.0 >= 2.32
14039\""; } >&513877\""; } >&5
14040 ($PKG_CONFIG --exists --print-errors "bluez >= 4.6113878 ($PKG_CONFIG --exists --print-errors "bluez >= 4.61
14041 libstartup-notification-1.0 >= 0.913879 libstartup-notification-1.0 >= 0.9
14042 gtk+-2.0 >= 2.1213880 gtk+-3.0
14043 pygobject-2.0 >= 2.12
14044 gobject-2.0 >= 2.12
14045 glib-2.0 >= 2.3213881 glib-2.0 >= 2.32
14046 gthread-2.0 >= 2.3213882 gthread-2.0 >= 2.32
14047") 2>&513883") 2>&5
@@ -14050,9 +13886,7 @@
14050 test $ac_status = 0; }; then13886 test $ac_status = 0; }; then
14051 pkg_cv_BLUEZ_LIBS=`$PKG_CONFIG --libs "bluez >= 4.6113887 pkg_cv_BLUEZ_LIBS=`$PKG_CONFIG --libs "bluez >= 4.61
14052 libstartup-notification-1.0 >= 0.913888 libstartup-notification-1.0 >= 0.9
14053 gtk+-2.0 >= 2.1213889 gtk+-3.0
14054 pygobject-2.0 >= 2.12
14055 gobject-2.0 >= 2.12
14056 glib-2.0 >= 2.3213890 glib-2.0 >= 2.32
14057 gthread-2.0 >= 2.3213891 gthread-2.0 >= 2.32
14058" 2>/dev/null`13892" 2>/dev/null`
@@ -14078,18 +13912,14 @@
14078 if test $_pkg_short_errors_supported = yes; then13912 if test $_pkg_short_errors_supported = yes; then
14079 BLUEZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "bluez >= 4.6113913 BLUEZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "bluez >= 4.61
14080 libstartup-notification-1.0 >= 0.913914 libstartup-notification-1.0 >= 0.9
14081 gtk+-2.0 >= 2.1213915 gtk+-3.0
14082 pygobject-2.0 >= 2.12
14083 gobject-2.0 >= 2.12
14084 glib-2.0 >= 2.3213916 glib-2.0 >= 2.32
14085 gthread-2.0 >= 2.3213917 gthread-2.0 >= 2.32
14086" 2>&1`13918" 2>&1`
14087 else 13919 else
14088 BLUEZ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "bluez >= 4.6113920 BLUEZ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "bluez >= 4.61
14089 libstartup-notification-1.0 >= 0.913921 libstartup-notification-1.0 >= 0.9
14090 gtk+-2.0 >= 2.1213922 gtk+-3.0
14091 pygobject-2.0 >= 2.12
14092 gobject-2.0 >= 2.12
14093 glib-2.0 >= 2.3213923 glib-2.0 >= 2.32
14094 gthread-2.0 >= 2.3213924 gthread-2.0 >= 2.32
14095" 2>&1`13925" 2>&1`
@@ -14099,9 +13929,7 @@
1409913929
14100 as_fn_error $? "Package requirements (bluez >= 4.6113930 as_fn_error $? "Package requirements (bluez >= 4.61
14101 libstartup-notification-1.0 >= 0.913931 libstartup-notification-1.0 >= 0.9
14102 gtk+-2.0 >= 2.1213932 gtk+-3.0
14103 pygobject-2.0 >= 2.12
14104 gobject-2.0 >= 2.12
14105 glib-2.0 >= 2.3213933 glib-2.0 >= 2.32
14106 gthread-2.0 >= 2.3213934 gthread-2.0 >= 2.32
14107) were not met:13935) were not met:
@@ -14140,6 +13968,262 @@
1414013968
1414113969
1414213970
13971pkg_failed=no
13972{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYGOBJECT" >&5
13973$as_echo_n "checking for PYGOBJECT... " >&6; }
13974
13975if test -n "$PYGOBJECT_CFLAGS"; then
13976 pkg_cv_PYGOBJECT_CFLAGS="$PYGOBJECT_CFLAGS"
13977 elif test -n "$PKG_CONFIG"; then
13978 if test -n "$PKG_CONFIG" && \
13979 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-2.0 >= 2.12\""; } >&5
13980 ($PKG_CONFIG --exists --print-errors "pygobject-2.0 >= 2.12") 2>&5
13981 ac_status=$?
13982 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13983 test $ac_status = 0; }; then
13984 pkg_cv_PYGOBJECT_CFLAGS=`$PKG_CONFIG --cflags "pygobject-2.0 >= 2.12" 2>/dev/null`
13985 test "x$?" != "x0" && pkg_failed=yes
13986else
13987 pkg_failed=yes
13988fi
13989 else
13990 pkg_failed=untried
13991fi
13992if test -n "$PYGOBJECT_LIBS"; then
13993 pkg_cv_PYGOBJECT_LIBS="$PYGOBJECT_LIBS"
13994 elif test -n "$PKG_CONFIG"; then
13995 if test -n "$PKG_CONFIG" && \
13996 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-2.0 >= 2.12\""; } >&5
13997 ($PKG_CONFIG --exists --print-errors "pygobject-2.0 >= 2.12") 2>&5
13998 ac_status=$?
13999 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14000 test $ac_status = 0; }; then
14001 pkg_cv_PYGOBJECT_LIBS=`$PKG_CONFIG --libs "pygobject-2.0 >= 2.12" 2>/dev/null`
14002 test "x$?" != "x0" && pkg_failed=yes
14003else
14004 pkg_failed=yes
14005fi
14006 else
14007 pkg_failed=untried
14008fi
14009
14010
14011
14012if test $pkg_failed = yes; then
14013 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14014$as_echo "no" >&6; }
14015
14016if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
14017 _pkg_short_errors_supported=yes
14018else
14019 _pkg_short_errors_supported=no
14020fi
14021 if test $_pkg_short_errors_supported = yes; then
14022 PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pygobject-2.0 >= 2.12" 2>&1`
14023 else
14024 PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pygobject-2.0 >= 2.12" 2>&1`
14025 fi
14026 # Put the nasty error message in config.log where it belongs
14027 echo "$PYGOBJECT_PKG_ERRORS" >&5
14028
14029
14030pkg_failed=no
14031{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYGOBJECT" >&5
14032$as_echo_n "checking for PYGOBJECT... " >&6; }
14033
14034if test -n "$PYGOBJECT_CFLAGS"; then
14035 pkg_cv_PYGOBJECT_CFLAGS="$PYGOBJECT_CFLAGS"
14036 elif test -n "$PKG_CONFIG"; then
14037 if test -n "$PKG_CONFIG" && \
14038 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-3.0\""; } >&5
14039 ($PKG_CONFIG --exists --print-errors "pygobject-3.0") 2>&5
14040 ac_status=$?
14041 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14042 test $ac_status = 0; }; then
14043 pkg_cv_PYGOBJECT_CFLAGS=`$PKG_CONFIG --cflags "pygobject-3.0" 2>/dev/null`
14044 test "x$?" != "x0" && pkg_failed=yes
14045else
14046 pkg_failed=yes
14047fi
14048 else
14049 pkg_failed=untried
14050fi
14051if test -n "$PYGOBJECT_LIBS"; then
14052 pkg_cv_PYGOBJECT_LIBS="$PYGOBJECT_LIBS"
14053 elif test -n "$PKG_CONFIG"; then
14054 if test -n "$PKG_CONFIG" && \
14055 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-3.0\""; } >&5
14056 ($PKG_CONFIG --exists --print-errors "pygobject-3.0") 2>&5
14057 ac_status=$?
14058 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14059 test $ac_status = 0; }; then
14060 pkg_cv_PYGOBJECT_LIBS=`$PKG_CONFIG --libs "pygobject-3.0" 2>/dev/null`
14061 test "x$?" != "x0" && pkg_failed=yes
14062else
14063 pkg_failed=yes
14064fi
14065 else
14066 pkg_failed=untried
14067fi
14068
14069
14070
14071if test $pkg_failed = yes; then
14072 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14073$as_echo "no" >&6; }
14074
14075if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
14076 _pkg_short_errors_supported=yes
14077else
14078 _pkg_short_errors_supported=no
14079fi
14080 if test $_pkg_short_errors_supported = yes; then
14081 PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pygobject-3.0" 2>&1`
14082 else
14083 PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pygobject-3.0" 2>&1`
14084 fi
14085 # Put the nasty error message in config.log where it belongs
14086 echo "$PYGOBJECT_PKG_ERRORS" >&5
14087
14088 as_fn_error $? "Package requirements (pygobject-3.0) were not met:
14089
14090$PYGOBJECT_PKG_ERRORS
14091
14092Consider adjusting the PKG_CONFIG_PATH environment variable if you
14093installed software in a non-standard prefix.
14094
14095Alternatively, you may set the environment variables PYGOBJECT_CFLAGS
14096and PYGOBJECT_LIBS to avoid the need to call pkg-config.
14097See the pkg-config man page for more details." "$LINENO" 5
14098elif test $pkg_failed = untried; then
14099 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14100$as_echo "no" >&6; }
14101 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
14102$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
14103as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
14104is in your PATH or set the PKG_CONFIG environment variable to the full
14105path to pkg-config.
14106
14107Alternatively, you may set the environment variables PYGOBJECT_CFLAGS
14108and PYGOBJECT_LIBS to avoid the need to call pkg-config.
14109See the pkg-config man page for more details.
14110
14111To get pkg-config, see <http://pkg-config.freedesktop.org/>.
14112See \`config.log' for more details" "$LINENO" 5; }
14113else
14114 PYGOBJECT_CFLAGS=$pkg_cv_PYGOBJECT_CFLAGS
14115 PYGOBJECT_LIBS=$pkg_cv_PYGOBJECT_LIBS
14116 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14117$as_echo "yes" >&6; }
14118
14119fi
14120
14121elif test $pkg_failed = untried; then
14122 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14123$as_echo "no" >&6; }
14124
14125pkg_failed=no
14126{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYGOBJECT" >&5
14127$as_echo_n "checking for PYGOBJECT... " >&6; }
14128
14129if test -n "$PYGOBJECT_CFLAGS"; then
14130 pkg_cv_PYGOBJECT_CFLAGS="$PYGOBJECT_CFLAGS"
14131 elif test -n "$PKG_CONFIG"; then
14132 if test -n "$PKG_CONFIG" && \
14133 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-3.0\""; } >&5
14134 ($PKG_CONFIG --exists --print-errors "pygobject-3.0") 2>&5
14135 ac_status=$?
14136 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14137 test $ac_status = 0; }; then
14138 pkg_cv_PYGOBJECT_CFLAGS=`$PKG_CONFIG --cflags "pygobject-3.0" 2>/dev/null`
14139 test "x$?" != "x0" && pkg_failed=yes
14140else
14141 pkg_failed=yes
14142fi
14143 else
14144 pkg_failed=untried
14145fi
14146if test -n "$PYGOBJECT_LIBS"; then
14147 pkg_cv_PYGOBJECT_LIBS="$PYGOBJECT_LIBS"
14148 elif test -n "$PKG_CONFIG"; then
14149 if test -n "$PKG_CONFIG" && \
14150 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-3.0\""; } >&5
14151 ($PKG_CONFIG --exists --print-errors "pygobject-3.0") 2>&5
14152 ac_status=$?
14153 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14154 test $ac_status = 0; }; then
14155 pkg_cv_PYGOBJECT_LIBS=`$PKG_CONFIG --libs "pygobject-3.0" 2>/dev/null`
14156 test "x$?" != "x0" && pkg_failed=yes
14157else
14158 pkg_failed=yes
14159fi
14160 else
14161 pkg_failed=untried
14162fi
14163
14164
14165
14166if test $pkg_failed = yes; then
14167 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14168$as_echo "no" >&6; }
14169
14170if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
14171 _pkg_short_errors_supported=yes
14172else
14173 _pkg_short_errors_supported=no
14174fi
14175 if test $_pkg_short_errors_supported = yes; then
14176 PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pygobject-3.0" 2>&1`
14177 else
14178 PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pygobject-3.0" 2>&1`
14179 fi
14180 # Put the nasty error message in config.log where it belongs
14181 echo "$PYGOBJECT_PKG_ERRORS" >&5
14182
14183 as_fn_error $? "Package requirements (pygobject-3.0) were not met:
14184
14185$PYGOBJECT_PKG_ERRORS
14186
14187Consider adjusting the PKG_CONFIG_PATH environment variable if you
14188installed software in a non-standard prefix.
14189
14190Alternatively, you may set the environment variables PYGOBJECT_CFLAGS
14191and PYGOBJECT_LIBS to avoid the need to call pkg-config.
14192See the pkg-config man page for more details." "$LINENO" 5
14193elif test $pkg_failed = untried; then
14194 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14195$as_echo "no" >&6; }
14196 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
14197$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
14198as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
14199is in your PATH or set the PKG_CONFIG environment variable to the full
14200path to pkg-config.
14201
14202Alternatively, you may set the environment variables PYGOBJECT_CFLAGS
14203and PYGOBJECT_LIBS to avoid the need to call pkg-config.
14204See the pkg-config man page for more details.
14205
14206To get pkg-config, see <http://pkg-config.freedesktop.org/>.
14207See \`config.log' for more details" "$LINENO" 5; }
14208else
14209 PYGOBJECT_CFLAGS=$pkg_cv_PYGOBJECT_CFLAGS
14210 PYGOBJECT_LIBS=$pkg_cv_PYGOBJECT_LIBS
14211 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14212$as_echo "yes" >&6; }
14213
14214fi
14215
14216else
14217 PYGOBJECT_CFLAGS=$pkg_cv_PYGOBJECT_CFLAGS
14218 PYGOBJECT_LIBS=$pkg_cv_PYGOBJECT_LIBS
14219 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14220$as_echo "yes" >&6; }
14221
14222fi
14223
14224
14225
14226
14143ac_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"14227ac_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"
1414414228
14145cat >confcache <<\_ACEOF14229cat >confcache <<\_ACEOF
1414614230
=== modified file 'autom4te.cache/requests'
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: