[gnome-shell/wip/hadess/import-gnome-bluetooth: 129/133] bluetooth: And re-remove udev dependency




commit b6858108aeb9858bf902dd308f8027d890e8914e
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Nov 2 15:08:00 2021 +0100

    bluetooth: And re-remove udev dependency
    
    This was only used for overriding phone icons.

 src/meson.build              |   5 +-
 src/shell-bluetooth-client.c |  24 -----
 src/shell-bluetooth-pin.c    | 239 -------------------------------------------
 src/shell-bluetooth-pin.h    |  36 -------
 4 files changed, 1 insertion(+), 303 deletions(-)
---
diff --git a/src/meson.build b/src/meson.build
index 95eb45fd35..7ba6a3ab7c 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -48,7 +48,6 @@ gnome_shell_cflags = [
 
 install_rpath = ':'.join([mutter_typelibdir, pkglibdir])
 
-libudev_dep = dependency('libudev')
 gnome_shell_deps = [
   gio_unix_dep,
   libxml_dep,
@@ -62,8 +61,7 @@ gnome_shell_deps = [
   gi_dep,
   polkit_dep,
   gcr_dep,
-  libsystemd_dep,
-  libudev_dep
+  libsystemd_dep
 ]
 
 gnome_shell_deps += nm_deps
@@ -140,7 +138,6 @@ libshell_sources = [
   'shell-app-usage.c',
   'shell-bluetooth-client.c',
   'shell-bluetooth-utils.c',
-  'shell-bluetooth-pin.c',
   'shell-blur-effect.c',
   'shell-embedded-window.c',
   'shell-embedded-window-private.h',
diff --git a/src/shell-bluetooth-client.c b/src/shell-bluetooth-client.c
index d42e51dfd7..4124fa2d77 100644
--- a/src/shell-bluetooth-client.c
+++ b/src/shell-bluetooth-client.c
@@ -44,7 +44,6 @@
 #include "shell-bluetooth-client-glue.h"
 #include "shell-bluetooth-utils.h"
 #include "shell-enum-types.h"
-#include "shell-bluetooth-pin.h"
 
 #define BLUEZ_SERVICE                  "org.bluez"
 #define BLUEZ_MANAGER_PATH             "/"
@@ -240,27 +239,6 @@ shell_bluetooth_client_get_connectable(const char **uuids)
        return FALSE;
 }
 
-static const char *
-phone_oui_to_icon_name (const char *bdaddr)
-{
-       char *vendor;
-       const char *ret = NULL;
-
-       vendor = oui_to_vendor (bdaddr);
-       if (vendor == NULL)
-               return NULL;
-
-       if (strstr (vendor, "Apple") != NULL)
-               ret = "phone-apple-iphone";
-       else if (strstr (vendor, "Samsung") != NULL)
-               ret = "phone-samsung-galaxy-s";
-       else if (strstr (vendor, "Google") != NULL)
-               ret = "phone-google-nexus-one";
-       g_free (vendor);
-
-       return ret;
-}
-
 static const char *
 icon_override (const char    *bdaddr,
               ShellBluetoothType  type)
@@ -273,8 +251,6 @@ icon_override (const char    *bdaddr,
                return "audio-headphones";
        case SHELL_BLUETOOTH_TYPE_OTHER_AUDIO:
                return "audio-speakers";
-       case SHELL_BLUETOOTH_TYPE_PHONE:
-               return phone_oui_to_icon_name (bdaddr);
        case SHELL_BLUETOOTH_TYPE_DISPLAY:
                return "video-display";
        case SHELL_BLUETOOTH_TYPE_SCANNER:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]