Show the default app for a content type only if recommended

The default application for a content type is selected depending on
whether it matches the given content type or any of its sub-classes.
This means that we might end up showing a text editor for the
`text/calendar` MIME type because it matches the `text/*` super-class.
The recommended applications, on the other hand, match the exact content
type.

Fixes: #377

.gitlab-ci.yml

@@ -12,7 +12,7 @@ stages:
     - subprojects/libepoxy/
     - subprojects/pango/
 
-fedora-x86_64: &fedora-x86_64-defaults
+fedora-x86_64:
   image: registry.gitlab.gnome.org/gnome/gtk/master:v7
   stage: build
   script:
@@ -33,11 +33,6 @@ fedora-x86_64: &fedora-x86_64-defaults
     key: "$CI_JOB_NAME"
     <<: *cache-paths
 
-fedora-x86_64-staticlibs:
-  variables:
-    EXTRA_MESON_FLAGS: "-Ddefault_library=both"
-  <<: *fedora-x86_64-defaults
-
 .mingw-defaults: &mingw-defaults
   stage: build
   tags:

.gitlab-ci/test-docker.sh

@@ -17,7 +17,6 @@ meson \
         -Dbroadway-backend=true \
         -Dvulkan=yes \
         --werror \
-        ${EXTRA_MESON_FLAGS:-} \
         _build $srcdir
 unset CCACHE_DISABLE
 

demos/constraint-editor/constraint-view.c

@@ -169,7 +169,6 @@ constraint_view_init (ConstraintView *self)
   GListModel *guides;
   GListModel *children;
   GListModel *constraints;
-  GtkFilter *filter;
 
   manager = gtk_constraint_layout_new ();
   gtk_widget_set_layout_manager (GTK_WIDGET (self), manager);
@@ -177,12 +176,8 @@ constraint_view_init (ConstraintView *self)
   all_children = gtk_widget_observe_children (GTK_WIDGET (self));
   all_constraints = gtk_constraint_layout_observe_constraints (GTK_CONSTRAINT_LAYOUT (manager));
   guides = gtk_constraint_layout_observe_guides (GTK_CONSTRAINT_LAYOUT (manager));
-  filter = gtk_custom_filter_new (omit_internal, NULL, NULL);
-  constraints = (GListModel *)gtk_filter_list_model_new (all_constraints, filter);
-  g_object_unref (filter);
-  filter = gtk_custom_filter_new (omit_internal, NULL, NULL);
-  children = (GListModel *)gtk_filter_list_model_new (all_children, filter);
-  g_object_unref (filter);
+  constraints = (GListModel *)gtk_filter_list_model_new (all_constraints, omit_internal, NULL, NULL);
+  children = (GListModel *)gtk_filter_list_model_new (all_children, omit_internal, NULL, NULL);
 
   list = g_list_store_new (G_TYPE_LIST_MODEL);
   g_list_store_append (list, children);

demos/constraint-editor/guide-editor.c

@@ -184,6 +184,58 @@ max_input (GtkSpinButton *spin_button,
   return FALSE;
 }
 
+static gboolean
+min_output (GtkSpinButton *spin_button)
+{
+  GtkAdjustment *adjustment;
+  double value;
+  GtkWidget *box, *text;
+
+  adjustment = gtk_spin_button_get_adjustment (spin_button);
+  value = gtk_adjustment_get_value (adjustment);
+
+  box = gtk_widget_get_first_child (GTK_WIDGET (spin_button));
+  text = gtk_widget_get_first_child (box);
+
+  if (value == 0.0)
+    {
+      gtk_editable_set_text (GTK_EDITABLE (spin_button), "");
+      gtk_text_set_placeholder_text (GTK_TEXT (text), "unset");
+      return TRUE;
+    }
+  else
+    {
+      gtk_text_set_placeholder_text (GTK_TEXT (text), "");
+      return FALSE;
+    }
+}
+
+static gboolean
+max_output (GtkSpinButton *spin_button)
+{
+  GtkAdjustment *adjustment;
+  double value;
+  GtkWidget *box, *text;
+
+  adjustment = gtk_spin_button_get_adjustment (spin_button);
+  value = gtk_adjustment_get_value (adjustment);
+
+  box = gtk_widget_get_first_child (GTK_WIDGET (spin_button));
+  text = gtk_widget_get_first_child (box);
+
+  if (value == (double)G_MAXINT)
+    {
+      gtk_editable_set_text (GTK_EDITABLE (spin_button), "");
+      gtk_text_set_placeholder_text (GTK_TEXT (text), "unset");
+      return TRUE;
+    }
+  else
+    {
+      gtk_text_set_placeholder_text (GTK_TEXT (text), "");
+      return FALSE;
+    }
+}
+
 static void
 guide_editor_constructed (GObject *object)
 {
@@ -192,12 +244,16 @@ guide_editor_constructed (GObject *object)
   guide_strength_combo (editor->strength);
 
   g_signal_connect (editor->min_width, "input", G_CALLBACK (min_input), NULL);
+  g_signal_connect (editor->min_width, "output", G_CALLBACK (min_output), NULL);
 
   g_signal_connect (editor->min_height, "input", G_CALLBACK (min_input), NULL);
+  g_signal_connect (editor->min_height, "output", G_CALLBACK (min_output), NULL);
 
   g_signal_connect (editor->max_width, "input", G_CALLBACK (max_input), NULL);
+  g_signal_connect (editor->max_width, "output", G_CALLBACK (max_output), NULL);
 
   g_signal_connect (editor->max_height, "input", G_CALLBACK (max_input), NULL);
+  g_signal_connect (editor->max_height, "output", G_CALLBACK (max_output), NULL);
 
   if (editor->guide)
     {

demos/gtk-demo/award.c

@@ -1,247 +0,0 @@
-/*
- * Copyright © 2018 Benjamin Otte
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Benjamin Otte <otte@gnome.org>
- */
-
-#include "award.h"
-
-struct _GtkAward
-{
-  GObject parent;
-
-  char *explanation;
-  char *name;
-  char *title;
-  GDateTime *granted; /* or NULL if not granted */
-};
-
-enum {
-  PROP_0,
-  PROP_EXPLANATION,
-  PROP_NAME,
-  PROP_TITLE,
-  PROP_GRANTED,
-
-  N_PROPS,
-};
-
-static GParamSpec *properties[N_PROPS] = { NULL, };
-
-G_DEFINE_TYPE (GtkAward, gtk_award, G_TYPE_OBJECT)
-
-static void
-gtk_award_set_property (GObject      *object,
-                        guint         prop_id,
-                        const GValue *value,
-                        GParamSpec   *pspec)
-
-{
-  GtkAward *self = GTK_AWARD (object);
-
-  switch (prop_id)
-    {
-    case PROP_EXPLANATION:
-      self->explanation = g_value_dup_string (value);
-      break;
-
-    case PROP_NAME:
-      self->name = g_value_dup_string (value);
-      break;
-
-    case PROP_TITLE:
-      self->title = g_value_dup_string (value);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_award_get_property (GObject    *object,
-                        guint       prop_id,
-                        GValue     *value,
-                        GParamSpec *pspec)
-{
-  GtkAward *self = GTK_AWARD (object);
-
-  switch (prop_id)
-    {
-    case PROP_EXPLANATION:
-      g_value_set_string (value, self->explanation);
-      break;
-
-    case PROP_NAME:
-      g_value_set_string (value, self->name);
-      break;
-
-    case PROP_TITLE:
-      g_value_set_string (value, self->title);
-      break;
-
-    case PROP_GRANTED:
-      g_value_set_boxed (value, self->granted);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_award_dispose (GObject *object)
-{
-  GtkAward *self = GTK_AWARD (object);
-
-  g_clear_pointer (&self->name, g_free);
-  g_clear_pointer (&self->title, g_free);
-  g_clear_pointer (&self->granted, g_date_time_unref);
-
-  G_OBJECT_CLASS (gtk_award_parent_class)->dispose (object);
-}
-
-static void
-gtk_award_class_init (GtkAwardClass *class)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (class);
-
-  gobject_class->set_property = gtk_award_set_property;
-  gobject_class->get_property = gtk_award_get_property;
-  gobject_class->dispose = gtk_award_dispose;
-
-  properties[PROP_EXPLANATION] =
-    g_param_spec_string ("explanation",
-                         "Explanation",
-                         "How to get the title",
-                         NULL,
-                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
-
-  properties[PROP_NAME] =
-    g_param_spec_string ("name",
-                         "Name",
-                         "internal name of the award",
-                         NULL,
-                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
-
-  properties[PROP_TITLE] =
-    g_param_spec_string ("title",
-                         "Title",
-                         "user-visible title",
-                         NULL,
-                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
-
-  properties[PROP_GRANTED] =
-    g_param_spec_boxed ("granted",
-                        "Granted",
-                        "Timestamp the award was granted or NULL if not granted yet",
-                        G_TYPE_DATE_TIME,
-                        G_PARAM_READABLE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
-
-  g_object_class_install_properties (gobject_class, N_PROPS, properties);
-}
-
-static void
-gtk_award_init (GtkAward *self)
-{
-}
-
-GListModel *
-gtk_award_get_list (void)
-{
-  static GListModel *list = NULL;
-
-  if (list == NULL)
-    {
-      GtkBuilder *builder;
-
-      g_type_ensure (GTK_TYPE_AWARD);
-      builder = gtk_builder_new_from_resource ("/awards.ui");
-      list = G_LIST_MODEL (gtk_builder_get_object (builder, "list"));
-      g_object_ref (list);
-      g_object_unref (builder);
-    }
-
-  return g_object_ref (list);
-}
-
-const char *
-gtk_award_get_name (GtkAward *award)
-{
-  return award->name;
-}
-
-const char *
-gtk_award_get_title (GtkAward *award)
-{
-  return award->title;
-}
-
-GDateTime *
-gtk_award_get_granted (GtkAward *award)
-{
-  return award->granted;
-}
-
-GtkAward *
-award_find (const char *name)
-{
-  GListModel *list;
-  GtkAward *self;
-  guint i;
-
-  list = gtk_award_get_list ();
-  g_object_unref (list);
-
-  for (i = 0; i < g_list_model_get_n_items (list); i++)
-    {
-      self = g_list_model_get_item (list, i);
-      g_object_unref (self);
-
-      if (g_ascii_strcasecmp (name, self->name) == 0)
-        return self;
-    }
-
-  return NULL;
-}
-
-void
-award (const char *name)
-{
-  GtkAward *self;
-  GNotification *notification;
-
-  self = award_find (name);
-  if (self == NULL)
-    {
-      g_warning ("Did not find award \"%s\"", name);
-      return;
-    }
-
-  if (self->granted)
-    return;
-
-  self->granted = g_date_time_new_now_utc ();
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_GRANTED]);
-
-  notification = g_notification_new ("You won an award!");
-  g_notification_set_body (notification, self->title);
-  g_application_send_notification (g_application_get_default (), NULL, notification);
-  g_object_unref (notification);
-}
-

demos/gtk-demo/award.h

@@ -1,18 +0,0 @@
-#ifndef __AWARD_H__
-#define __AWARD_H__
-
-#include <gtk/gtk.h>
-
-#define GTK_TYPE_AWARD (gtk_award_get_type ())
-
-G_DECLARE_FINAL_TYPE (GtkAward, gtk_award, GTK, AWARD, GObject)
-
-GListModel *    gtk_award_get_list                      (void);
-
-const char *    gtk_award_get_name                      (GtkAward               *award);
-const char *    gtk_award_get_title                     (GtkAward               *award);
-GDateTime *     gtk_award_get_granted                   (GtkAward               *award);
-
-void            award                                   (const char             *name);
-
-#endif /* __AWARD_H__ */

demos/gtk-demo/awardlistitem.ui

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk40">
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkLabel">
-        <property name="label" bind-source="GtkListItem" bind-property="position"></property>
-        <property name="margin">6</property>
-      </object>
-    </property>
-  </template>
-</interface>

demos/gtk-demo/awards.ui

@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GListStore" id="list">
-    <property name="item-type">GtkAward</property>
-    <child>
-      <object class="GtkAward">
-        <property name="name">demo-inspector</property>
-        <!-- Transformers -->
-        <property name="title" translatable="yes">You got a high-rise double-pump carburetor.</property>
-        <property name="explanation" translatable="yes">Launch the inspector</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkAward">
-        <property name="name">demo-start</property>
-        <!-- The Matrix -->
-        <property name="title" translatable="yes">After this, there is no turning back.</property>
-        <property name="explanation" translatable="yes">Start gtk-demo</property>
-      </object>
-    </child>
-
-    <child>
-      <object class="GtkAward">
-        <property name="name">listbox-reshare</property>
-        <!-- Mean Girls -->
-        <property name="title" translatable="yes">Trying to make fetch happen</property>
-        <property name="explanation" translatable="yes">Reshare a tweet</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkAward">
-        <property name="name">listbox-100th-row</property>
-        <!-- Aladdin -->
-        <property name="title" translatable="yes">The ever impressive, long contained, often imitated, but never duplicated Genie of the lamp.</property>
-        <property name="explanation" translatable="yes">Select a 100th row in a list</property>
-      </object>
-    </child>
-
-    <child>
-      <object class="GtkAward">
-        <property name="name">password-best</property>
-        <!-- Spaceballs -->
-        <property name="title" translatable="yes">I've got the same combination on my luggage!</property>
-        <property name="explanation" translatable="yes">Use "12345" as the password</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkAward">
-        <property name="name">password-correct</property>
-        <!-- Stanley Parable -->
-        <property name="title" translatable="yes">Night Shark 1-1-5</property>
-        <property name="explanation" translatable="yes">Correctly enter a password</property>
-      </object>
-    </child>
-
-    <child>
-      <object class="GtkAward">
-        <property name="name">puzzle-give-up</property>
-        <!-- Pretty Woman -->
-        <property name="title" translatable="yes">Big Mistake. Big. Huge!</property>
-        <property name="explanation" translatable="yes">Close the puzzle without finishing it</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkAward">
-        <property name="name">puzzle-solve</property>
-        <!-- The Incredibles -->
-        <property name="title" translatable="yes">That was totally wicked!</property>
-        <property name="explanation" translatable="yes">Solve a puzzle</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkAward">
-        <property name="name">puzzle-solve-animated</property>
-        <!-- The Phantom Menace -->
-        <property name="title" translatable="yes">A surprise to be sure but a welcome one.</property>
-        <property name="explanation" translatable="yes">Solve an animated puzzle</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkAward">
-        <property name="name">puzzle-solve-large</property>
-        <!-- Portal -->
-        <property name="title" translatable="yes">Science isn't about WHY. It's about WHY NOT?!</property>
-        <property name="explanation" translatable="yes">Solve a puzzle with at least 20 pieces</property>
-      </object>
-    </child>
-  </object>
-</interface>

demos/gtk-demo/awardview.c

@@ -1,49 +0,0 @@
-/* Awards
- *
- * This demo demonstrates how to use lists to show the awards you have collected
- * while exploring this demo.
- *
- */
-
-#include <gtk/gtk.h>
-
-/* Include the header for accessing the awards */
-#include "award.h"
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_awardview (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkWidget *sw, *listview;
-      GListModel *list;
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Awards");
-      gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (window), sw);
-
-      listview = gtk_list_view_new_with_factory (
-          gtk_builder_list_item_factory_new_from_resource (NULL, "/awardview/awardlistitem.ui"));
-      list = gtk_award_get_list ();
-      gtk_list_view_set_model (GTK_LIST_VIEW (listview), list);
-      g_object_unref (list);
-      gtk_list_view_set_show_separators (GTK_LIST_VIEW (listview), TRUE);
-      gtk_container_add (GTK_CONTAINER (sw), listview);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/builder.c

@@ -59,6 +59,7 @@ do_builder (GtkWidget *do_widget)
 
       builder = gtk_builder_new_from_resource ("/builder/demo.ui");
 
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

demos/gtk-demo/cursors.c

@@ -24,6 +24,7 @@ do_cursors (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/cursors/cursors.ui");
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

demos/gtk-demo/demo.gresource.xml

@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/">
-    <file>awards.ui</file>
-  </gresource>
   <gresource prefix="/ui">
     <file preprocess="xml-stripblanks">main.ui</file>
-    <file preprocess="xml-stripblanks">main-listitem.ui</file>
     <file preprocess="xml-stripblanks">appmenu.ui</file>
   </gresource>
   <gresource prefix="/application_demo">
@@ -13,9 +9,6 @@
     <file>application.ui</file>
     <file>menus.ui</file>
   </gresource>
-  <gresource prefix="/awardview">
-    <file>awardlistitem.ui</file>
-  </gresource>
   <gresource prefix="/builder">
     <file>demo.ui</file>
   </gresource>
@@ -118,22 +111,6 @@
     <file>gnome-fs-directory.png</file>
     <file>gnome-fs-regular.png</file>
   </gresource>
-  <gresource prefix="/listview_filebrowser">
-    <file>listview_filebrowser.ui</file>
-  </gresource>
-  <gresource prefix="/listview_minesweeper">
-    <file>listview_minesweeper.ui</file>
-    <file>listview_minesweeper_cell.ui</file>
-  </gresource>
-  <gresource prefix="/listview_settings">
-    <file>listview_settings.ui</file>
-  </gresource>
-  <gresource prefix="/listview_weather">
-    <file compressed="true">listview_weather.txt</file>
-  </gresource>
-  <gresource prefix="/listview_colors">
-    <file compressed="true">color.names.txt</file>
-  </gresource>
   <gresource prefix="/shortcuts">
     <file>shortcuts.ui</file>
     <file>shortcuts-builder.ui</file>
@@ -170,7 +147,6 @@
   </gresource>
   <gresource prefix="/sources">
     <file>application_demo.c</file>
-    <file>awardview.c</file>
     <file>assistant.c</file>
     <file>builder.c</file>
     <file>changedisplay.c</file>
@@ -213,13 +189,6 @@
     <file>infobar.c</file>
     <file>links.c</file>
     <file>listbox.c</file>
-    <file>listview_applauncher.c</file>
-    <file>listview_colors.c</file>
-    <file>listview_clocks.c</file>
-    <file>listview_filebrowser.c</file>
-    <file>listview_minesweeper.c</file>
-    <file>listview_settings.c</file>
-    <file>listview_weather.c</file>
     <file>list_store.c</file>
     <file>markup.c</file>
     <file>menus.c</file>

demos/gtk-demo/filtermodel.c

@@ -122,6 +122,7 @@ do_filtermodel (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/filtermodel/filtermodel.ui");
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

demos/gtk-demo/fishbowl.c

@@ -226,8 +226,8 @@ set_widget_type (GtkFishbowl *fishbowl,
 }
 
 void
-fishbowl_next_button_clicked_cb (GtkButton *source,
-                                 gpointer   user_data)
+next_button_clicked_cb (GtkButton *source,
+                        gpointer   user_data)
 {
   GtkFishbowl *fishbowl = user_data;
   int new_index;
@@ -241,8 +241,8 @@ fishbowl_next_button_clicked_cb (GtkButton *source,
 }
 
 void
-fishbowl_prev_button_clicked_cb (GtkButton *source,
-                                 gpointer   user_data)
+prev_button_clicked_cb (GtkButton *source,
+                        gpointer   user_data)
 {
   GtkFishbowl *fishbowl = user_data;
   int new_index;
@@ -256,8 +256,8 @@ fishbowl_prev_button_clicked_cb (GtkButton *source,
 }
 
 void
-fishbowl_changes_toggled_cb (GtkToggleButton *button,
-                             gpointer         user_data)
+changes_toggled_cb (GtkToggleButton *button,
+                    gpointer         user_data)
 {
   if (gtk_toggle_button_get_active (button))
     gtk_button_set_icon_name (GTK_BUTTON (button), "changes-prevent");
@@ -265,14 +265,6 @@ fishbowl_changes_toggled_cb (GtkToggleButton *button,
     gtk_button_set_icon_name (GTK_BUTTON (button), "changes-allow");
 }
 
-char *
-format_header_cb (GObject *object,
-                  guint    count,
-                  double   fps)
-{
-  return g_strdup_printf ("%u Icons, %.2f fps", count, fps);
-}
-
 GtkWidget *
 do_fishbowl (GtkWidget *do_widget)
 {
@@ -296,6 +288,12 @@ do_fishbowl (GtkWidget *do_widget)
       g_type_ensure (GTK_TYPE_FISHBOWL);
 
       builder = gtk_builder_new_from_resource ("/fishbowl/fishbowl.ui");
+      gtk_builder_add_callback_symbols (builder,
+                                        "next_button_clicked_cb", G_CALLBACK (next_button_clicked_cb),
+                                        "prev_button_clicked_cb", G_CALLBACK (prev_button_clicked_cb),
+                                        "changes_toggled_cb", G_CALLBACK (changes_toggled_cb),
+                                        NULL);
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);

demos/gtk-demo/fishbowl.ui

@@ -15,32 +15,42 @@
             <child>
               <object class="GtkButton">
                 <property name="icon-name">pan-start-symbolic</property>
-                <signal name="clicked" handler="fishbowl_prev_button_clicked_cb" object="bowl" swapped="no"/>
+                <signal name="clicked" handler="prev_button_clicked_cb" object="bowl" swapped="no"/>
               </object>
             </child>
             <child>
               <object class="GtkButton">
                 <property name="icon-name">pan-end-symbolic</property>
-                <signal name="clicked" handler="fishbowl_next_button_clicked_cb" object="bowl" swapped="no"/>
+                <signal name="clicked" handler="next_button_clicked_cb" object="bowl" swapped="no"/>
               </object>
             </child>
           </object>
         </child>
         <child type="end">
           <object class="GtkLabel">
-            <binding name="label">
-              <closure type="gchararray" function="format_header_cb">
-                <lookup name="count">bowl</lookup>
-                <lookup name="framerate">bowl</lookup>
-              </closure>
-            </binding>
+            <property name="label">fps</property>
+          </object>
+        </child>
+        <child type="end">
+          <object class="GtkLabel">
+            <property name="label" bind-source="bowl" bind-property="framerate-string"/>
+          </object>
+        </child>
+        <child type="end">
+          <object class="GtkLabel">
+            <property name="label">Icons, </property>
+          </object>
+        </child>
+        <child type="end">
+          <object class="GtkLabel">
+            <property name="label" bind-source="bowl" bind-property="count"/>
           </object>
         </child>
         <child type="end">
           <object class="GtkToggleButton" id="changes_allow">
             <property name="icon-name">changes-allow</property>
             <property name="relief">none</property>
-            <signal name="notify::active" handler="fishbowl_changes_toggled_cb"/>
+            <signal name="notify::active" handler="changes_toggled_cb"/>
           </object>
         </child>
       </object>

demos/gtk-demo/flowbox.c

@@ -4,8 +4,6 @@
  * as needed and support sorting and filtering.
  *
  * The children of a GtkFlowBox are regular widgets
- *
- * The dataset used here has 665 colors.
  */
 
 #include <gtk/gtk.h>

demos/gtk-demo/font-features.ui

@@ -13,7 +13,7 @@
             <property name="can-focus">1</property>
             <property name="receives-default">1</property>
             <property name="tooltip-text">Reset</property>
-            <signal name="clicked" handler="font_features_reset_features" swapped="no"/>
+            <signal name="clicked" handler="reset" swapped="no"/>
             <child>
               <object class="GtkImage">
                 <property name="icon-name">view-refresh-symbolic</property>
@@ -42,7 +42,7 @@
                         <property name="receives-default">1</property>
                         <property name="font">Sans 12</property>
                         <property name="level">family|style|size|variations|features</property>
-                        <signal name="font-set" handler="font_features_font_changed" swapped="no"/>
+                        <signal name="font-set" handler="font_changed" swapped="no"/>
                       </object>
                     </child>
                     <child>
@@ -63,7 +63,7 @@
                               <object class="GtkComboBox" id="script_lang">
                                 <property name="can-focus">1</property>
                                 <property name="margin-top">10</property>
-                                <signal name="changed" handler="font_features_script_changed" swapped="no"/>
+                                <signal name="changed" handler="script_changed" swapped="no"/>
                                 <child>
                                   <object class="GtkCellRendererText"/>
                                   <attributes>
@@ -137,7 +137,7 @@
 Разъяренный чтец эгоистично бьёт пятью жердями шустрого фехтовальщика. Наш банк вчера же выплатил Ф.Я. Эйхгольду комиссию за ценные вещи. Эх, чужак, общий съём цен шляп (юфть) – вдрызг! В чащах юга жил бы цитрус? Да, но фальшивый экземпляр!
 
 Τάχιστη αλώπηξ βαφής ψημένη γη, δρασκελίζει υπέρ νωθρού κυνός</property>
-                        <signal name="activate" handler="font_features_stop_edit"/>
+                        <signal name="activate" handler="stop_edit"/>
                         <property name="valign">start</property>
                         <property name="width-chars">50</property>
                       </object>
@@ -181,7 +181,7 @@
                     <property name="icon-name">document-edit-symbolic</property>
                     <property name="halign">end</property>
                     <property name="valign">end</property>
-                    <signal name="toggled" handler="font_features_toggle_edit"/>
+                    <signal name="toggled" handler="toggle_edit"/>
                   </object>
                 </child>
               </object>

demos/gtk-demo/font_features.c

@@ -880,7 +880,7 @@ add_instance (hb_face_t    *face,
   name_id = hb_ot_var_named_instance_get_subfamily_name_id (face, index);
   hb_ot_name_get_utf8 (face, name_id, HB_LANGUAGE_INVALID, &name_len, name);
 
-  instance->name = g_strdup (name);
+  instance->name = g_strdup_printf (name);
   instance->index = index;
 
   g_hash_table_add (instances, instance);
@@ -1109,23 +1109,23 @@ done:
   g_free (design_coords);
 }
 
-void
-font_features_font_changed (void)
+static void
+font_changed (void)
 {
   update_script_combo ();
   update_features ();
   update_font_variations ();
 }
 
-void
-font_features_script_changed (void)
+static void
+script_changed (void)
 {
   update_features ();
   update_display ();
 }
 
-void
-font_features_reset_features (void)
+static void
+reset_features (void)
 {
   GList *l;
 
@@ -1170,8 +1170,8 @@ switch_to_label (void)
   update_display ();
 }
 
-void
-font_features_toggle_edit (void)
+static void
+toggle_edit (void)
 {
   if (strcmp (gtk_stack_get_visible_child_name (GTK_STACK (stack)), "label") == 0)
     switch_to_entry ();
@@ -1179,8 +1179,8 @@ font_features_toggle_edit (void)
     switch_to_label ();
 }
 
-void
-font_features_stop_edit (void)
+static void
+stop_edit (void)
 {
   g_signal_emit_by_name (edit_toggle, "clicked");
 }
@@ -1195,7 +1195,7 @@ entry_key_press (GtkEventController *controller,
   if (keyval == GDK_KEY_Escape)
     {
       gtk_editable_set_text (GTK_EDITABLE (entry), text);
-      font_features_stop_edit ();
+      stop_edit ();
       return GDK_EVENT_STOP;
     }
 
@@ -1215,6 +1215,14 @@ do_font_features (GtkWidget *do_widget)
 
       builder = gtk_builder_new_from_resource ("/font_features/font-features.ui");
 
+      gtk_builder_add_callback_symbol (builder, "update_display", update_display);
+      gtk_builder_add_callback_symbol (builder, "font_changed", font_changed);
+      gtk_builder_add_callback_symbol (builder, "script_changed", script_changed);
+      gtk_builder_add_callback_symbol (builder, "reset", reset_features);
+      gtk_builder_add_callback_symbol (builder, "stop_edit", G_CALLBACK (stop_edit));
+      gtk_builder_add_callback_symbol (builder, "toggle_edit", G_CALLBACK (toggle_edit));
+      gtk_builder_connect_signals (builder, NULL);
+
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       feature_list = GTK_WIDGET (gtk_builder_get_object (builder, "feature_list"));
       label = GTK_WIDGET (gtk_builder_get_object (builder, "label"));
@@ -1331,7 +1339,7 @@ do_font_features (GtkWidget *do_widget)
       else
         g_hash_table_remove_all (axes);
 
-      font_features_font_changed ();
+      font_changed ();
 
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);

demos/gtk-demo/fontplane.c

@@ -19,6 +19,8 @@
 
 #include "fontplane.h"
 
+#include "gtk.h"
+
 enum {
   PROP_0,
   PROP_WEIGHT_ADJUSTMENT,

demos/gtk-demo/fontrendering.c

@@ -248,6 +248,7 @@ do_fontrendering (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/fontrendering/fontrendering.ui");
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

demos/gtk-demo/fontrendering.ui

@@ -165,11 +165,10 @@
         </child>
         <child>
           <object class="GtkBox">
+            <property name="orientation">horizontal</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <style>
-              <class name="linked"/>
-            </style>
+            <style><class name="linked"/></style>
             <child>
               <object class="GtkRadioButton" id="text_radio">
                 <property name="draw-indicator">0</property>
@@ -184,7 +183,7 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">0</property>
+             <property name="left-attach">0</property>
               <property name="top-attach">3</property>
               <property name="column-span">7</property>
             </layout>

demos/gtk-demo/geninclude.py

@@ -13,16 +13,17 @@ in_files = sys.argv[2:]
 file_output = """
 typedef GtkWidget *(*GDoDemoFunc) (GtkWidget *do_widget);
 
-typedef struct _DemoData DemoData;
+typedef struct _Demo Demo;
 
-struct _DemoData
+struct _Demo
 {
-  char *name;
-  char *title;
-  char *filename;
+  gchar *name;
+  gchar *title;
+  gchar *filename;
   GDoDemoFunc func;
-  DemoData *children;
+  Demo *children;
 };
+
 """
 
 # Demo = namedtuple('Demo', ['name', 'title', 'file', 'func'])
@@ -66,7 +67,7 @@ for demo in demos:
 i = 0
 for parent in parents:
     id = parent_ids[i]
-    file_output += "\nDemoData child" + str(id) + "[] = {\n"
+    file_output += "\nDemo child" + str(id) + "[] = {\n"
     # iterate over all demos and check if the name starts with the given parent name
     for child in demos:
         if child[1].startswith(parent + "/"):
@@ -81,7 +82,7 @@ for parent in parents:
 # Sort demos by title
 demos = sorted(demos, key=lambda x: x[1])
 
-file_output += "\nDemoData gtk_demos[] = {\n"
+file_output += "\nDemo gtk_demos[] = {\n"
 for demo in demos:
     # Do not generate one of these for demos with a parent demo
     if "/" not in demo[1]:

demos/gtk-demo/gtkfishbowl.c

@@ -53,6 +53,7 @@ enum {
    PROP_BENCHMARK,
    PROP_COUNT,
    PROP_FRAMERATE,
+   PROP_FRAMERATE_STRING,
    PROP_UPDATE_DELAY,
    NUM_PROPERTIES
 };
@@ -288,6 +289,14 @@ gtk_fishbowl_get_property (GObject         *object,
       g_value_set_double (value, gtk_fishbowl_get_framerate (fishbowl));
       break;
 
+    case PROP_FRAMERATE_STRING:
+      {
+        char *s = g_strdup_printf ("%.2f", gtk_fishbowl_get_framerate (fishbowl));
+        g_value_set_string (value, s);
+        g_free (s);
+      }
+      break;
+
     case PROP_UPDATE_DELAY:
       g_value_set_int64 (value, gtk_fishbowl_get_update_delay (fishbowl));
       break;
@@ -341,6 +350,13 @@ gtk_fishbowl_class_init (GtkFishbowlClass *klass)
                            0,
                            G_PARAM_READABLE);
 
+  props[PROP_FRAMERATE_STRING] =
+      g_param_spec_string ("framerate-string",
+                           "Framerate as string",
+                           "Framerate as string, with 2 decimals",
+                           NULL,
+                           G_PARAM_READABLE);
+
   props[PROP_UPDATE_DELAY] =
       g_param_spec_int64 ("update-delay",
                           "Update delay",
@@ -492,6 +508,7 @@ gtk_fishbowl_do_update (GtkFishbowl *fishbowl)
   priv->framerate = ((int)(priv->framerate * 100))/100.0;
 
   g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_FRAMERATE]);
+  g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_FRAMERATE_STRING]);
 
   if (!priv->benchmark)
     return;

demos/gtk-demo/iconscroll.c

@@ -12,7 +12,7 @@ static GtkWidget *window = NULL;
 static GtkWidget *scrolledwindow;
 static int selected;
 
-#define N_WIDGET_TYPES 6
+#define N_WIDGET_TYPES 4
 
 
 static int hincrement = 5;
@@ -61,7 +61,6 @@ populate_icons (void)
       gtk_grid_attach (GTK_GRID (grid), create_icon (), left, top, 1, 1);
 
   hincrement = 0;
-  vincrement = 5;
 
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
 		                  GTK_POLICY_NEVER,
@@ -98,7 +97,6 @@ populate_text (gboolean hilight)
   gtk_text_view_set_buffer (GTK_TEXT_VIEW (textview), buffer);
 
   hincrement = 0;
-  vincrement = 5;
 
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
 		                  GTK_POLICY_NEVER,
@@ -123,7 +121,6 @@ populate_image (void)
   gtk_picture_set_can_shrink (GTK_PICTURE (image), FALSE);
 
   hincrement = 5;
-  vincrement = 5;
 
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
 		                  GTK_POLICY_AUTOMATIC,
@@ -131,42 +128,6 @@ populate_image (void)
   gtk_container_add (GTK_CONTAINER (scrolledwindow), image);
 }
 
-extern GtkWidget *create_weather_view (void);
-
-static void
-populate_list (void)
-{
-  GtkWidget *list;
-
-  list = create_weather_view ();
-
-  hincrement = 5;
-  vincrement = 0;
-
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-		                  GTK_POLICY_AUTOMATIC,
-		                  GTK_POLICY_AUTOMATIC);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow), list);
-}
-
-extern GtkWidget *create_color_grid (void);
-
-static void
-populate_grid (void)
-{
-  GtkWidget *list;
-
-  list = create_color_grid ();
-
-  hincrement = 0;
-  vincrement = 5;
-
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-		                  GTK_POLICY_AUTOMATIC,
-		                  GTK_POLICY_AUTOMATIC);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow), list);
-}
-
 static void
 set_widget_type (int type)
 {
@@ -201,16 +162,6 @@ set_widget_type (int type)
       populate_image ();
       break;
 
-    case 4:
-      gtk_window_set_title (GTK_WINDOW (window), "Scrolling a list");
-      populate_list ();
-      break;
-
-    case 5:
-      gtk_window_set_title (GTK_WINDOW (window), "Scrolling a grid");
-      populate_grid ();
-      break;
-
     default:
       g_assert_not_reached ();
     }
@@ -218,9 +169,9 @@ set_widget_type (int type)
   tick_cb = gtk_widget_add_tick_callback (window, scroll_cb, NULL, NULL);
 }
 
-void
-iconscroll_next_clicked_cb (GtkButton *source,
-                            gpointer   user_data)
+static void
+next_clicked_cb (GtkButton *source,
+                 gpointer   user_data)
 {
   int new_index;
 
@@ -233,9 +184,9 @@ iconscroll_next_clicked_cb (GtkButton *source,
   set_widget_type (new_index);
 }
 
-void
-iconscroll_prev_clicked_cb (GtkButton *source,
-                            gpointer   user_data)
+static void
+prev_clicked_cb (GtkButton *source,
+                 gpointer   user_data)
 {
   int new_index;
 
@@ -255,6 +206,11 @@ do_iconscroll (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/iconscroll/iconscroll.ui");
+      gtk_builder_add_callback_symbols (builder,
+                                        "next_clicked_cb", G_CALLBACK (next_clicked_cb),
+                                        "prev_clicked_cb", G_CALLBACK (prev_clicked_cb),
+                                        NULL);
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);

demos/gtk-demo/iconscroll.ui

@@ -15,13 +15,13 @@
             <child>
               <object class="GtkButton">
                 <property name="icon-name">pan-start-symbolic</property>
-                <signal name="clicked" handler="iconscroll_prev_clicked_cb"/>
+                <signal name="clicked" handler="prev_clicked_cb"/>
               </object>
             </child>
             <child>
               <object class="GtkButton">
                 <property name="icon-name">pan-end-symbolic</property>
-                <signal name="clicked" handler="iconscroll_next_clicked_cb"/>
+                <signal name="clicked" handler="next_clicked_cb"/>
               </object>
             </child>
           </object>
@@ -31,12 +31,9 @@
     <child>
       <object class="GtkScrolledWindow" id="scrolledwindow">
         <property name="hscrollbar-policy">never</property>
-        <property name="hadjustment">
-          <object class="GtkAdjustment" id="hadjustment"/>
-        </property>
-        <property name="vadjustment">
-          <object class="GtkAdjustment" id="vadjustment"/>
-        </property>
+        <property name="vscrollbar-policy">automatic</property>
+        <property name="hadjustment"><object class="GtkAdjustment" id="hadjustment"/></property> 
+        <property name="vadjustment"><object class="GtkAdjustment" id="vadjustment"/></property> 
       </object>
     </child>
   </object>

demos/gtk-demo/listbox.c

@@ -8,7 +8,6 @@
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
-#include "award.h"
 
 static GdkPixbuf *avatar_pixbuf_other;
 static GtkWidget *window = NULL;
@@ -235,9 +234,9 @@ reshare_clicked (GtkMessageRow *row,
 {
   GtkMessageRowPrivate *priv = row->priv;
 
-  award ("listbox-reshare");
   priv->message->n_reshares++;
   gtk_message_row_update (row);
+
 }
 
 static void
@@ -256,14 +255,11 @@ gtk_message_row_state_flags_changed (GtkWidget    *widget,
 {
   GtkMessageRowPrivate *priv = GTK_MESSAGE_ROW (widget)->priv;
   GtkStateFlags flags;
-  gboolean visible;
 
   flags = gtk_widget_get_state_flags (widget);
 
-  visible = flags & (GTK_STATE_FLAG_PRELIGHT | GTK_STATE_FLAG_SELECTED) ? TRUE : FALSE;
-  gtk_widget_set_visible (priv->extra_buttons_box, visible);
-  if (visible && gtk_list_box_row_get_index (GTK_LIST_BOX_ROW (widget)) % 100 == 99)
-    award ("listbox-100th-row");
+  gtk_widget_set_visible (priv->extra_buttons_box,
+                          flags & (GTK_STATE_FLAG_PRELIGHT | GTK_STATE_FLAG_SELECTED));
 
   GTK_WIDGET_CLASS (gtk_message_row_parent_class)->state_flags_changed (widget, previous_state_flags);
 }

demos/gtk-demo/listview_applauncher.c

@@ -1,200 +0,0 @@
-/* Lists/Application launcher
- *
- * This demo uses the GtkCoverFlow widget as a fancy application launcher.
- *
- * It is also a very small introduction to listviews.
- */
-
-#include <gtk/gtk.h>
-
-/* This is the function that creates the #GListModel that we need.
- * GTK list widgets need a #GListModel to display, as models support change
- * notifications.
- * Unfortunately various older APIs do not provide list models, so we create
- * our own.
- */
-static GListModel *
-create_application_list (void)
-{
-  GListStore *store;
-  GList *apps, *l;
-
-  /* We use a #GListStore here, which is a simple array-like list implementation
-   * for manual management.
-   * List models need to know what type of data they provide, so we need to
-   * provide the type here. As we want to do a list of applications, #GAppInfo
-   * is the object we provide.
-   */
-  store = g_list_store_new (G_TYPE_APP_INFO);
-
-  apps = g_app_info_get_all ();
-
-  for (l = apps; l; l = l->next)
-    {
-      g_list_store_append (store, l->data);
-    }
-
-  g_list_free_full (apps, g_object_unref);
-
-  return G_LIST_MODEL (store);
-}
-
-/* This is the function we use for setting up new listitems to display.
- * We add just a #GtkImage here to display the application's icon as this is just
- * a simple demo.
- */
-static void
-setup_listitem_cb (GtkListItemFactory *factory,
-                   GtkListItem        *list_item)
-{
-  GtkWidget *image;
-
-  image = gtk_image_new ();
-  gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
-
-  gtk_list_item_set_child (list_item, image);
-}
-
-/* Here we need to prepare the listitem for displaying its item. We get the
- * listitem already set up from the previous function, so we can reuse the
- * #GtkImage widget we set up above.
- * We get the item - which we know is a #GAppInfo because it comes out of
- * the model we set up above, grab its icon and display it.
- */
-static void
-bind_listitem_cb (GtkListItemFactory *factory,
-                  GtkListItem        *list_item)
-{
-  GtkWidget *image;
-  GAppInfo *app_info;
-
-  image = gtk_list_item_get_child (list_item);
-  app_info = gtk_list_item_get_item (list_item);
-
-  gtk_image_set_from_gicon (GTK_IMAGE (image), g_app_info_get_icon (app_info));
-}
-
-/* In more complex code, we would also need functions to unbind and teardown
- * the listitem, but this is simple code, so the default implementations are
- * enough. If we had connected signals, this step would have been necessary.
- *
- * The #GtkSignalListItemFactory documentation contains more information about
- * this step.
- */
-
-/* This function is called whenever an item in the list is activated. This is
- * the simple way to allow reacting to the Enter key or double-clicking on a
- * listitem.
- * Of course, it is possible to use far more complex interactions by turning
- * off activation and adding buttons or other widgets in the setup function
- * above, but this is a simple demo, so we'll use the simple way.
- */
-static void
-activate_cb (GtkCoverFlow *coverflow,
-             guint         position,
-             gpointer      unused)
-{
-  GAppInfo *app_info;
-  GdkAppLaunchContext *context;
-  GError *error = NULL;
-
-  app_info = g_list_model_get_item (gtk_cover_flow_get_model (coverflow), position);
-
-  /* Prepare the context for launching the application and launch it. This
-   * code is explained in detail in the documentation for #GdkAppLaunchContext
-   * and #GAppInfo.
-   */
-  context = gdk_display_get_app_launch_context (gtk_widget_get_display (GTK_WIDGET (coverflow)));
-  if (!g_app_info_launch (app_info,
-                          NULL, 
-                          G_APP_LAUNCH_CONTEXT (context),
-                          &error))
-    {
-      GtkWidget *dialog;
-
-      /* And because error handling is important, even a simple demo has it:
-       * We display an error dialog that something went wrong.
-       */
-      dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (coverflow))),
-                                       GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
-                                       GTK_MESSAGE_ERROR,
-                                       GTK_BUTTONS_CLOSE,
-                                       "Could not launch %s", g_app_info_get_display_name (app_info));
-      gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", error->message);
-      g_clear_error (&error);
-      gtk_widget_show (dialog);
-    }
-
-  g_object_unref (context);
-  g_object_unref (app_info);
-}
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_listview_applauncher (GtkWidget *do_widget)
-{
-  if (window == NULL)
-    {
-      GtkWidget *coverflow, *sw;;
-      GListModel *model;
-      GtkListItemFactory *factory;
-
-      /* Create a window and set a few defaults */
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_default_size (GTK_WINDOW (window), 640, 320);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Application Launcher");
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK(gtk_widget_destroyed), &window);
-    
-      /* The #GtkListitemFactory is what is used to create #GtkListItems
-       * to display the data from the model. So it is absolutely necessary
-       * to create one.
-       * We will use a #GtkSignalListItemFactory because it is the simplest
-       * one to use. Different ones are available for different use cases.
-       * The most powerful one is #GtkBuilderListItemFactory which uses
-       * #GtkBuilder .ui files, so it requires little code.
-       */
-      factory = gtk_signal_list_item_factory_new ();
-      g_signal_connect (factory, "setup", G_CALLBACK (setup_listitem_cb), NULL);
-      g_signal_connect (factory, "bind", G_CALLBACK (bind_listitem_cb), NULL);
-
-      /* Create the list widget here: We use a coverflow widget because it's
-       * the coolest one. We could just as well use other list widgets such
-       * as a #GtkListView or a #GtkGridView and the code would look very
-       * similar.
-       */
-      coverflow = gtk_cover_flow_new_with_factory (factory);
-      /* We connect the activate signal here. It's the function we defined
-       * above for launching the selected application.
-       */
-      g_signal_connect (coverflow, "activate", G_CALLBACK (activate_cb), NULL);
-
-      /* And of course we need to set the data model. Here we call the function
-       * we wrote above that gives us the list of applications. Then we set
-       * it on the coverflow list widget.
-       * The coverflow will now take items from the model and use the factory
-       * to create as many listitems as it needs to show itself to the user.
-       */
-      model = create_application_list ();
-      gtk_cover_flow_set_model (GTK_COVER_FLOW (coverflow), model);
-      g_object_unref (model);
-
-      /* List widgets should always be contained in a #GtkScrolledWindow,
-       * because otherwise they might get too large or they might not
-       * be scrollable.
-       */
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (window), sw);
-      gtk_container_add (GTK_CONTAINER (sw), coverflow);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/listview_clocks.c

@@ -1,491 +0,0 @@
-/* Lists/Clocks
- *
- * This demo displays the time in different timezones.
- *
- * It is using a GtkGridView.
- *
- * The goal is to show how to set up expressions that track changes
- * in objects and make them update widgets. For that, we create a
- * GtkClock object that updates its time every second and then use
- * various ways to display that time.
- *
- * Typically, this will be done using GtkBuilder .ui files with the
- * help of the <binding> tag, but this demo shows the code that runs
- * behind that.
- */
-
-#include <gtk/gtk.h>
-
-#define GTK_TYPE_CLOCK (gtk_clock_get_type ())
-G_DECLARE_FINAL_TYPE (GtkClock, gtk_clock, GTK, CLOCK, GObject)
-
-/* This is our object. It's just a timezone */
-typedef struct _GtkClock GtkClock;
-struct _GtkClock
-{
-  GObject parent_instance;
-
-  /* We allow this to be NULL for the local timezone */
-  GTimeZone *timezone;
-  /* Name of the location we're displaying time for */
-  char *location;
-};
-
-enum {
-  PROP_0,
-  PROP_LOCATION,
-  PROP_TIME,
-  PROP_TIMEZONE,
-
-  N_PROPS
-};
-
-/* This function returns the current time in the clock's timezone.
- * Note that this returns a new object every time, so we need to
- * remember to unref it after use. */
-static GDateTime *
-gtk_clock_get_time (GtkClock *clock)
-{
-  if (clock->timezone)
-    return g_date_time_new_now (clock->timezone);
-  else
-    return g_date_time_new_now_local ();
-}
-
-/* Here, we implement the functionality required by the GdkPaintable interface.
- * This way we have a trivial way to display an analog clock.
- * It also allows demonstrating how to directly use objects in the listview
- * later by making this object do something interesting. */
-static void
-gtk_clock_snapshot (GdkPaintable *paintable,
-                    GdkSnapshot  *snapshot,
-                    double        width,
-                    double        height)
-{
-  GtkClock *self = GTK_CLOCK (paintable);
-  GDateTime *time;
-  GskRoundedRect outline;
-
-#define BLACK ((GdkRGBA) { 0, 0, 0, 1 })
-
-  /* save/restore() is necessary so we can undo the transforms we start
-   * out with. */
-  gtk_snapshot_save (snapshot);
-
-  /* First, we move the (0, 0) point to the center of the area so
-   * we can draw everything relative to it. */
-  gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (width / 2, height / 2));
-  /* Next we scale it, so that we can pretend that the clock is
-   * 100px in size. That way, we don't need to do any complicated
-   * math later.
-   * We use MIN() here so that we use the smaller dimension for sizing.
-   * That way we don't overdraw but keep the aspect ratio. */
-  gtk_snapshot_scale (snapshot, MIN (width, height) / 100.0, MIN (width, height) / 100.0);
-  /* Now we have a circle with diameter 100px (and radius 50px) that
-   * has its (0, 0) point at the center.
-   * Let's draw a simple clock into it. */
-
-  time = gtk_clock_get_time (self);
-
-  /* First, draw a circle. This is a neat little trick to draw a circle
-   * without requiring Cairo. */
-  gsk_rounded_rect_init_from_rect (&outline, &GRAPHENE_RECT_INIT(-50, -50, 100, 100), 50);
-  gtk_snapshot_append_border (snapshot,
-                              &outline,
-                              (float[4]) { 4, 4, 4, 4 },
-                              (GdkRGBA [4]) { BLACK, BLACK, BLACK, BLACK });
-
-  /* Next, draw the hour hand.
-   * We do this using tranforms again: Instead of computing where the angle points
-   * to, we just rotate everything and then draw the hand as if if was :00.
-   * We don't even need to care about am/pm here because rotations just work. */
-  gtk_snapshot_save (snapshot);
-  gtk_snapshot_rotate (snapshot, 30 * g_date_time_get_hour (time) + 0.5 * g_date_time_get_minute (time));
-  gsk_rounded_rect_init_from_rect (&outline, &GRAPHENE_RECT_INIT(-2, -23, 4, 25), 2);
-  gtk_snapshot_push_rounded_clip (snapshot, &outline);
-  gtk_snapshot_append_color (snapshot, &BLACK, &outline.bounds);
-  gtk_snapshot_pop (snapshot);
-  gtk_snapshot_restore (snapshot);
-
-  /* And the same as above for the minute hand. Just make this one longer
-   * so people can tell the hands apart. */
-  gtk_snapshot_save (snapshot);
-  gtk_snapshot_rotate (snapshot, 6 * g_date_time_get_minute (time));
-  gsk_rounded_rect_init_from_rect (&outline, &GRAPHENE_RECT_INIT(-2, -43, 4, 45), 2);
-  gtk_snapshot_push_rounded_clip (snapshot, &outline);
-  gtk_snapshot_append_color (snapshot, &BLACK, &outline.bounds);
-  gtk_snapshot_pop (snapshot);
-  gtk_snapshot_restore (snapshot);
-
-  /* and finally, the second indicator. */
-  gtk_snapshot_save (snapshot);
-  gtk_snapshot_rotate (snapshot, 6 * g_date_time_get_second (time));
-  gsk_rounded_rect_init_from_rect (&outline, &GRAPHENE_RECT_INIT(-2, -43, 4, 10), 2);
-  gtk_snapshot_push_rounded_clip (snapshot, &outline);
-  gtk_snapshot_append_color (snapshot, &BLACK, &outline.bounds);
-  gtk_snapshot_pop (snapshot);
-  gtk_snapshot_restore (snapshot);
-
-  /* And finally, don't forget to restore the initial save() that we did for
-   * the initial transformations. */
-  gtk_snapshot_restore (snapshot);
-
-  g_date_time_unref (time);
-}
-
-/* Our desired size is 100px. That sounds okay for an analog clock */
-static int
-gtk_clock_get_intrinsic_width (GdkPaintable *paintable)
-{
-  return 100;
-}
-
-static int
-gtk_clock_get_intrinsic_height (GdkPaintable *paintable)
-{
-  return 100;
-}
-
-/* Initialize the paintable interface. This way we turn our clock objects
- * into objects that can be drawn.
- * There are more functions to this interface to define desired size,
- * but this is enough.
- */
-static void
-gtk_clock_paintable_init (GdkPaintableInterface *iface)
-{
-  iface->snapshot = gtk_clock_snapshot;
-  iface->get_intrinsic_width = gtk_clock_get_intrinsic_width;
-  iface->get_intrinsic_height = gtk_clock_get_intrinsic_height;
-}
-
-/* Finally, we define the type. The important part is adding the paintable
- * interface, so GTK knows that this object can indeed be drawm.
- */
-G_DEFINE_TYPE_WITH_CODE (GtkClock, gtk_clock, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
-                                                gtk_clock_paintable_init))
-
-static GParamSpec *properties[N_PROPS] = { NULL, };
-
-static void
-gtk_clock_get_property (GObject    *object,
-                        guint       property_id,
-                        GValue     *value,
-                        GParamSpec *pspec)
-{
-  GtkClock *self = GTK_CLOCK (object);
-
-  switch (property_id)
-    {
-    case PROP_LOCATION:
-      g_value_set_string (value, self->location);
-      break;
-
-    case PROP_TIME:
-      g_value_take_boxed (value, gtk_clock_get_time (self));
-      break;
-
-    case PROP_TIMEZONE:
-      g_value_set_boxed (value, self->timezone);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_clock_set_property (GObject      *object,
-                        guint         property_id,
-                        const GValue *value,
-                        GParamSpec   *pspec)
-{
-  GtkClock *self = GTK_CLOCK (object);
-
-  switch (property_id)
-    {
-    case PROP_LOCATION:
-      self->location = g_value_dup_string (value);
-      break;
-
-    case PROP_TIMEZONE:
-      self->timezone = g_value_dup_boxed (value);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-/* This is the list of all the ticking clocks */
-static GSList *ticking_clocks = NULL;
-/* This is the id of the timeout source that is updating all ticking clocks */
-static guint ticking_clock_id = 0;
-
-/* Every second, this function is called to tell everybody that the
- * clocks are ticking.
- */
-static gboolean
-gtk_clock_tick (gpointer unused)
-{
-  GSList *l;
-
-  for (l = ticking_clocks; l; l = l->next)
-    {
-      GtkClock *clock = l->data;
-
-      /* We will now return a different value for the time porperty,
-       * so notify about that.
-       */
-      g_object_notify_by_pspec (G_OBJECT (clock), properties[PROP_TIME]);
-      /* We will also draw the hands of the clock differently.
-       * So notify about that, too.
-       */
-      gdk_paintable_invalidate_contents (GDK_PAINTABLE (clock));
-    }
-
-  return G_SOURCE_CONTINUE;
-}
-
-static void
-gtk_clock_stop_ticking (GtkClock *self)
-{
-  ticking_clocks = g_slist_remove (ticking_clocks, self);
-
-  /* If no clock is remaining, stop running the tick updates */
-  if (ticking_clocks == NULL && ticking_clock_id != 0)
-    g_clear_handle_id (&ticking_clock_id, g_source_remove);
-}
-
-static void
-gtk_clock_start_ticking (GtkClock *self)
-{
-  /* if no clock is ticking yet, start */
-  if (ticking_clock_id == 0)
-    ticking_clock_id = g_timeout_add_seconds (1, gtk_clock_tick, NULL);
-
-  ticking_clocks = g_slist_prepend (ticking_clocks, self);
-}
-
-static void
-gtk_clock_finalize (GObject *object)
-{
-  GtkClock *self = GTK_CLOCK (object);
-
-  gtk_clock_stop_ticking (self);
-
-  g_free (self->location);
-  g_clear_pointer (&self->timezone, g_time_zone_unref);
-
-  G_OBJECT_CLASS (gtk_clock_parent_class)->finalize (object);
-}
-
-static void
-gtk_clock_class_init (GtkClockClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->get_property = gtk_clock_get_property;
-  gobject_class->set_property = gtk_clock_set_property;
-  gobject_class->finalize = gtk_clock_finalize;
-
-  properties[PROP_LOCATION] =
-    g_param_spec_string ("location", NULL, NULL, NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-  properties[PROP_TIME] =
-    g_param_spec_boxed ("time", NULL, NULL, G_TYPE_DATE_TIME, G_PARAM_READABLE);
-  properties[PROP_TIMEZONE] =
-    g_param_spec_boxed ("timezone", NULL, NULL, G_TYPE_TIME_ZONE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-
-  g_object_class_install_properties (gobject_class, N_PROPS, properties);
-}
-
-static void
-gtk_clock_init (GtkClock *self)
-{
-  gtk_clock_start_ticking (self);
-}
-
-static GtkClock *
-gtk_clock_new (const char *location,
-               GTimeZone  *timezone)
-{
-  GtkClock *result;
-
-  result = g_object_new (GTK_TYPE_CLOCK,
-                         "location", location,
-                         "timezone", timezone,
-                         NULL);
-
-  g_clear_pointer (&timezone, g_time_zone_unref);
-
-  return result;
-}
-
-static GListModel *
-create_clocks_model (void)
-{
-  GListStore *result;
-  GtkClock *clock;
-
-  result = g_list_store_new (GTK_TYPE_CLOCK);
-
-  /* local time */
-  clock = gtk_clock_new ("local", NULL);
-  g_list_store_append (result, clock);
-  g_object_unref (clock);
-  /* UTC time */
-  clock = gtk_clock_new ("UTC", g_time_zone_new_utc ());
-  g_list_store_append (result, clock);
-  g_object_unref (clock);
-  /* A bunch of timezones with GTK hackers */
-  clock = gtk_clock_new ("San Francisco", g_time_zone_new ("America/Los_Angeles"));
-  g_list_store_append (result, clock);
-  g_object_unref (clock);
-  clock = gtk_clock_new ("Boston", g_time_zone_new ("America/New_York"));
-  g_list_store_append (result, clock);
-  g_object_unref (clock);
-  clock = gtk_clock_new ("London", g_time_zone_new ("Europe/London"));
-  g_list_store_append (result, clock);
-  g_object_unref (clock);
-  clock = gtk_clock_new ("Berlin", g_time_zone_new ("Europe/Berlin"));
-  g_list_store_append (result, clock);
-  g_object_unref (clock);
-  clock = gtk_clock_new ("Moscow", g_time_zone_new ("Europe/Moscow"));
-  g_list_store_append (result, clock);
-  g_object_unref (clock);
-  clock = gtk_clock_new ("New Delhi", g_time_zone_new ("Asia/Kolkata"));
-  g_list_store_append (result, clock);
-  g_object_unref (clock);
-  clock = gtk_clock_new ("Shanghai", g_time_zone_new ("Asia/Shanghai"));
-  g_list_store_append (result, clock);
-  g_object_unref (clock);
-
-  return G_LIST_MODEL (result);
-}
-
-static char *
-convert_time_to_string (GObject   *image,
-                        GDateTime *time,
-                        gpointer   unused)
-{
-  return g_date_time_format (time, "%x\n%X");
-}
-
-/* And this function is the crux for this whole demo.
- * It shows how to use expressions to set up bindings.
- */
-static void
-setup_listitem_cb (GtkListItemFactory *factory,
-                   GtkListItem        *list_item)
-{
-  GtkWidget *box, *picture, *location_label, *time_label;
-  GtkExpression *clock_expression, *expression;
-
-  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_list_item_set_child (list_item, box);
-
-  /* First, we create an expression that gets us the clock from the listitem:
-   * 1. Create an expression that gets the list item.
-   * 2. Use that expression's "item" property to get the clock
-   */
-  expression = gtk_constant_expression_new (GTK_TYPE_LIST_ITEM, list_item);
-  clock_expression = gtk_property_expression_new (GTK_TYPE_LIST_ITEM, expression, "item");
-
-  /* Bind the clock's location to a label.
-   * This is easy: We just get the "location" property of the clock.
-   */
-  expression = gtk_property_expression_new (GTK_TYPE_CLOCK,
-                                            gtk_expression_ref (clock_expression),
-                                            "location");
-  /* Now create the label and bind the expression to it. */
-  location_label = gtk_label_new (NULL);
-  gtk_expression_bind (expression, location_label, "label", location_label);
-  gtk_container_add (GTK_CONTAINER (box), location_label);
-
-
-  /* Here we bind the item itself to a GdkPicture.
-   * This is simply done by using the clock expression itself.
-   */
-  expression = gtk_expression_ref (clock_expression);
-  /* Now create the widget and bind the expression to it. */
-  picture = gtk_picture_new ();
-  gtk_expression_bind (expression, picture, "paintable", picture);
-  gtk_container_add (GTK_CONTAINER (box), picture);
-
-
-  /* And finally, everything comes together.
-   * We create a label for displaying the time as text.
-   * For that, we need to transform the "GDateTime" of the
-   * time property into a string so that the label can display it.
-   */
-  expression = gtk_property_expression_new (GTK_TYPE_CLOCK,
-                                            gtk_expression_ref (clock_expression),
-                                            "time");
-  expression = gtk_cclosure_expression_new (G_TYPE_STRING,
-                                            NULL,
-                                            1, (GtkExpression *[1]) { expression },
-                                            G_CALLBACK (convert_time_to_string),
-                                            NULL, NULL);
-  /* Now create the label and bind the expression to it. */
-  time_label = gtk_label_new (NULL);
-  gtk_expression_bind (expression, time_label, "label", time_label);
-  gtk_container_add (GTK_CONTAINER (box), time_label);
-
-  gtk_expression_unref (clock_expression);
-}
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_listview_clocks (GtkWidget *do_widget)
-{
-  if (window == NULL)
-    {
-      GtkWidget *gridview, *sw;
-      GtkListItemFactory *factory;
-      GListModel *model;
-      GtkNoSelection *selection;
-
-      /* This is the normal window setup code every demo does */
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_title (GTK_WINDOW (window), "Clocks");
-      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      /* List widgets go into a scrolled window. Always. */
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (window), sw);
-
-      /* Create the factory that creates the listitems. Because we
-       * used bindings above during setup, we only need to connect
-       * to the setup signal.
-       * The bindings take care of the bind step.
-       */
-      factory = gtk_signal_list_item_factory_new ();
-      g_signal_connect (factory, "setup", G_CALLBACK (setup_listitem_cb), NULL);
-
-      gridview = gtk_grid_view_new_with_factory (factory);
-      gtk_scrollable_set_hscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);
-      gtk_scrollable_set_vscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);
-
-      model = create_clocks_model ();
-      selection = gtk_no_selection_new (model);
-      gtk_grid_view_set_model (GTK_GRID_VIEW (gridview), G_LIST_MODEL (selection));
-      gtk_container_add (GTK_CONTAINER (sw), gridview);
-      g_object_unref (selection);
-      g_object_unref (model);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/listview_colors.c

@@ -1,593 +0,0 @@
-/* Lists/Colors
- *
- * This demo displays a named colors.
- *
- * It is using a GtkGridView, and shows
- * how to sort the data in various ways.
- *
- * The dataset used here has 9283 items.
- */
-
-#include <gtk/gtk.h>
-
-#define GTK_TYPE_COLOR (gtk_color_get_type ())
-G_DECLARE_FINAL_TYPE (GtkColor, gtk_color, GTK, COLOR, GObject)
-
-/* This is our object. It's just a color */
-typedef struct _GtkColor GtkColor;
-struct _GtkColor
-{
-  GObject parent_instance;
-
-  char *name;
-  GdkRGBA *color;
-  int h, s, v;
-};
-
-enum {
-  PROP_0,
-  PROP_NAME,
-  PROP_COLOR,
-  PROP_RED,
-  PROP_GREEN,
-  PROP_BLUE,
-  PROP_HUE,
-  PROP_SATURATION,
-  PROP_VALUE,
-
-  N_PROPS
-};
-
-static void
-gtk_color_snapshot (GdkPaintable *paintable,
-                    GdkSnapshot  *snapshot,
-                    double        width,
-                    double        height)
-{
-  GtkColor *self = GTK_COLOR (paintable);
-
-  gtk_snapshot_append_color (snapshot, self->color, &GRAPHENE_RECT_INIT (0, 0, width, height));
-}
-
-static int
-gtk_color_get_intrinsic_width (GdkPaintable *paintable)
-{
-  return 32;
-}
-
-static int
-gtk_color_get_intrinsic_height (GdkPaintable *paintable)
-{
-  return 32;
-}
-
-static void
-gtk_color_paintable_init (GdkPaintableInterface *iface)
-{
-  iface->snapshot = gtk_color_snapshot;
-  iface->get_intrinsic_width = gtk_color_get_intrinsic_width;
-  iface->get_intrinsic_height = gtk_color_get_intrinsic_height;
-}
-
-/*
- * Finally, we define the type. The important part is adding the paintable
- * interface, so GTK knows that this object can indeed be drawm.
- */
-G_DEFINE_TYPE_WITH_CODE (GtkColor, gtk_color, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
-                                                gtk_color_paintable_init))
-
-static GParamSpec *properties[N_PROPS] = { NULL, };
-
-static void
-gtk_color_get_property (GObject    *object,
-                        guint       property_id,
-                        GValue     *value,
-                        GParamSpec *pspec)
-{
-  GtkColor *self = GTK_COLOR (object);
-
-  switch (property_id)
-    {
-    case PROP_NAME:
-      g_value_set_string (value, self->name);
-      break;
-
-    case PROP_COLOR:
-      g_value_set_boxed (value, self->color);
-      break;
-
-    case PROP_RED:
-      g_value_set_float (value, self->color->red);
-      break;
-
-    case PROP_GREEN:
-      g_value_set_float (value, self->color->green);
-      break;
-
-    case PROP_BLUE:
-      g_value_set_float (value, self->color->blue);
-      break;
-
-    case PROP_HUE:
-      g_value_set_int (value, self->h);
-      break;
-
-    case PROP_SATURATION:
-      g_value_set_int (value, self->s);
-      break;
-
-    case PROP_VALUE:
-      g_value_set_int (value, self->v);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_color_set_property (GObject      *object,
-                        guint         property_id,
-                        const GValue *value,
-                        GParamSpec   *pspec)
-{
-  GtkColor *self = GTK_COLOR (object);
-
-  switch (property_id)
-    {
-    case PROP_NAME:
-      self->name = g_value_dup_string (value);
-      break;
-
-    case PROP_COLOR:
-      self->color = g_value_dup_boxed (value);
-      break;
-
-    case PROP_HUE:
-      self->h = g_value_get_int (value);
-      break;
-
-    case PROP_SATURATION:
-      self->s = g_value_get_int (value);
-      break;
-
-    case PROP_VALUE:
-      self->v = g_value_get_int (value);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_color_finalize (GObject *object)
-{
-  GtkColor *self = GTK_COLOR (object);
-
-  g_free (self->name);
-  g_clear_pointer (&self->color, gdk_rgba_free);
-
-  G_OBJECT_CLASS (gtk_color_parent_class)->finalize (object);
-}
-
-static void
-gtk_color_class_init (GtkColorClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->get_property = gtk_color_get_property;
-  gobject_class->set_property = gtk_color_set_property;
-  gobject_class->finalize = gtk_color_finalize;
-
-  properties[PROP_NAME] =
-    g_param_spec_string ("name", NULL, NULL, NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-  properties[PROP_COLOR] =
-    g_param_spec_boxed ("color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-  properties[PROP_RED] =
-    g_param_spec_float ("red", NULL, NULL, 0, 1, 0, G_PARAM_READABLE);
-  properties[PROP_GREEN] =
-    g_param_spec_float ("green", NULL, NULL, 0, 1, 0, G_PARAM_READABLE);
-  properties[PROP_BLUE] =
-    g_param_spec_float ("blue", NULL, NULL, 0, 1, 0, G_PARAM_READABLE);
-  properties[PROP_HUE] =
-    g_param_spec_int ("hue", NULL, NULL, 0, 360, 0, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-  properties[PROP_SATURATION] =
-    g_param_spec_int ("saturation", NULL, NULL, 0, 100, 0, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-  properties[PROP_VALUE] =
-    g_param_spec_int ("value", NULL, NULL, 0, 100, 0, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-
-  g_object_class_install_properties (gobject_class, N_PROPS, properties);
-}
-
-static void
-gtk_color_init (GtkColor *self)
-{
-}
-
-static GtkColor *
-gtk_color_new (const char *name,
-               float r, float g, float b,
-               int h, int s, int v)
-{
-  GtkColor *result;
-  GdkRGBA color = { r, g, b, 1.0 };
-
-  result = g_object_new (GTK_TYPE_COLOR,
-                         "name", name,
-                         "color", &color,
-                         "hue", h,
-                         "saturation", s,
-                         "value", v,
-                         NULL);
-
-  return result;
-}
-
-static GListModel *
-create_colors_model (void)
-{
-  GListStore *result;
-  GtkColor *color;
-  GBytes *data;
-  char **lines;
-  guint i;
-
-  result = g_list_store_new (GTK_TYPE_COLOR);
-  data = g_resources_lookup_data ("/listview_colors/color.names.txt", 0, NULL);
-  lines = g_strsplit (g_bytes_get_data (data, NULL), "\n", 0);
-
-  for (i = 0; lines[i]; i++)
-    {
-      const char *name;
-      char **fields;
-      int red, green, blue;
-      int h, s, v;
-
-      if (lines[i][0] == '#' || lines[i][0] == '\0')
-        continue;
-
-      fields = g_strsplit (lines[i], " ", 0);
-      name = fields[1];
-      red = atoi (fields[3]);
-      green = atoi (fields[4]);
-      blue = atoi (fields[5]);
-      h = atoi (fields[9]);
-      s = atoi (fields[10]);
-      v = atoi (fields[11]);
- 
-      color = gtk_color_new (name, red / 255., green / 255., blue / 255., h, s, v);
-      g_list_store_append (result, color);
-      g_object_unref (color);
-
-      g_strfreev (fields);
-    }
-  g_strfreev (lines);
-
-  g_bytes_unref (data);
-
-  return G_LIST_MODEL (result);
-}
-
-static char *
-get_rgb_markup (gpointer this,
-                GtkColor *color)
-{
-  if (!color)
-    return NULL;
-
-  return g_strdup_printf ("<b>R:</b> %d <b>G:</b> %d <b>B:</b> %d",
-                          (int)(color->color->red * 255), 
-                          (int)(color->color->green * 255),
-                          (int)(color->color->blue * 255));
-}
-
-static char *
-get_hsv_markup (gpointer this,
-                GtkColor *color)
-{
-  if (!color)
-    return NULL;
-
-  return g_strdup_printf ("<b>H:</b> %d <b>S:</b> %d <b>V:</b> %d",
-                          color->h, 
-                          color->s,
-                          color->v);
-}
-
-static void
-setup_simple_listitem_cb (GtkListItemFactory *factory,
-                          GtkListItem        *list_item)
-{
-  GtkWidget *picture;
-  GtkExpression *color_expression, *expression;
-
-  expression = gtk_constant_expression_new (GTK_TYPE_LIST_ITEM, list_item);
-  color_expression = gtk_property_expression_new (GTK_TYPE_LIST_ITEM, expression, "item");
-
-  picture = gtk_picture_new ();
-  gtk_widget_set_size_request (picture, 32, 32);
-  gtk_expression_bind (color_expression, picture, "paintable", NULL);
-
-  gtk_list_item_set_child (list_item, picture);
-}
-
-static void
-setup_listitem_cb (GtkListItemFactory *factory,
-                   GtkListItem        *list_item)
-{
-  GtkWidget *box, *picture, *name_label, *rgb_label, *hsv_label;;
-  GtkExpression *color_expression, *expression;
-  GtkExpression *params[1];
-
-  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_list_item_set_child (list_item, box);
-
-  expression = gtk_constant_expression_new (GTK_TYPE_LIST_ITEM, list_item);
-  color_expression = gtk_property_expression_new (GTK_TYPE_LIST_ITEM, expression, "item");
-
-  expression = gtk_property_expression_new (GTK_TYPE_COLOR,
-                                            gtk_expression_ref (color_expression),
-                                            "name");
-  name_label = gtk_label_new (NULL);
-  gtk_expression_bind (expression, name_label, "label", NULL);
-  gtk_container_add (GTK_CONTAINER (box), name_label);
-
-  expression = gtk_expression_ref (color_expression);
-  picture = gtk_picture_new ();
-  gtk_expression_bind (expression, picture, "paintable", NULL);
-  gtk_container_add (GTK_CONTAINER (box), picture);
-
-  params[0] = gtk_expression_ref (color_expression);
-  expression = gtk_cclosure_expression_new (G_TYPE_STRING,
-                                            NULL,
-                                            1, params,
-                                            (GCallback)get_rgb_markup,
-                                            NULL, NULL);
-
-  rgb_label = gtk_label_new (NULL);
-  gtk_label_set_use_markup (GTK_LABEL (rgb_label), TRUE);
-  gtk_expression_bind (expression, rgb_label, "label", NULL);
-  gtk_container_add (GTK_CONTAINER (box), rgb_label);
-
-  params[0] = gtk_expression_ref (color_expression);
-  expression = gtk_cclosure_expression_new (G_TYPE_STRING,
-                                            NULL,
-                                            1, params,
-                                            (GCallback)get_hsv_markup,
-                                            NULL, NULL);
-
-  hsv_label = gtk_label_new (NULL);
-  gtk_label_set_use_markup (GTK_LABEL (hsv_label), TRUE);
-  gtk_expression_bind (expression, hsv_label, "label", NULL);
-  gtk_container_add (GTK_CONTAINER (box), hsv_label);
-
-  gtk_expression_unref (color_expression);
-}
-
-static void
-set_title (gpointer    item,
-           const char *title)
-{
-  g_object_set_data (G_OBJECT (item), "title", (gpointer)title);
-}
-
-static char *
-get_title (gpointer item)
-{
-  return g_strdup ((char *)g_object_get_data (G_OBJECT (item), "title"));
-}
-
-static gboolean
-set_item (GBinding *binding,
-          const GValue *from,
-          GValue *to,
-          gpointer data)
-{
-  GObject *source = g_binding_get_source (binding);
-  GListModel *model;
-  guint selected;
-  gpointer item;
-
-  selected = g_value_get_uint (from);
-
-  model = gtk_drop_down_get_model (GTK_DROP_DOWN (source));
-  item = g_list_model_get_item (model, selected);
-
-  g_value_set_object (to, item);
-
-  g_clear_object (&item);
-
-  return TRUE;
-}
-
-GtkWidget *
-create_color_grid (void)
-{
-  GtkWidget *gridview;
-  GtkListItemFactory *factory;
-  GListModel *model, *selection;
-
-  gridview = gtk_grid_view_new ();
-  gtk_scrollable_set_hscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);
-  gtk_scrollable_set_vscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);
-
-  factory = gtk_signal_list_item_factory_new ();
-  g_signal_connect (factory, "setup", G_CALLBACK (setup_simple_listitem_cb), NULL);
-  gtk_grid_view_set_factory (GTK_GRID_VIEW (gridview), factory);
-  g_object_unref (factory);
- 
-  gtk_grid_view_set_max_columns (GTK_GRID_VIEW (gridview), 24);
-  gtk_grid_view_set_enable_rubberband (GTK_GRID_VIEW (gridview), TRUE);
-
-  model = G_LIST_MODEL (gtk_sort_list_model_new (create_colors_model (), NULL));
-  selection = G_LIST_MODEL (gtk_multi_selection_new (model));
-  gtk_grid_view_set_model (GTK_GRID_VIEW (gridview), selection);
-  g_object_unref (selection);
-  g_object_unref (model);
-
-  return gridview;
-}
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_listview_colors (GtkWidget *do_widget)
-{
-  if (window == NULL)
-    {
-      GtkWidget *header, *gridview, *sw, *box, *dropdown;
-      GtkListItemFactory *factory;
-      GListStore *factories;
-      GListModel *model;
-
-      GtkSorter *sorter;
-      GtkSorter *multi_sorter;
-      GListStore *sorters;
-      GtkExpression *expression;
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_title (GTK_WINDOW (window), "Colors");
-      header = gtk_header_bar_new ();
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
-      gtk_window_set_titlebar (GTK_WINDOW (window), header);
-
-      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (window), sw);
-
-      gridview = create_color_grid ();
-      gtk_container_add (GTK_CONTAINER (sw), gridview);
-      model = gtk_grid_view_get_model (GTK_GRID_VIEW (gridview));
-      g_object_get (model, "model", &model, NULL);
-
-      sorters = g_list_store_new (GTK_TYPE_SORTER);
-
-      sorter = gtk_string_sorter_new (gtk_property_expression_new (GTK_TYPE_COLOR, NULL, "name"));
-      set_title (sorter, "Name");
-      g_list_store_append (sorters, sorter);
-      g_object_unref (sorter);
-
-      multi_sorter = gtk_multi_sorter_new ();
-
-      sorter = gtk_numeric_sorter_new (gtk_property_expression_new (GTK_TYPE_COLOR, NULL, "red"));
-      gtk_numeric_sorter_set_sort_order (GTK_NUMERIC_SORTER (sorter), GTK_SORT_DESCENDING);
-      set_title (sorter, "Red");
-      g_list_store_append (sorters, sorter);
-      gtk_multi_sorter_append (GTK_MULTI_SORTER (multi_sorter), sorter);
-
-      sorter = gtk_numeric_sorter_new (gtk_property_expression_new (GTK_TYPE_COLOR, NULL, "green"));
-      gtk_numeric_sorter_set_sort_order (GTK_NUMERIC_SORTER (sorter), GTK_SORT_DESCENDING);
-      set_title (sorter, "Green");
-      g_list_store_append (sorters, sorter);
-      gtk_multi_sorter_append (GTK_MULTI_SORTER (multi_sorter), sorter);
-
-      sorter = gtk_numeric_sorter_new (gtk_property_expression_new (GTK_TYPE_COLOR, NULL, "blue"));
-      gtk_numeric_sorter_set_sort_order (GTK_NUMERIC_SORTER (sorter), GTK_SORT_DESCENDING);
-      set_title (sorter, "Blue");
-      g_list_store_append (sorters, sorter);
-      gtk_multi_sorter_append (GTK_MULTI_SORTER (multi_sorter), sorter);
-
-      set_title (multi_sorter, "RGB");
-      g_list_store_append (sorters, multi_sorter);
-      g_object_unref (multi_sorter);
-
-      multi_sorter = gtk_multi_sorter_new ();
-
-      sorter = gtk_numeric_sorter_new (gtk_property_expression_new (GTK_TYPE_COLOR, NULL, "hue"));
-      gtk_numeric_sorter_set_sort_order (GTK_NUMERIC_SORTER (sorter), GTK_SORT_DESCENDING);
-      set_title (sorter, "Hue");
-      g_list_store_append (sorters, sorter);
-      gtk_multi_sorter_append (GTK_MULTI_SORTER (multi_sorter), sorter);
-
-      sorter = gtk_numeric_sorter_new (gtk_property_expression_new (GTK_TYPE_COLOR, NULL, "saturation"));
-      gtk_numeric_sorter_set_sort_order (GTK_NUMERIC_SORTER (sorter), GTK_SORT_DESCENDING);
-      set_title (sorter, "Saturation");
-      g_list_store_append (sorters, sorter);
-      gtk_multi_sorter_append (GTK_MULTI_SORTER (multi_sorter), sorter);
-
-      sorter = gtk_numeric_sorter_new (gtk_property_expression_new (GTK_TYPE_COLOR, NULL, "value"));
-      gtk_numeric_sorter_set_sort_order (GTK_NUMERIC_SORTER (sorter), GTK_SORT_DESCENDING);
-      set_title (sorter, "Value");
-      g_list_store_append (sorters, sorter);
-      gtk_multi_sorter_append (GTK_MULTI_SORTER (multi_sorter), sorter);
-
-      set_title (multi_sorter, "HSV");
-      g_list_store_append (sorters, multi_sorter);
-      g_object_unref (multi_sorter);
-
-      dropdown = gtk_drop_down_new ();
-      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_container_add (GTK_CONTAINER (box), gtk_label_new ("Sort by:"));
-      gtk_container_add (GTK_CONTAINER (box), dropdown);
-      gtk_header_bar_pack_end (GTK_HEADER_BAR (header), box);
-
-      expression = gtk_cclosure_expression_new (G_TYPE_STRING,
-                                                NULL,
-                                                0, NULL,
-                                                (GCallback)get_title,
-                                                NULL, NULL);
-      gtk_drop_down_set_expression (GTK_DROP_DOWN (dropdown), expression);
-      gtk_expression_unref (expression);
-
-      gtk_drop_down_set_model (GTK_DROP_DOWN (dropdown), G_LIST_MODEL (sorters));
-      g_object_unref (sorters);
-
-      g_object_bind_property_full (dropdown, "selected",
-                                   model, "sorter",
-                                   G_BINDING_SYNC_CREATE,
-                                   set_item, NULL,
-                                   NULL, NULL);
-
-      factories = g_list_store_new (GTK_TYPE_LIST_ITEM_FACTORY);
-
-      factory = gtk_signal_list_item_factory_new ();
-      g_signal_connect (factory, "setup", G_CALLBACK (setup_simple_listitem_cb), NULL);
-      set_title (factory, "Colors");
-      g_list_store_append (factories, factory);
-
-      factory = gtk_signal_list_item_factory_new ();
-      g_signal_connect (factory, "setup", G_CALLBACK (setup_listitem_cb), NULL);
-      set_title (factory, "Everything");
-      g_list_store_append (factories, factory);
-
-      dropdown = gtk_drop_down_new ();
-      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_container_add (GTK_CONTAINER (box), gtk_label_new ("Show:"));
-      gtk_container_add (GTK_CONTAINER (box), dropdown);
-      gtk_header_bar_pack_end (GTK_HEADER_BAR (header), box);
-
-      expression = gtk_cclosure_expression_new (G_TYPE_STRING,
-                                                NULL,
-                                                0, NULL,
-                                                (GCallback)get_title,
-                                                NULL, NULL);
-      gtk_drop_down_set_expression (GTK_DROP_DOWN (dropdown), expression);
-      gtk_expression_unref (expression);
-
-      gtk_drop_down_set_model (GTK_DROP_DOWN (dropdown), G_LIST_MODEL (factories));
-      g_object_unref (factories);
-
-      g_object_bind_property_full (dropdown, "selected",
-                                   gridview, "factory",
-                                   G_BINDING_SYNC_CREATE,
-                                   set_item, NULL,
-                                   NULL, NULL);
-      g_object_unref (model);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/listview_filebrowser.c

@@ -1,256 +0,0 @@
-/* Lists/File browser
- *
- * This demo shows off the different layouts that are quickly achievable
- * with GtkListview and GtkGridView by implementing a file browser with
- * different views.
- */
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-
-/* Create a simple object that holds the data for the different views */
-typedef struct _FileBrowserView FileBrowserView;
-struct _FileBrowserView
-{
-  GObject parent_instance;
-
-  GtkListItemFactory *factory;
-  char *icon_name;
-  GtkOrientation orientation;
-};
-
-enum {
-  PROP_0,
-  PROP_FACTORY,
-  PROP_ICON_NAME,
-  PROP_ORIENTATION,
-
-  N_PROPS
-};
-
-#define FILE_BROWSER_TYPE_VIEW (file_browser_view_get_type ())
-G_DECLARE_FINAL_TYPE (FileBrowserView, file_browser_view, FILE_BROWSER, VIEW, GObject);
-
-G_DEFINE_TYPE (FileBrowserView, file_browser_view, G_TYPE_OBJECT);
-static GParamSpec *properties[N_PROPS] = { NULL, };
-
-static void
-file_browser_view_get_property (GObject    *object,
-                                guint       property_id,
-                                GValue     *value,
-                                GParamSpec *pspec)
-{
-  FileBrowserView *self = FILE_BROWSER_VIEW (object);
-
-  switch (property_id)
-    {
-    case PROP_FACTORY:
-      g_value_set_object (value, self->factory);
-      break;
-
-    case PROP_ICON_NAME:
-      g_value_set_string (value, self->icon_name);
-      break;
-
-    case PROP_ORIENTATION:
-      g_value_set_enum (value, self->orientation);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-file_browser_view_set_property (GObject      *object,
-                                guint         prop_id,
-                                const GValue *value,
-                                GParamSpec   *pspec)
-{
-  FileBrowserView *self = FILE_BROWSER_VIEW (object);
-
-  switch (prop_id)
-    {
-    case PROP_FACTORY:
-      g_set_object (&self->factory, g_value_get_object (value));
-      break;
-
-    case PROP_ICON_NAME:
-      g_free (self->icon_name);
-      self->icon_name = g_value_dup_string (value);
-      break;
-
-    case PROP_ORIENTATION:
-      self->orientation = g_value_get_enum (value);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-file_browser_view_finalize (GObject *object)
-{
-  FileBrowserView *self = FILE_BROWSER_VIEW (object);
-
-  g_object_unref (self->factory);
-  g_free (self->icon_name);
-
-  G_OBJECT_CLASS (file_browser_view_parent_class)->dispose (object);
-}
-
-static void
-file_browser_view_class_init (FileBrowserViewClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->get_property = file_browser_view_get_property;
-  gobject_class->set_property = file_browser_view_set_property;
-  gobject_class->finalize = file_browser_view_finalize;
-
-  properties[PROP_FACTORY] =
-    g_param_spec_object ("factory",
-                         "factory",
-                         "factory to use in the main view",
-                         GTK_TYPE_LIST_ITEM_FACTORY,
-                         G_PARAM_READWRITE);
-  properties[PROP_ICON_NAME] =
-    g_param_spec_string ("icon-name",
-                         "icon name",
-                         "icon to display for selecting this view",
-                         NULL,
-                         G_PARAM_READWRITE);
-  properties[PROP_ORIENTATION] =
-    g_param_spec_enum ("orientation",
-                       "orientation",
-                       "orientation of the view",
-                       GTK_TYPE_ORIENTATION,
-                       GTK_ORIENTATION_VERTICAL,
-                       G_PARAM_READWRITE);
-
-  g_object_class_install_properties (gobject_class, N_PROPS, properties);
-}
-
-static void file_browser_view_init (FileBrowserView *self)
-{
-}
-
-char *
-filebrowser_get_display_name (GObject *object,
-                              GFileInfo *info)
-{
-  if (!info)
-    return NULL;
-
-  return g_strdup (g_file_info_get_attribute_string (info, "standard::display-name"));
-}
-
-char *
-filebrowser_get_content_type (GObject *object,
-                              GFileInfo *info)
-{
-  if (!info)
-    return NULL;
-
-  return g_strdup (g_file_info_get_attribute_string (info, "standard::content-type"));
-}
-
-char *
-filebrowser_get_size (GObject *object,
-                      GFileInfo *info)
-{
-  if (!info)
-    return NULL;
-
-  return g_format_size (g_file_info_get_attribute_uint64 (info, "standard::size"));
-}
-
-GIcon *
-filebrowser_get_icon (GObject *object,
-                      GFileInfo *info)
-{
-  GIcon *icon;
-
-  if (info)
-    icon = G_ICON (g_file_info_get_attribute_object (info, "standard::icon"));
-  else
-    icon = NULL;
-
-  if (icon)
-    g_object_ref (icon);
-
-  return icon;
-}
-
-void
-filebrowser_up_clicked_cb (GtkButton        *button,
-                           GtkDirectoryList *list)
-{
-  GFile *file;
-
-  file = g_file_get_parent (gtk_directory_list_get_file (list));
-  if (file == NULL)
-    return;
-
-  gtk_directory_list_set_file (list, file);
-}
-
-void
-filebrowser_view_activated_cb (GtkGridView      *view,
-                               guint             pos,
-                               GtkDirectoryList *list)
-{
-  GFileInfo *info;
-
-  info = g_list_model_get_item (gtk_grid_view_get_model (view), pos);
-  if (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY)
-    gtk_directory_list_set_file (list, G_FILE (g_file_info_get_attribute_object (info, "standard::file")));
-
-  g_object_unref (info);
-}
-
-GtkWidget *
-do_listview_filebrowser (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkWidget *view;
-      GtkBuilder *builder;
-      GtkDirectoryList *dirlist;
-      GFile *file;
-      char *cwd;
-
-      builder = gtk_builder_new_from_resource ("/listview_filebrowser/listview_filebrowser.ui");
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      /* Create the model and fill it with the contents of the current directory */
-      cwd = g_get_current_dir ();
-      file = g_file_new_for_path (cwd);
-      g_free (cwd);
-      dirlist = GTK_DIRECTORY_LIST (gtk_builder_get_object (builder, "dirlist"));
-      gtk_directory_list_set_file (dirlist, file);
-      g_object_unref (file);
-
-      /* grab focus in the view */
-      view = GTK_WIDGET (gtk_builder_get_object (builder, "view"));
-      gtk_widget_grab_focus (view);
-
-      g_object_unref (builder);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/listview_filebrowser.ui

@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GListStore" id="viewlist">
-    <property name="item-type">FileBrowserView</property>
-    <child>
-      <object class="FileBrowserView">
-        <property name="factory">
-          <object class="GtkBuilderListItemFactory">
-            <property name="bytes"><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkBox">
-        <child>
-          <object class="GtkImage">
-            <binding name="gicon">
-              <closure type="GIcon" function="filebrowser_get_icon">
-                <lookup name="item">GtkListItem</lookup>
-              </closure>
-            </binding>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="halign">start</property>
-            <binding name="label">
-              <closure type="gchararray" function="filebrowser_get_display_name">
-                <lookup name="item">GtkListItem</lookup>
-              </closure>
-            </binding>
-          </object>
-        </child>
-      </object>
-    </property>
-  </template>
-</interface>
-            ]]></property>
-          </object>
-        </property>
-        <property name="icon-name">view-list-symbolic</property>
-        <property name="orientation">horizontal</property>
-      </object>
-    </child>
-    <child>
-      <object class="FileBrowserView">
-        <property name="icon-name">view-grid-symbolic</property>
-        <property name="factory">
-          <object class="GtkBuilderListItemFactory">
-            <property name="bytes"><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkBox">
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkImage">
-            <property name="icon-size">large</property>
-            <binding name="gicon">
-              <closure type="GIcon" function="filebrowser_get_icon">
-                <lookup name="item">GtkListItem</lookup>
-              </closure>
-            </binding>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="wrap">1</property>
-            <property name="wrap-mode">word-char</property>
-            <property name="lines">2</property>
-            <property name="ellipsize">end</property>
-            <property name="width-chars">10</property>
-            <property name="max-width-chars">30</property>
-            <binding name="label">
-              <closure type="gchararray" function="filebrowser_get_display_name">
-                <lookup name="item">GtkListItem</lookup>
-              </closure>
-            </binding>
-          </object>
-        </child>
-      </object>
-    </property>
-  </template>
-</interface>
-            ]]></property>
-          </object>
-        </property>
-        <property name="orientation">vertical</property>
-      </object>
-    </child>
-    <child>
-      <object class="FileBrowserView">
-        <property name="icon-name">view-paged-symbolic</property>
-        <property name="factory">
-          <object class="GtkBuilderListItemFactory">
-            <property name="bytes"><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkBox">
-        <child>
-          <object class="GtkImage">
-            <property name="icon-size">large</property>
-            <binding name="gicon">
-              <closure type="GIcon" function="filebrowser_get_icon">
-                <lookup name="item">GtkListItem</lookup>
-              </closure>
-            </binding>
-          </object>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkLabel">
-                <property name="halign">start</property>
-                <binding name="label">
-                  <closure type="gchararray" function="filebrowser_get_display_name">
-                    <lookup name="item">GtkListItem</lookup>
-                  </closure>
-                </binding>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="halign">start</property>
-                <binding name="label">
-                  <closure type="gchararray" function="filebrowser_get_size">
-                    <lookup name="item">GtkListItem</lookup>
-                  </closure>
-                </binding>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="halign">start</property>
-                <binding name="label">
-                  <closure type="gchararray" function="filebrowser_get_content_type">
-                    <lookup name="item">GtkListItem</lookup>
-                  </closure>
-                </binding>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </property>
-  </template>
-</interface>
-            ]]></property>
-          </object>
-        </property>
-        <property name="orientation">horizontal</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkDirectoryList" id="dirlist">
-    <property name="attributes">standard::name,standard::display-name,standard::icon,standard::size,standard::content-type</property>
-  </object>
-  <object class="GtkWindow" id="window">
-    <property name="title" translatable="yes">File browser</property>
-    <property name="default-width">600</property>
-    <property name="default-height">400</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar" id="">
-        <property name="show-title-buttons">1</property>
-        <child>
-          <object class="GtkButton">
-            <property name="icon-name">go-up</property>
-            <signal name="clicked" handler="filebrowser_up_clicked_cb" object="dirlist" swapped="no"/>
-          </object>
-        </child>
-        <child type="end">
-          <object class="GtkListView">
-            <property name="valign">center</property>
-            <property name="orientation">horizontal</property>
-            <style>
-              <class name="linked"/>
-            </style>
-            <property name="model">
-              <object class="GtkSingleSelection" id="selected-view">
-                <property name="model">viewlist</property>
-              </object>
-            </property>
-            <property name="factory">
-              <object class="GtkBuilderListItemFactory">
-                <property name="bytes"><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkImage">
-        <binding name="icon-name">
-          <lookup type="FileBrowserView" name="icon-name">
-            <lookup name="item">GtkListItem</lookup>
-          </lookup>
-        </binding>
-      </object>
-    </property>
-  </template>
-</interface>
-                ]]></property>
-              </object>
-            </property>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkScrolledWindow">
-        <property name="can-focus">1</property>
-        <child>
-          <object class="GtkGridView" id="view">
-            <property name="model">dirlist</property>
-            <property name="max-columns">15</property>
-            <binding name="factory">
-              <lookup name="factory" type="FileBrowserView">
-                <lookup name="selected-item">selected-view</lookup>
-              </lookup>
-            </binding>
-            <binding name="orientation">
-              <lookup name="orientation" type="FileBrowserView">
-                <lookup name="selected-item">selected-view</lookup>
-              </lookup>
-            </binding>
-            <signal name="activate" handler="filebrowser_view_activated_cb" object="dirlist" swapped="no"/>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

demos/gtk-demo/listview_minesweeper.c

@@ -1,473 +0,0 @@
-/* Lists/Minesweeper
- *
- * This demo shows how to develop a user interface for small game using a
- * gridview.
- *
- * It demonstrates how to use the activate signal and single-press behavior
- * to implement rather different interaction behavior to a typical list.
- */
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-/*** The cell object ***/
-
-/* Create an object that holds the data for a cell in the game */
-typedef struct _SweeperCell SweeperCell;
-struct _SweeperCell
-{
-  GObject parent_instance;
-
-  gboolean is_mine;
-  gboolean is_visible;
-  guint neighbor_mines;
-};
-
-enum {
-  CELL_PROP_0,
-  CELL_PROP_LABEL,
-
-  N_CELL_PROPS
-};
-
-#define SWEEPER_TYPE_CELL (sweeper_cell_get_type ())
-G_DECLARE_FINAL_TYPE (SweeperCell, sweeper_cell, SWEEPER, CELL, GObject);
-
-G_DEFINE_TYPE (SweeperCell, sweeper_cell, G_TYPE_OBJECT);
-static GParamSpec *cell_properties[N_CELL_PROPS] = { NULL, };
-
-static const char *
-sweeper_cell_get_label (SweeperCell *self)
-{
-  static const char *minecount_labels[10] = { "", "1", "2", "3", "4", "5", "6", "7", "8", "9" };
-
-  if (!self->is_visible)
-    return "?";
-  
-  if (self->is_mine)
-    return "💣";
-
-  return minecount_labels[self->neighbor_mines];
-}
-
-static void
-sweeper_cell_get_property (GObject    *object,
-                           guint       property_id,
-                           GValue     *value,
-                           GParamSpec *pspec)
-{
-  SweeperCell *self = SWEEPER_CELL (object);
-
-  switch (property_id)
-    {
-    case CELL_PROP_LABEL:
-      g_value_set_string (value, sweeper_cell_get_label (self));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-sweeper_cell_class_init (SweeperCellClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->get_property = sweeper_cell_get_property;
-
-  cell_properties[CELL_PROP_LABEL] =
-    g_param_spec_string ("label",
-                         "label",
-                         "label to display for this row",
-                         NULL,
-                         G_PARAM_READABLE);
-
-  g_object_class_install_properties (gobject_class, N_CELL_PROPS, cell_properties);
-}
-
-static void
-sweeper_cell_init (SweeperCell *self)
-{
-}
-
-static void
-sweeper_cell_reveal (SweeperCell *self)
-{
-  if (self->is_visible)
-    return;
-
-  self->is_visible = TRUE;
-
-  g_object_notify_by_pspec (G_OBJECT (self), cell_properties[CELL_PROP_LABEL]);
-}
-
-static SweeperCell *
-sweeper_cell_new ()
-{
-  return g_object_new (SWEEPER_TYPE_CELL, NULL);
-}
-
-/*** The board object ***/
-
-/* Create an object that holds the data for the game */
-typedef struct _SweeperGame SweeperGame;
-struct _SweeperGame
-{
-  GObject parent_instance;
-
-  GPtrArray *cells;
-  guint width;
-  guint height;
-  gboolean playing;
-  gboolean win;
-};
-
-enum {
-  GAME_PROP_0,
-  GAME_PROP_HEIGHT,
-  GAME_PROP_PLAYING,
-  GAME_PROP_WIDTH,
-  GAME_PROP_WIN,
-
-  N_GAME_PROPS
-};
-
-#define SWEEPER_TYPE_GAME (sweeper_game_get_type ())
-G_DECLARE_FINAL_TYPE (SweeperGame, sweeper_game, SWEEPER, GAME, GObject);
-
-static GType
-sweeper_game_list_model_get_item_type (GListModel *model)
-{
-  return SWEEPER_TYPE_GAME;
-}
-
-static guint
-sweeper_game_list_model_get_n_items (GListModel *model)
-{
-  SweeperGame *self = SWEEPER_GAME (model);
-
-  return self->width * self->height;
-}
-
-static gpointer
-sweeper_game_list_model_get_item (GListModel *model,
-                                  guint       position)
-{
-  SweeperGame *self = SWEEPER_GAME (model);
-
-  return g_object_ref (g_ptr_array_index (self->cells, position));
-}
-
-static void
-sweeper_game_list_model_init (GListModelInterface *iface)
-{
-  iface->get_item_type = sweeper_game_list_model_get_item_type;
-  iface->get_n_items = sweeper_game_list_model_get_n_items;
-  iface->get_item = sweeper_game_list_model_get_item;
-}
-
-G_DEFINE_TYPE_WITH_CODE (SweeperGame, sweeper_game, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, sweeper_game_list_model_init))
-
-static GParamSpec *game_properties[N_GAME_PROPS] = { NULL, };
-
-static void
-sweeper_game_dispose (GObject *object)
-{
-  SweeperGame *self = SWEEPER_GAME (object);
-
-  g_clear_pointer (&self->cells, g_ptr_array_unref);
-
-  G_OBJECT_CLASS (sweeper_game_parent_class)->dispose (object);
-}
-
-static void
-sweeper_game_get_property (GObject    *object,
-                           guint       property_id,
-                           GValue     *value,
-                           GParamSpec *pspec)
-{
-  SweeperGame *self = SWEEPER_GAME (object);
-
-  switch (property_id)
-    {
-    case GAME_PROP_HEIGHT:
-      g_value_set_uint (value, self->height);
-      break;
-
-    case GAME_PROP_PLAYING:
-      g_value_set_boolean (value, self->playing);
-      break;
-
-    case GAME_PROP_WIDTH:
-      g_value_set_uint (value, self->width);
-      break;
-
-    case GAME_PROP_WIN:
-      g_value_set_boolean (value, self->win);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-sweeper_game_class_init (SweeperGameClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->dispose = sweeper_game_dispose;
-  gobject_class->get_property = sweeper_game_get_property;
-
-  game_properties[GAME_PROP_HEIGHT] =
-    g_param_spec_uint ("height",
-                       "height",
-                       "height of the game grid",
-                       1, G_MAXUINT, 8,
-                       G_PARAM_READABLE);
-
-  game_properties[GAME_PROP_PLAYING] =
-    g_param_spec_boolean ("playing",
-                          "playing",
-                          "if the game is still going on",
-                          FALSE,
-                          G_PARAM_READABLE);
-
-  game_properties[GAME_PROP_WIDTH] =
-    g_param_spec_uint ("width",
-                       "width",
-                       "width of the game grid",
-                       1, G_MAXUINT, 8,
-                       G_PARAM_READABLE);
-
-  game_properties[GAME_PROP_WIN] =
-    g_param_spec_boolean ("win",
-                          "win",
-                          "if the game was won",
-                          FALSE,
-                          G_PARAM_READABLE);
-
-  g_object_class_install_properties (gobject_class, N_GAME_PROPS, game_properties);
-}
-
-static void
-sweeper_game_reset_board (SweeperGame *self,
-                          guint        width,
-                          guint        height)
-{
-  guint i;
-
-  g_ptr_array_set_size (self->cells, 0);
-
-  for (i = 0; i < width * height; i++)
-    {
-      g_ptr_array_add (self->cells, sweeper_cell_new ());
-    }
-
-  if (self->width != width)
-    {
-      self->width = width;
-      g_object_notify_by_pspec (G_OBJECT (self), game_properties[GAME_PROP_WIDTH]);
-    }
-  if (self->height != height)
-    {
-      self->height = height;
-      g_object_notify_by_pspec (G_OBJECT (self), game_properties[GAME_PROP_HEIGHT]);
-    }
-  if (!self->playing)
-    {
-      self->playing = TRUE;
-      g_object_notify_by_pspec (G_OBJECT (self), game_properties[GAME_PROP_PLAYING]);
-    }
-  if (self->win)
-    {
-      self->win = FALSE;
-      g_object_notify_by_pspec (G_OBJECT (self), game_properties[GAME_PROP_WIN]);
-    }
-}
-
-static void
-sweeper_game_place_mines (SweeperGame *self,
-                          guint        n_mines)
-{
-  guint i;
-
-  for (i = 0; i < n_mines; i++)
-    {
-      SweeperCell *cell;
-
-      do {
-        cell = g_ptr_array_index (self->cells, g_random_int_range (0, self->cells->len));
-      } while (cell->is_mine);
-
-      cell->is_mine = TRUE;
-    }
-}
-
-static SweeperCell *
-get_cell (SweeperGame *self,
-          guint        x,
-          guint        y)
-{
-  return g_ptr_array_index (self->cells, y * self->width + x);
-}
-
-static void
-sweeper_game_count_neighbor_mines (SweeperGame *self,
-                                   guint        width,
-                                   guint        height)
-{
-  guint x, y, x2, y2;
-
-  for (y = 0; y < height; y++)
-    {
-      for (x = 0; x < width; x++)
-        {
-          SweeperCell *cell = get_cell (self, x, y);
-
-          for (y2 = MAX (1, y) - 1; y2 < MIN (height, y + 2); y2++)
-            {
-              for (x2 = MAX (1, x) - 1; x2 < MIN (width, x + 2); x2++)
-                {
-                  SweeperCell *other = get_cell (self, x2, y2);
-
-                  if (other->is_mine)
-                    cell->neighbor_mines++;
-                }
-            }
-        }
-    }
-}
-
-static void
-sweeper_game_new_game (SweeperGame *self,
-                       guint        width,
-                       guint        height,
-                       guint        n_mines)
-{
-  guint n_items_before;
-
-  g_return_if_fail (n_mines <= width * height);
-
-  n_items_before = self->width * self->height;
-
-  g_object_freeze_notify (G_OBJECT (self));
-
-  sweeper_game_reset_board (self, width, height);
-  sweeper_game_place_mines (self, n_mines);
-  sweeper_game_count_neighbor_mines (self, width, height);
-
-  g_list_model_items_changed (G_LIST_MODEL (self), 0, n_items_before, width * height);
-
-  g_object_thaw_notify (G_OBJECT (self));
-}
-
-static void
-sweeper_game_init (SweeperGame *self)
-{
-  self->cells = g_ptr_array_new_with_free_func (g_object_unref);
-
-  sweeper_game_new_game (self, 8, 8, 10);
-}
-
-static void
-sweeper_game_end (SweeperGame *self,
-                  gboolean     win)
-{
-  if (self->playing)
-    {
-      self->playing = FALSE;
-      g_object_notify_by_pspec (G_OBJECT (self), game_properties[GAME_PROP_PLAYING]);
-    }
-  if (self->win != win)
-    {
-      self->win = win;
-      g_object_notify_by_pspec (G_OBJECT (self), game_properties[GAME_PROP_WIN]);
-    }
-}
-
-static void
-sweeper_game_check_finished (SweeperGame *self)
-{
-  guint i;
-
-  if (!self->playing)
-    return;
-
-  for (i = 0; i < self->cells->len; i++)
-    {
-      SweeperCell *cell = g_ptr_array_index (self->cells, i);
-
-      /* There's still a non-revealed cell that isn't a mine */
-      if (!cell->is_visible && !cell->is_mine)
-        return;
-    }
-
-  sweeper_game_end (self, TRUE);
-}
-
-static void
-sweeper_game_reveal_cell (SweeperGame *self,
-                          guint        position)
-{
-  SweeperCell *cell;
-
-  if (!self->playing)
-    return;
-
-  cell = g_ptr_array_index (self->cells, position);
-  sweeper_cell_reveal (cell);
-
-  if (cell->is_mine)
-    sweeper_game_end (self, FALSE);
-
-  sweeper_game_check_finished (self);
-}
-
-void
-minesweeper_cell_clicked_cb (GtkGridView *gridview,
-                             guint        pos,
-                             SweeperGame *game)
-{
-  sweeper_game_reveal_cell (game, pos);
-}
-
-void
-minesweeper_new_game_cb (GtkButton   *button,
-                         SweeperGame *game)
-{
-  sweeper_game_new_game (game, 8, 8, 10);
-}
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_listview_minesweeper (GtkWidget *do_widget)
-{
-  if (window == NULL)
-    {
-      GtkBuilder *builder;
-
-      g_type_ensure (SWEEPER_TYPE_GAME);
-
-      builder = gtk_builder_new_from_resource ("/listview_minesweeper/listview_minesweeper.ui");
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      g_object_unref (builder);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/listview_minesweeper.ui

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="SweeperGame" id="game">
-  </object>
-  <object class="GtkWindow" id="window">
-    <property name="title" translatable="yes">Minesweeper</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar" id="">
-        <property name="show-title-buttons">1</property>
-        <child>
-          <object class="GtkButton">
-            <property name="label">New Game</property>
-            <signal name="clicked" handler="minesweeper_new_game_cb" object="game" swapped="no"/>
-          </object>
-        </child>
-        <child type="title">
-          <object class="GtkImage">
-            <property name="icon-name">trophy-gold</property>
-            <binding name="visible">
-              <lookup name="win">game</lookup>
-            </binding>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkGridView" id="view">
-        <property name="model">
-          <object class="GtkNoSelection">
-            <property name="model">game</property>
-          </object>
-        </property>
-        <binding name="max-columns">
-          <lookup name="width">game</lookup>
-        </binding>
-        <binding name="min-columns">
-          <lookup name="width">game</lookup>
-        </binding>
-        <property name="factory">
-          <object class="GtkBuilderListItemFactory">
-            <property name="resource">/listview_minesweeper/listview_minesweeper_cell.ui</property>
-          </object>
-        </property>
-        <signal name="activate" handler="minesweeper_cell_clicked_cb" object="game" swapped="no"/>
-      </object>
-    </child>
-  </object>
-</interface>

demos/gtk-demo/listview_minesweeper_cell.ui

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkLabel">
-        <property name="halign">center</property>
-        <property name="valign">center</property>
-        <binding name="label">
-          <lookup name="label" type="SweeperCell">
-            <lookup name="item">GtkListItem</lookup>
-          </lookup>
-        </binding>
-      </object>
-    </property>
-  </template>
-</interface>

demos/gtk-demo/listview_settings.c

@@ -1,398 +0,0 @@
-/* Lists/Settings
- *
- * This demo shows a settings viewer for GSettings.
- *
- * It demonstrates how to implement support for trees with GtkListView.
- *
- * It also shows how to set up sorting for columns in a GtkColumnView.
- */
-
-#include <gtk/gtk.h>
-
-/* Create an object that wraps GSettingsSchemaKey because that's a boxed type */
-typedef struct _SettingsKey SettingsKey;
-struct _SettingsKey
-{
-  GObject parent_instance;
-
-  GSettings *settings;
-  GSettingsSchemaKey *key;
-};
-
-enum {
-  PROP_0,
-  PROP_NAME,
-  PROP_SUMMARY,
-  PROP_DESCRIPTION,
-  PROP_VALUE,
-
-  N_PROPS
-};
-
-#define SETTINGS_TYPE_KEY (settings_key_get_type ())
-G_DECLARE_FINAL_TYPE (SettingsKey, settings_key, SETTINGS, KEY, GObject);
-
-G_DEFINE_TYPE (SettingsKey, settings_key, G_TYPE_OBJECT);
-static GParamSpec *properties[N_PROPS] = { NULL, };
-
-static void
-settings_key_get_property (GObject    *object,
-                           guint       property_id,
-                           GValue     *value,
-                           GParamSpec *pspec)
-{
-  SettingsKey *self = SETTINGS_KEY (object);
-
-  switch (property_id)
-    {
-    case PROP_DESCRIPTION:
-      g_value_set_string (value, g_settings_schema_key_get_description (self->key));
-      break;
-
-    case PROP_NAME:
-      g_value_set_string (value, g_settings_schema_key_get_name (self->key));
-      break;
-
-    case PROP_SUMMARY:
-      g_value_set_string (value, g_settings_schema_key_get_summary (self->key));
-      break;
-
-    case PROP_VALUE:
-      {
-        GVariant *variant = g_settings_get_value (self->settings, g_settings_schema_key_get_name (self->key));
-        g_value_take_string (value, g_variant_print (variant, FALSE));
-        g_variant_unref (variant);
-      }
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-settings_key_finalize (GObject *object)
-{
-  SettingsKey *self = SETTINGS_KEY (object);
-
-  g_object_unref (self->settings);
-  g_settings_schema_key_unref (self->key);
-
-  G_OBJECT_CLASS (settings_key_parent_class)->finalize (object);
-}
-
-static void
-settings_key_class_init (SettingsKeyClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->finalize = settings_key_finalize;
-  gobject_class->get_property = settings_key_get_property;
-
-  properties[PROP_DESCRIPTION] =
-    g_param_spec_string ("description", NULL, NULL, NULL, G_PARAM_READABLE);
-  properties[PROP_NAME] =
-    g_param_spec_string ("name", NULL, NULL, NULL, G_PARAM_READABLE);
-  properties[PROP_SUMMARY] =
-    g_param_spec_string ("summary", NULL, NULL, NULL, G_PARAM_READABLE);
-  properties[PROP_VALUE] =
-    g_param_spec_string ("value", NULL, NULL, NULL, G_PARAM_READABLE);
-
-  g_object_class_install_properties (gobject_class, N_PROPS, properties);
-}
-
-static void
-settings_key_init (SettingsKey *self)
-{
-}
-
-static SettingsKey *
-settings_key_new (GSettings          *settings,
-                  GSettingsSchemaKey *key)
-{
-  SettingsKey *result = g_object_new (SETTINGS_TYPE_KEY, NULL);
-
-  result->settings = g_object_ref (settings);
-  result->key = g_settings_schema_key_ref (key);
-
-  return result;
-}
-
-static int
-strvcmp (gconstpointer p1,
-         gconstpointer p2)
-{
-  const char * const *s1 = p1;
-  const char * const *s2 = p2;
-
-  return strcmp (*s1, *s2);
-}
-
-static GtkFilter *current_filter;
-
-static gboolean
-transform_settings_to_keys (GBinding     *binding,
-                            const GValue *from_value,
-                            GValue       *to_value,
-                            gpointer      data)
-{
-  GtkTreeListRow *treelistrow;
-  GSettings *settings;
-  GSettingsSchema *schema;
-  GListStore *store;
-  GtkSortListModel *sort_model;
-  GtkFilterListModel *filter_model;
-  GtkFilter *filter;
-  GtkExpression *expression;
-  char **keys;
-  guint i;
-
-  treelistrow = g_value_get_object (from_value);
-  if (treelistrow == NULL)
-    return TRUE;
-  settings = gtk_tree_list_row_get_item (treelistrow);
-  g_object_get (settings, "settings-schema", &schema, NULL);
-
-  store = g_list_store_new (SETTINGS_TYPE_KEY);
-
-  keys = g_settings_schema_list_keys (schema);
-
-  for (i = 0; keys[i] != NULL; i++)
-    {
-      GSettingsSchemaKey *almost_there = g_settings_schema_get_key (schema, keys[i]);
-      SettingsKey *finally = settings_key_new (settings, almost_there);
-      g_list_store_append (store, finally);
-      g_object_unref (finally);
-      g_settings_schema_key_unref (almost_there);
-    }
-
-  g_strfreev (keys);
-  g_settings_schema_unref (schema);
-  g_object_unref (settings);
-
-  sort_model = gtk_sort_list_model_new (G_LIST_MODEL (store),
-                                        gtk_column_view_get_sorter (GTK_COLUMN_VIEW (data)));
-  g_object_unref (store);
-  expression = gtk_property_expression_new (SETTINGS_TYPE_KEY, NULL, "name");
-  filter = gtk_string_filter_new ();
-  gtk_string_filter_set_expression (GTK_STRING_FILTER (filter), expression);
-  filter_model = gtk_filter_list_model_new (G_LIST_MODEL (sort_model), filter);
-  gtk_expression_unref (expression);
-  g_object_unref (sort_model);
-
-  g_set_object (&current_filter, filter);
-
-  g_object_unref (filter);
-
-  g_value_take_object (to_value, filter_model);
-
-  return TRUE;
-}
-
-static GListModel *
-create_settings_model (gpointer item,
-                       gpointer unused)
-{
-  GSettings *settings = item;
-  char **schemas;
-  GListStore *result;
-  guint i;
-
-  if (settings == NULL)
-    {
-      g_settings_schema_source_list_schemas (g_settings_schema_source_get_default (),
-                                             TRUE,
-                                             &schemas,
-                                             NULL);
-    }
-  else
-    {
-      schemas = g_settings_list_children (settings);
-    }
-
-  if (schemas == NULL || schemas[0] == NULL)
-    {
-      g_free (schemas);
-      return NULL;
-    }
-
-  qsort (schemas, g_strv_length (schemas), sizeof (char *), strvcmp);
-
-  result = g_list_store_new (G_TYPE_SETTINGS);
-  for (i = 0;  schemas[i] != NULL; i++)
-    {
-      GSettings *child;
-
-      if (settings == NULL)
-        child = g_settings_new (schemas[i]);
-      else
-        child = g_settings_get_child (settings, schemas[i]);
-
-      g_list_store_append (result, child);
-      g_object_unref (child);
-    }
-
-  g_strfreev (schemas);
-
-  return G_LIST_MODEL (result);
-}
-
-static void
-search_enabled (GtkSearchEntry *entry)
-{
-  gtk_editable_set_text (GTK_EDITABLE (entry), "");
-}
-
-static void
-search_changed (GtkSearchEntry *entry,
-                gpointer data)
-{
-  const char *text = gtk_editable_get_text (GTK_EDITABLE (entry));
-
-  if (current_filter)
-    gtk_string_filter_set_search (GTK_STRING_FILTER (current_filter), text);
-}
-
-static void
-stop_search (GtkSearchEntry *entry,
-             gpointer data)
-{
-  gtk_editable_set_text (GTK_EDITABLE (entry), "");
-
-  if (current_filter)
-    gtk_string_filter_set_search (GTK_STRING_FILTER (current_filter), "");
-}
-
-static void
-move_column (GtkListView *columns_list, gboolean down)
-{
-  GListModel *columns;
-  guint position;
-  GtkColumnViewColumn *selected;
-  GtkColumnView *view;
-
-  columns = gtk_list_view_get_model (columns_list);
-  position = gtk_single_selection_get_selected (GTK_SINGLE_SELECTION (columns));
-  selected = gtk_single_selection_get_selected_item (GTK_SINGLE_SELECTION (columns));
-  view = gtk_column_view_column_get_column_view (selected);
- 
-  if (down && position + 1 < g_list_model_get_n_items (columns))
-    position++;
-  else if (!down && position > 0)
-    position--;
-  else
-    return;
-
-  gtk_column_view_insert_column (view, position, selected);
-  gtk_single_selection_set_selected (GTK_SINGLE_SELECTION (columns), position);
-}
-
-static void
-move_column_down (GtkListView *columns_list)
-{
-  move_column (columns_list, TRUE);
-}
-
-static void
-move_column_up (GtkListView *columns_list)
-{
-  move_column (columns_list, FALSE);
-}
-
-static void
-column_visible_toggled (GtkListItem *item, GtkToggleButton *button)
-{
-  GtkColumnViewColumn *column = gtk_list_item_get_item (item);
-
-  gtk_column_view_column_set_visible (column, gtk_toggle_button_get_active (button));
-}
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_listview_settings (GtkWidget *do_widget)
-{
-  if (window == NULL)
-    {
-      GtkWidget *listview, *columnview;
-      GListModel *model;
-      GtkTreeListModel *treemodel;
-      GtkSingleSelection *selection;
-      GtkBuilderScope *scope;
-      GtkBuilder *builder;
-      GtkColumnViewColumn *name_column;
-      GtkSorter *sorter;
-      GtkWidget *menubutton, *popover;
-      GtkWidget *columns_list;
-
-      g_type_ensure (SETTINGS_TYPE_KEY);
-
-      scope = gtk_builder_cscope_new ();
-      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope), "search_enabled", (GCallback)search_enabled);
-      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope), "search_changed", (GCallback)search_changed);
-      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope), "stop_search", (GCallback)stop_search);
-      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope), "move_column_down", (GCallback)move_column_down);
-      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope), "move_column_up", (GCallback)move_column_up);
-      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope), "column_visible_toggled", (GCallback)column_visible_toggled);
-
-      builder = gtk_builder_new ();
-      gtk_builder_set_scope (builder, scope);
-      {
-        g_autoptr(GError) error = NULL;
-      gtk_builder_add_from_resource (builder, "/listview_settings/listview_settings.ui", &error);
-      if (error)
-        g_warning ("%s", error->message);
-      }
-
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      listview = GTK_WIDGET (gtk_builder_get_object (builder, "listview"));
-      columnview = GTK_WIDGET (gtk_builder_get_object (builder, "columnview"));
-      model = create_settings_model (NULL, NULL);
-      treemodel = gtk_tree_list_model_new (FALSE,
-                                           model,
-                                           TRUE,
-                                           create_settings_model,
-                                           NULL,
-                                           NULL);
-      selection = gtk_single_selection_new (G_LIST_MODEL (treemodel));
-      g_object_bind_property_full (selection, "selected-item",
-                                   columnview, "model",
-                                   G_BINDING_SYNC_CREATE,
-                                   transform_settings_to_keys,
-                                   NULL,
-                                   columnview, NULL);
-      gtk_list_view_set_model (GTK_LIST_VIEW (listview), G_LIST_MODEL (selection));
-      g_object_unref (selection);
-      g_object_unref (treemodel);
-      g_object_unref (model);
-
-      name_column = GTK_COLUMN_VIEW_COLUMN (gtk_builder_get_object (builder, "name_column"));
-      sorter = gtk_string_sorter_new (gtk_property_expression_new (SETTINGS_TYPE_KEY, NULL, "name"));
-      gtk_column_view_column_set_sorter (name_column, sorter);
-      g_object_unref (sorter);
-
-      menubutton = GTK_WIDGET (gtk_builder_get_object (builder, "menubutton"));
-      popover = GTK_WIDGET (gtk_builder_get_object (builder, "column_popover"));
-      gtk_menu_button_set_popover (GTK_MENU_BUTTON (menubutton), popover);
-
-      columns_list = GTK_WIDGET (gtk_builder_get_object (builder, "columns_list"));
-      model = G_LIST_MODEL (gtk_single_selection_new (gtk_column_view_get_columns (GTK_COLUMN_VIEW (columnview))));
-      gtk_list_view_set_model (GTK_LIST_VIEW (columns_list), model);
-      g_object_unref (model);
-
-      g_object_unref (builder);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/listview_settings.ui

@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow" id="window">
-    <property name="title" translatable="yes">Settings</property>
-    <property name="default-width">640</property>
-    <property name="default-height">480</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar">
-        <property name="show-title-buttons">1</property>
-        <child type="end">
-          <object class="GtkMenuButton" id="menubutton">
-            <property name="icon-name">open-menu-symbolic</property>
-          </object>
-        </child>
-        <child type="end">
-          <object class="GtkToggleButton" id="search_button">
-            <property name="icon-name">system-search-symbolic</property>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkPaned">
-        <property name="position">300</property>
-        <child>
-          <object class="GtkScrolledWindow">
-            <child>
-              <object class="GtkListView" id="listview">
-                <property name="factory">
-                  <object class="GtkBuilderListItemFactory">
-                    <property name="bytes"><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkTreeExpander" id="expander">
-        <binding name="list-row">
-          <lookup name="item">GtkListItem</lookup>
-        </binding>
-        <property name="child">
-          <object class="GtkLabel">
-            <property name="xalign">0</property>
-            <binding name="label">
-              <lookup name="schema" type="GSettings">
-                <lookup name="item">expander</lookup>
-              </lookup>
-            </binding>
-          </object>
-        </property>
-      </object>
-    </property>
-  </template>
-</interface>
-                    ]]></property>
-                  </object>
-                </property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkSearchBar">
-                <property name="search-mode-enabled" bind-source="search_button" bind-property="active" bind-flags="bidirectional"/>
-                <signal name="notify::search-mode-enabled" handler="search_enabled" object="entry"/>
-                <child>
-                  <object class="GtkSearchEntry" id="entry">
-                    <signal name="search-changed" handler="search_changed"/>
-                    <signal name="stop-search" handler="stop_search"/>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkScrolledWindow">
-                <property name="expand">1</property>
-                <child>
-                  <object class="GtkColumnView" id="columnview">
-                    <child>
-                      <object class="GtkColumnViewColumn" id="name_column">
-                        <property name="title">Name</property>
-                        <property name="factory">
-                          <object class="GtkBuilderListItemFactory">
-                            <property name="bytes"><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkLabel">
-        <property name="xalign">0</property>
-        <binding name="label">
-          <lookup name="name" type="SettingsKey">
-            <lookup name="item">GtkListItem</lookup>
-          </lookup>
-        </binding>
-      </object>
-    </property>
-  </template>
-</interface>
-                        ]]></property>
-                          </object>
-                        </property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkColumnViewColumn" id="value_column">
-                        <property name="title">Value</property>
-                        <property name="factory">
-                          <object class="GtkBuilderListItemFactory">
-                            <property name="bytes"><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkLabel">
-        <property name="xalign">0</property>
-        <binding name="label">
-          <lookup name="value" type="SettingsKey">
-            <lookup name="item">GtkListItem</lookup>
-          </lookup>
-        </binding>
-      </object>
-    </property>
-  </template>
-</interface>
-                        ]]></property>
-                          </object>
-                        </property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkColumnViewColumn" id="summary_column">
-                        <property name="title">Summary</property>
-                        <property name="factory">
-                          <object class="GtkBuilderListItemFactory">
-                            <property name="bytes"><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkLabel">
-        <property name="xalign">0</property>
-        <binding name="label">
-          <lookup name="summary" type="SettingsKey">
-            <lookup name="item">GtkListItem</lookup>
-          </lookup>
-        </binding>
-      </object>
-    </property>
-  </template>
-</interface>
-                        ]]></property>
-                          </object>
-                        </property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkColumnViewColumn" id="description_column">
-                        <property name="title">Description</property>
-                        <property name="factory">
-                          <object class="GtkBuilderListItemFactory">
-                            <property name="bytes"><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkLabel">
-        <property name="xalign">0</property>
-        <binding name="label">
-          <lookup name="description" type="SettingsKey">
-            <lookup name="item">GtkListItem</lookup>
-          </lookup>
-        </binding>
-      </object>
-    </property>
-  </template>
-</interface>
-                        ]]></property>
-                          </object>
-                        </property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkPopover" id="column_popover">
-    <child>
-      <object class="GtkBox">
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkListView" id="columns_list">
-            <property name="factory">
-              <object class="GtkBuilderListItemFactory">
-                <property name="bytes"><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkBox">
-        <property name="spacing">10</property>
-        <child>
-          <object class="GtkCheckButton">
-            <signal name="toggled" handler="column_visible_toggled" object="GtkListItem"/>
-            <binding name="active">
-              <lookup name="visible" type="GtkColumnViewColumn">
-                <lookup name="item">GtkListItem</lookup>
-              </lookup>
-            </binding>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="xalign">0</property>
-            <property name="label">label</property>
-            <binding name="label">
-              <lookup name="title" type="GtkColumnViewColumn">
-                <lookup name="item">GtkListItem</lookup>
-              </lookup>
-            </binding>
-          </object>
-        </child>
-      </object>
-    </property>
-  </template>
-</interface>
-             ]]></property>
-              </object>
-            </property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="halign">center</property>
-            <style>
-              <class name="linked"/>
-            </style>
-            <child>
-              <object class="GtkButton">
-                <property name="icon-name">go-down-symbolic</property>
-                <signal name="clicked" handler="move_column_down" object="columns_list"/>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton">
-                <property name="icon-name">go-up-symbolic</property>
-                <signal name="clicked" handler="move_column_up" object="columns_list"/>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

demos/gtk-demo/listview_weather.c

@@ -1,329 +0,0 @@
-/* Lists/Weather
- *
- * This demo shows a few of the rarer features of GtkListView and
- * how they can be used to display weather information.
- *
- * The hourly weather info uses a horizontal listview. This is easy
- * to achieve because GtkListView implements the GtkOrientable interface.
- * To make the items in the list stand out more, the listview uses
- * separators.
- *
- * A GtkNoSelectionModel is used to make sure no item in the list can be
- * selected. All other interactions with the items is still possible.
- *
- * The dataset used here has 70000 items.
- */
-
-#include <gtk/gtk.h>
-
-#define GTK_TYPE_WEATHER_INFO (gtk_weather_info_get_type ())
-
-G_DECLARE_FINAL_TYPE (GtkWeatherInfo, gtk_weather_info, GTK, WEATHER_INFO, GObject)
-
-typedef enum {
-  GTK_WEATHER_CLEAR,
-  GTK_WEATHER_FEW_CLOUDS,
-  GTK_WEATHER_FOG,
-  GTK_WEATHER_OVERCAST,
-  GTK_WEATHER_SCATTERED_SHOWERS,
-  GTK_WEATHER_SHOWERS,
-  GTK_WEATHER_SNOW,
-  GTK_WEATHER_STORM
-} GtkWeatherType;
-
-struct _GtkWeatherInfo
-{
-  GObject parent_instance;
-
-  gint64 timestamp;
-  int temperature;
-  GtkWeatherType weather_type;
-};
-
-struct _GtkWeatherInfoClass
-{
-  GObjectClass parent_class;
-};
-
-static void
-gtk_weather_info_class_init (GtkWeatherInfoClass *klass)
-{
-}
-
-static void
-gtk_weather_info_init (GtkWeatherInfo *self)
-{
-}
-
-G_DEFINE_TYPE (GtkWeatherInfo, gtk_weather_info, G_TYPE_OBJECT);
-
-static GtkWeatherInfo *
-gtk_weather_info_new (GDateTime      *timestamp,
-                      GtkWeatherInfo *copy_from)
-{
-  GtkWeatherInfo *result;
-
-  result = g_object_new (GTK_TYPE_WEATHER_INFO, NULL);
-
-  result->timestamp = g_date_time_to_unix (timestamp);
-  if (copy_from)
-    {
-      result->temperature = copy_from->temperature;
-      result->weather_type = copy_from->weather_type;
-      g_object_unref (copy_from);
-    }
-
-  return result;
-}
-
-static GDateTime *
-parse_timestamp (const char *string,
-                 GTimeZone  *timezone)
-{
-  char *with_seconds;
-  GDateTime *result;
-
-  with_seconds = g_strconcat (string, ":00", NULL);
-  result = g_date_time_new_from_iso8601 (with_seconds, timezone);
-  g_free (with_seconds);
-
-  return result;
-}
-
-static GtkWeatherType
-parse_weather_type (const char     *clouds,
-                    const char     *precip,
-                    GtkWeatherType  fallback)
-{
-  if (strstr (precip, "SN"))
-    return GTK_WEATHER_SNOW;
-
-  if (strstr (precip, "TS"))
-    return GTK_WEATHER_STORM;
-
-  if (strstr (precip, "DZ"))
-    return GTK_WEATHER_SCATTERED_SHOWERS;
-
-  if (strstr (precip, "SH") || strstr (precip, "RA"))
-    return GTK_WEATHER_SHOWERS;
-
-  if (strstr (precip, "FG"))
-    return GTK_WEATHER_FOG;
-
-  if (g_str_equal (clouds, "M") ||
-      g_str_equal (clouds, ""))
-    return fallback;
-
-  if (strstr (clouds, "OVC") ||
-      strstr (clouds, "BKN"))
-    return GTK_WEATHER_OVERCAST;
-
-  if (strstr (clouds, "BKN") ||
-      strstr (clouds, "SCT"))
-    return GTK_WEATHER_FEW_CLOUDS;
-
-  if (strstr (clouds, "VV"))
-    return GTK_WEATHER_FOG;
-
-  return GTK_WEATHER_CLEAR;
-}
-
-static double
-parse_temperature (const char *s,
-                   double      fallback)
-{
-  char *endptr;
-  double d;
-
-  d = g_ascii_strtod (s, &endptr);
-  if (*endptr != '\0')
-    return fallback;
-
-  return d;
-}
-
-static GListModel *
-create_weather_model (void)
-{
-  GListStore *store;
-  GTimeZone *utc;
-  GDateTime *timestamp;
-  GtkWeatherInfo *info;
-  GBytes *data;
-  char **lines;
-  guint i;
-
-  store = g_list_store_new (GTK_TYPE_WEATHER_INFO);
-  data = g_resources_lookup_data ("/listview_weather/listview_weather.txt", 0, NULL);
-  lines = g_strsplit (g_bytes_get_data (data, NULL), "\n", 0);
-
-  utc = g_time_zone_new_utc ();
-  timestamp = g_date_time_new (utc, 2011, 1, 1, 0, 0, 0);
-  info = gtk_weather_info_new (timestamp, NULL);
-  g_list_store_append (store, info);
-
-  for (i = 0; lines[i] != NULL && *lines[i]; i++)
-    {
-      char **fields;
-      GDateTime *date;
-
-      fields = g_strsplit (lines[i], ",", 0);
-      date = parse_timestamp (fields[0], utc);
-      while (g_date_time_difference (date, timestamp) > 30 * G_TIME_SPAN_MINUTE)
-        {
-          GDateTime *new_timestamp = g_date_time_add_hours (timestamp, 1);
-          g_date_time_unref (timestamp);
-          timestamp = new_timestamp;
-          info = gtk_weather_info_new (timestamp, info);
-          g_list_store_append (store, info);
-        }
-
-      info->temperature = parse_temperature (fields[1], info->temperature);
-      info->weather_type = parse_weather_type (fields[2], fields[3], info->weather_type);
-      g_date_time_unref (date);
-      g_strfreev (fields);
-    }
-
-  g_strfreev (lines);
-  g_bytes_unref (data);
-  g_time_zone_unref (utc);
-
-  return G_LIST_MODEL (store);
-}
-
-static void
-setup_widget (GtkListItem *list_item,
-              gpointer     unused)
-{
-  GtkWidget *box, *child;
-
-  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_list_item_set_child (list_item, box);
-
-  child = gtk_label_new (NULL);
-  gtk_label_set_width_chars (GTK_LABEL (child), 5);
-  gtk_container_add (GTK_CONTAINER (box), child);
-
-  child = gtk_image_new ();
-  gtk_image_set_icon_size (GTK_IMAGE (child), GTK_ICON_SIZE_LARGE);
-  gtk_container_add (GTK_CONTAINER (box), child);
-
-  child = gtk_label_new (NULL);
-  gtk_widget_set_vexpand (child, TRUE);
-  gtk_widget_set_valign (child, GTK_ALIGN_END);
-  gtk_label_set_width_chars (GTK_LABEL (child), 4);
-  gtk_container_add (GTK_CONTAINER (box), child);
-}
-
-static void
-bind_widget (GtkListItem *list_item,
-             gpointer     unused)
-{
-  GtkWidget *box, *child;
-  GtkWeatherInfo *info;
-  GDateTime *timestamp;
-  char *s;
-
-  box = gtk_list_item_get_child (list_item);
-  info = gtk_list_item_get_item (list_item);
-
-  child = gtk_widget_get_first_child (box);
-  timestamp = g_date_time_new_from_unix_utc (info->timestamp);
-  s = g_date_time_format (timestamp, "%R");
-  gtk_label_set_text (GTK_LABEL (child), s);
-  g_free (s);
-  g_date_time_unref (timestamp);
-
-  child = gtk_widget_get_next_sibling (child);
-  switch (info->weather_type)
-  {
-  case GTK_WEATHER_CLEAR:
-    gtk_image_set_from_icon_name (GTK_IMAGE (child), "weather-clear-symbolic");
-    break;
-  case GTK_WEATHER_FEW_CLOUDS:
-    gtk_image_set_from_icon_name (GTK_IMAGE (child), "weather-few-clouds-symbolic");
-    break;
-  case GTK_WEATHER_FOG:
-    gtk_image_set_from_icon_name (GTK_IMAGE (child), "weather-fog-symbolic");
-    break;
-  case GTK_WEATHER_OVERCAST:
-    gtk_image_set_from_icon_name (GTK_IMAGE (child), "weather-overcast-symbolic");
-    break;
-  case GTK_WEATHER_SCATTERED_SHOWERS:
-    gtk_image_set_from_icon_name (GTK_IMAGE (child), "weather-showers-scattered-symbolic");
-    break;
-  case GTK_WEATHER_SHOWERS:
-    gtk_image_set_from_icon_name (GTK_IMAGE (child), "weather-showers-symbolic");
-    break;
-  case GTK_WEATHER_SNOW:
-    gtk_image_set_from_icon_name (GTK_IMAGE (child), "weather-snow-symbolic");
-    break;
-  case GTK_WEATHER_STORM:
-    gtk_image_set_from_icon_name (GTK_IMAGE (child), "weather-storm-symbolic");
-    break;
-  default:
-    gtk_image_clear (GTK_IMAGE (child));
-    break;
-  }
-
-
-  child = gtk_widget_get_next_sibling (child);
-  s = g_strdup_printf ("%d°", info->temperature);
-  gtk_label_set_text (GTK_LABEL (child), s);
-  g_free (s);
-}
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-create_weather_view (void)
-{
-  GtkWidget *listview;
-  GListModel *model, *selection;
-
-  listview = gtk_list_view_new_with_factory (
-  gtk_functions_list_item_factory_new (setup_widget,
-                                       bind_widget,
-                                       NULL, NULL));
-  gtk_orientable_set_orientation (GTK_ORIENTABLE (listview), GTK_ORIENTATION_HORIZONTAL);
-  gtk_list_view_set_show_separators (GTK_LIST_VIEW (listview), TRUE);
-  model = create_weather_model ();
-  selection = G_LIST_MODEL (gtk_no_selection_new (model));
-  gtk_list_view_set_model (GTK_LIST_VIEW (listview), selection);
-  g_object_unref (selection);
-  g_object_unref (model);
-
-  return listview;
-}
-
-GtkWidget *
-do_listview_weather (GtkWidget *do_widget)
-{
-  if (window == NULL)
-    {
-      GtkWidget *listview, *sw;;
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
-      gtk_window_set_title (GTK_WINDOW (window), "Weather");
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Weather");
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK(gtk_widget_destroyed), &window);
-
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (window), sw);
-    
-      listview = create_weather_view ();
-
-      gtk_container_add (GTK_CONTAINER (sw), listview);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/main-listitem.ui

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkTreeExpander" id="expander">
-        <binding name="list-row">
-          <lookup name="item">GtkListItem</lookup>
-        </binding>
-        <property name="child">
-          <object class="GtkLabel">
-            <property name="halign">start</property>
-            <binding name="label">
-              <lookup name="title" type="GtkDemo">
-                <lookup name="item">expander</lookup>
-              </lookup>
-            </binding>
-          </object>
-        </property>
-      </object>
-    </property>
-  </template>
-</interface>

demos/gtk-demo/main.c

@@ -8,7 +8,6 @@
 #include <gtk/gtk.h>
 #include <glib/gstdio.h>
 
-#include "award.h"
 #include "demos.h"
 
 static GtkWidget *info_view;
@@ -16,99 +15,19 @@ static GtkWidget *source_view;
 
 static gchar *current_file = NULL;
 
-static GtkWidget *window;
 static GtkWidget *notebook;
-static GtkWidget *listview;
-static GtkSingleSelection *selection;
+static GtkWidget *treeview;
 static GtkWidget *headerbar;
 
-typedef struct _GtkDemo GtkDemo;
-struct _GtkDemo
-{
-  GObject parent_instance;
-
-  const char *name;
-  const char *title;
-  const char *filename;
-  GDoDemoFunc func;
-  GListModel *children_model;
-};
-
 enum {
-  PROP_0,
-  PROP_FILENAME,
-  PROP_NAME,
-  PROP_TITLE,
-
-  N_PROPS
+  NAME_COLUMN,
+  TITLE_COLUMN,
+  FILENAME_COLUMN,
+  FUNC_COLUMN,
+  STYLE_COLUMN,
+  NUM_COLUMNS
 };
 
-# define GTK_TYPE_DEMO (gtk_demo_get_type ())
-G_DECLARE_FINAL_TYPE (GtkDemo, gtk_demo, GTK, DEMO, GObject);
-
-G_DEFINE_TYPE (GtkDemo, gtk_demo, G_TYPE_OBJECT);
-static GParamSpec *properties[N_PROPS] = { NULL, };
-
-static void
-gtk_demo_get_property (GObject    *object,
-                       guint       property_id,
-                       GValue     *value,
-                       GParamSpec *pspec)
-{
-  GtkDemo *self = GTK_DEMO (object);
-
-  switch (property_id)
-    {
-    case PROP_FILENAME:
-      g_value_set_string (value, self->filename);
-      break;
-
-    case PROP_NAME:
-      g_value_set_string (value, self->name);
-      break;
-
-    case PROP_TITLE:
-      g_value_set_string (value, self->title);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void gtk_demo_class_init (GtkDemoClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->get_property = gtk_demo_get_property;
-
-  properties[PROP_FILENAME] =
-    g_param_spec_string ("filename",
-                         "filename",
-                         "filename",
-                         NULL,
-                         G_PARAM_READABLE);
-  properties[PROP_NAME] =
-    g_param_spec_string ("name",
-                         "name",
-                         "name",
-                         NULL,
-                         G_PARAM_READABLE);
-  properties[PROP_TITLE] =
-    g_param_spec_string ("title",
-                         "title",
-                         "title",
-                         NULL,
-                         G_PARAM_READABLE);
-
-  g_object_class_install_properties (gobject_class, N_PROPS, properties);
-}
-
-static void gtk_demo_init (GtkDemo *self)
-{
-}
-
 typedef struct _CallbackData CallbackData;
 struct _CallbackData
 {
@@ -116,27 +35,6 @@ struct _CallbackData
   GtkTreePath *path;
 };
 
-static gboolean
-gtk_demo_run (GtkDemo   *self,
-              GtkWidget *window)
-{
-  GtkWidget *result;
-
-  if (!self->func)
-    return FALSE;
-
-  result = self->func (window);
-  if (result == NULL)
-    return FALSE;
-
-  if (GTK_IS_WINDOW (result))
-    {
-      gtk_window_set_transient_for (GTK_WINDOW (result), GTK_WINDOW (window));
-      gtk_window_set_modal (GTK_WINDOW (result), TRUE);
-    }
-  return TRUE;
-}
-              
 static void
 activate_about (GSimpleAction *action,
                 GVariant      *parameter,
@@ -213,7 +111,69 @@ activate_inspector (GSimpleAction *action,
                     gpointer       user_data)
 {
   gtk_window_set_interactive_debugging (TRUE);
-  award ("demo-inspector");
+}
+
+static void
+window_closed_cb (GtkWidget *window, gpointer data)
+{
+  CallbackData *cbdata = data;
+  GtkTreeIter iter;
+  PangoStyle style;
+
+  gtk_tree_model_get_iter (cbdata->model, &iter, cbdata->path);
+  gtk_tree_model_get (GTK_TREE_MODEL (cbdata->model), &iter,
+                      STYLE_COLUMN, &style,
+                      -1);
+  if (style == PANGO_STYLE_ITALIC)
+    gtk_tree_store_set (GTK_TREE_STORE (cbdata->model), &iter,
+                        STYLE_COLUMN, PANGO_STYLE_NORMAL,
+                        -1);
+
+  gtk_tree_path_free (cbdata->path);
+  g_free (cbdata);
+}
+
+static void
+run_example_for_row (GtkWidget    *window,
+                     GtkTreeModel *model,
+                     GtkTreeIter  *iter)
+{
+  PangoStyle style;
+  GDoDemoFunc func;
+  GtkWidget *demo;
+
+  gtk_tree_model_get (GTK_TREE_MODEL (model),
+                      iter,
+                      FUNC_COLUMN, &func,
+                      STYLE_COLUMN, &style,
+                      -1);
+
+  if (func)
+    {
+      gtk_tree_store_set (GTK_TREE_STORE (model),
+                          iter,
+                          STYLE_COLUMN, (style == PANGO_STYLE_ITALIC ? PANGO_STYLE_NORMAL : PANGO_STYLE_ITALIC),
+                          -1);
+      demo = (func) (window);
+
+      if (demo != NULL)
+        {
+          CallbackData *cbdata;
+
+          cbdata = g_new (CallbackData, 1);
+          cbdata->model = model;
+          cbdata->path = gtk_tree_model_get_path (model, iter);
+
+          if (GTK_IS_WINDOW (demo))
+            {
+              gtk_window_set_transient_for (GTK_WINDOW (demo), GTK_WINDOW (window));
+              gtk_window_set_modal (GTK_WINDOW (demo), TRUE);
+            }
+
+          g_signal_connect (demo, "destroy",
+                            G_CALLBACK (window_closed_cb), cbdata);
+        }
+    }
 }
 
 static void
@@ -221,10 +181,14 @@ activate_run (GSimpleAction *action,
               GVariant      *parameter,
               gpointer       user_data)
 {
-  GtkTreeListRow *row = gtk_single_selection_get_selected_item (selection);
-  GtkDemo *demo = gtk_tree_list_row_get_item (row);
+  GtkWidget *window = user_data;
+  GtkTreeSelection *selection;
+  GtkTreeModel *model;
+  GtkTreeIter iter;
 
-  gtk_demo_run (demo, window);
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
+  if (gtk_tree_selection_get_selected (selection, &model, &iter))
+    run_example_for_row (window, model, &iter);
 }
 
 /* Stupid syntax highlighting.
@@ -929,72 +893,81 @@ load_file (const gchar *demoname,
 }
 
 static void
-
-selection_cb (GtkSingleSelection *selection,
-              GParamSpec         *pspec,
-              gpointer            user_data)
+selection_cb (GtkTreeSelection *selection,
+              GtkTreeModel     *model)
 {
-  GtkTreeListRow *row = gtk_single_selection_get_selected_item (selection);
-  GtkDemo *demo = gtk_tree_list_row_get_item (row);
+  GtkTreeIter iter;
+  char *name;
+  char *filename;
+  char *title;
 
-  if (demo->filename)
-    load_file (demo->name, demo->filename);
+  if (! gtk_tree_selection_get_selected (selection, NULL, &iter))
+    return;
 
-  gtk_header_bar_set_title (GTK_HEADER_BAR (headerbar), demo->title);
+  gtk_tree_model_get (model, &iter,
+                      NAME_COLUMN, &name,
+                      TITLE_COLUMN, &title,
+                      FILENAME_COLUMN, &filename,
+                      -1);
+
+  if (filename)
+    load_file (name, filename);
+
+  gtk_header_bar_set_title (GTK_HEADER_BAR (headerbar), title);
+
+  g_free (name);
+  g_free (title);
+  g_free (filename);
 }
 
-static GListModel *
-create_demo_model (void)
+static void
+populate_model (GtkTreeModel *model)
 {
-  GListStore *store = g_list_store_new (GTK_TYPE_DEMO);
-  DemoData *demo = gtk_demos;
+  Demo *d = gtk_demos;
 
-  while (demo->title)
+  /* this code only supports 1 level of children. If we
+   * want more we probably have to use a recursing function.
+   */
+  while (d->title)
     {
-      GtkDemo *d = GTK_DEMO (g_object_new (GTK_TYPE_DEMO, NULL));
-      DemoData *children = demo->children;
+      Demo *children = d->children;
+      GtkTreeIter iter;
 
-      d->name = demo->name;
-      d->title = demo->title;
-      d->filename = demo->filename;
-      d->func = demo->func;
+      gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
 
-      g_list_store_append (store, d);
+      gtk_tree_store_set (GTK_TREE_STORE (model),
+                          &iter,
+                          NAME_COLUMN, d->name,
+                          TITLE_COLUMN, d->title,
+                          FILENAME_COLUMN, d->filename,
+                          FUNC_COLUMN, d->func,
+                          STYLE_COLUMN, PANGO_STYLE_NORMAL,
+                          -1);
 
-      if (children)
+      d++;
+
+      if (!children)
+        continue;
+
+      while (children->title)
         {
-          d->children_model = G_LIST_MODEL (g_list_store_new (GTK_TYPE_DEMO));
+          GtkTreeIter child_iter;
 
-          while (children->title)
-            {
-              GtkDemo *child = GTK_DEMO (g_object_new (GTK_TYPE_DEMO, NULL));
+          gtk_tree_store_append (GTK_TREE_STORE (model), &child_iter, &iter);
 
-              child->name = children->name;
-              child->title = children->title;
-              child->filename = children->filename;
-              child->func = children->func;
+          gtk_tree_store_set (GTK_TREE_STORE (model),
+                              &child_iter,
+                              NAME_COLUMN, children->name,
+                              TITLE_COLUMN, children->title,
+                              FILENAME_COLUMN, children->filename,
+                              FUNC_COLUMN, children->func,
+                              STYLE_COLUMN, PANGO_STYLE_NORMAL,
+                              -1);
 
-              g_list_store_append (G_LIST_STORE (d->children_model), child);
-              children++;
-            }
+          children++;
         }
-
-      demo++;
     }
 
-  return G_LIST_MODEL (store);
-}
-
-static GListModel *
-get_child_model (gpointer item,
-                 gpointer user_data)
-{
-  GtkDemo *demo = item;
-
-  if (demo->children_model)
-    return g_object_ref (G_LIST_MODEL (demo->children_model));
-
-  return NULL;
 }
 
 static void
@@ -1014,6 +987,22 @@ startup (GApplication *app)
   g_object_unref (builder);
 }
 
+static void
+row_activated_cb (GtkWidget         *tree_view,
+                  GtkTreePath       *path,
+                  GtkTreeViewColumn *column)
+{
+  GtkTreeIter iter;
+  GtkWidget *window;
+  GtkTreeModel *model;
+
+  window = GTK_WIDGET (gtk_widget_get_root (tree_view));
+  model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree_view));
+  gtk_tree_model_get_iter (model, &iter, path);
+
+  run_example_for_row (window, model, &iter);
+}
+
 static void
 start_cb (GtkMenuItem *item, GtkWidget *scrollbar)
 {
@@ -1040,36 +1029,34 @@ scrollbar_popup (GtkWidget *scrollbar, GtkWidget *menu)
   return TRUE;
 }
 
-void
-main_activate_cb (GtkListView *listview,
-                  guint        position,
-                  gpointer     user_data)
-{
-  GtkTreeListRow *row = g_list_model_get_item (gtk_list_view_get_model (listview), position);
-  GtkDemo *demo = gtk_tree_list_row_get_item (row);
-
-  gtk_demo_run (demo, window);
-}
-
 static void
 activate (GApplication *app)
 {
   GtkBuilder *builder;
+  GtkWindow *window;
+  GtkWidget *widget;
+  GtkTreeModel *model;
+  GtkTreeIter iter;
+  GError *error = NULL;
   GtkWidget *sw;
   GtkWidget *scrollbar;
   GtkWidget *menu;
   GtkWidget *item;
-  GListModel *listmodel;
-  GtkTreeListModel *treemodel;
 
   static GActionEntry win_entries[] = {
     { "run", activate_run, NULL, NULL, NULL }
   };
 
-  builder = gtk_builder_new_from_resource ("/ui/main.ui");
+  builder = gtk_builder_new ();
+  gtk_builder_add_from_resource (builder, "/ui/main.ui", &error);
+  if (error != NULL)
+    {
+      g_critical ("%s", error->message);
+      exit (1);
+    }
 
-  window = (GtkWidget *)gtk_builder_get_object (builder, "window");
-  gtk_application_add_window (GTK_APPLICATION (app), GTK_WINDOW (window));
+  window = (GtkWindow *)gtk_builder_get_object (builder, "window");
+  gtk_application_add_window (GTK_APPLICATION (app), window);
   g_action_map_add_action_entries (G_ACTION_MAP (window),
                                    win_entries, G_N_ELEMENTS (win_entries),
                                    window);
@@ -1079,7 +1066,8 @@ activate (GApplication *app)
   info_view = (GtkWidget *)gtk_builder_get_object (builder, "info-textview");
   source_view = (GtkWidget *)gtk_builder_get_object (builder, "source-textview");
   headerbar = (GtkWidget *)gtk_builder_get_object (builder, "headerbar");
-  listview = (GtkWidget *)gtk_builder_get_object (builder, "listview");
+  treeview = (GtkWidget *)gtk_builder_get_object (builder, "treeview");
+  model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview));
 
   sw = (GtkWidget *)gtk_builder_get_object (builder, "source-scrolledwindow");
   scrollbar = gtk_scrolled_window_get_vscrollbar (GTK_SCROLLED_WINDOW (sw));
@@ -1098,19 +1086,17 @@ activate (GApplication *app)
 
   load_file (gtk_demos[0].name, gtk_demos[0].filename);
 
-  listmodel = create_demo_model ();
-  treemodel = gtk_tree_list_model_new (FALSE,
-                                       G_LIST_MODEL (listmodel),
-                                       FALSE,
-                                       get_child_model,
-                                       NULL,
-                                       NULL);
-  selection = gtk_single_selection_new (G_LIST_MODEL (treemodel));
-  g_signal_connect (selection, "notify::selected-item", G_CALLBACK (selection_cb), NULL);
-  gtk_list_view_set_model (GTK_LIST_VIEW (listview),
-                           G_LIST_MODEL (selection));
+  populate_model (model);
 
-  award ("demo-start");
+  g_signal_connect (treeview, "row-activated", G_CALLBACK (row_activated_cb), model);
+
+  widget = (GtkWidget *)gtk_builder_get_object (builder, "treeview-selection");
+  g_signal_connect (widget, "changed", G_CALLBACK (selection_cb), model);
+
+  gtk_tree_model_get_iter_first (gtk_tree_view_get_model (GTK_TREE_VIEW (treeview)), &iter);
+  gtk_tree_selection_select_iter (GTK_TREE_SELECTION (widget), &iter);
+
+  gtk_tree_view_collapse_all (GTK_TREE_VIEW (treeview));
 
   gtk_widget_show (GTK_WIDGET (window));
 
@@ -1127,7 +1113,7 @@ auto_quit (gpointer data)
 static void
 list_demos (void)
 {
-  DemoData *d, *c;
+  Demo *d, *c;
 
   d = gtk_demos;
 
@@ -1154,7 +1140,7 @@ command_line (GApplication            *app,
   const gchar *name = NULL;
   gboolean autoquit = FALSE;
   gboolean list = FALSE;
-  DemoData *d, *c;
+  Demo *d, *c;
   GDoDemoFunc func = 0;
   GtkWidget *window, *demo;
 

demos/gtk-demo/main.ui

@@ -28,6 +28,7 @@
     <property name="default-width">800</property>
     <property name="default-height">600</property>
     <property name="title">GTK Demo</property>
+    <signal name="destroy" handler="gtk_main_quit" swapped="no"/>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar">
         <property name="show-title-buttons">1</property>
@@ -65,15 +66,32 @@
                 <property name="can-focus">1</property>
                 <property name="hscrollbar-policy">never</property>
                 <property name="min-content-width">150</property>
-
                 <child>
-                  <object class="GtkListView" id="listview">
-                    <signal name="activate" handler="main_activate_cb" swapped="no" />
-                    <property name="factory">
-                      <object class="GtkBuilderListItemFactory">
-                        <property name="resource">/ui/main-listitem.ui</property>
+                  <object class="GtkTreeView" id="treeview">
+                    <property name="can-focus">1</property>
+                    <property name="model">treestore</property>
+                    <property name="headers-visible">0</property>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection" id="treeview-selection">
+                        <property name="mode">browse</property>
                       </object>
-                    </property>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn">
+                        <child>
+                          <object class="GtkCellRendererText"/>
+                          <attributes>
+                            <attribute name="style">4</attribute>
+                            <attribute name="text">1</attribute>
+                          </attributes>
+                        </child>
+                        <child>
+                          <object class="GtkCellRendererText">
+                            <property name="text">  </property>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
                   </object>
                 </child>
               </object>

demos/gtk-demo/meson.build

@@ -3,7 +3,6 @@
 demos = files([
   'application_demo.c',
   'assistant.c',
-  'awardview.c',
   'builder.c',
   'changedisplay.c',
   'clipboard.c',
@@ -44,13 +43,6 @@ demos = files([
   'listbox.c',
   'flowbox.c',
   'list_store.c',
-  'listview_applauncher.c',
-  'listview_clocks.c',
-  'listview_colors.c',
-  'listview_filebrowser.c',
-  'listview_minesweeper.c',
-  'listview_settings.c',
-  'listview_weather.c',
   'markup.c',
   'menus.c',
   'modelbutton.c',
@@ -94,7 +86,6 @@ demos = files([
 gtkdemo_deps = [ libgtk_dep, ]
 
 extra_demo_sources = files(['main.c',
-                            'award.c',
                             'gtkfishbowl.c',
                             'fontplane.c',
                             'gtkgears.c',
@@ -105,7 +96,7 @@ extra_demo_sources = files(['main.c',
 if harfbuzz_dep.found() and pangoft_dep.found()
   demos += files('font_features.c')
   extra_demo_sources += files(['script-names.c', 'language-names.c'])
-  gtkdemo_deps += [ harfbuzz_dep, epoxy_dep ]
+  gtkdemo_deps += [ harfbuzz_dep, ]
 endif
 
 if os_unix

demos/gtk-demo/modelbutton.c

@@ -14,8 +14,8 @@
 
 #include <gtk/gtk.h>
 
-void
-modelbutton_tool_clicked (GtkButton *button)
+static void
+tool_clicked (GtkButton *button)
 {
   gboolean active;
 
@@ -40,6 +40,8 @@ do_modelbutton (GtkWidget *do_widget)
       GActionGroup *actions;
 
       builder = gtk_builder_new_from_resource ("/modelbutton/modelbutton.ui");
+      gtk_builder_add_callback_symbol (builder, "tool_clicked", G_CALLBACK (tool_clicked));
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

demos/gtk-demo/modelbutton.ui

@@ -101,21 +101,21 @@
           <object class="GtkModelButton">
             <property name="text">Hammer</property>
             <property name="role">check</property>
-            <signal name="clicked" handler="modelbutton_tool_clicked"/>
+            <signal name="clicked" handler="tool_clicked"/>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
             <property name="text">Screwdriver</property>
             <property name="role">check</property>
-            <signal name="clicked" handler="modelbutton_tool_clicked"/>
+            <signal name="clicked" handler="tool_clicked"/>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
             <property name="text">Drill</property>
             <property name="role">check</property>
-            <signal name="clicked" handler="modelbutton_tool_clicked"/>
+            <signal name="clicked" handler="tool_clicked"/>
           </object>
         </child>
       </object>

demos/gtk-demo/password_entry.c

@@ -11,8 +11,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "award.h"
-
 static GtkWidget *entry;
 static GtkWidget *entry2;
 static GtkWidget *button;
@@ -27,18 +25,6 @@ update_button (GObject    *object,
 
   gtk_widget_set_sensitive (button,
                             text[0] != '\0' && g_str_equal (text, text2));
-
-  if (g_str_equal (text, text2) &&
-      g_ascii_strcasecmp (text, "12345") == 0)
-    award ("password-best");
-}
-
-static void
-button_pressed (GtkButton *button,
-                GtkWidget *window)
-{
-  award ("password-correct");
-  gtk_widget_destroy (window);
 }
 
 GtkWidget *
@@ -86,7 +72,7 @@ do_password_entry (GtkWidget *do_widget)
 
       button = gtk_button_new_with_mnemonic ("_Done");
       gtk_style_context_add_class (gtk_widget_get_style_context (button), "suggested-action");
-      g_signal_connect (button, "clicked", G_CALLBACK (button_pressed), window);
+      g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_widget_destroy), window);
       gtk_widget_set_sensitive (button, FALSE);
       gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);
 

demos/gtk-demo/revealer.c

@@ -69,6 +69,7 @@ do_revealer (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/revealer/revealer.ui");
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

demos/gtk-demo/scale.c

@@ -18,6 +18,7 @@ do_scale (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/scale/scale.ui");
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

demos/gtk-demo/scale.ui

@@ -75,11 +75,11 @@
             <property name="adjustment">adjustment2</property>
             <property name="hexpand">1</property>
             <marks>
-              <mark value="0" position="bottom"></mark>
-              <mark value="1" position="bottom"></mark>
-              <mark value="2" position="bottom"></mark>
-              <mark value="3" position="bottom"></mark>
-              <mark value="4" position="bottom"></mark>
+              <mark value="0" position="bottom"/>
+              <mark value="1" position="bottom"/>
+              <mark value="2" position="bottom"/>
+              <mark value="3" position="bottom"/>
+              <mark value="4" position="bottom"/>
             </marks>
             <accessibility>
               <relation type="labelled-by" target="label_marks"/>
@@ -115,11 +115,11 @@
               <relation type="labelled-by" target="label_discrete"/>
             </accessibility>
             <marks>
-              <mark value="0" position="bottom"></mark>
-              <mark value="1" position="bottom"></mark>
-              <mark value="2" position="bottom"></mark>
-              <mark value="3" position="bottom"></mark>
-              <mark value="4" position="bottom"></mark>
+              <mark value="0" position="bottom"/>
+              <mark value="1" position="bottom"/>
+              <mark value="2" position="bottom"/>
+              <mark value="3" position="bottom"/>
+              <mark value="4" position="bottom"/>
             </marks>
             <layout>
               <property name="left-attach">1</property>

demos/gtk-demo/shortcuts.c

@@ -25,44 +25,44 @@ show_shortcuts (GtkWidget   *window,
   g_object_unref (builder);
 }
 
-void
-shortcuts_builder_shortcuts (GtkWidget *window)
+static void
+builder_shortcuts (GtkWidget *window)
 {
   show_shortcuts (window, "shortcuts-builder", NULL);
 }
 
-void
-shortcuts_gedit_shortcuts (GtkWidget *window)
+static void
+gedit_shortcuts (GtkWidget *window)
 {
   show_shortcuts (window, "shortcuts-gedit", NULL);
 }
 
-void
-shortcuts_clocks_shortcuts (GtkWidget *window)
+static void
+clocks_shortcuts (GtkWidget *window)
 {
   show_shortcuts (window, "shortcuts-clocks", NULL);
 }
 
-void
-shortcuts_clocks_shortcuts_stopwatch (GtkWidget *window)
+static void
+clocks_shortcuts_stopwatch (GtkWidget *window)
 {
   show_shortcuts (window, "shortcuts-clocks", "stopwatch");
 }
 
-void
-shortcuts_boxes_shortcuts (GtkWidget *window)
+static void
+boxes_shortcuts (GtkWidget *window)
 {
   show_shortcuts (window, "shortcuts-boxes", NULL);
 }
 
-void
-shortcuts_boxes_shortcuts_wizard (GtkWidget *window)
+static void
+boxes_shortcuts_wizard (GtkWidget *window)
 {
   show_shortcuts (window, "shortcuts-boxes", "wizard");
 }
 
-void
-shortcuts_boxes_shortcuts_display (GtkWidget *window)
+static void
+boxes_shortcuts_display (GtkWidget *window)
 {
   show_shortcuts (window, "shortcuts-boxes", "display");
 }
@@ -86,6 +86,16 @@ do_shortcuts (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/shortcuts/shortcuts.ui");
+      gtk_builder_add_callback_symbols (builder,
+                                        "builder_shortcuts", G_CALLBACK (builder_shortcuts),
+                                        "gedit_shortcuts", G_CALLBACK (gedit_shortcuts),
+                                        "clocks_shortcuts", G_CALLBACK (clocks_shortcuts),
+                                        "clocks_shortcuts_stopwatch", G_CALLBACK (clocks_shortcuts_stopwatch),
+                                        "boxes_shortcuts", G_CALLBACK (boxes_shortcuts),
+                                        "boxes_shortcuts_wizard", G_CALLBACK (boxes_shortcuts_wizard),
+                                        "boxes_shortcuts_display", G_CALLBACK (boxes_shortcuts_display),
+                                        NULL);
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

demos/gtk-demo/shortcuts.ui

@@ -10,43 +10,43 @@
         <child>
           <object class="GtkButton">
             <property name="label">Builder</property>
-            <signal name="clicked" handler="shortcuts_builder_shortcuts" swapped="1" object="window1"/>
+            <signal name="clicked" handler="builder_shortcuts" swapped="1" object="window1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
             <property name="label">GEdit</property>
-            <signal name="clicked" handler="shortcuts_gedit_shortcuts" swapped="1" object="window1"/>
+            <signal name="clicked" handler="gedit_shortcuts" swapped="1" object="window1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
             <property name="label">Clocks - All</property>
-            <signal name="clicked" handler="shortcuts_clocks_shortcuts" swapped="1" object="window1"/>
+            <signal name="clicked" handler="clocks_shortcuts" swapped="1" object="window1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
             <property name="label">Clocks - Stopwatch</property>
-            <signal name="clicked" handler="shortcuts_clocks_shortcuts_stopwatch" swapped="1" object="window1"/>
+            <signal name="clicked" handler="clocks_shortcuts_stopwatch" swapped="1" object="window1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
             <property name="label">Boxes</property>
-            <signal name="clicked" handler="shortcuts_boxes_shortcuts" swapped="1" object="window1"/>
+            <signal name="clicked" handler="boxes_shortcuts" swapped="1" object="window1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
             <property name="label">Boxes - Wizard</property>
-            <signal name="clicked" handler="shortcuts_boxes_shortcuts_wizard" swapped="1" object="window1"/>
+            <signal name="clicked" handler="boxes_shortcuts_wizard" swapped="1" object="window1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
             <property name="label">Boxes - Display</property>
-            <signal name="clicked" handler="shortcuts_boxes_shortcuts_display" swapped="1" object="window1"/>
+            <signal name="clicked" handler="boxes_shortcuts_display" swapped="1" object="window1"/>
           </object>
         </child>
       </object>

demos/gtk-demo/sliding_puzzle.c

@@ -11,9 +11,6 @@
 #include "puzzlepiece.h"
 #include "paintable.h"
 
-/* Give out awards */
-#include "award.h"
-
 static GtkWidget *window = NULL;
 static GtkWidget *frame = NULL;
 static GtkWidget *choices = NULL;
@@ -159,14 +156,6 @@ check_solved (GtkWidget *grid)
   picture = gtk_grid_get_child_at (GTK_GRID (grid), pos_x, pos_y);
   gtk_picture_set_paintable (GTK_PICTURE (picture), piece);
 
-  /* Hand out a bunch of awards
-   */
-  award ("puzzle-solve");
-  if ((gdk_paintable_get_flags (piece) & GDK_PAINTABLE_STATIC_CONTENTS) == 0)
-    award ("puzzle-solve-animated");
-  if (height * width > 20)
-    award ("puzzle-solve-large");
-
   return TRUE;
 }
 
@@ -412,18 +401,6 @@ add_choice (GtkWidget    *choices,
   gtk_container_add (GTK_CONTAINER (choices), icon);
 }
 
-static void
-widget_destroyed (GtkWidget      *widget,
-		  GtkWidget     **widget_pointer)
-{
-  if (widget_pointer)
-    *widget_pointer = NULL;
-
-  if (!solved)
-    award ("puzzle-give-up");
-}
-
-
 GtkWidget *
 do_sliding_puzzle (GtkWidget *do_widget)
 {
@@ -492,7 +469,7 @@ do_sliding_puzzle (GtkWidget *do_widget)
       gtk_window_set_titlebar (GTK_WINDOW (window), header);
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
       g_signal_connect (window, "destroy",
-                        G_CALLBACK (widget_destroyed), &window);
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       frame = gtk_aspect_frame_new (NULL, 0.5, 0.5, (float) gdk_paintable_get_intrinsic_aspect_ratio (puzzle), FALSE);
       gtk_container_add (GTK_CONTAINER (window), frame);

demos/gtk-demo/spinbutton.c

@@ -11,9 +11,9 @@
 #include <math.h>
 #include <stdlib.h>
 
-gint
-spinbutton_hex_spin_input (GtkSpinButton *spin_button,
-                           gdouble       *new_val)
+static gint
+hex_spin_input (GtkSpinButton *spin_button,
+                gdouble       *new_val)
 {
   const gchar *buf;
   gchar *err;
@@ -28,8 +28,8 @@ spinbutton_hex_spin_input (GtkSpinButton *spin_button,
     return TRUE;
 }
 
-gint
-spinbutton_hex_spin_output (GtkSpinButton *spin_button)
+static gint
+hex_spin_output (GtkSpinButton *spin_button)
 {
   GtkAdjustment *adjustment;
   gchar *buf;
@@ -48,9 +48,9 @@ spinbutton_hex_spin_output (GtkSpinButton *spin_button)
   return TRUE;
 }
 
-gint
-spinbutton_time_spin_input (GtkSpinButton *spin_button,
-                            gdouble       *new_val)
+static gint
+time_spin_input (GtkSpinButton *spin_button,
+                 gdouble       *new_val)
 {
   const gchar *text;
   gchar **str;
@@ -87,8 +87,8 @@ spinbutton_time_spin_input (GtkSpinButton *spin_button,
   return TRUE;
 }
 
-gint
-spinbutton_time_spin_output (GtkSpinButton *spin_button)
+static gint
+time_spin_output (GtkSpinButton *spin_button)
 {
   GtkAdjustment *adjustment;
   gchar *buf;
@@ -121,9 +121,9 @@ static gchar *month[12] = {
   "December"
 };
 
-gint
-spinbutton_month_spin_input (GtkSpinButton *spin_button,
-                             gdouble       *new_val)
+static gint
+month_spin_input (GtkSpinButton *spin_button,
+                  gdouble       *new_val)
 {
   gint i;
   gchar *tmp1, *tmp2;
@@ -150,8 +150,8 @@ spinbutton_month_spin_input (GtkSpinButton *spin_button,
   return TRUE;
 }
 
-gint
-spinbutton_month_spin_output (GtkSpinButton *spin_button)
+static gint
+month_spin_output (GtkSpinButton *spin_button)
 {
   GtkAdjustment *adjustment;
   gdouble value;
@@ -191,6 +191,15 @@ do_spinbutton (GtkWidget *do_widget)
     GtkWidget *label;
 
     builder = gtk_builder_new_from_resource ("/spinbutton/spinbutton.ui");
+    gtk_builder_add_callback_symbols (builder,
+                                      "hex_spin_input", G_CALLBACK (hex_spin_input),
+                                      "hex_spin_output", G_CALLBACK (hex_spin_output),
+                                      "time_spin_input", G_CALLBACK (time_spin_input),
+                                      "time_spin_output", G_CALLBACK (time_spin_output),
+                                      "month_spin_input", G_CALLBACK (month_spin_input),
+                                      "month_spin_output", G_CALLBACK (month_spin_output),
+                                      NULL);
+    gtk_builder_connect_signals (builder, NULL);
     window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
     gtk_window_set_display (GTK_WINDOW (window),
                             gtk_widget_get_display (do_widget));

demos/gtk-demo/spinbutton.ui

@@ -83,8 +83,8 @@
             <property name="halign">start</property>
             <property name="width-chars">4</property>
             <property name="adjustment">hex_adjustment</property>
-            <signal name="input" handler="spinbutton_hex_spin_input"/>
-            <signal name="output" handler="spinbutton_hex_spin_output"/>
+            <signal name="input" handler="hex_spin_input"/>
+            <signal name="output" handler="hex_spin_output"/>
             <property name="wrap">1</property>
             <layout>
               <property name="left-attach">1</property>
@@ -119,8 +119,8 @@
             <property name="halign">start</property>
             <property name="width-chars">5</property>
             <property name="adjustment">time_adjustment</property>
-            <signal name="input" handler="spinbutton_time_spin_input"/>
-            <signal name="output" handler="spinbutton_time_spin_output"/>
+            <signal name="input" handler="time_spin_input"/>
+            <signal name="output" handler="time_spin_output"/>
             <property name="wrap">1</property>
             <layout>
               <property name="left-attach">1</property>
@@ -154,8 +154,8 @@
           <object class="GtkSpinButton" id="month_spin">
             <property name="halign">start</property>
             <property name="width-chars">9</property>
-            <signal name="input" handler="spinbutton_month_spin_input"/>
-            <signal name="output" handler="spinbutton_month_spin_output"/>
+            <signal name="input" handler="month_spin_input"/>
+            <signal name="output" handler="month_spin_output"/>
             <property name="adjustment">month_adjustment</property>
             <property name="wrap">1</property>
             <property name="update-policy">if-valid</property>

demos/gtk-demo/stack.c

@@ -18,6 +18,7 @@ do_stack (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/stack/stack.ui");
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

demos/gtk-demo/themes.ui

@@ -6,235 +6,236 @@
       <object class="GtkHeaderBar" id="header">
         <property name="show-title-buttons">1</property>
         <child type="end">
-          <object class="GtkLabel" id="fps"/>
+          <object class="GtkLabel" id="fps">
+          </object>
         </child>
       </object>
     </child>
     <child>
-      <object class="GtkGrid" id="grid">
-        <property name="margin">10</property>
-        <property name="row-spacing">10</property>
-        <property name="orientation">vertical</property>
+  <object class="GtkGrid" id="grid">
+    <property name="margin">10</property>
+    <property name="row-spacing">10</property>
+    <property name="orientation">vertical</property>
+    <child>
+      <object class="GtkToolbar">
+        <property name="hexpand">1</property>
+        <property name="show-arrow">0</property>
+        <style>
+          <class name="primary-toolbar"/>
+        </style>
         <child>
-          <object class="GtkToolbar">
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="label" translatable="yes">Normal</property>
+            <property name="use-underline">1</property>
+            <property name="is-important">1</property>
+            <property name="icon-name">edit-find</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="label" translatable="yes">Active</property>
+            <property name="use-underline">1</property>
+            <property name="is-important">1</property>
+            <property name="icon-name">edit-find</property>
+            <property name="active">1</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="sensitive">0</property>
+            <property name="label" translatable="yes">Insensitive</property>
+            <property name="use-underline">1</property>
+            <property name="is-important">1</property>
+            <property name="icon-name">edit-find</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="label" translatable="yes">Raised</property>
+            <property name="use-underline">1</property>
+            <property name="is-important">1</property>
+            <property name="icon-name">edit-find</property>
+            <style>
+              <class name="raised"/>
+            </style>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="label" translatable="yes">Raised Active</property>
+            <property name="use-underline">1</property>
+            <property name="is-important">1</property>
+            <property name="icon-name">edit-find</property>
+            <property name="active">1</property>
+            <style>
+              <class name="raised"/>
+            </style>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="sensitive">0</property>
+            <property name="label" translatable="yes">Insensitive Active</property>
+            <property name="use-underline">1</property>
+            <property name="icon-name">edit-find</property>
+            <property name="is-important">1</property>
+            <property name="active">1</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToolItem">
+            <child>
+              <object class="GtkEntry" id="entry1">
+                <property name="can-focus">1</property>
+                <property name="width-chars">10</property>
+                <property name="invisible-char">•</property>
+                <property name="placeholder-text" translatable="yes">Search...</property>
+                <property name="secondary-icon-name">edit-find-symbolic</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToolItem">
+            <child>
+              <object class="GtkSwitch" id="switch1">
+                <property name="can-focus">1</property>
+                <property name="valign">center</property>
+                <property name="tooltip_text">Switch it</property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkBox">
+        <property name="valign">center</property>
+        <property name="halign">center</property>
+        <style>
+          <class name="linked"/>
+        </style>
+        <child>
+          <object class="GtkButton">
+            <property name="label" translatable="yes">Hi, I am a button</property>
+            <property name="can-focus">1</property>
+            <property name="receives-default">1</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton">
+            <property name="label" translatable="yes">And I&apos;m another button</property>
+            <property name="can-focus">1</property>
+            <property name="receives-default">1</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton">
+            <property name="label" translatable="yes">This is a button party!</property>
+            <property name="can-focus">1</property>
+            <property name="receives-default">1</property>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkToolbar">
+        <property name="hexpand">1</property>
+        <property name="toolbar-style">icons</property>
+        <style>
+          <class name="inline-toolbar"/>
+        </style>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="label" translatable="yes">Normal</property>
+            <property name="use-underline">1</property>
+            <property name="icon-name">list-add-symbolic</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="label" translatable="yes">Normal</property>
+            <property name="use-underline">1</property>
+            <property name="icon-name">list-add-symbolic</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="label" translatable="yes">Active</property>
+            <property name="use-underline">1</property>
+            <property name="icon-name">list-remove-symbolic</property>
+            <property name="active">1</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="label" translatable="yes">Active</property>
+            <property name="use-underline">1</property>
+            <property name="icon-name">list-remove-symbolic</property>
+            <property name="active">1</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="sensitive">0</property>
+            <property name="label" translatable="yes">Insensitive</property>
+            <property name="use-underline">1</property>
+            <property name="icon-name">edit-find-symbolic</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="sensitive">0</property>
+            <property name="label" translatable="yes">Insensitive Active</property>
+            <property name="use-underline">1</property>
+            <property name="icon-name">go-up-symbolic</property>
+            <property name="active">1</property>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkBox">
+        <property name="spacing">10</property>
+        <child>
+          <object class="GtkButton">
+            <property name="label">Plain</property>
+            <property name="halign">end</property>
             <property name="hexpand">1</property>
-            <property name="show-arrow">0</property>
-            <style>
-              <class name="primary-toolbar"/>
-            </style>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="label" translatable="yes">Normal</property>
-                <property name="use-underline">1</property>
-                <property name="is-important">1</property>
-                <property name="icon-name">edit-find</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="label" translatable="yes">Active</property>
-                <property name="use-underline">1</property>
-                <property name="is-important">1</property>
-                <property name="icon-name">edit-find</property>
-                <property name="active">1</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="sensitive">0</property>
-                <property name="label" translatable="yes">Insensitive</property>
-                <property name="use-underline">1</property>
-                <property name="is-important">1</property>
-                <property name="icon-name">edit-find</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="label" translatable="yes">Raised</property>
-                <property name="use-underline">1</property>
-                <property name="is-important">1</property>
-                <property name="icon-name">edit-find</property>
-                <style>
-                  <class name="raised"/>
-                </style>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="label" translatable="yes">Raised Active</property>
-                <property name="use-underline">1</property>
-                <property name="is-important">1</property>
-                <property name="icon-name">edit-find</property>
-                <property name="active">1</property>
-                <style>
-                  <class name="raised"/>
-                </style>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="sensitive">0</property>
-                <property name="label" translatable="yes">Insensitive Active</property>
-                <property name="use-underline">1</property>
-                <property name="icon-name">edit-find</property>
-                <property name="is-important">1</property>
-                <property name="active">1</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToolItem">
-                <child>
-                  <object class="GtkEntry" id="entry1">
-                    <property name="can-focus">1</property>
-                    <property name="width-chars">10</property>
-                    <property name="invisible-char">•</property>
-                    <property name="placeholder-text" translatable="yes">Search...</property>
-                    <property name="secondary-icon-name">edit-find-symbolic</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToolItem">
-                <child>
-                  <object class="GtkSwitch" id="switch1">
-                    <property name="can-focus">1</property>
-                    <property name="valign">center</property>
-                    <property name="tooltip_text">Switch it</property>
-                  </object>
-                </child>
-              </object>
-            </child>
+            <property name="vexpand">1</property>
           </object>
         </child>
         <child>
-          <object class="GtkBox">
-            <property name="valign">center</property>
-            <property name="halign">center</property>
+          <object class="GtkButton">
+            <property name="label">Destructive</property>
             <style>
-              <class name="linked"/>
+              <class name="destructive-action"/>
             </style>
-            <child>
-              <object class="GtkButton">
-                <property name="label" translatable="yes">Hi, I am a button</property>
-                <property name="can-focus">1</property>
-                <property name="receives-default">1</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton">
-                <property name="label" translatable="yes">And I&apos;m another button</property>
-                <property name="can-focus">1</property>
-                <property name="receives-default">1</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton">
-                <property name="label" translatable="yes">This is a button party!</property>
-                <property name="can-focus">1</property>
-                <property name="receives-default">1</property>
-              </object>
-            </child>
           </object>
         </child>
         <child>
-          <object class="GtkToolbar">
-            <property name="hexpand">1</property>
-            <property name="toolbar-style">icons</property>
+          <object class="GtkButton">
+            <property name="label">Suggested</property>
             <style>
-              <class name="inline-toolbar"/>
+              <class name="suggested-action"/>
             </style>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="label" translatable="yes">Normal</property>
-                <property name="use-underline">1</property>
-                <property name="icon-name">list-add-symbolic</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="label" translatable="yes">Normal</property>
-                <property name="use-underline">1</property>
-                <property name="icon-name">list-add-symbolic</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="label" translatable="yes">Active</property>
-                <property name="use-underline">1</property>
-                <property name="icon-name">list-remove-symbolic</property>
-                <property name="active">1</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="label" translatable="yes">Active</property>
-                <property name="use-underline">1</property>
-                <property name="icon-name">list-remove-symbolic</property>
-                <property name="active">1</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="sensitive">0</property>
-                <property name="label" translatable="yes">Insensitive</property>
-                <property name="use-underline">1</property>
-                <property name="icon-name">edit-find-symbolic</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="sensitive">0</property>
-                <property name="label" translatable="yes">Insensitive Active</property>
-                <property name="use-underline">1</property>
-                <property name="icon-name">go-up-symbolic</property>
-                <property name="active">1</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="spacing">10</property>
-            <child>
-              <object class="GtkButton">
-                <property name="label">Plain</property>
-                <property name="halign">end</property>
-                <property name="hexpand">1</property>
-                <property name="vexpand">1</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton">
-                <property name="label">Destructive</property>
-                <style>
-                  <class name="destructive-action"/>
-                </style>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton">
-                <property name="label">Suggested</property>
-                <style>
-                  <class name="suggested-action"/>
-                </style>
-              </object>
-            </child>
           </object>
         </child>
       </object>
     </child>
   </object>
+    </child>
+  </object>
 </interface>

demos/gtk-demo/theming.ui

@@ -2,7 +2,6 @@
 <interface>
   <object class="GtkGrid" id="grid">
     <property name="row-spacing">10</property>
-    <property name="margin">10</property>
     <property name="orientation">vertical</property>
     <child>
       <object class="GtkToolbar">
@@ -93,7 +92,6 @@
             <child>
               <object class="GtkSwitch" id="switch1">
                 <property name="can-focus">1</property>
-                <property name="valign">center</property>
                 <property name="tooltip_text">Switch it</property>
               </object>
             </child>

demos/widget-factory/widget-factory.c

@@ -1663,7 +1663,6 @@ static void
 activate (GApplication *app)
 {
   GtkBuilder *builder;
-  GtkBuilderScope *scope;
   GtkWindow *window;
   GtkWidget *widget;
   GtkWidget *widget2;
@@ -1716,25 +1715,21 @@ activate (GApplication *app)
                                               GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
   g_object_unref (provider);
 
-  builder = gtk_builder_new ();
-  scope = gtk_builder_cscope_new ();
-  gtk_builder_cscope_add_callback_symbols (GTK_BUILDER_CSCOPE (scope),
-          "on_entry_icon_release", (GCallback)on_entry_icon_release,
-          "on_scale_button_value_changed", (GCallback)on_scale_button_value_changed,
-          "on_scale_button_query_tooltip", (GCallback)on_scale_button_query_tooltip,
-          "on_record_button_toggled", (GCallback)on_record_button_toggled,
-          "on_page_combo_changed", (GCallback)on_page_combo_changed,
-          "on_range_from_changed", (GCallback)on_range_from_changed,
-          "on_range_to_changed", (GCallback)on_range_to_changed,
-          "tab_close_cb", (GCallback)tab_close_cb,
-          "increase_icon_size", (GCallback)increase_icon_size,
-          "decrease_icon_size", (GCallback)decrease_icon_size,
-          "reset_icon_size", (GCallback)reset_icon_size,
-          "osd_frame_pressed", (GCallback)osd_frame_pressed,
-          NULL);
-  gtk_builder_set_scope (builder, scope);
-  g_object_unref (scope);
-  gtk_builder_add_from_resource (builder, "/org/gtk/WidgetFactory4/widget-factory.ui", NULL);
+  builder = gtk_builder_new_from_resource ("/org/gtk/WidgetFactory4/widget-factory.ui");
+  gtk_builder_add_callback_symbol (builder, "on_entry_icon_release", (GCallback)on_entry_icon_release);
+  gtk_builder_add_callback_symbol (builder, "on_scale_button_value_changed", (GCallback)on_scale_button_value_changed);
+  gtk_builder_add_callback_symbol (builder, "on_scale_button_query_tooltip", (GCallback)on_scale_button_query_tooltip);
+  gtk_builder_add_callback_symbol (builder, "on_record_button_toggled", (GCallback)on_record_button_toggled);
+  gtk_builder_add_callback_symbol (builder, "on_page_combo_changed", (GCallback)on_page_combo_changed);
+  gtk_builder_add_callback_symbol (builder, "on_range_from_changed", (GCallback)on_range_from_changed);
+  gtk_builder_add_callback_symbol (builder, "on_range_to_changed", (GCallback)on_range_to_changed);
+  gtk_builder_add_callback_symbol (builder, "tab_close_cb", (GCallback)tab_close_cb);
+  gtk_builder_add_callback_symbol (builder, "increase_icon_size", (GCallback)increase_icon_size);
+  gtk_builder_add_callback_symbol (builder, "decrease_icon_size", (GCallback)decrease_icon_size);
+  gtk_builder_add_callback_symbol (builder, "reset_icon_size", (GCallback)reset_icon_size);
+  gtk_builder_add_callback_symbol (builder, "osd_frame_pressed", (GCallback)osd_frame_pressed);
+
+  gtk_builder_connect_signals (builder, NULL);
 
   window = (GtkWindow *)gtk_builder_get_object (builder, "window");
   gtk_application_add_window (GTK_APPLICATION (app), window);

demos/widget-factory/widget-factory.ui

@@ -598,6 +598,10 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">checkbutton</property>
                                     <property name="can-focus">1</property>
                                     <property name="active">1</property>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">0</property>
+                                    </layout>
                                   </object>
                                 </child>
                                 <child>
@@ -662,8 +666,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="can-focus">1</property>
                                     <property name="active">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
                                       <property name="left-attach">1</property>
+                                      <property name="top-attach">0</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -736,6 +740,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="active">1</property>
                                     <layout>
                                       <property name="left-attach">2</property>
+                                      <property name="top-attach">0</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -966,11 +971,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="adjustment">adjustment3</property>
                                 <property name="restrict-to-fill-level">0</property>
                                 <marks>
-                                  <mark value="0" position="bottom"></mark>
-                                  <mark value="1" position="bottom"></mark>
-                                  <mark value="2" position="bottom"></mark>
-                                  <mark value="3" position="bottom"></mark>
-                                  <mark value="4" position="bottom"></mark>
+                                  <mark value="0" position="bottom"/>
+                                  <mark value="1" position="bottom"/>
+                                  <mark value="2" position="bottom"/>
+                                  <mark value="3" position="bottom"/>
+                                  <mark value="4" position="bottom"/>
                                 </marks>
                               </object>
                             </child>
@@ -1500,6 +1505,10 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                         <property name="valign">center</property>
                                         <property name="value">.5</property>
                                         <property name="halign">center</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">0</property>
+                                        </layout>
                                       </object>
                                     </child>
                                     <child>
@@ -1515,6 +1524,7 @@ microphone-sensitivity-medium-symbolic</property>
                                         <signal name="query-tooltip" handler="on_scale_button_query_tooltip" swapped="no"/>
                                         <signal name="value-changed" handler="on_scale_button_value_changed" swapped="no"/>
                                         <layout>
+                                          <property name="left-attach">0</property>
                                           <property name="top-attach">1</property>
                                         </layout>
                                       </object>
@@ -1565,7 +1575,7 @@ microphone-sensitivity-medium-symbolic</property>
                                                 <property name="icon-name">org.gtk.WidgetFactory4</property>
                                                 <property name="pixel-size">256</property>
                                                 <style>
-                                                  <class name="icon-dropshadow"/>
+                                                  <class name="icon-dropshadow" />
                                                 </style>
                                               </object>
                                             </property>
@@ -2004,6 +2014,7 @@ microphone-sensitivity-medium-symbolic</property>
                                             </child>
                                           </object>
                                         </child>
+FOO
                                         <child>
                                           <object class="GtkMenuItem" id="menuitem3">
                                             <property name="label" translatable="yes">View</property>
@@ -2123,10 +2134,13 @@ microphone-sensitivity-medium-symbolic</property>
                                       </object>
                                     </child>
                                     <child>
-                                      <object class="GtkSeparator"/>
+                                      <object class="GtkSeparator">
+                                        <property name="orientation">horizontal</property>
+                                      </object>
                                     </child>
                                     <child>
                                       <object class="GtkScrolledWindow">
+                                        <property name="shadow-type">none</property>
                                         <property name="vexpand">1</property>
                                         <child>
                                           <object class="MyTextView" id="text3">
@@ -2141,7 +2155,9 @@ microphone-sensitivity-medium-symbolic</property>
                                       </object>
                                     </child>
                                     <child>
-                                      <object class="GtkSeparator"/>
+                                      <object class="GtkSeparator">
+                                        <property name="orientation">horizontal</property>
+                                      </object>
                                     </child>
                                     <child>
                                       <object class="GtkStatusbar" id="statusbar"/>
@@ -2433,9 +2449,11 @@ microphone-sensitivity-medium-symbolic</property>
                         <property name="spacing">10</property>
                         <child>
                           <object class="GtkBox">
+                            <property name="halign">fill</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkBox" id="lockbox">
+                                <property name="halign">fill</property>
                                 <property name="hexpand">1</property>
                                 <property name="spacing">6</property>
                                 <child>
@@ -2512,6 +2530,9 @@ microphone-sensitivity-medium-symbolic</property>
                               <object class="GtkMenuButton">
                                 <property name="icon-name">view-more-symbolic</property>
                                 <property name="popover">new_style_menu</property>
+<!--
+                                <property name="menu-model">new_style_menu_model</property>
+-->
                               </object>
                             </child>
                           </object>
@@ -3346,6 +3367,10 @@ bad things might happen.</property>
             <accessibility>
               <relation type="label-for" target="open_popover_entry"/>
             </accessibility>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
         </child>
         <child>
@@ -3357,6 +3382,7 @@ bad things might happen.</property>
               <relation type="label-for" target="open_popover_textview"/>
             </accessibility>
             <layout>
+              <property name="left-attach">0</property>
               <property name="top-attach">1</property>
             </layout>
           </object>
@@ -3391,6 +3417,7 @@ bad things might happen.</property>
             </accessibility>
             <layout>
               <property name="left-attach">1</property>
+              <property name="top-attach">0</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -3429,6 +3456,7 @@ bad things might happen.</property>
         </child>
         <child>
           <object class="GtkButton" id="open_popover_button">
+            <property name="halign">fill</property>
             <property name="label">_Open</property>
             <property name="use-underline">1</property>
             <property name="sensitive">0</property>
@@ -3477,7 +3505,7 @@ bad things might happen.</property>
     <property name="autohide">0</property>
     <child>
       <object class="GtkLabel">
-        <property name="label">You&apos;re in too deep!</property>
+        <property name="label">You're in too deep!</property>
         <accessibility>
           <role type="static"/>
         </accessibility>
@@ -3488,6 +3516,7 @@ bad things might happen.</property>
     <property name="autohide">0</property>
     <child>
       <object class="GtkBox">
+        <property name="orientation">horizontal</property>
         <child>
           <object class="GtkLabel">
             <property name="label">Hidden gems:</property>
@@ -3507,246 +3536,219 @@ bad things might happen.</property>
       </object>
     </child>
   </object>
-  <object class="GtkPopover" id="new_style_menu">
+  <object class="GtkPopoverMenu" id="new_style_menu">
     <child>
-      <object class="GtkStack">
+      <object class="GtkBox">
+        <property name="name">main</property>
+        <property name="orientation">vertical</property>
         <child>
-          <object class="GtkStackPage">
-            <property name="name">main</property>
-            <property name="child">
-              <object class="GtkBox">
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkBox">
-                    <style>
-                      <class name="circular-buttons"/>
-                    </style>
-                    <child>
-                      <object class="GtkModelButton">
-                        <property name="icon">
-                          <object class="GThemedIcon">
-                            <property name="name">printer-symbolic</property>
-                          </object>
-                        </property>
-                        <property name="iconic">1</property>
-                        <property name="action-name">app.print</property>
-                        <property name="hexpand">1</property>
-                        <property name="halign">center</property>
-                        <style>
-                          <class name="circular"/>
-                        </style>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkModelButton">
-                        <property name="icon">
-                          <object class="GThemedIcon">
-                            <property name="name">emblem-shared-symbolic</property>
-                          </object>
-                        </property>
-                        <property name="iconic">1</property>
-                        <property name="action-name">app.share</property>
-                        <property name="hexpand">1</property>
-                        <property name="halign">center</property>
-                        <style>
-                          <class name="circular"/>
-                        </style>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSeparator"/>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Open in New Window</property>
-                    <property name="action-name">app.open-in</property>
-                    <property name="indicator-size-group">main-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSeparator"/>
-                </child>
-                <child>
-                  <object class="GtkBox">
-                    <style>
-                      <class name="inline-buttons"/>
-                    </style>
-                    <child>
-                      <object class="GtkLabel" id="cut_copy_paste_filler"/>
-                    </child>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label">Edit</property>
-                        <property name="xalign">0</property>
-                        <property name="hexpand">1</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkModelButton">
-                        <property name="icon">
-                          <object class="GThemedIcon">
-                            <property name="name">edit-cut-symbolic</property>
-                          </object>
-                        </property>
-                        <property name="iconic">1</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkModelButton">
-                        <property name="icon">
-                          <object class="GThemedIcon">
-                            <property name="name">edit-copy-symbolic</property>
-                          </object>
-                        </property>
-                        <property name="iconic">1</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkModelButton">
-                        <property name="icon">
-                          <object class="GThemedIcon">
-                            <property name="name">edit-paste-symbolic</property>
-                          </object>
-                        </property>
-                        <property name="iconic">1</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSeparator"/>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Pin</property>
-                    <property name="action-name">app.pin</property>
-                    <property name="indicator-size-group">main-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Select Labels…</property>
-                    <property name="action-name">app.labels</property>
-                    <property name="indicator-size-group">main-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Share…</property>
-                    <property name="action-name">app.share</property>
-                    <property name="indicator-size-group">main-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSeparator"/>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Basement</property>
-                    <property name="menu-name">basement</property>
-                    <property name="indicator-size-group">main-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSeparator"/>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Large</property>
-                    <property name="action-name">app.size</property>
-                    <property name="action-target">&apos;large&apos;</property>
-                    <property name="indicator-size-group">main-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Medium</property>
-                    <property name="action-name">app.size</property>
-                    <property name="action-target">&apos;medium&apos;</property>
-                    <property name="indicator-size-group">main-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Small</property>
-                    <property name="action-name">app.size</property>
-                    <property name="action-target">&apos;small&apos;</property>
-                    <property name="indicator-size-group">main-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSeparator"/>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Move to Trash</property>
-                    <property name="action-name">win.delete</property>
-                    <property name="indicator-size-group">main-indicators</property>
-                  </object>
-                </child>
+          <object class="GtkBox">
+            <property name="halign">fill</property>
+            <style>
+              <class name="circular-buttons"/>
+            </style>
+            <child>
+              <object class="GtkModelButton">
+                <property name="icon"><object class="GThemedIcon"><property name="name">printer-symbolic</property></object></property>
+                <property name="iconic">1</property>
+                <property name="action-name">app.print</property>
+                <property name="hexpand">1</property>
+                <property name="halign">center</property>
+                <style>
+                  <class name="circular"/>
+                </style>
               </object>
-            </property>
+            </child>
+            <child>
+              <object class="GtkModelButton">
+                <property name="icon"><object class="GThemedIcon"><property name="name">emblem-shared-symbolic</property></object></property>
+                <property name="iconic">1</property>
+                <property name="action-name">app.share</property>
+                <property name="hexpand">1</property>
+                <property name="halign">center</property>
+                <style>
+                  <class name="circular"/>
+                </style>
+              </object>
+            </child>
           </object>
         </child>
         <child>
-          <object class="GtkStackPage">
-            <property name="name">basement</property>
-            <property name="child">
-              <object class="GtkBox">
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Basement</property>
-                    <property name="role">title</property>
-                    <property name="menu-name">main</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSeparator"/>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Berk</property>
-                    <property name="action-name">app.berk</property>
-                    <property name="indicator-size-group">basement-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Broni</property>
-                    <property name="action-name">app.broni</property>
-                    <property name="indicator-size-group">basement-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Drutt</property>
-                    <property name="action-name">app.drutt</property>
-                    <property name="indicator-size-group">basement-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">The Thing Upstairs</property>
-                    <property name="action-name">app.upstairs</property>
-                    <property name="indicator-size-group">basement-indicators</property>
-                  </object>
-                </child>
+          <object class="GtkSeparator"/>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Open in New Window</property>
+            <property name="action-name">app.open-in</property>
+            <property name="indicator-size-group">main-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSeparator"/>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <style>
+              <class name="inline-buttons"/>
+            </style>
+            <child>
+              <object class="GtkLabel" id="cut_copy_paste_filler">
+            </object>
+            </child>
+            <child>
+              <object class="GtkLabel">
+                <property name="label">Edit</property>
+                <property name="xalign">0</property>
+                <property name="hexpand">1</property>
               </object>
-            </property>
+            </child>
+            <child>
+              <object class="GtkModelButton">
+                <property name="icon"><object class="GThemedIcon"><property name="name">edit-cut-symbolic</property></object></property>
+                <property name="iconic">1</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkModelButton">
+                <property name="icon"><object class="GThemedIcon"><property name="name">edit-copy-symbolic</property></object></property>
+                <property name="iconic">1</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkModelButton">
+                <property name="icon"><object class="GThemedIcon"><property name="name">edit-paste-symbolic</property></object></property>
+                <property name="iconic">1</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSeparator"/>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Pin</property>
+            <property name="action-name">app.pin</property>
+            <property name="indicator-size-group">main-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Select Labels…</property>
+            <property name="action-name">app.labels</property>
+            <property name="indicator-size-group">main-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Share…</property>
+            <property name="action-name">app.share</property>
+            <property name="indicator-size-group">main-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSeparator"/>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Basement</property>
+            <property name="menu-name">basement</property>
+            <property name="indicator-size-group">main-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSeparator"/>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Large</property>
+            <property name="action-name">app.size</property>
+            <property name="action-target">'large'</property>
+            <property name="indicator-size-group">main-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Medium</property>
+            <property name="action-name">app.size</property>
+            <property name="action-target">'medium'</property>
+            <property name="indicator-size-group">main-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Small</property>
+            <property name="action-name">app.size</property>
+            <property name="action-target">'small'</property>
+            <property name="indicator-size-group">main-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSeparator"/>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Move to Trash</property>
+            <property name="action-name">win.delete</property>
+            <property name="indicator-size-group">main-indicators</property>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkBox">
+        <property name="name">basement</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Basement</property>
+            <property name="role">title</property>
+            <property name="menu-name">main</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSeparator"/>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Berk</property>
+            <property name="action-name">app.berk</property>
+            <property name="indicator-size-group">basement-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Broni</property>
+            <property name="action-name">app.broni</property>
+            <property name="indicator-size-group">basement-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Drutt</property>
+            <property name="action-name">app.drutt</property>
+            <property name="indicator-size-group">basement-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">The Thing Upstairs</property>
+            <property name="action-name">app.upstairs</property>
+            <property name="indicator-size-group">basement-indicators</property>
           </object>
         </child>
       </object>
     </child>
   </object>
   <object class="GtkSizeGroup" id="main-indicators">
+    <property name="mode">horizontal</property>
     <widgets>
       <widget name="cut_copy_paste_filler"/>
     </widgets>
   </object>
-  <object class="GtkSizeGroup" id="basement-indicators"/>
+  <object class="GtkSizeGroup" id="basement-indicators">
+    <property name="mode">horizontal</property>
+  </object>
   <menu id="new_style_menu_model">
     <section>
       <attribute name="display-hint">circular-buttons</attribute>
@@ -3836,10 +3838,10 @@ bad things might happen.</property>
       </item>
     </section>
     <section>
-      <item>
-        <attribute name="label" translatable="yes">Move to Trash</attribute>
-        <attribute name="action">win.delete</attribute>
-      </item>
+        <item>
+          <attribute name="label" translatable="yes">Move to Trash</attribute>
+          <attribute name="action">win.delete</attribute>
+        </item>
     </section>
   </menu>
   <menu id="new_style_context_menu_model">
@@ -4030,13 +4032,14 @@ bad things might happen.</property>
           <attribute name="action">win.background</attribute>
         </item>
       </section>
+
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_Help</attribute>
-      <item>
-        <attribute name="label" translatable="yes">About</attribute>
-        <attribute name="action">app.about</attribute>
-      </item>
+        <item>
+          <attribute name="label" translatable="yes">About</attribute>
+          <attribute name="action">app.about</attribute>
+        </item>
     </submenu>
   </menu>
 </interface>

docs/reference/gdk/gdk4-sections.txt

@@ -192,8 +192,8 @@ gdk_surface_is_destroyed
 gdk_surface_is_visible
 gdk_surface_is_viewable
 gdk_surface_get_state
-gdk_surface_minimize
-gdk_surface_unminimize
+gdk_surface_iconify
+gdk_surface_deiconify
 gdk_surface_stick
 gdk_surface_unstick
 gdk_surface_maximize
@@ -789,6 +789,8 @@ gdk_drop_get_type
 </SECTION>
 
 <SECTION>
+<INCLUDE>gdk/gdkx.h</INCLUDE>
+<TITLE>X Window System Interaction</TITLE>
 <FILE>x_interaction</FILE>
 GDK_SURFACE_XID
 GDK_DISPLAY_XDISPLAY
@@ -939,6 +941,8 @@ gdk_surface_impl_x11_get_type
 </SECTION>
 
 <SECTION>
+<INCLUDE>gdk/gdkwayland.h</INCLUDE>
+<TITLE>Wayland Interaction</TITLE>
 <FILE>wayland_interaction</FILE>
 gdk_wayland_seat_get_wl_seat
 gdk_wayland_device_get_wl_keyboard

docs/reference/gtk/gtk4-docs.xml

@@ -44,51 +44,15 @@
 
     <chapter id="Lists">
       <title>GListModel support</title>
-      <xi:include href="xml/gtkexpression.xml" />
       <xi:include href="xml/gtkfilterlistmodel.xml" />
-      <section>
-        <xi:include href="xml/gtkfilter.xml" />
-        <xi:include href="xml/gtkcustomfilter.xml" />
-        <xi:include href="xml/gtkstringfilter.xml" />
-        <xi:include href="xml/gtkmultifilter.xml" />
-      </section>
       <xi:include href="xml/gtkflattenlistmodel.xml" />
       <xi:include href="xml/gtkmaplistmodel.xml" />
       <xi:include href="xml/gtkslicelistmodel.xml" />
       <xi:include href="xml/gtksortlistmodel.xml" />
-      <section>
-        <xi:include href="xml/gtksorter.xml" />
-        <xi:include href="xml/gtkcustomsorter.xml" />
-        <xi:include href="xml/gtkstringsorter.xml" />
-        <xi:include href="xml/gtknumericsorter.xml" />
-        <xi:include href="xml/gtkmultisorter.xml" />
-      </section>
+      <xi:include href="xml/gtktreelistmodel.xml" />
       <xi:include href="xml/gtkselectionmodel.xml" />
       <xi:include href="xml/gtknoselection.xml" />
       <xi:include href="xml/gtksingleselection.xml" />
-      <xi:include href="xml/gtkdirectorylist.xml" />
-    </chapter>
-
-    <chapter id="ListContainers">
-      <title>List-based Widgets</title>
-      <xi:include href="xml/gtklistitem.xml" />
-      <xi:include href="xml/gtklistitemfactory.xml" />
-      <section>
-        <xi:include href="xml/gtksignallistitemfactory.xml" />
-        <xi:include href="xml/gtkbuilderlistitemfactory.xml" />
-      </section>
-      <xi:include href="xml/gtklistview.xml" />
-      <xi:include href="xml/gtkgridview.xml" />
-      <xi:include href="xml/gtkcolumnview.xml" />
-      <xi:include href="xml/gtkcolumnviewcolumn.xml" />
-      <xi:include href="xml/gtkdropdown.xml" />
-    </chapter>
-
-    <chapter id="Trees">
-      <xi:include href="xml/gtktreelistrow.xml" />
-      <xi:include href="xml/gtktreelistmodel.xml" />
-      <xi:include href="xml/gtktreelistrowsorter.xml" />
-      <xi:include href="xml/gtktreeexpander.xml" />
     </chapter>
 
     <chapter id="Application">
@@ -102,13 +66,11 @@
       <title>Interface builder</title>
       <xi:include href="xml/gtkbuilder.xml" />
       <xi:include href="xml/gtkbuildable.xml" />
-      <xi:include href="xml/gtkbuilderscope.xml" />
     </chapter>
 
     <chapter id="WindowWidgets">
       <title>Windows</title>
       <xi:include href="xml/gtkroot.xml" />
-      <xi:include href="xml/gtknative.xml" />
       <xi:include href="xml/gtkwindow.xml" />
       <xi:include href="xml/gtkdialog.xml" />
       <xi:include href="xml/gtkmessagedialog.xml" />
@@ -187,6 +149,7 @@
       <xi:include href="xml/gtkscalebutton.xml" />
       <xi:include href="xml/gtkvolumebutton.xml" />
       <xi:include href="xml/gtklockbutton.xml" />
+      <xi:include href="xml/gtkmodelbutton.xml" />
     </chapter>
 
     <chapter id="NumericEntry">
@@ -266,7 +229,6 @@
       <xi:include href="xml/gtkpopover.xml" />
       <xi:include href="xml/gtkpopovermenu.xml" />
       <xi:include href="xml/gtkpopovermenubar.xml" />
-      <xi:include href="xml/gtkdropdown.xml" />
     </chapter>
 
     <chapter id="SelectorWidgets">

docs/reference/gtk/gtk4.types.in

@@ -9,7 +9,6 @@ gtk_accessible_get_type
 gtk_actionable_get_type
 gtk_action_bar_get_type
 gtk_adjustment_get_type
-gtk_any_filter_get_type
 gtk_app_chooser_get_type
 gtk_app_chooser_button_get_type
 gtk_app_chooser_dialog_get_type
@@ -23,11 +22,8 @@ gtk_bin_get_type
 gtk_bin_layout_get_type
 gtk_box_get_type
 gtk_box_layout_get_type
-gtk_buildable_get_type
-gtk_builder_cscope_get_type
 gtk_builder_get_type
-gtk_builder_list_item_factory_get_type
-gtk_builder_scope_get_type
+gtk_buildable_get_type
 gtk_button_get_type
 gtk_calendar_get_type
 gtk_cell_area_get_type
@@ -51,8 +47,6 @@ gtk_color_button_get_type
 gtk_color_chooser_get_type
 gtk_color_chooser_dialog_get_type
 gtk_color_chooser_widget_get_type
-gtk_column_view_get_type
-gtk_column_view_column_get_type
 gtk_combo_box_get_type
 gtk_combo_box_text_get_type
 gtk_constraint_get_type
@@ -60,13 +54,9 @@ gtk_constraint_guide_get_type
 gtk_constraint_layout_get_type
 gtk_constraint_target_get_type
 gtk_container_get_type
-gtk_custom_sorter_get_type
 gtk_css_provider_get_type
-gtk_custom_filter_get_type
 gtk_dialog_get_type
-gtk_directory_list_get_type
 gtk_drawing_area_get_type
-gtk_drop_down_get_type
 gtk_editable_get_type
 gtk_entry_buffer_get_type
 gtk_entry_completion_get_type
@@ -76,18 +66,14 @@ gtk_event_controller_key_get_type
 gtk_event_controller_legacy_get_type
 gtk_event_controller_motion_get_type
 gtk_event_controller_scroll_get_type
-gtk_every_filter_get_type
 gtk_expander_get_type
 gtk_file_chooser_button_get_type
 gtk_file_chooser_dialog_get_type
 gtk_file_chooser_get_type
 gtk_file_chooser_widget_get_type
 gtk_file_filter_get_type
-gtk_filter_get_type
-gtk_filter_list_model_get_type
 gtk_fixed_get_type
 gtk_fixed_layout_get_type
-gtk_flatten_list_model_get_type
 gtk_flow_box_get_type
 gtk_flow_box_child_get_type
 gtk_font_button_get_type
@@ -109,7 +95,6 @@ gtk_gl_area_get_type
 gtk_grid_get_type
 gtk_grid_layout_child_get_type
 gtk_grid_layout_get_type
-gtk_grid_view_get_type
 gtk_header_bar_get_type
 gtk_icon_theme_get_type
 gtk_icon_view_get_type
@@ -122,14 +107,10 @@ gtk_label_get_type
 gtk_layout_child_get_type
 gtk_layout_manager_get_type
 gtk_link_button_get_type
-gtk_list_item_get_type
-gtk_list_item_factory_get_type
 gtk_list_store_get_type
 gtk_list_box_get_type
 gtk_list_box_row_get_type
-gtk_list_view_get_type
 gtk_lock_button_get_type
-gtk_map_list_model_get_type
 gtk_media_controls_get_type
 gtk_media_file_get_type
 gtk_media_stream_get_type
@@ -140,14 +121,11 @@ gtk_menu_item_get_type
 gtk_menu_shell_get_type
 gtk_menu_tool_button_get_type
 gtk_message_dialog_get_type
+gtk_model_button_get_type
 gtk_mount_operation_get_type
-gtk_multi_filter_get_type
-gtk_multi_sorter_get_type
 gtk_native_get_type
-gtk_no_selection_get_type
 gtk_notebook_get_type
 gtk_notebook_page_get_type
-gtk_numeric_sorter_get_type
 gtk_orientable_get_type
 gtk_overlay_get_type
 gtk_pad_controller_get_type
@@ -192,13 +170,9 @@ gtk_shortcuts_window_get_type
 gtk_shortcuts_section_get_type
 gtk_shortcuts_group_get_type
 gtk_shortcuts_shortcut_get_type
-gtk_signal_list_item_factory_get_type
 gtk_single_selection_get_type
 gtk_size_group_get_type
-gtk_slice_list_model_get_type
 gtk_snapshot_get_type
-gtk_sort_list_model_get_type
-gtk_sorter_get_type
 gtk_spin_button_get_type
 gtk_spinner_get_type
 gtk_stack_get_type
@@ -206,8 +180,6 @@ gtk_stack_page_get_type
 gtk_stack_sidebar_get_type
 gtk_stack_switcher_get_type
 gtk_statusbar_get_type
-gtk_string_filter_get_type
-gtk_string_sorter_get_type
 gtk_switch_get_type
 gtk_level_bar_get_type
 gtk_style_context_get_type
@@ -227,10 +199,6 @@ gtk_tool_button_get_type
 gtk_tool_item_get_type
 gtk_tree_drag_dest_get_type
 gtk_tree_drag_source_get_type
-gtk_tree_expander_get_type
-gtk_tree_list_model_get_type
-gtk_tree_list_row_get_type
-gtk_tree_list_row_sorter_get_type
 gtk_tree_model_filter_get_type
 gtk_tree_model_get_type
 gtk_tree_model_sort_get_type

docs/reference/gtk/meson.build

@@ -21,13 +21,6 @@ private_headers = [
   'gtkcolorplaneprivate.h',
   'gtkcolorscaleprivate.h',
   'gtkcolorswatchprivate.h',
-  'gtkcolumnviewcellprivate.h',
-  'gtkcolumnviewcolumnprivate.h',
-  'gtkcolumnviewlayoutprivate.h',
-  'gtkcolumnlistitemfactoryprivate.h',
-  'gtkcolumviewprivate.h',
-  'gtkcolumnviewsorterprivate.h',
-  'gtkcolumnviewtitleprivate.h',
   'gtkcomboboxprivate.h',
   'gtkcontainerprivate.h',
   'gtkconstraintexpressionprivate.h',
@@ -138,11 +131,6 @@ private_headers = [
   'gtkimmoduleprivate.h',
   'gtkkineticscrollingprivate.h',
   'gtklabelprivate.h',
-  'gtklistbaseprivate.h',
-  'gtklistitemprivate.h',
-  'gtklistitemfactoryprivate.h',
-  'gtklistitemmanagerprivate.h',
-  'gtklistitemwidgetprivate.h',
   'gtklockbuttonprivate.h',
   'gtkmagnifierprivate.h',
   'gtkmediafileprivate.h',
@@ -190,10 +178,8 @@ private_headers = [
   'gtktextchildprivate.h',
   'gtktextdisplayprivate.h',
   'gtktexthandleprivate.h',
-  'gtktexthistoryprivate.h',
   'gtktextiterprivate.h',
   'gtktextlayoutprivate.h',
-  'gtktextlinedisplaycacheprivate.h',
   'gtktextmarkprivate.h',
   'gtktexttagprivate.h',
   'gtktextviewprivate.h',

docs/reference/gtk/migrating-3to4.xml

@@ -828,29 +828,6 @@
       </para>
     </section>
 
-    <section>
-      <title>The "iconified" window state has been renamed to "minimized"</title>
-      <para>
-        The <literal>GDK_SURFACE_STATE_ICONIFIED</literal> value of the
-        #GdkSurfaceState enumeration is now %GDK_SURFACE_STATE_MINIMIZED.
-      </para>
-      <para>
-        The #GdkSurface functions <function>gdk_surface_iconify()</function>
-        and <function>gdk_surface_deiconify()</function> have been renamed to
-        gdk_surface_minimize() and gdk_surface_unminimize(), respectively.
-      </para>
-      <para>
-        The corresponding #GtkWindow functions <function>gtk_window_iconify()</function>
-        and <function>gtk_window_deiconify()</function> have been renamed
-        to gtk_window_minimize() and gtk_window_unminimize(), respectively.
-      </para>
-      <para>
-        The behavior of the minimization and unminimization operations have
-        not been changed, and they still require support from the underlying
-        windowing system.
-      </para>
-    </section>
-
   </section>
 
 </chapter>

docs/reference/gtk/x11.xml

@@ -138,7 +138,7 @@ url="http://www.freedesktop.org/standards/">convention</ulink>.
 <para>
 GTK has functions for asking the window manager to do various things;
 see for example <link
-linkend="gtk-window-minimize">gtk_window_minimize()</link> or <link
+linkend="gtk-window-iconify">gtk_window_iconify()</link> or <link
 linkend="gtk-window-maximize">gtk_window_maximize()</link> or <link
 linkend="gtk-window-set-decorated">gtk_window_set_decorated()</link>.
 Keep in mind that most window managers <emphasis>will</emphasis> ignore

gdk/broadway/gdkbroadwaycursor.h

@@ -25,8 +25,8 @@
 #ifndef __GDK_BROADWAY_CURSOR_H__
 #define __GDK_BROADWAY_CURSOR_H__
 
-#if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gdk/broadway/gdkbroadway.h> can be included directly."
+#if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdkbroadway.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
@@ -40,7 +40,7 @@ G_BEGIN_DECLS
 #define GDK_IS_BROADWAY_CURSOR_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_BROADWAY_CURSOR))
 #define GDK_BROADWAY_CURSOR_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_BROADWAY_CURSOR, GdkBroadwayCursorClass))
 
-#ifdef GTK_COMPILATION
+#ifdef GDK_COMPILATION
 typedef struct _GdkBroadwayCursor GdkBroadwayCursor;
 #else
 typedef GdkCursor GdkBroadwayCursor;

gdk/broadway/gdkbroadwaydisplay.h

@@ -18,15 +18,15 @@
 #ifndef __GDK_BROADWAY_DISPLAY_H__
 #define __GDK_BROADWAY_DISPLAY_H__
 
-#if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gdk/broadway/gdkbroadway.h> can be included directly."
+#if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdkbroadway.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 
-#ifdef GTK_COMPILATION
+#ifdef GDK_COMPILATION
 typedef struct _GdkBroadwayDisplay GdkBroadwayDisplay;
 #else
 typedef GdkDisplay GdkBroadwayDisplay;

gdk/broadway/gdkbroadwaydisplaymanager.h

@@ -20,8 +20,8 @@
 #ifndef __GDK_BROADWAY_DISPLAY_MANAGER_H__
 #define __GDK_BROADWAY_DISPLAY_MANAGER_H__
 
-#if !defined(__GDKBROADWAY_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gdk/broadway/gdkbroadway.h> can be included directly."
+#if !defined(__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdkbroadway.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
@@ -31,7 +31,7 @@ G_BEGIN_DECLS
 #define GDK_TYPE_BROADWAY_DISPLAY_MANAGER    (gdk_broadway_display_manager_get_type ())
 #define GDK_BROADWAY_DISPLAY_MANAGER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_BROADWAY_DISPLAY_MANAGER, GdkBroadwayDisplayManager))
 
-#ifdef GTK_COMPILATION
+#ifdef GDK_COMPILATION
 typedef struct _GdkBroadwayDisplayManager GdkBroadwayDisplayManager;
 #else
 typedef GdkDisplayManager _GdkBroadwayDisplayManager;

gdk/broadway/gdkbroadwaymonitor.h

@@ -22,8 +22,8 @@
 #ifndef __GDK_BROADWAY_MONITOR_H__
 #define __GDK_BROADWAY_MONITOR_H__
 
-#if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gdk/broadway/gdkbroadway.h> can be included directly."
+#if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdkbroadway.h> can be included directly."
 #endif
 
 #include <gdk/gdkmonitor.h>

gdk/broadway/gdkbroadwaysurface.h

@@ -36,7 +36,7 @@ G_BEGIN_DECLS
 #define GDK_IS_BROADWAY_SURFACE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_BROADWAY_SURFACE))
 #define GDK_BROADWAY_SURFACE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_BROADWAY_SURFACE, GdkBroadwaySurfaceClass))
 
-#ifdef GTK_COMPILATION
+#ifdef GDK_COMPILATION
 typedef struct _GdkBroadwaySurface GdkBroadwaySurface;
 #else
 typedef GdkSurface GdkBroadwaySurface;

gdk/broadway/gdkdnd-broadway.c

@@ -41,7 +41,7 @@
 #define GDK_IS_BROADWAY_DRAG_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_BROADWAY_DRAG))
 #define GDK_BROADWAY_DRAG_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_BROADWAY_DRAG, GdkBroadwayDragClass))
 
-#ifdef GTK_COMPILATION
+#ifdef GDK_COMPILATION
 typedef struct _GdkBroadwayDrag GdkBroadwayDrag;
 #else
 typedef GdkDrag GdkBroadwayDrag;

gdk/broadway/gdksurface-broadway.c

@@ -710,7 +710,7 @@ gdk_broadway_surface_set_icon_name (GdkSurface   *surface,
 }
 
 static void
-gdk_broadway_surface_minimize (GdkSurface *surface)
+gdk_broadway_surface_iconify (GdkSurface *surface)
 {
   if (GDK_SURFACE_DESTROYED (surface) ||
       !SURFACE_IS_TOPLEVEL (surface))
@@ -718,7 +718,7 @@ gdk_broadway_surface_minimize (GdkSurface *surface)
 }
 
 static void
-gdk_broadway_surface_unminimize (GdkSurface *surface)
+gdk_broadway_surface_deiconify (GdkSurface *surface)
 {
   if (GDK_SURFACE_DESTROYED (surface) ||
       !SURFACE_IS_TOPLEVEL (surface))
@@ -1413,8 +1413,8 @@ gdk_broadway_surface_class_init (GdkBroadwaySurfaceClass *klass)
   impl_class->set_focus_on_map = gdk_broadway_surface_set_focus_on_map;
   impl_class->set_icon_list = gdk_broadway_surface_set_icon_list;
   impl_class->set_icon_name = gdk_broadway_surface_set_icon_name;
-  impl_class->minimize = gdk_broadway_surface_minimize;
-  impl_class->unminimize = gdk_broadway_surface_unminimize;
+  impl_class->iconify = gdk_broadway_surface_iconify;
+  impl_class->deiconify = gdk_broadway_surface_deiconify;
   impl_class->stick = gdk_broadway_surface_stick;
   impl_class->unstick = gdk_broadway_surface_unstick;
   impl_class->maximize = gdk_broadway_surface_maximize;

gdk/broadway/meson.build

@@ -57,7 +57,7 @@ libgdk_broadway = static_library('gdk-broadway',
   gdk_broadway_sources, gdkconfig, gdkenum_h,
   include_directories: [confinc, gdkinc],
   c_args: [
-    '-DGTK_COMPILATION',
+    '-DGDK_COMPILATION',
     '-DG_LOG_DOMAIN="Gdk"',
   ] + common_cflags,
   link_args: common_ldflags,
@@ -71,6 +71,6 @@ executable('gtk4-broadwayd',
   clienthtml_h, broadwayjs_h,
   'broadwayd.c', 'broadway-server.c', 'broadway-output.c',
   include_directories: [confinc, gdkinc, include_directories('.')],
-  c_args: ['-DGTK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', ],
+  c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', ],
   dependencies : [broadwayd_syslib, gdk_deps],
   install : true)

gdk/filetransferportal.c

@@ -1,341 +0,0 @@
-/*
- * Copyright (C) 2018 Matthias Clasen
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include <errno.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include <gio/gio.h>
-#include <gio/gunixfdlist.h>
-
-#include "filetransferportalprivate.h"
-
-static GDBusProxy *file_transfer_proxy = NULL;
-
-static GDBusProxy *
-ensure_file_transfer_portal (void)
-{
-  if (file_transfer_proxy == NULL)
-    {
-      GError *error = NULL;
-
-      file_transfer_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
-                                                           G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES
-                                                           | G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS
-                                                           | G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
-                                                           NULL,
-                                                           "org.freedesktop.portal.Documents",
-                                                           "/org/freedesktop/portal/documents",
-                                                           "org.freedesktop.portal.FileTransfer",
-                                                           NULL, &error);
-
-      if (error)
-        {
-          g_debug ("Failed to get proxy: %s", error->message);
-          g_error_free (error);
-        }
-    }
-
-  if (file_transfer_proxy)
-    {
-      char *owner = g_dbus_proxy_get_name_owner (file_transfer_proxy);
-
-      if (owner)
-        {
-          g_free (owner);
-          return file_transfer_proxy;
-        }
-    }
-
-  return NULL;
-}
-
-gboolean
-file_transfer_portal_available (void)
-{
-  gboolean available;
-
-  ensure_file_transfer_portal ();
-
-  available = file_transfer_proxy != NULL;
-
-  g_clear_object (&file_transfer_proxy);
-
-  return available;
-}
-
-typedef struct {
-  GTask *task;
-  const char **files;
-  int len;
-  int start;
-} AddFileData;
-
-static void add_files (GDBusProxy  *proxy,
-                       AddFileData *afd);
-
-static void
-add_files_done (GObject      *object,
-                GAsyncResult *result,
-                gpointer      data)
-{
-  GDBusProxy *proxy = G_DBUS_PROXY (object);
-  AddFileData *afd = data;
-  GError *error = NULL;
-  GVariant *ret;
-
-  ret = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, NULL, result, &error);
-  if (ret == NULL)
-    {
-      g_task_return_error (afd->task, error);
-      g_object_unref (afd->task);
-      g_free (afd);
-      return;
-    }
-
-  g_variant_unref (ret);
-
-  if (afd->start >= afd->len)
-    {
-      g_task_return_boolean (afd->task, TRUE);
-      g_object_unref (afd->task);
-      g_free (afd);
-      return;
-    }
-
-  add_files (proxy, afd);
-}
-
-/* We call AddFiles in chunks of 16 to avoid running into
- * the per-message fd limit of the bus.
- */
-static void
-add_files (GDBusProxy  *proxy,
-           AddFileData *afd)
-{
-  GUnixFDList *fd_list;
-  GVariantBuilder fds;
-  int i;
-  char *key;
-
-  g_variant_builder_init (&fds, G_VARIANT_TYPE ("ah"));
-  fd_list = g_unix_fd_list_new ();
-
-  for (i = 0; afd->files[afd->start + i]; i++)
-    {
-      int fd;
-      int fd_in;
-      GError *error = NULL;
-
-      if (i == 16)
-        break;
-
-      fd = open (afd->files[afd->start + i], O_PATH | O_CLOEXEC);
-      if (fd == -1)
-        {
-          g_task_return_new_error (afd->task, G_IO_ERROR, g_io_error_from_errno (errno),
-                                   "Failed to open %s", afd->files[afd->start + i]);
-          g_object_unref (afd->task);
-          g_free (afd);
-          g_object_unref (fd_list);
-          return;
-         }
-      fd_in = g_unix_fd_list_append (fd_list, fd, &error);
-      close (fd);
-
-      if (fd_in == -1)
-        {
-          g_task_return_error (afd->task, error);
-          g_object_unref (afd->task);
-          g_free (afd);
-          g_object_unref (fd_list);
-          return;
-        }
-
-      g_variant_builder_add (&fds, "h", fd_in);
-    }
-
-   afd->start += 16;
-
-  key = (char *)g_object_get_data (G_OBJECT (afd->task), "key");
-
-  g_dbus_proxy_call_with_unix_fd_list (proxy,
-                                       "AddFiles",
-                                       g_variant_new ("(sah)", key, &fds),
-                                       0, -1,
-                                       fd_list,
-                                       NULL,
-                                       add_files_done, afd);
-
-  g_object_unref (fd_list);
-}
-
-static void
-start_session_done (GObject      *object,
-                    GAsyncResult *result,
-                    gpointer      data)
-{
-  GDBusProxy *proxy = G_DBUS_PROXY (object);
-  AddFileData *afd = data;
-  GError *error = NULL;
-  GVariant *ret;
-  const char *key;
-
-  ret = g_dbus_proxy_call_finish (proxy, result, &error);
-  if (ret == NULL)
-    {
-      g_task_return_error (afd->task, error);
-      g_object_unref (afd->task);
-      g_free (afd);
-      return;
-    }
-
-  g_variant_get (ret, "(&s)", &key);
-
-  g_object_set_data_full (G_OBJECT (afd->task), "key", g_strdup (key), g_free);
-
-  g_variant_unref (ret);
-
-  add_files (proxy, afd);
-}
-
-void
-file_transfer_portal_register_files (const char          **files,
-                                     gboolean              writable,
-                                     GAsyncReadyCallback   callback,
-                                     gpointer              data)
-{
-  GTask *task;
-  GDBusProxy *proxy;
-  AddFileData *afd;
-  GVariantBuilder options;
-
-  task = g_task_new (NULL, NULL, callback, data);
-
-  proxy = ensure_file_transfer_portal ();
-
-  if (proxy == NULL)
-    {
-      g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                               "No portal found");
-      g_object_unref (task);
-      return;
-    }
-
-  afd = g_new (AddFileData, 1);
-  afd->task = task;
-  afd->files = files;
-  afd->len = g_strv_length ((char **)files);
-  afd->start = 0;
-
-  g_variant_builder_init (&options, G_VARIANT_TYPE_VARDICT);
-  g_variant_builder_add (&options, "{sv}", "writable", g_variant_new_boolean (writable));
-  g_variant_builder_add (&options, "{sv}", "autostop", g_variant_new_boolean (TRUE));
-
-  g_dbus_proxy_call (proxy, "StartTransfer",
-                     g_variant_new ("(a{sv})", &options),
-                     0, -1, NULL, start_session_done, afd);
-}
-
-gboolean
-file_transfer_portal_register_files_finish (GAsyncResult  *result,
-                                            char         **key,
-                                            GError       **error)
-{
-  if (g_task_propagate_boolean (G_TASK (result), error))
-    {
-      *key = g_strdup (g_object_get_data (G_OBJECT (result), "key"));
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
-static void
-retrieve_files_done (GObject      *object,
-                     GAsyncResult *result,
-                     gpointer      data)
-{
-  GDBusProxy *proxy = G_DBUS_PROXY (object);
-  GTask *task = data;
-  GError *error = NULL;
-  GVariant *ret;
-  char **files;
-
-  ret = g_dbus_proxy_call_finish (proxy, result, &error);
-  if (ret == NULL)
-    {
-      g_task_return_error (task, error);
-      g_object_unref (task);
-      return;
-    }
-
-  g_variant_get (ret, "(^a&s)", &files);
-
-  g_object_set_data_full (G_OBJECT (task), "files", g_strdupv (files), (GDestroyNotify)g_strfreev);
-
-  g_variant_unref (ret);
-
-  g_task_return_boolean (task, TRUE);
-}
-
-void
-file_transfer_portal_retrieve_files (const char          *key,
-                                     GAsyncReadyCallback  callback,
-                                     gpointer             data)
-{
-  GDBusProxy *proxy;
-  GTask *task;
-  GVariantBuilder options;
-
-  task = g_task_new (NULL, NULL, callback, data);
-
-  proxy = ensure_file_transfer_portal ();
-
-  if (proxy == NULL)
-    {
-      g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                               "No portal found");
-      g_object_unref (task);
-      return;
-    }
-
-  g_variant_builder_init (&options, G_VARIANT_TYPE_VARDICT);
-  g_dbus_proxy_call (proxy,
-                     "RetrieveFiles",
-                     g_variant_new ("(sa{sv})", key, &options),
-                     0, -1, NULL,
-                     retrieve_files_done, task);
-}
-
-gboolean
-file_transfer_portal_retrieve_files_finish (GAsyncResult   *result,
-                                            char         ***files,
-                                            GError        **error)
-{
-  if (g_task_propagate_boolean (G_TASK (result), error))
-    {
-      *files = g_strdupv (g_object_get_data (G_OBJECT (result), "files"));
-      return TRUE;
-    }
-
-  return FALSE;
-}

gdk/filetransferportalprivate.h

@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2018 Matthias Clasen
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __FILE_TRANSFER_PROTOCOL_H__
-#define __FILE_TRANSFER_PROTOCOL_H__
-
-
-gboolean file_transfer_portal_available             (void);
-void     file_transfer_portal_register_files        (const char           **files,
-                                                     gboolean               writable,
-                                                     GAsyncReadyCallback    callback,
-                                                     gpointer               data);
-gboolean file_transfer_portal_register_files_finish (GAsyncResult          *result,
-                                                     char                 **key,
-                                                     GError               **error);
-
-void     file_transfer_portal_retrieve_files        (const char            *key,
-                                                     GAsyncReadyCallback    callback,
-                                                     gpointer               data);
-gboolean file_transfer_portal_retrieve_files_finish (GAsyncResult          *result,
-                                                     char                ***files,
-                                                     GError               **error);
-
-
-#endif

gdk/gdk-autocleanup.h

@@ -15,19 +15,27 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
 #ifndef __GI_SCANNER__
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkAppLaunchContext, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkClipboard, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkContentProvider, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkCursor, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDevice, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDisplay, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDisplayManager, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDrag, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDrawContext, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkFrameClock, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkGLContext, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkKeymap, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkMonitor, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkSeat, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkVulkanContext, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkSurface, g_object_unref)
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkContentFormats, gdk_content_formats_unref)

gdk/gdkapplaunchcontext.h

@@ -21,7 +21,7 @@
 #ifndef __GDK_APP_LAUNCH_CONTEXT_H__
 #define __GDK_APP_LAUNCH_CONTEXT_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

gdk/gdkcairo.h

@@ -18,7 +18,7 @@
 #ifndef __GDK_CAIRO_H__
 #define __GDK_CAIRO_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

gdk/gdkcairocontext.h

@@ -21,7 +21,7 @@
 #ifndef __GDK_CAIRO_CONTEXT__
 #define __GDK_CAIRO_CONTEXT__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
@@ -32,11 +32,14 @@
 
 G_BEGIN_DECLS
 
+#define GDK_TYPE_CAIRO_CONTEXT             (gdk_cairo_context_get_type ())
+#define GDK_CAIRO_CONTEXT(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_TYPE_CAIRO_CONTEXT, GdkCairoContext))
+#define GDK_IS_CAIRO_CONTEXT(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDK_TYPE_CAIRO_CONTEXT))
+
 #define GDK_CAIRO_ERROR                    (gdk_cairo_error_quark ())
 
-#define GDK_TYPE_CAIRO_CONTEXT (gdk_cairo_context_get_type ())
 GDK_AVAILABLE_IN_ALL
-GDK_DECLARE_EXPORTED_TYPE (GdkCairoContext, gdk_cairo_context, GDK, CAIRO_CONTEXT)
+GType                   gdk_cairo_context_get_type                      (void) G_GNUC_CONST;
 
 GDK_AVAILABLE_IN_ALL
 cairo_t *               gdk_cairo_context_cairo_create                  (GdkCairoContext        *self);

gdk/gdkcairocontextprivate.h

@@ -29,6 +29,12 @@
 
 G_BEGIN_DECLS
 
+#define GDK_CAIRO_CONTEXT_CLASS(klass) 	        (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_CAIRO_CONTEXT, GdkCairoContextClass))
+#define GDK_IS_CAIRO_CONTEXT_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_CAIRO_CONTEXT))
+#define GDK_CAIRO_CONTEXT_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_CAIRO_CONTEXT, GdkCairoContextClass))
+
+typedef struct _GdkCairoContextClass GdkCairoContextClass;
+
 struct _GdkCairoContext
 {
   GdkDrawContext parent_instance;

gdk/gdkclipboard.c

@@ -1054,7 +1054,6 @@ gdk_clipboard_write_serialize_done (GObject      *content,
 
   g_object_unref (task);
 }
-
 void
 gdk_clipboard_write_async (GdkClipboard        *clipboard,
                            const char          *mime_type,

gdk/gdkclipboard.h

@@ -19,7 +19,7 @@
 #ifndef __GDK_CLIPBOARD_H__
 #define __GDK_CLIPBOARD_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
@@ -31,8 +31,11 @@
 G_BEGIN_DECLS
 
 #define GDK_TYPE_CLIPBOARD            (gdk_clipboard_get_type ())
+#define GDK_CLIPBOARD(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_TYPE_CLIPBOARD, GdkClipboard))
+#define GDK_IS_CLIPBOARD(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDK_TYPE_CLIPBOARD))
+
 GDK_AVAILABLE_IN_ALL
-GDK_DECLARE_EXPORTED_TYPE (GdkClipboard, gdk_clipboard, GDK, CLIPBOARD)
+GType                   gdk_clipboard_get_type          (void) G_GNUC_CONST;
 
 GDK_AVAILABLE_IN_ALL
 GdkDisplay *            gdk_clipboard_get_display       (GdkClipboard          *clipboard);

gdk/gdkclipboardprivate.h

@@ -22,6 +22,12 @@
 
 G_BEGIN_DECLS
 
+#define GDK_CLIPBOARD_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_CLIPBOARD, GdkClipboardClass))
+#define GDK_IS_CLIPBOARD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_CLIPBOARD))
+#define GDK_CLIPBOARD_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_CLIPBOARD, GdkClipboardClass))
+
+typedef struct _GdkClipboardClass GdkClipboardClass;
+
 struct _GdkClipboard
 {
   GObject parent;

gdk/gdkconfig.h.meson

@@ -1,7 +1,7 @@
 #ifndef __GDKCONFIG_H__
 #define __GDKCONFIG_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

gdk/gdkconfig.h.win32

@@ -6,7 +6,7 @@
 #ifndef __GDKCONFIG_H__
 #define __GDKCONFIG_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

gdk/gdkconfig.h.win32_vulkan

@@ -6,7 +6,7 @@
 #ifndef __GDKCONFIG_H__
 #define __GDKCONFIG_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

gdk/gdkcontentdeserializer.c

@@ -22,7 +22,6 @@
 #include "gdkcontentdeserializer.h"
 
 #include "gdkcontentformats.h"
-#include "filetransferportalprivate.h"
 #include "gdktexture.h"
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
@@ -691,93 +690,6 @@ string_deserializer (GdkContentDeserializer *deserializer)
   g_object_unref (filter);
 }
 
-static void
-portal_finish (GObject *object,
-               GAsyncResult *result,
-               gpointer deserializer)
-{
-  char **files = NULL;
-  GError *error = NULL;
-  GValue *value;
-
-  if (!file_transfer_portal_retrieve_files_finish (result, &files, &error))
-    {
-      gdk_content_deserializer_return_error (deserializer, error);
-      return;
-    }
-
-  value = gdk_content_deserializer_get_value (deserializer);
-  if (G_VALUE_HOLDS (value, G_TYPE_FILE))
-    {
-      if (files[0] != NULL)
-        g_value_take_object (value, g_file_new_for_path (files[0]));
-    }
-  else
-    {
-      GSList *l = NULL;
-      gsize i;
-
-      for (i = 0; files[i] != NULL; i++)
-        l = g_slist_prepend (l, g_file_new_for_path (files[i]));
-      g_value_take_boxed (value, g_slist_reverse (l));
-    }
-  g_strfreev (files);
-
-  gdk_content_deserializer_return_success (deserializer);
-}
-
-static void
-portal_file_deserializer_finish (GObject      *source,
-                                 GAsyncResult *result,
-                                 gpointer      deserializer)
-{
-  GOutputStream *stream = G_OUTPUT_STREAM (source);
-  GError *error = NULL;
-  gssize written;
-  char *key;
-
-  written = g_output_stream_splice_finish (stream, result, &error);
-  if (written < 0)
-    {
-      gdk_content_deserializer_return_error (deserializer, error);
-      return;
-    }
-
-  /* write terminating NULL */
-  if (!g_output_stream_write (stream, "", 1, NULL, &error))
-    {
-      gdk_content_deserializer_return_error (deserializer, error);
-      return;
-    }
-
-  key = g_memory_output_stream_steal_data (G_MEMORY_OUTPUT_STREAM (stream));
-  if (key == NULL)
-    {
-      deserialize_not_found (deserializer);
-      return;
-    }
-
-  file_transfer_portal_retrieve_files (key, portal_finish, deserializer);
-  gdk_content_deserializer_set_task_data (deserializer, key, g_free);
-}
-
-static void
-portal_file_deserializer (GdkContentDeserializer *deserializer)
-{
-  GOutputStream *output;
-
-  output = g_memory_output_stream_new_resizable ();
-
-  g_output_stream_splice_async (output,
-                                gdk_content_deserializer_get_input_stream (deserializer),
-                                G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,
-                                gdk_content_deserializer_get_priority (deserializer),
-                                gdk_content_deserializer_get_cancellable (deserializer),
-                                portal_file_deserializer_finish,
-                                deserializer);
-  g_object_unref (output);
-}
-
 static void
 file_uri_deserializer_finish (GObject      *source,
                               GAsyncResult *result,
@@ -852,7 +764,6 @@ init (void)
   static gboolean initialized = FALSE;
   GSList *formats, *f;
   const char *charset;
-  gboolean has_portal;
 
   if (initialized)
     return;
@@ -905,24 +816,11 @@ init (void)
 
   g_slist_free (formats);
 
-  has_portal = file_transfer_portal_available ();
-  if (has_portal)
-    gdk_content_register_deserializer ("application/vnd.portal.files",
-                                       GDK_TYPE_FILE_LIST,
-                                       portal_file_deserializer,
-                                       NULL,
-                                       NULL);
   gdk_content_register_deserializer ("text/uri-list",
                                      GDK_TYPE_FILE_LIST,
                                      file_uri_deserializer,
                                      NULL,
                                      NULL);
-  if (has_portal)
-    gdk_content_register_deserializer ("application/vnd.portal.files",
-                                       G_TYPE_FILE,
-                                       portal_file_deserializer,
-                                       NULL,
-                                       NULL);
   gdk_content_register_deserializer ("text/uri-list",
                                      G_TYPE_FILE,
                                      file_uri_deserializer,

gdk/gdkcontentdeserializer.h

@@ -18,7 +18,7 @@
 #ifndef __GTK_CONTENT_DESERIALIZER_H__
 #define __GTK_CONTENT_DESERIALIZER_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

gdk/gdkcontentformats.h

@@ -18,7 +18,7 @@
 #ifndef __GTK_CONTENT_FORMATS_H__
 #define __GTK_CONTENT_FORMATS_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

gdk/gdkcontentprovider.h

@@ -19,7 +19,7 @@
 #ifndef __GDK_CONTENT_PROVIDER_H__
 #define __GDK_CONTENT_PROVIDER_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

gdk/gdkcontentproviderimpl.h

@@ -19,7 +19,7 @@
 #ifndef __GDK_CONTENT_PROVIDER_IMPL_H__
 #define __GDK_CONTENT_PROVIDER_IMPL_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

gdk/gdkcontentserializer.c

@@ -23,7 +23,6 @@
 
 #include "gdkcontentformats.h"
 #include "gdkpixbuf.h"
-#include "filetransferportalprivate.h"
 #include "gdktextureprivate.h"
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
@@ -702,63 +701,6 @@ file_serializer_finish (GObject      *source,
     gdk_content_serializer_return_success (serializer);
 }
 
-static void
-portal_ready (GObject *object,
-              GAsyncResult *result,
-              gpointer serializer)
-{
-  GError *error = NULL;
-  char *key;
-
-  if (!file_transfer_portal_register_files_finish (result, &key, &error))
-    {
-      gdk_content_serializer_return_error (serializer, error);
-      return;
-    }
-
-  g_output_stream_write_all_async (gdk_content_serializer_get_output_stream (serializer),
-                                   key,
-                                   strlen (key) + 1,
-                                   gdk_content_serializer_get_priority (serializer),
-                                   gdk_content_serializer_get_cancellable (serializer),
-                                   file_serializer_finish,
-                                   serializer);
-  gdk_content_serializer_set_task_data (serializer, key, g_free);
-}
-
-static void
-portal_file_serializer (GdkContentSerializer *serializer)
-{
-  GFile *file;
-  const GValue *value;
-  GPtrArray *files;
-
-  files = g_ptr_array_new_with_free_func (g_free);
-
-  value = gdk_content_serializer_get_value (serializer);
-
-  if (G_VALUE_HOLDS (value, G_TYPE_FILE))
-    {
-      file = g_value_get_object (gdk_content_serializer_get_value (serializer));
-      if (file)
-        g_ptr_array_add (files, g_file_get_path (file));
-      g_ptr_array_add (files, NULL);
-    }
-  else if (G_VALUE_HOLDS (value, GDK_TYPE_FILE_LIST))
-    {
-      GSList *l;
-
-      for (l = g_value_get_boxed (value); l; l = l->next)
-        g_ptr_array_add (files, g_file_get_path (l->data));
-
-      g_ptr_array_add (files, NULL);
-    }
-
-  /* this call doesn't copy the strings, so keep the array around until the registration is done */
-  file_transfer_portal_register_files ((const char **)files->pdata, TRUE, portal_ready, serializer);
-  gdk_content_serializer_set_task_data (serializer, files, (GDestroyNotify)g_ptr_array_unref);
-}
-
 static void
 file_uri_serializer (GdkContentSerializer *serializer)
 {
@@ -866,7 +808,6 @@ init (void)
   static gboolean initialized = FALSE;
   GSList *formats, *f;
   const char *charset;
-  gboolean has_portal;
 
   if (initialized)
     return;
@@ -922,14 +863,6 @@ init (void)
 
   g_slist_free (formats);
 
-  has_portal = file_transfer_portal_available ();
-
-  if (has_portal)
-    gdk_content_register_serializer (G_TYPE_FILE,
-                                     "application/vnd.portal.files",
-                                     portal_file_serializer,
-                                     NULL,
-                                     NULL);
   gdk_content_register_serializer (G_TYPE_FILE,
                                    "text/uri-list",
                                    file_uri_serializer,
@@ -940,12 +873,6 @@ init (void)
                                    file_text_serializer,
                                    NULL,
                                    NULL);
-  if (has_portal)
-    gdk_content_register_serializer (GDK_TYPE_FILE_LIST,
-                                     "application/vnd.portal.files",
-                                     portal_file_serializer,
-                                     NULL,
-                                     NULL);
   gdk_content_register_serializer (GDK_TYPE_FILE_LIST,
                                    "text/uri-list",
                                    file_uri_serializer,

gdk/gdkcontentserializer.h

@@ -18,7 +18,7 @@
 #ifndef __GTK_CONTENT_SERIALIZER_H__
 #define __GTK_CONTENT_SERIALIZER_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

gdk/gdkcursor.h

@@ -25,7 +25,7 @@
 #ifndef __GDK_CURSOR_H__
 #define __GDK_CURSOR_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
@@ -35,8 +35,14 @@
 G_BEGIN_DECLS
 
 #define GDK_TYPE_CURSOR              (gdk_cursor_get_type ())
+#define GDK_CURSOR(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_CURSOR, GdkCursor))
+#define GDK_IS_CURSOR(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_CURSOR))
+
+/* Cursors
+ */
+
 GDK_AVAILABLE_IN_ALL
-GDK_DECLARE_EXPORTED_TYPE (GdkCursor, gdk_cursor, GDK, CURSOR)
+GType      gdk_cursor_get_type           (void) G_GNUC_CONST;
 
 GDK_AVAILABLE_IN_ALL
 GdkCursor* gdk_cursor_new_from_texture   (GdkTexture      *texture,

gdk/gdkcursorprivate.h

@@ -29,6 +29,12 @@
 
 G_BEGIN_DECLS
 
+#define GDK_CURSOR_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_CURSOR, GdkCursorClass))
+#define GDK_IS_CURSOR_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_CURSOR))
+#define GDK_CURSOR_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_CURSOR, GdkCursorClass))
+
+typedef struct _GdkCursorClass GdkCursorClass;
+
 struct _GdkCursor
 {
   GObject parent_instance;

gdk/gdkdevice.h

@@ -18,7 +18,7 @@
 #ifndef __GDK_DEVICE_H__
 #define __GDK_DEVICE_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
@@ -29,8 +29,8 @@
 G_BEGIN_DECLS
 
 #define GDK_TYPE_DEVICE         (gdk_device_get_type ())
-GDK_AVAILABLE_IN_ALL
-GDK_DECLARE_EXPORTED_TYPE (GdkDevice, gdk_device, GDK, DEVICE)
+#define GDK_DEVICE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GDK_TYPE_DEVICE, GdkDevice))
+#define GDK_IS_DEVICE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_DEVICE))
 
 typedef struct _GdkTimeCoord GdkTimeCoord;
 
@@ -121,6 +121,9 @@ struct _GdkTimeCoord
   gdouble axes[GDK_MAX_TIMECOORD_AXES];
 };
 
+GDK_AVAILABLE_IN_ALL
+GType                 gdk_device_get_type       (void) G_GNUC_CONST;
+
 GDK_AVAILABLE_IN_ALL
 const gchar *         gdk_device_get_name       (GdkDevice *device);
 GDK_AVAILABLE_IN_ALL

gdk/gdkdevicepad.h

@@ -20,7 +20,7 @@
 #ifndef __GDK_DEVICE_PAD_H__
 #define __GDK_DEVICE_PAD_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

gdk/gdkdeviceprivate.h

@@ -25,6 +25,11 @@
 
 G_BEGIN_DECLS
 
+#define GDK_DEVICE_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c), GDK_TYPE_DEVICE, GdkDeviceClass))
+#define GDK_IS_DEVICE_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE ((c), GDK_TYPE_DEVICE))
+#define GDK_DEVICE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDK_TYPE_DEVICE, GdkDeviceClass))
+
+typedef struct _GdkDeviceClass GdkDeviceClass;
 typedef struct _GdkDeviceKey GdkDeviceKey;
 
 struct _GdkDeviceKey

gdk/gdkdevicetool.h

@@ -18,7 +18,7 @@
 #ifndef __GDK_DEVICE_TOOL_H__
 #define __GDK_DEVICE_TOOL_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif