[gnome-control-center] mouse: Don't use gtk_widget_show_all
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] mouse: Don't use gtk_widget_show_all
- Date: Wed, 10 Oct 2018 04:06:45 +0000 (UTC)
commit ea1a4b0afc3b7a5c29f7424e5143f3cdedd876e3
Author: Robert Ancell <robert ancell canonical com>
Date: Mon Oct 1 15:01:51 2018 +1300
mouse: Don't use gtk_widget_show_all
It is removed in GTK+ 4
panels/mouse/gnome-mouse-properties.c | 11 ++++-------
panels/mouse/gnome-mouse-properties.ui | 2 --
2 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/panels/mouse/gnome-mouse-properties.c b/panels/mouse/gnome-mouse-properties.c
index 5af129391..e74a59761 100644
--- a/panels/mouse/gnome-mouse-properties.c
+++ b/panels/mouse/gnome-mouse-properties.c
@@ -98,17 +98,14 @@ setup_touchpad_options (CcMouseProperties *self)
gboolean have_edge_scrolling;
gboolean have_tap_to_click;
- gtk_widget_set_visible (self->touchpad_frame, !self->have_synaptics);
- if (self->have_synaptics)
- return;
-
- gtk_widget_set_visible (self->touchpad_frame, self->have_touchpad);
- if (!self->have_touchpad)
+ if (self->have_synaptics || !self->have_touchpad) {
+ gtk_widget_hide (self->touchpad_frame);
return;
+ }
cc_touchpad_check_capabilities (&have_two_finger_scrolling, &have_edge_scrolling, &have_tap_to_click);
- gtk_widget_show_all (self->touchpad_frame);
+ gtk_widget_show (self->touchpad_frame);
gtk_widget_set_visible (self->two_finger_scrolling_row, have_two_finger_scrolling);
gtk_widget_set_visible (self->edge_scrolling_row, have_edge_scrolling);
diff --git a/panels/mouse/gnome-mouse-properties.ui b/panels/mouse/gnome-mouse-properties.ui
index 12c9876fa..9d5bfcd28 100644
--- a/panels/mouse/gnome-mouse-properties.ui
+++ b/panels/mouse/gnome-mouse-properties.ui
@@ -616,7 +616,6 @@
<object class="GtkListBoxRow" id="two_finger_scrolling_row">
<property name="visible">False</property>
<property name="can_focus">True</property>
- <property name="no_show_all">True</property>
<property name="activatable">false</property>
<child>
<object class="GtkGrid" id="two_finger_scrolling_grid">
@@ -670,7 +669,6 @@
<object class="GtkListBoxRow" id="edge_scrolling_row">
<property name="visible">False</property>
<property name="can_focus">True</property>
- <property name="no_show_all">True</property>
<property name="activatable">false</property>
<child>
<object class="GtkGrid" id="edge_scrolling_grid">
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]