8 files changed, 135 insertions, 9 deletions
diff --git a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
index 91a065ed..e4c2f570 100644
--- a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
+++ b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
@@ -541,7 +541,6 @@ configure_item_cursor (GtkToolItem *item,
     }
 }
 
-
 static void
 configure_item_tooltip (GtkToolItem *item)
 {
@@ -557,7 +556,6 @@ configure_item_tooltip (GtkToolItem *item)
     }
 }
 
-
 static void
 connect_widget_signals (GtkWidget *proxy, EggEditableToolbar *etoolbar)
 {
diff --git a/cut-n-paste/toolbar-editor/egg-toolbar-editor.c b/cut-n-paste/toolbar-editor/egg-toolbar-editor.c
index 312b9128..cb07011f 100644
--- a/cut-n-paste/toolbar-editor/egg-toolbar-editor.c
+++ b/cut-n-paste/toolbar-editor/egg-toolbar-editor.c
@@ -36,7 +36,6 @@ static const GtkTargetEntry source_drag_types[] = {
   {EGG_TOOLBAR_ITEM_TYPE, GTK_TARGET_SAME_APP, 0},
 };
 
-
 static void egg_toolbar_editor_finalize         (GObject *object);
 static void update_editor_sheet                 (EggToolbarEditor *editor);
 
@@ -150,6 +149,11 @@ egg_toolbar_editor_disconnect_model (EggToolbarEditor *t)
     {
       handler = priv->sig_handlers[i];
 
+#if GLIB_CHECK_VERSION(2,62,0)
+      if ((handler == 0) || !g_signal_handler_is_connected (model, handler))
+        continue;
+      g_clear_signal_handler (&handler, model);
+#else
       if (handler != 0)
         {
           if (g_signal_handler_is_connected (model, handler))
@@ -159,6 +163,7 @@ egg_toolbar_editor_disconnect_model (EggToolbarEditor *t)
 
           priv->sig_handlers[i] = 0;
         }
+#endif
     }
 }
 
diff --git a/cut-n-paste/toolbar-editor/egg-toolbar-editor.h b/cut-n-paste/toolbar-editor/egg-toolbar-editor.h
index e5a10b0a..13154808 100644
--- a/cut-n-paste/toolbar-editor/egg-toolbar-editor.h
+++ b/cut-n-paste/toolbar-editor/egg-toolbar-editor.h
@@ -34,7 +34,6 @@ typedef struct EggToolbarEditorClass EggToolbarEditorClass;
 #define EGG_IS_TOOLBAR_EDITOR_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_TOOLBAR_EDITOR))
 #define EGG_TOOLBAR_EDITOR_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_TOOLBAR_EDITOR, EggToolbarEditorClass))
 
-
 typedef struct EggToolbarEditor EggToolbarEditor;
 typedef struct EggToolbarEditorPrivate EggToolbarEditorPrivate;
 
@@ -51,7 +50,6 @@ struct EggToolbarEditorClass
   GtkBoxClass parent_class;
 };
 
-
 GType            egg_toolbar_editor_get_type     (void);
 GtkWidget        *egg_toolbar_editor_new         (GtkUIManager *manager,
                                                   EggToolbarsModel *model);
diff --git a/cut-n-paste/toolbar-editor/egg-toolbars-model.c b/cut-n-paste/toolbar-editor/egg-toolbars-model.c
index f3cc8022..cede0c70 100644
--- a/cut-n-paste/toolbar-editor/egg-toolbars-model.c
+++ b/cut-n-paste/toolbar-editor/egg-toolbars-model.c
@@ -27,7 +27,9 @@
 
 #include <unistd.h>
 #include <string.h>
+#include <libxml/parser.h>
 #include <libxml/tree.h>
+#include <libxml/xmlsave.h>
 #include <gdk/gdk.h>
 
 static void egg_toolbars_model_finalize   (GObject               *object);
@@ -213,7 +215,6 @@ is_unique (EggToolbarsModel *model,
   EggToolbarsItem *idata2;
   GNode *toolbar, *item;
 
-
   for(toolbar = g_node_first_child (model->priv->toolbars);
       toolbar != NULL; toolbar = g_node_next_sibling (toolbar))
     {
@@ -330,7 +331,6 @@ egg_toolbars_model_set_flags (EggToolbarsModel *model,
 		 0, toolbar_position);
 }
 
-
 char *
 egg_toolbars_model_get_data (EggToolbarsModel *model,
                              GdkAtom           type,
diff --git a/cut-n-paste/toolbar-editor/meson.build b/cut-n-paste/toolbar-editor/meson.build
new file mode 100644
index 00000000..fc37a885
--- /dev/null
+++ b/cut-n-paste/toolbar-editor/meson.build
@@ -0,0 +1,98 @@
+glib_genmarshal = find_program('glib-genmarshal')
+glib_mkenums = find_program('glib-mkenums')
+
+eggsources = [
+  'egg-editable-toolbar.c',
+  'egg-toolbars-model.c',
+  'egg-toolbar-editor.c'
+]
+
+eggheaders = [
+  'egg-editable-toolbar.h',
+  'egg-toolbars-model.h',
+  'egg-toolbar-editor.h'
+]
+
+noinst_headers = [
+  'eggmarshalers.h'
+]
+
+eggmarshalers_h = custom_target('eggmarshalers.h',
+  output: 'eggmarshalers.h',
+  input: 'eggmarshalers.list',
+  command: [
+    glib_genmarshal,
+    '--prefix=_egg_marshal',
+    '@INPUT@',
+    '--header'
+  ],
+  capture: true
+)
+
+eggmarshalers_c = custom_target('eggmarshalers.c',
+  output: 'eggmarshalers.c',
+  input: 'eggmarshalers.list',
+  command: [
+    glib_genmarshal,
+    '--prefix=_egg_marshal',
+    '@INPUT@',
+    '--body',
+    '--prototypes'
+  ],
+  capture: true
+)
+
+eggtypebuiltins_h = custom_target('eggtypebuiltins.h',
+  output: 'eggtypebuiltins.h',
+  input: eggheaders,
+  command: [
+    glib_mkenums,
+    '--fhead', '#ifndef __EGGTYPEBUILTINS_H__\n#define __EGGTYPEBUILTINS_H__ 1\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n\n',
+    '--ftail', 'G_END_DECLS\n\n#endif /* __EGGTYPEBUILTINS_H__ */\n',
+    '--fprod', '\n/* --- @filename@ --- */',
+    '--eprod', '#define EGG_TYPE_@ENUMSHORT@ @enum_name@_get_type()\nGType @enum_name@_get_type (void);\n',
+    '@INPUT@'
+  ],
+  capture: true
+)
+
+eggtypebuiltins_c = custom_target('eggtypebuiltins.c',
+  output: 'eggtypebuiltins.c',
+  input: eggheaders,
+  command: [
+    glib_mkenums,
+    '--fhead', '#include <config.h>\n\n#include "eggtypebuiltins.h"\n\n',
+    '--fprod', '\n/* enumerations from "@filename@" */\n#include "@filename@"',
+    '--vhead', 'static const G@Type@Value _@enum_name@_values[] = {',
+    '--vprod', '  { @VALUENAME@, "@VALUENAME@", "@valuenick@" },',
+    '--vtail', '  { 0, NULL, NULL }\n};\n\nGType\n@enum_name@_get_type (void)\n{\n  static GType type = 0;\n\n  if (G_UNLIKELY (type == 0))\n    type = g_@type@_register_static ("@EnumName@", _@enum_name@_values);\n\n  return type;\n}\n\n',
+    '@INPUT@'
+  ],
+  capture: true
+)
+
+built_sources = [
+  eggmarshalers_c,
+  eggmarshalers_h,
+  eggtypebuiltins_c,
+  eggtypebuiltins_h
+]
+
+# Define the library
+libtoolbareditor = static_library('toolbareditor',
+  sources: [
+    eggsources,
+    eggheaders,
+    built_sources
+  ],
+  c_args: [
+    '-DCURSOR_DIR="' + join_paths(get_option('prefix'), get_option('datadir'), meson.project_name()) + '"',
+  ],
+  include_directories: include_dirs,
+  dependencies: [shell_core_deps, xml]
+)
+
+libtoolbareditor_dep = declare_dependency(
+  link_with: libtoolbareditor,
+  include_directories: include_dirs
+)
diff --git a/cut-n-paste/zoom-control/ephy-zoom-control.c b/cut-n-paste/zoom-control/ephy-zoom-control.c
index c1364f32..3d5c7fde 100644
--- a/cut-n-paste/zoom-control/ephy-zoom-control.c
+++ b/cut-n-paste/zoom-control/ephy-zoom-control.c
@@ -34,7 +34,7 @@ struct _EphyZoomControlPrivate
 	float zoom;
 	float min_zoom;
 	float max_zoom;
-	guint handler_id;
+	gulong handler_id;
 };
 
 enum
diff --git a/cut-n-paste/zoom-control/ephy-zoom.c b/cut-n-paste/zoom-control/ephy-zoom.c
index 9c289f2c..c462bb4b 100644
--- a/cut-n-paste/zoom-control/ephy-zoom.c
+++ b/cut-n-paste/zoom-control/ephy-zoom.c
@@ -54,7 +54,6 @@ ephy_zoom_get_zoom_level_index (float level)
 	return n_zoom_levels - 1;
 }
 
-
 float
 ephy_zoom_get_changed_zoom_level (float level, gint steps)
 {
diff --git a/cut-n-paste/zoom-control/meson.build b/cut-n-paste/zoom-control/meson.build
new file mode 100644
index 00000000..7830f1d1
--- /dev/null
+++ b/cut-n-paste/zoom-control/meson.build
@@ -0,0 +1,28 @@
+zoom_sources = [
+    'ephy-zoom-action.h',
+    'ephy-zoom-action.c',
+    'ephy-zoom-control.c',
+    'ephy-zoom-control.h',
+    'ephy-zoom.c',
+    'ephy-zoom.h',
+]
+
+zoom_deps = [
+    config_h,
+    glib,
+    gtk,
+    math
+]
+
+libephyzoom = static_library(
+    'ephyzoom',
+    zoom_sources,
+    include_directories: include_root,
+    dependencies: zoom_deps,
+)
+
+libephyzoom_dep = declare_dependency(
+    link_with: libephyzoom,
+    include_directories: [include_root, include_directories('.')],
+    dependencies: zoom_deps,
+)