Hello community, here is the log from the commit of package blueberry for openSUSE:Factory checked in at 2017-06-13 16:09:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blueberry (Old) and /work/SRC/openSUSE:Factory/.blueberry.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blueberry" Tue Jun 13 16:09:53 2017 rev:20 rq:503279 version:1.1.13 Changes: -------- --- /work/SRC/openSUSE:Factory/blueberry/blueberry.changes 2017-05-27 13:18:24.279168900 +0200 +++ /work/SRC/openSUSE:Factory/.blueberry.new/blueberry.changes 2017-06-13 16:09:59.682700940 +0200 @@ -1,0 +2,7 @@ +Mon Jun 12 19:52:24 UTC 2017 - [email protected] + +- Update to version 1.1.13: + * Fix how autostart of the tray icon is handled. + * Add exception handling around bt-adapter -i. + +------------------------------------------------------------------- Old: ---- blueberry-1.1.12.tar.gz New: ---- blueberry-1.1.13.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blueberry.spec ++++++ --- /var/tmp/diff_new_pack.HUosYg/_old 2017-06-13 16:10:01.686418555 +0200 +++ /var/tmp/diff_new_pack.HUosYg/_new 2017-06-13 16:10:01.694417427 +0200 @@ -18,7 +18,7 @@ %define __requires_exclude typelib\\((St)\\) Name: blueberry -Version: 1.1.12 +Version: 1.1.13 Release: 0 Summary: A configuration tool for Bluetooth License: GPL-3.0+ ++++++ blueberry-1.1.12.tar.gz -> blueberry-1.1.13.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blueberry-1.1.12/debian/changelog new/blueberry-1.1.13/debian/changelog --- old/blueberry-1.1.12/debian/changelog 2017-05-23 15:14:00.000000000 +0200 +++ new/blueberry-1.1.13/debian/changelog 2017-06-12 17:56:55.000000000 +0200 @@ -1,3 +1,13 @@ +blueberry (1.1.13) sonya; urgency=medium + + [ JosephMcc ] + * Fix how autostart of the tray icon is handled (#37) + + [ Clement Lefebvre ] + * Add exception handling around bt-adapter -i + + -- Clement Lefebvre <[email protected]> Mon, 12 Jun 2017 16:56:30 +0100 + blueberry (1.1.12) sonya; urgency=medium * l10n: Update translations diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blueberry-1.1.12/etc/xdg/autostart/blueberry-tray.desktop new/blueberry-1.1.13/etc/xdg/autostart/blueberry-tray.desktop --- old/blueberry-1.1.12/etc/xdg/autostart/blueberry-tray.desktop 2017-05-23 15:14:00.000000000 +0200 +++ new/blueberry-1.1.13/etc/xdg/autostart/blueberry-tray.desktop 2017-06-12 17:56:55.000000000 +0200 @@ -3,6 +3,7 @@ Name=blueberry Comment=Blueberry tray icon Exec=blueberry-tray +AutostartCondition=GSettings org.blueberry tray-enabled Terminal=false Type=Application Categories=GTK;GNOME;Settings;X-GNOME-NetworkSettings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blueberry-1.1.12/usr/lib/blueberry/blueberry.py new/blueberry-1.1.13/usr/lib/blueberry/blueberry.py --- old/blueberry-1.1.12/usr/lib/blueberry/blueberry.py 2017-05-23 15:14:00.000000000 +0200 +++ new/blueberry-1.1.13/usr/lib/blueberry/blueberry.py 2017-06-12 17:56:55.000000000 +0200 @@ -151,7 +151,9 @@ section = page.add_section(_("Bluetooth settings")) self.adapter_name_entry = Gtk.Entry() - self.adapter_name_entry.set_text(self.get_default_adapter_name()) + adapter_name = self.get_default_adapter_name() + if adapter_name is not None: + self.adapter_name_entry.set_text(adapter_name) self.adapter_name_entry.connect("changed", self.on_adapter_name_changed) row = SettingsRow(Gtk.Label(_("Name")), self.adapter_name_entry) row.set_tooltip_text(_("This is the Bluetooth name of your computer")) @@ -169,9 +171,7 @@ self.tray_switch.set_active(self.settings.get_boolean("tray-enabled")) self.tray_switch.connect("notify::active", self.on_tray_switch_toggled) self.settings.connect("changed", self.on_settings_changed) - if self.de != "Cinnamon": - # In Cinnamon we're using an applet instead - section.add_row(SettingsRow(Gtk.Label(_("Show a tray icon")), self.tray_switch)) + section.add_row(SettingsRow(Gtk.Label(_("Show a tray icon")), self.tray_switch)) self.window.add(self.main_box) @@ -228,12 +228,15 @@ def get_default_adapter_name(self): name = None - output = subprocess.check_output(["bt-adapter", "-i"]).strip() - for line in output.split("\n"): - line = line.strip() - if line.startswith("Alias: "): - name = line.replace("Alias: ", "").replace(" [rw]", "").replace(" [ro]", "") - break + try: + output = subprocess.check_output(["bt-adapter", "-i"]).strip() + for line in output.split("\n"): + line = line.strip() + if line.startswith("Alias: "): + name = line.replace("Alias: ", "").replace(" [rw]", "").replace(" [ro]", "") + break + except Exception as cause: + print ("Could not retrieve the BT adapter name with 'bt-adapter -i': %s" % cause) return name def update_status(self, path=None, iter=None, data=None):
