build: add libdazzle dependency

Now that libdazzle can compile on gtk+-3 3.22 again, we can use it and
still keep things working on Debian stable, RHEL, etc.

build-aux/flatpak/org.gnome.Sysprof3.json

@@ -81,6 +81,21 @@
                 }
             ]
         },
+        {
+            "name" : "libdazzle",
+            "config-opts" : [
+                "--libdir=/app/lib",
+                "--buildtype=debugoptimized"
+            ],
+            "buildsystem" : "meson",
+            "builddir" : true,
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://gitlab.gnome.org/GNOME/libdazzle.git"
+                }
+            ]
+        },
         {
             "name" : "sysprof",
             "config-opts" : [
@@ -94,7 +109,7 @@
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : "https://git.gnome.org/browse/sysprof"
+                    "url" : "https://gitlab.gnome.org/GNOME/sysprof.git"
                 }
             ]
         }

meson.build

@@ -20,6 +20,7 @@ podir = join_paths(meson.source_root(), 'po')
 glib_req_version = '>= 2.50'
 gtk_req_version = '>= 3.22'
 polkit_req_version = '>= 0.105'
+dazzle_req_version = '>= 3.33.1'
 
 cc = meson.get_compiler('c')
 cxx = meson.get_compiler('cpp')
@@ -51,6 +52,7 @@ glib_dep = dependency('glib-2.0', version: glib_req_version)
 gio_dep = dependency('gio-2.0', version: glib_req_version)
 gio_unix_dep = dependency('gio-unix-2.0', version: glib_req_version)
 gtk_dep = dependency('gtk+-3.0', version: gtk_req_version)
+dazzle_dep = dependency('libdazzle-1.0', version: dazzle_req_version)
 
 # If we find polkit 0.114, we don't need to backport autoptr cleanups
 polkit_dep = dependency('polkit-gobject-1', version: '>= 0.114', required: false)

src/libsysprof-ui/meson.build

@@ -11,7 +11,6 @@ libsysprof_ui_public_sources = [
   'sysprof-marks-view.c',
   'sysprof-mark-visualizer-row.c',
   'sysprof-model-filter.c',
-  'sysprof-multi-paned.c',
   'sysprof-notebook.c',
   'sysprof-process-model-row.c',
   'sysprof-profiler-menu-button.c',
@@ -48,7 +47,6 @@ libsysprof_ui_public_headers = [
   'sysprof-marks-view.h',
   'sysprof-mark-visualizer-row.h',
   'sysprof-model-filter.h',
-  'sysprof-multi-paned.h',
   'sysprof-notebook.h',
   'sysprof-process-model-row.h',
   'sysprof-profiler-menu-button.h',
@@ -70,6 +68,7 @@ libsysprof_ui_resources = gnome.compile_resources(
 libsysprof_ui_deps = [
   gio_dep,
   gtk_dep,
+  dazzle_dep,
   libsysprof_dep,
 ]
 

src/libsysprof-ui/sysprof-capture-view.c

@@ -22,6 +22,7 @@
 
 #include "config.h"
 
+#include <dazzle.h>
 #include <glib/gi18n.h>
 
 #include "sysprof-callgraph-view.h"
@@ -814,6 +815,7 @@ sysprof_capture_view_class_init (SysprofCaptureViewClass *klass)
   
   g_object_class_install_properties (object_class, N_PROPS, properties);
 
+  g_type_ensure (DZL_TYPE_MULTI_PANED);
   g_type_ensure (SYSPROF_TYPE_DETAILS_VIEW);
 }
 

src/libsysprof-ui/sysprof-multi-paned.h

@@ -1,62 +0,0 @@
-/* sysprof-multi-paned.h
- *
- * Copyright 2016-2019 Christian Hergert <chergert@redhat.com>
- *
- * This program 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 program 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 program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-#pragma once
-
-#if !defined (SYSPROF_UI_INSIDE) && !defined (SYSPROF_UI_COMPILATION)
-# error "Only <sysprof-ui.h> can be included directly."
-#endif
-
-#include <gtk/gtk.h>
-#include <sysprof.h>
-
-G_BEGIN_DECLS
-
-#define SYSPROF_TYPE_MULTI_PANED (sysprof_multi_paned_get_type())
-
-SYSPROF_AVAILABLE_IN_ALL
-G_DECLARE_DERIVABLE_TYPE (SysprofMultiPaned, sysprof_multi_paned, SYSPROF, MULTI_PANED, GtkContainer)
-
-struct _SysprofMultiPanedClass
-{
-  GtkContainerClass parent;
-
-  void (*resize_drag_begin) (SysprofMultiPaned *self,
-                             GtkWidget     *child);
-  void (*resize_drag_end)   (SysprofMultiPaned *self,
-                             GtkWidget     *child);
-
-  gpointer _reserved1;
-  gpointer _reserved2;
-  gpointer _reserved3;
-  gpointer _reserved4;
-  gpointer _reserved5;
-  gpointer _reserved6;
-  gpointer _reserved7;
-  gpointer _reserved8;
-};
-
-SYSPROF_AVAILABLE_IN_ALL
-GtkWidget *sysprof_multi_paned_new            (void);
-SYSPROF_AVAILABLE_IN_ALL
-guint      sysprof_multi_paned_get_n_children (SysprofMultiPaned *self);
-
-G_END_DECLS

src/libsysprof-ui/sysprof-ui.h

@@ -20,6 +20,7 @@
 
 #pragma once
 
+#include <dazzle.h>
 #include <sysprof.h>
 
 G_BEGIN_DECLS
@@ -38,7 +39,6 @@ G_BEGIN_DECLS
 # include "sysprof-marks-view.h"
 # include "sysprof-mark-visualizer-row.h"
 # include "sysprof-model-filter.h"
-# include "sysprof-multi-paned.h"
 # include "sysprof-notebook.h"
 # include "sysprof-process-model-row.h"
 # include "sysprof-profiler-menu-button.h"

src/libsysprof-ui/ui/sysprof-capture-view.ui

@@ -89,7 +89,7 @@
           </object>
         </child>
         <child>
-          <object class="SysprofMultiPaned">
+          <object class="DzlMultiPaned">
             <property name="visible">true</property>
             <child>
               <object class="GtkBox">