diff options
| author | Adrien Plazas <kekun.plazas@laposte.net> | 2019-02-05 13:08:36 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2019-02-06 17:54:26 +0100 |
| commit | 218efaf6e128290869259aeccf3069401f5e8dde (patch) | |
| tree | 55d9980ad8e68361ce1fcd9410036c1b79fb1a54 | |
| parent | 543b34a22dbecb71f495ab28c30f6636e38f49fd (diff) | |
| download | gnome-bluetooth-218efaf6e128290869259aeccf3069401f5e8dde.tar.gz | |
settings-widget: Replace HdyColumn by BluetoothHdyColumn
This fixes the name collision in GNOME Settings.
| -rw-r--r-- | lib/bluetooth-settings-widget.c | 10 | ||||
| -rw-r--r-- | lib/settings.ui | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/lib/bluetooth-settings-widget.c b/lib/bluetooth-settings-widget.c index ca25c7e4..497c1999 100644 --- a/lib/bluetooth-settings-widget.c +++ b/lib/bluetooth-settings-widget.c @@ -25,8 +25,6 @@ #include <gtk/gtk.h> #include <glib/gi18n-lib.h> -#define HANDY_USE_UNSTABLE_API -#include <handy.h> #include <math.h> #include "bluetooth-client.h" @@ -39,6 +37,7 @@ #include "bluetooth-settings-row.h" #include "bluetooth-settings-obexpush.h" #include "bluetooth-pairing-dialog.h" +#include "bluetooth-hdy-column.h" #include "pin.h" #define BLUETOOTH_SETTINGS_WIDGET_GET_PRIVATE(obj) \ @@ -1895,11 +1894,10 @@ bluetooth_settings_widget_init (BluetoothSettingsWidget *self) GtkWidget *widget; GError *error = NULL; - /* This ensures the HdyColumn type is known by GtkBuilder when loading the UI - * template. This avoids the widget to fail at runtime if the user didn't run - * hdy_init(). + /* This ensures the BluetoothHdyColumn type is known by GtkBuilder when + * loading the UI template. */ - g_type_ensure (HDY_TYPE_COLUMN); + g_type_ensure (BLUETOOTH_TYPE_HDY_COLUMN); priv->cancellable = g_cancellable_new (); priv->debug = g_getenv ("BLUETOOTH_DEBUG") != NULL; diff --git a/lib/settings.ui b/lib/settings.ui index ac944233..60440161 100644 --- a/lib/settings.ui +++ b/lib/settings.ui @@ -379,7 +379,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="HdyColumn"> + <object class="BluetoothHdyColumn"> <property name="visible">True</property> <property name="maximum_width">600</property> <property name="linear_growth_width">400</property> |