[gnome-control-center] mouse: Remove unused toplevel windows from .ui files
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] mouse: Remove unused toplevel windows from .ui files
- Date: Tue, 1 Oct 2013 08:06:42 +0000 (UTC)
commit 98ec15a5d5c7c7dc0eb89a0bcde70a1366cb513c
Author: Rui Matos <tiagomatos gmail com>
Date: Tue Sep 17 15:01:10 2013 +0200
mouse: Remove unused toplevel windows from .ui files
https://bugzilla.gnome.org/show_bug.cgi?id=708286
panels/mouse/gnome-mouse-properties.c | 2 +-
panels/mouse/gnome-mouse-properties.ui | 71 --------------------------------
panels/mouse/gnome-mouse-test.c | 2 +-
panels/mouse/gnome-mouse-test.ui | 5 --
4 files changed, 2 insertions(+), 78 deletions(-)
---
diff --git a/panels/mouse/gnome-mouse-properties.c b/panels/mouse/gnome-mouse-properties.c
index 168e606..5175306 100644
--- a/panels/mouse/gnome-mouse-properties.c
+++ b/panels/mouse/gnome-mouse-properties.c
@@ -359,7 +359,7 @@ cc_mouse_properties_init (CcMouseProperties *object)
d->changing_scroll = FALSE;
- gtk_widget_reparent (WID ("prefs_widget"), GTK_WIDGET (object));
+ gtk_container_add (GTK_CONTAINER (object), WID ("prefs_widget"));
create_dialog (d);
setup_dialog (d);
diff --git a/panels/mouse/gnome-mouse-properties.ui b/panels/mouse/gnome-mouse-properties.ui
index 3735903..77ae3d3 100644
--- a/panels/mouse/gnome-mouse-properties.ui
+++ b/panels/mouse/gnome-mouse-properties.ui
@@ -22,17 +22,6 @@
<property name="step_increment">100</property>
<property name="page_increment">100</property>
</object>
- <object class="GtkDialog" id="mouse_properties_dialog">
- <property name="can_focus">False</property>
- <property name="border_width">5</property>
- <property name="title" translatable="yes">Mouse Preferences</property>
- <property name="type_hint">dialog</property>
- <child internal-child="vbox">
- <object class="GtkBox" id="dialog-vbox1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
<object class="GtkBox" id="prefs_widget">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -706,64 +695,4 @@
</packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="helpbutton1">
- <property name="label">gtk-help</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="closebutton1">
- <property name="label">gtk-close</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="0">helpbutton1</action-widget>
- <action-widget response="0">closebutton1</action-widget>
- </action-widgets>
- </object>
</interface>
diff --git a/panels/mouse/gnome-mouse-test.c b/panels/mouse/gnome-mouse-test.c
index 285b257..64828da 100644
--- a/panels/mouse/gnome-mouse-test.c
+++ b/panels/mouse/gnome-mouse-test.c
@@ -374,7 +374,7 @@ cc_mouse_test_init (CcMouseTest *object)
d->button_drawing_area_timeout_id = 0;
d->scroll_image_timeout_id = 0;
- gtk_widget_reparent (WID ("test_widget"), GTK_WIDGET (object));
+ gtk_container_add (GTK_CONTAINER (object), WID ("test_widget"));
setup_dialog (d);
}
diff --git a/panels/mouse/gnome-mouse-test.ui b/panels/mouse/gnome-mouse-test.ui
index b1a2e99..b532697 100644
--- a/panels/mouse/gnome-mouse-test.ui
+++ b/panels/mouse/gnome-mouse-test.ui
@@ -7,9 +7,6 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkWindow" id="mouse_test_window">
- <property name="can_focus">False</property>
- <child>
<object class="GtkGrid" id="test_widget">
<property name="height_request">540</property>
<property name="visible">True</property>
@@ -98,6 +95,4 @@
</packing>
</child>
</object>
- </child>
- </object>
</interface>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]