[gnome-control-center] printers: Use gtk_stack_set_visible_child instead of names



commit 015c79411ad52de8123b4eb71f961bbbd2f6c6b3
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri Nov 23 12:11:37 2018 +1300

    printers: Use gtk_stack_set_visible_child instead of names

 panels/printers/pp-options-dialog.c  | 8 +++++---
 panels/printers/pp-options-dialog.ui | 8 +-------
 2 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/panels/printers/pp-options-dialog.c b/panels/printers/pp-options-dialog.c
index 9e608a77f..6039262f1 100644
--- a/panels/printers/pp-options-dialog.c
+++ b/panels/printers/pp-options-dialog.c
@@ -45,10 +45,11 @@ struct _PpOptionsDialog {
 
   GtkTreeSelection *categories_selection;
   GtkTreeView      *categories_treeview;
+  GtkBox           *main_box;
   GtkNotebook      *notebook;
   GtkSpinner       *spinner;
   GtkStack         *stack;
-  GtkButton   *test_page_button;
+  GtkButton        *test_page_button;
 
   gchar       *printer_name;
 
@@ -522,7 +523,7 @@ populate_options_real (PpOptionsDialog *self)
 
   gtk_spinner_stop (self->spinner);
 
-  gtk_stack_set_visible_child_name (self->stack, "main-box");
+  gtk_stack_set_visible_child (self->stack, GTK_WIDGET (self->main_box));
 
   if (self->ipp_attributes)
     {
@@ -769,7 +770,7 @@ populate_options (PpOptionsDialog *self)
       "orientation-requested-default",
       NULL};
 
-  gtk_stack_set_visible_child_name (self->stack, "progress-box");
+  gtk_stack_set_visible_child (self->stack, GTK_WIDGET (self->spinner));
 
   renderer = gtk_cell_renderer_text_new ();
 
@@ -970,6 +971,7 @@ pp_options_dialog_class_init (PpOptionsDialogClass *klass)
 
   gtk_widget_class_bind_template_child (widget_class, PpOptionsDialog, categories_selection);
   gtk_widget_class_bind_template_child (widget_class, PpOptionsDialog, categories_treeview);
+  gtk_widget_class_bind_template_child (widget_class, PpOptionsDialog, main_box);
   gtk_widget_class_bind_template_child (widget_class, PpOptionsDialog, notebook);
   gtk_widget_class_bind_template_child (widget_class, PpOptionsDialog, spinner);
   gtk_widget_class_bind_template_child (widget_class, PpOptionsDialog, stack);
diff --git a/panels/printers/pp-options-dialog.ui b/panels/printers/pp-options-dialog.ui
index 02f3e40e5..3efaa3a72 100644
--- a/panels/printers/pp-options-dialog.ui
+++ b/panels/printers/pp-options-dialog.ui
@@ -30,7 +30,7 @@
             <property name="visible">True</property>
             <property name="homogeneous">True</property>
             <child>
-              <object class="GtkBox">
+              <object class="GtkBox" id="main_box">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
@@ -87,9 +87,6 @@
                   </packing>
                 </child>
               </object>
-              <packing>
-                <property name="name">main-box</property>
-              </packing>
             </child>
             <child>
               <object class="GtkSpinner" id="spinner">
@@ -98,9 +95,6 @@
                 <property name="height_request">24</property>
                 <property name="can_focus">False</property>
               </object>
-              <packing>
-                <property name="name">progress-box</property>
-              </packing>
             </child>
           </object>
         </child>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]