summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2021-02-11 11:55:31 +0100
committerBastien Nocera <hadess@hadess.net>2021-02-17 17:31:27 +0100
commit1e6dbdc90090d6455e664c4b2146f0daf600315d (patch)
tree81e04a8c79a1f0e92291fbf10811e210f800f9b5
parentd93955b7c1a906181b3cdfc8afb6ea061e257e89 (diff)
downloadgnome-bluetooth-1e6dbdc90090d6455e664c4b2146f0daf600315d.tar.gz
lib: Remove use of deprecated GtkMisc and GtkAlignment
-rw-r--r--lib/bluetooth-filter-widget.c22
-rw-r--r--lib/bluetooth-settings-widget.c5
2 files changed, 17 insertions, 10 deletions
diff --git a/lib/bluetooth-filter-widget.c b/lib/bluetooth-filter-widget.c
index a7a8b26a..c73a8a14 100644
--- a/lib/bluetooth-filter-widget.c
+++ b/lib/bluetooth-filter-widget.c
@@ -205,7 +205,6 @@ bluetooth_filter_widget_init(BluetoothFilterWidget *filter)
guint i;
GtkWidget *label;
- GtkWidget *alignment;
GtkWidget *table;
GtkCellRenderer *renderer;
@@ -220,15 +219,14 @@ bluetooth_filter_widget_init(BluetoothFilterWidget *filter)
bluetooth_filter_widget_set_title (filter, _("Show:"));
gtk_widget_show (filter->title);
gtk_box_pack_start (GTK_BOX (filter), filter->title, TRUE, TRUE, 0);
- gtk_misc_set_alignment (GTK_MISC (filter->title), 0, 0.5);
-
- alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
- gtk_widget_show (alignment);
- gtk_box_pack_start (GTK_BOX (filter), alignment, TRUE, TRUE, 0);
+ g_object_set (G_OBJECT (filter->title),
+ "xalign", 0.0,
+ "yalign", 0.5,
+ NULL);
table = gtk_grid_new ();
gtk_widget_show (table);
- gtk_container_add (GTK_CONTAINER (alignment), table);
+ gtk_box_pack_start (GTK_BOX (filter), table, TRUE, TRUE, 0);
gtk_grid_set_row_spacing (GTK_GRID (table), 6);
gtk_grid_set_column_spacing (GTK_GRID (table), 12);
@@ -237,7 +235,10 @@ bluetooth_filter_widget_init(BluetoothFilterWidget *filter)
gtk_widget_set_no_show_all (label, TRUE);
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ g_object_set (G_OBJECT (label),
+ "xalign", 0.0,
+ "yalign", 0.5,
+ NULL);
filter->device_category_label = label;
filter->device_category = gtk_combo_box_text_new ();
@@ -262,7 +263,10 @@ bluetooth_filter_widget_init(BluetoothFilterWidget *filter)
gtk_widget_set_no_show_all (label, TRUE);
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 0, 1, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ g_object_set (G_OBJECT (label),
+ "xalign", 0.0,
+ "yalign", 0.5,
+ NULL);
filter->device_type_label = label;
filter->device_type_filter_model = GTK_TREE_MODEL (gtk_list_store_new (DEVICE_TYPE_FILTER_NUM_COLS,
diff --git a/lib/bluetooth-settings-widget.c b/lib/bluetooth-settings-widget.c
index 15ac0a39..80433ec5 100644
--- a/lib/bluetooth-settings-widget.c
+++ b/lib/bluetooth-settings-widget.c
@@ -1546,7 +1546,10 @@ add_device_section (BluetoothSettingsWidget *self)
priv->device_label = gtk_label_new (s);
g_free (s);
gtk_label_set_use_markup (GTK_LABEL (priv->device_label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (priv->device_label), 0, 0.5);
+ g_object_set (G_OBJECT (priv->device_label),
+ "xalign", 0.0,
+ "yalign", 0.5,
+ NULL);
gtk_widget_set_margin_end (priv->device_label, 6);
gtk_widget_set_margin_bottom (priv->device_label, 12);
gtk_box_pack_start (GTK_BOX (hbox), priv->device_label, FALSE, TRUE, 0);