[gnome-flashback/issue-80] system-indicators: port to gnome-bluetooth 42
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-flashback/issue-80] system-indicators: port to gnome-bluetooth 42
- Date: Wed, 24 Aug 2022 12:41:07 +0000 (UTC)
commit 14cff5c7eec0b38921e393e7d196d564724c64b2
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Wed Aug 24 15:19:46 2022 +0300
system-indicators: port to gnome-bluetooth 42
https://gitlab.gnome.org/GNOME/gnome-flashback/-/issues/80
.gitlab-ci.yml | 2 +-
configure.ac | 28 +-----
system-indicators/Makefile.am | 18 +---
system-indicators/si-applet.c | 10 --
system-indicators/si-bluetooth.c | 197 ++++++++++++++++-----------------------
5 files changed, 84 insertions(+), 171 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a57c513..bf76d52 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ variables:
libgdk-pixbuf2.0-dev
libgdm-dev
libglib2.0-dev
- libgnome-bluetooth-dev
+ libgnome-bluetooth-3.0-dev
libgnome-desktop-3-dev
libgnome-panel-dev
libgtk-3-dev
diff --git a/configure.ac b/configure.ac
index eadb21d..a1fa637 100644
--- a/configure.ac
+++ b/configure.ac
@@ -340,33 +340,7 @@ PKG_CHECK_MODULES([SYSTEM_INDICATORS], [
upower-glib
])
-PKG_CHECK_EXISTS([gnome-bluetooth-1.0], [
- found_gnome_bluetooth="yes"
- PKG_CHECK_MODULES([GNOME_BLUETOOTH], [gnome-bluetooth-1.0])
- AC_DEFINE([HAVE_GNOME_BLUETOOTH], [1],
- [Define if libgnome-bluetooth is available])
-], [
- found_gnome_bluetooth="no"
-])
-
-AM_CONDITIONAL([HAVE_GNOME_BLUETOOTH], [test "x$found_gnome_bluetooth" = "xyes"])
-
-save_CFLAGS="$CFLAGS"
-CFLAGS=$GNOME_BLUETOOTH_CFLAGS
-AC_MSG_CHECKING([for BLUETOOTH_TYPE_SPEAKERS])
-AC_COMPILE_IFELSE([
- AC_LANG_PROGRAM([
- #include <bluetooth-client.h>
- ], [
- int type = BLUETOOTH_TYPE_SPEAKERS;
- ])
-], [
- AC_MSG_RESULT([yes])
- AC_DEFINE([HAVE_BLUETOOTH_TYPE_SPEAKERS], [1], [xxx])
-], [
- AC_MSG_RESULT([no])
-])
-CFLAGS="$save_CFLAGS"
+PKG_CHECK_MODULES([GNOME_BLUETOOTH], [gnome-bluetooth-3.0])
dnl **************************************************************************
dnl Compiz session
diff --git a/system-indicators/Makefile.am b/system-indicators/Makefile.am
index b52aec6..171b4f8 100644
--- a/system-indicators/Makefile.am
+++ b/system-indicators/Makefile.am
@@ -21,6 +21,8 @@ system_indicators_la_CFLAGS = \
system_indicators_la_SOURCES = \
si-applet.c \
si-applet.h \
+ si-bluetooth.c \
+ si-bluetooth.h \
si-desktop-menu-item.c \
si-desktop-menu-item.h \
si-indicator.c \
@@ -40,6 +42,7 @@ system_indicators_la_LIBADD = \
$(top_builddir)/dbus/libdbus.la \
$(top_builddir)/gvc/libgvc.la \
$(SYSTEM_INDICATORS_LIBS) \
+ $(GNOME_BLUETOOTH_LIBS) \
$(LIBM) \
$(NULL)
@@ -49,19 +52,4 @@ system_indicators_la_LDFLAGS = \
$(AM_LDFLAGS) \
$(NULL)
-if HAVE_GNOME_BLUETOOTH
-system_indicators_la_SOURCES += \
- si-bluetooth.c \
- si-bluetooth.h \
- $(NULL)
-
-system_indicators_la_CFLAGS += \
- $(GNOME_BLUETOOTH_CFLAGS) \
- $(NULL)
-
-system_indicators_la_LIBADD += \
- $(GNOME_BLUETOOTH_LIBS) \
- $(NULL)
-endif
-
-include $(top_srcdir)/git.mk
diff --git a/system-indicators/si-applet.c b/system-indicators/si-applet.c
index 54a1703..e1f13d3 100644
--- a/system-indicators/si-applet.c
+++ b/system-indicators/si-applet.c
@@ -19,9 +19,7 @@
#include "si-applet.h"
#include "gvc-mixer-control.h"
-#ifdef HAVE_GNOME_BLUETOOTH
#include "si-bluetooth.h"
-#endif
#include "si-input-sources.h"
#include "si-menu-bar.h"
#include "si-power.h"
@@ -35,9 +33,7 @@ struct _SiApplet
GvcMixerControl *mixer_control;
-#ifdef HAVE_GNOME_BLUETOOTH
SiIndicator *bluetooth;
-#endif
SiIndicator *input_sources;
SiIndicator *power;
SiIndicator *volume_input;
@@ -77,7 +73,6 @@ append_power (SiApplet *self)
gtk_menu_shell_append (GTK_MENU_SHELL (self->menu_bar), item);
}
-#ifdef HAVE_GNOME_BLUETOOTH
static void
append_bluetooth (SiApplet *self)
{
@@ -88,7 +83,6 @@ append_bluetooth (SiApplet *self)
item = si_indicator_get_menu_item (self->bluetooth);
gtk_menu_shell_append (GTK_MENU_SHELL (self->menu_bar), item);
}
-#endif
static void
append_input_sources (SiApplet *self)
@@ -127,9 +121,7 @@ setup_applet (SiApplet *self)
append_input_sources (self);
append_volume (self);
-#ifdef HAVE_GNOME_BLUETOOTH
append_bluetooth (self);
-#endif
append_power (self);
}
@@ -149,9 +141,7 @@ si_applet_dispose (GObject *object)
g_clear_object (&self->mixer_control);
-#ifdef HAVE_GNOME_BLUETOOTH
g_clear_object (&self->bluetooth);
-#endif
g_clear_object (&self->input_sources);
g_clear_object (&self->power);
g_clear_object (&self->volume_input);
diff --git a/system-indicators/si-bluetooth.c b/system-indicators/si-bluetooth.c
index 2bf8f86..081e68c 100644
--- a/system-indicators/si-bluetooth.c
+++ b/system-indicators/si-bluetooth.c
@@ -18,12 +18,24 @@
#include "config.h"
#include "si-bluetooth.h"
-#include <bluetooth-client.h>
#include <glib/gi18n-lib.h>
#include "dbus/gf-sd-rfkill-gen.h"
#include "si-desktop-menu-item.h"
+typedef enum
+{
+ BLUETOOTH_TYPE_HEADSET = 1 << 5,
+ BLUETOOTH_TYPE_HEADPHONES = 1 << 6,
+ BLUETOOTH_TYPE_OTHER_AUDIO = 1 << 7,
+ BLUETOOTH_TYPE_KEYBOARD = 1 << 8,
+ BLUETOOTH_TYPE_MOUSE = 1 << 9,
+ BLUETOOTH_TYPE_SPEAKERS = 1 << 20
+} BluetoothType;
+
+typedef struct _BluetoothClient BluetoothClient;
+typedef struct _BluetoothDevice BluetoothDevice;
+
struct _SiBluetooth
{
SiIndicator parent;
@@ -31,7 +43,7 @@ struct _SiBluetooth
GtkWidget *menu;
BluetoothClient *client;
- GtkTreeModel *model;
+ GListModel *devices;
guint bus_name_id;
@@ -42,6 +54,25 @@ struct _SiBluetooth
G_DEFINE_TYPE (SiBluetooth, si_bluetooth, SI_TYPE_INDICATOR)
+extern BluetoothClient *
+bluetooth_client_new (void);
+
+extern GListStore *
+bluetooth_client_get_devices (BluetoothClient *client);
+
+extern void
+bluetooth_client_connect_service (BluetoothClient *client,
+ const char *path,
+ gboolean connect,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+
+extern gboolean
+bluetooth_client_connect_service_finish (BluetoothClient *client,
+ GAsyncResult *res,
+ GError **error);
+
static gboolean
is_airplane_mode (SiBluetooth *self)
{
@@ -112,7 +143,7 @@ connect_done_cb (GObject *source_object,
GError *error;
error = NULL;
- bluetooth_client_connect_service_finish (BLUETOOTH_CLIENT (source_object),
+ bluetooth_client_connect_service_finish ((BluetoothClient *) source_object,
res,
&error);
@@ -173,25 +204,24 @@ connect_cb (GtkMenuItem *item,
}
static void
-append_devices (SiBluetooth *self,
- GtkTreeIter *adapter,
- int n_devices)
+append_devices (SiBluetooth *self)
{
GtkWidget *separator;
- gboolean valid;
- GtkTreeIter iter;
+ guint n_items;
+ guint i;
- if (is_airplane_mode (self) || n_devices == 0)
+ if (is_airplane_mode (self))
return;
separator = gtk_separator_menu_item_new ();
gtk_menu_shell_append (GTK_MENU_SHELL (self->menu), separator);
gtk_widget_show (separator);
- valid = gtk_tree_model_iter_children (self->model, &iter, adapter);
+ n_items = g_list_model_get_n_items (self->devices);
- while (valid)
+ for (i = 0; i < n_items; i++)
{
+ BluetoothDevice *device;
GDBusProxy *proxy;
char *name;
BluetoothType type;
@@ -200,12 +230,14 @@ append_devices (SiBluetooth *self,
GtkWidget *menu;
char *path;
- gtk_tree_model_get (self->model, &iter,
- BLUETOOTH_COLUMN_PROXY, &proxy,
- BLUETOOTH_COLUMN_NAME, &name,
- BLUETOOTH_COLUMN_TYPE, &type,
- BLUETOOTH_COLUMN_CONNECTED, &is_connected,
- -1);
+ device = g_list_model_get_item (self->devices, i);
+
+ g_object_get (device,
+ "proxy", &proxy,
+ "name", &name,
+ "type", &type,
+ "connected", &is_connected,
+ NULL);
item = gtk_menu_item_new_with_label (name);
g_free (name);
@@ -270,9 +302,7 @@ append_devices (SiBluetooth *self,
case BLUETOOTH_TYPE_HEADSET:
case BLUETOOTH_TYPE_HEADPHONES:
-#ifdef HAVE_BLUETOOTH_TYPE_SPEAKERS
case BLUETOOTH_TYPE_SPEAKERS:
-#endif
case BLUETOOTH_TYPE_OTHER_AUDIO:
item = si_desktop_menu_item_new (_("Sound Settings"),
"gnome-sound-panel.desktop");
@@ -281,26 +311,11 @@ append_devices (SiBluetooth *self,
gtk_widget_show (item);
break;
- case BLUETOOTH_TYPE_ANY:
- case BLUETOOTH_TYPE_PHONE:
- case BLUETOOTH_TYPE_MODEM:
- case BLUETOOTH_TYPE_COMPUTER:
- case BLUETOOTH_TYPE_NETWORK:
- case BLUETOOTH_TYPE_CAMERA:
- case BLUETOOTH_TYPE_PRINTER:
- case BLUETOOTH_TYPE_JOYPAD:
- case BLUETOOTH_TYPE_TABLET:
- case BLUETOOTH_TYPE_VIDEO:
- case BLUETOOTH_TYPE_REMOTE_CONTROL:
- case BLUETOOTH_TYPE_SCANNER:
- case BLUETOOTH_TYPE_DISPLAY:
- case BLUETOOTH_TYPE_WEARABLE:
- case BLUETOOTH_TYPE_TOY:
default:
break;
}
- valid = gtk_tree_model_iter_next (self->model , &iter);
+ g_object_unref (device);
}
}
@@ -312,9 +327,7 @@ remove_item_cb (GtkWidget *widget,
}
static void
-update_indicator_menu (SiBluetooth *self,
- GtkTreeIter *adapter,
- int n_devices)
+update_indicator_menu (SiBluetooth *self)
{
GtkWidget *separator;
GtkWidget *item;
@@ -322,7 +335,7 @@ update_indicator_menu (SiBluetooth *self,
gtk_container_foreach (GTK_CONTAINER (self->menu), remove_item_cb, NULL);
append_main_items (self);
- append_devices (self, adapter, n_devices);
+ append_devices (self);
separator = gtk_separator_menu_item_new ();
gtk_menu_shell_append (GTK_MENU_SHELL (self->menu), separator);
@@ -361,56 +374,33 @@ update_indicator_icon (SiBluetooth *self)
si_indicator_set_icon_name (SI_INDICATOR (self), icon_name);
}
-static GtkTreeIter *
-get_default_adapter (SiBluetooth *self)
-{
- gboolean valid;
- GtkTreeIter iter;
-
- valid = gtk_tree_model_get_iter_first (self->model, &iter);
-
- while (valid)
- {
- gboolean is_default;
-
- gtk_tree_model_get (self->model, &iter,
- BLUETOOTH_COLUMN_DEFAULT, &is_default,
- -1);
-
- if (is_default)
- return gtk_tree_iter_copy (&iter);
-
- valid = gtk_tree_model_iter_next (self->model , &iter);
- }
-
- return NULL;
-}
-
static void
get_n_devices (SiBluetooth *self,
- GtkTreeIter *adapter,
int *n_devices,
int *n_connected_devices)
{
- gboolean valid;
- GtkTreeIter iter;
+ guint n_items;
+ guint i;
*n_devices = 0;
*n_connected_devices = 0;
- valid = gtk_tree_model_iter_children (self->model, &iter, adapter);
+ n_items = g_list_model_get_n_items (self->devices);
- while (valid)
+ for (i = 0; i < n_items; i++)
{
+ BluetoothDevice *device;
gboolean is_connected;
gboolean is_paired;
gboolean is_trusted;
- gtk_tree_model_get (self->model, &iter,
- BLUETOOTH_COLUMN_CONNECTED, &is_connected,
- BLUETOOTH_COLUMN_PAIRED, &is_paired,
- BLUETOOTH_COLUMN_TRUSTED, &is_trusted,
- -1);
+ device = g_list_model_get_item (self->devices, i);
+
+ g_object_get (device,
+ "connected", &is_connected,
+ "paired", &is_paired,
+ "trusted", &is_trusted,
+ NULL);
if (is_connected)
(*n_connected_devices)++;
@@ -418,7 +408,7 @@ get_n_devices (SiBluetooth *self,
if (is_paired || is_trusted)
(*n_devices)++;
- valid = gtk_tree_model_iter_next (self->model , &iter);
+ g_object_unref (device);
}
}
@@ -426,25 +416,22 @@ static void
update_indicator (SiBluetooth *self)
{
GtkWidget *menu_item;
- GtkTreeIter *adapter;
int n_devices;
int n_connected_devices;
char *tooltip;
menu_item = si_indicator_get_menu_item (SI_INDICATOR (self));
- adapter = get_default_adapter (self);
- if (adapter == NULL)
+ get_n_devices (self, &n_devices, &n_connected_devices);
+
+ if (n_devices == 0)
{
gtk_widget_hide (menu_item);
return;
}
- get_n_devices (self, adapter, &n_devices, &n_connected_devices);
-
update_indicator_icon (self);
- update_indicator_menu (self, adapter, n_devices);
- gtk_tree_iter_free (adapter);
+ update_indicator_menu (self);
if (n_connected_devices > 0)
{
@@ -464,27 +451,11 @@ update_indicator (SiBluetooth *self)
}
static void
-row_changed_cb (GtkTreeModel *tree_model,
- GtkTreePath *path,
- GtkTreeIter *iter,
- SiBluetooth *self)
-{
- update_indicator (self);
-}
-
-static void
-row_inserted_cb (GtkTreeModel *tree_model,
- GtkTreePath *path,
- GtkTreeIter *iter,
- SiBluetooth *self)
-{
- update_indicator (self);
-}
-
-static void
-row_deleted_cb (GtkTreeModel *tree_model,
- GtkTreePath *path,
- SiBluetooth *self)
+items_changed_cb (GListModel *model,
+ guint position,
+ guint removed,
+ guint added,
+ SiBluetooth *self)
{
update_indicator (self);
}
@@ -592,21 +563,11 @@ si_bluetooth_constructed (GObject *object)
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), self->menu);
self->client = bluetooth_client_new ();
- self->model = bluetooth_client_get_model (self->client);
-
- g_signal_connect (self->model,
- "row-changed",
- G_CALLBACK (row_changed_cb),
- self);
-
- g_signal_connect (self->model,
- "row-inserted",
- G_CALLBACK (row_inserted_cb),
- self);
+ self->devices = G_LIST_MODEL (bluetooth_client_get_devices (self->client));
- g_signal_connect (self->model,
- "row-deleted",
- G_CALLBACK (row_deleted_cb),
+ g_signal_connect (self->devices,
+ "items-changed",
+ G_CALLBACK (items_changed_cb),
self);
applet = si_indicator_get_applet (SI_INDICATOR (self));
@@ -638,7 +599,7 @@ si_bluetooth_dispose (GObject *object)
g_clear_object (&self->rfkill);
g_clear_object (&self->client);
- g_clear_object (&self->model);
+ g_clear_object (&self->devices);
G_OBJECT_CLASS (si_bluetooth_parent_class)->dispose (object);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
