GNOME.org
 

[gtk+] Fix fallout from the show-close-button rename

commit 029a84aa74acbd450af9c61d1ea6549a0d4d9e66
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Dec 8 11:29:14 2017 -0500

    Fix fallout from the show-close-button rename
    
    I had overlooked ui files. We should really
    validate those during build.

 demos/gtk-demo/fishbowl.ui             |    2 +-
 demos/gtk-demo/main.ui                 |    2 +-
 demos/gtk-demo/modelbutton.ui          |    2 +-
 demos/icon-browser/window.ui           |    2 +-
 demos/widget-factory/widget-factory.ui |    2 +-
 examples/application10/window.ui       |    2 +-
 gtk/gtkshortcutswindow.c               |    2 +-
 gtk/gtkwindow.c                        |    2 +-
 gtk/inspector/window.ui                |    2 +-
 gtk/ui/gtkaboutdialog.ui               |    2 +-
 gtk/ui/gtkdialog.ui                    |    2 +-
 tests/testsplitheaders.c               |   12 ++++++------
 tests/testtitlebar.c                   |    2 +-
 13 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/demos/gtk-demo/fishbowl.ui b/demos/gtk-demo/fishbowl.ui
index f186999..2579fc7 100644
--- a/demos/gtk-demo/fishbowl.ui
+++ b/demos/gtk-demo/fishbowl.ui
@@ -6,7 +6,7 @@
     <child type="titlebar">
       <object class="GtkHeaderBar" id="">
         <property name="visible">True</property>
-        <property name="show-close-button">True</property>
+        <property name="show-title-buttons">True</property>
         <child>
           <object class="GtkLabel" id="info_label">
             <property name="visible">True</property>
diff --git a/demos/gtk-demo/main.ui b/demos/gtk-demo/main.ui
index 99b4957..7e16168 100644
--- a/demos/gtk-demo/main.ui
+++ b/demos/gtk-demo/main.ui
@@ -24,7 +24,7 @@
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar">
         <property name="visible">1</property>
-        <property name="show-close-button">1</property>
+        <property name="show-title-buttons">1</property>
         <child>
           <object class="GtkButton">
             <property name="visible">1</property>
diff --git a/demos/gtk-demo/modelbutton.ui b/demos/gtk-demo/modelbutton.ui
index 8fbd90c..ead3da1 100644
--- a/demos/gtk-demo/modelbutton.ui
+++ b/demos/gtk-demo/modelbutton.ui
@@ -5,7 +5,7 @@
     <child type="titlebar">
       <object class="GtkHeaderBar">
         <property name="visible">1</property>
-        <property name="show-close-button">1</property>
+        <property name="show-title-buttons">1</property>
         <property name="title" translatable="yes">Model Button</property>
       </object>
     </child>
diff --git a/demos/icon-browser/window.ui b/demos/icon-browser/window.ui
index 68c8767..c04aec2 100644
--- a/demos/icon-browser/window.ui
+++ b/demos/icon-browser/window.ui
@@ -15,7 +15,7 @@
       <object class="GtkHeaderBar" id="header">
         <property name="visible">True</property>
         <property name="title" translatable="yes">Icon Browser</property>
-        <property name="show-close-button">True</property>
+        <property name="show-title-buttons">True</property>
         <child type="title">
           <object class="GtkBox">
             <property name="visible">True</property>
diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index b6d24cb..064c534 100644
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -400,7 +400,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
     <property name="title">GTK+ Widget Factory</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar1">
-        <property name="show-close-button">1</property>
+        <property name="show-title-buttons">1</property>
         <child type="title">
           <object class="GtkStackSwitcher" id="stack_switcher">
             <property name="stack">toplevel_stack</property>
diff --git a/examples/application10/window.ui b/examples/application10/window.ui
index 6c02697..c751dc6 100644
--- a/examples/application10/window.ui
+++ b/examples/application10/window.ui
@@ -8,7 +8,7 @@
         <child type="titlebar">
           <object class="GtkHeaderBar" id="header">
             <property name="visible">True</property>
-            <property name="show-close-button">True</property>
+            <property name="show-title-buttons">True</property>
             <child>
               <object class="GtkLabel" id="lines_label">
                 <property name="visible">False</property>
diff --git a/gtk/gtkshortcutswindow.c b/gtk/gtkshortcutswindow.c
index 7f77a53..6499c04 100644
--- a/gtk/gtkshortcutswindow.c
+++ b/gtk/gtkshortcutswindow.c
@@ -875,7 +875,7 @@ gtk_shortcuts_window_init (GtkShortcutsWindow *self)
   priv->search_image_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 
   priv->header_bar = g_object_new (GTK_TYPE_HEADER_BAR,
-                                   "show-close-button", TRUE,
+                                   "show-title-buttons", TRUE,
                                    NULL);
   gtk_window_set_titlebar (GTK_WINDOW (self), GTK_WIDGET (priv->header_bar));
 
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 3650734..eb00059 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -5973,7 +5973,7 @@ create_titlebar (GtkWindow *window)
   g_object_set (titlebar,
                 "title", priv->title ? priv->title : get_default_title (),
                 "has-subtitle", FALSE,
-                "show-close-button", TRUE,
+                "show-title-buttons", TRUE,
                 NULL);
   context = gtk_widget_get_style_context (titlebar);
   gtk_style_context_add_class (context, GTK_STYLE_CLASS_TITLEBAR);
diff --git a/gtk/inspector/window.ui b/gtk/inspector/window.ui
index 9ab5774..f2a12c1 100644
--- a/gtk/inspector/window.ui
+++ b/gtk/inspector/window.ui
@@ -14,7 +14,7 @@
     <property name="icon">resource:///org/gtk/libgtk/inspector/logo.png</property>
     <child type="titlebar">
       <object class="GtkHeaderBar">
-        <property name="show-close-button">1</property>
+        <property name="show-title-buttons">1</property>
         <child>
           <object class="GtkStack" id="button_stack">
             <property name="visible-child-name" bind-source="top_stack" bind-property="visible-child-name"/>
diff --git a/gtk/ui/gtkaboutdialog.ui b/gtk/ui/gtkaboutdialog.ui
index ac0bfa7..46f9c74 100644
--- a/gtk/ui/gtkaboutdialog.ui
+++ b/gtk/ui/gtkaboutdialog.ui
@@ -7,7 +7,7 @@
     <child internal-child="headerbar">
       <object class="GtkHeaderBar" id="headerbar1">
         <property name="visible">1</property>
-        <property name="show-close-button">1</property>
+        <property name="show-title-buttons">1</property>
         <child type="title">
           <object class="GtkStackSwitcher" id="stack_switcher">
             <property name="visible">0</property>
diff --git a/gtk/ui/gtkdialog.ui b/gtk/ui/gtkdialog.ui
index 250bfb1..0f7f3af 100644
--- a/gtk/ui/gtkdialog.ui
+++ b/gtk/ui/gtkdialog.ui
@@ -7,7 +7,7 @@
     <signal name="delete-event" handler="gtk_dialog_delete_event_handler" swapped="no"/>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar">
-        <property name="show-close-button">1</property>
+        <property name="show-title-buttons">1</property>
       </object>
     </child>
     <child>
diff --git a/tests/testsplitheaders.c b/tests/testsplitheaders.c
index 7d89418..62cb890 100644
--- a/tests/testsplitheaders.c
+++ b/tests/testsplitheaders.c
@@ -61,15 +61,15 @@ main (int argc, char *argv[])
   entry = (GtkWidget *)gtk_builder_get_object (builder, "layout-entry");
   g_object_bind_property (settings, "gtk-decoration-layout",
                           entry, "text",
-                          G_BINDING_BIDIRECTIONAL|G_BINDING_SYNC_CREATE);                      
+                          G_BINDING_BIDIRECTIONAL|G_BINDING_SYNC_CREATE);
   check = (GtkWidget *)gtk_builder_get_object (builder, "decorations");
   header = (GtkWidget *)gtk_builder_get_object (builder, "sidebar-header");
-  g_object_bind_property (check, "active", 
-                          header, "show-close-button",
-                         G_BINDING_DEFAULT);                      
+  g_object_bind_property (check, "active",
+                          header, "show-title-buttons",
+                         G_BINDING_DEFAULT);
   header = (GtkWidget *)gtk_builder_get_object (builder, "main-header");
-  g_object_bind_property (check, "active", 
-                          header, "show-close-button",
+  g_object_bind_property (check, "active",
+                          header, "show-title-buttons",
                          G_BINDING_DEFAULT);                      
   gtk_window_present (GTK_WINDOW (win));
 
diff --git a/tests/testtitlebar.c b/tests/testtitlebar.c
index 2e40457..49c89b5 100644
--- a/tests/testtitlebar.c
+++ b/tests/testtitlebar.c
@@ -148,7 +148,7 @@ activate (GApplication *gapp)
   label = gtk_label_new ("Decorations");
   gtk_widget_set_halign (label, GTK_ALIGN_END);
   check = gtk_check_button_new ();
-  g_object_bind_property (header, "show-close-button",
+  g_object_bind_property (header, "show-title-buttons",
                           check, "active",
                           G_BINDING_BIDIRECTIONAL|G_BINDING_SYNC_CREATE);
   gtk_grid_attach (GTK_GRID (grid), label, 2, 0, 1, 1);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]