Drop blueman-assistant

.gitignore

@@ -48,7 +48,6 @@ Makefile
 /stamp-h1
 /apps/blueman-adapters
 /apps/blueman-applet
-/apps/blueman-assistant
 /apps/blueman-manager
 /apps/blueman-mechanism
 /apps/blueman-rfcomm-watcher

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Changes
 
 * Drop blueman-report
+* Drop blueman-assistant
 * Raise minimum Python version to 3.6
 * Do not use exitcode 1 when we expect to fail
 * Use apply button for transfer options

apps/Makefile.am

@@ -4,7 +4,6 @@ APPS =				\
 	blueman-manager		\
 	blueman-services	\
 	blueman-sendto		\
-	blueman-assistant	\
 	blueman-tray
 
 appsdir = $(bindir)

blueman/gui/manager/ManagerDeviceMenu.py

@@ -352,12 +352,6 @@ def generate(self) -> None:
             item.show()
         item.props.tooltip_text = _("Mark/Unmark this device as trusted")
 
-        item = create_menuitem(_("_Set up…"), "document-properties")
-        self.append(item)
-        item.connect("activate", lambda x: self.Blueman.setup(self.SelectedDevice))
-        item.show()
-        item.props.tooltip_text = _("Run the setup assistant for this device")
-
         def on_rename(_item: Gtk.MenuItem, device: Device) -> None:
             def on_response(dialog: Gtk.Dialog, response_id: int) -> None:
                 if response_id == Gtk.ResponseType.ACCEPT:

blueman/gui/manager/ManagerToolbar.py

@@ -44,10 +44,6 @@ def __init__(self, blueman: "Blueman") -> None:
         self.b_remove = blueman.builder.get_widget("b_remove", Gtk.ToolButton)
         self.b_remove.connect("clicked", self.on_action, self.blueman.remove)
 
-        self.b_setup = blueman.builder.get_widget("b_setup", Gtk.ToolButton)
-        self.b_setup.connect("clicked", self.on_action, self.blueman.setup)
-        self.b_setup.set_homogeneous(False)
-
         self.b_send = blueman.builder.get_widget("b_send", Gtk.ToolButton)
         self.b_send.props.sensitive = False
         self.b_send.connect("clicked", self.on_action, self.blueman.send)
@@ -82,10 +78,8 @@ def on_device_selected(self, dev_list: ManagerDeviceList, device: Device, tree_i
             self.b_bond.props.sensitive = False
             self.b_remove.props.sensitive = False
             self.b_trust.props.sensitive = False
-            self.b_setup.props.sensitive = False
         else:
             row = dev_list.get(tree_iter, "paired", "trusted", "objpush")
-            self.b_setup.props.sensitive = True
             self.b_remove.props.sensitive = True
             if row["paired"]:
                 self.b_bond.props.sensitive = False

blueman/main/Manager.py

@@ -206,11 +206,6 @@ def on_error(e: Exception) -> None:
         s1 = self.List.connect("discovery-progress", on_progress)
         s2 = self.List.connect("adapter-property-changed", prop_changed)
 
-    @staticmethod
-    def setup(device: Device) -> None:
-        command = f"blueman-assistant --device={device['Address']}"
-        launch(command, name=_("Bluetooth Assistant"))
-
     @staticmethod
     def bond(device: Device) -> None:
         def error_handler(e: Exception) -> None:

blueman/plugins/applet/StandardItems.py

@@ -27,9 +27,6 @@ def on_load(self) -> None:
 
         self.parent.Plugins.Menu.add(self, 21)
 
-        self.new_dev = self.parent.Plugins.Menu.add(self, 30, text=_("_Set Up New Device") + "…",
-                                                    icon_name="document-new", callback=self.on_setup_new)
-
         self.parent.Plugins.Menu.add(self, 31)
 
         self.send = self.parent.Plugins.Menu.add(self, 40, text=_("Send _Files to Device") + "…",
@@ -61,7 +58,6 @@ def change_sensitivity(self, sensitive: bool) -> None:
             power = True
 
         sensitive = sensitive and self.parent.Manager is not None and power
-        self.new_dev.set_sensitive(sensitive)
         self.send.set_sensitive(sensitive)
         self.devices.set_sensitive(sensitive)
         self.adapters.set_sensitive(sensitive)
@@ -72,9 +68,6 @@ def on_manager_state_changed(self, state: bool) -> None:
     def on_power_state_changed(self, manager: PowerManager, state: bool) -> None:
         self.change_sensitivity(state)
 
-    def on_setup_new(self) -> None:
-        launch("blueman-assistant", name=_("Bluetooth Assistant"))
-
     def on_send(self) -> None:
         launch("blueman-sendto", name=_("File Sender"))
 

configure.ac

@@ -247,7 +247,6 @@ Makefile
 apps/Makefile
 apps/blueman-adapters
 apps/blueman-applet
-apps/blueman-assistant
 apps/blueman-manager
 apps/blueman-mechanism
 apps/blueman-rfcomm-watcher

data/man/Makefile.am

@@ -4,7 +4,6 @@ man_MANS = 			\
 	blueman-manager.1	\
 	blueman-sendto.1	\
 	blueman-services.1	\
-	blueman-assistant.1	\
 	blueman-tray.1
 
 EXTRA_DIST = $(man_MANS)