6 files changed, 30 insertions, 7 deletions
diff --git a/cut-n-paste/meson.build b/cut-n-paste/meson.build
new file mode 100644
index 0000000..db067e9
--- /dev/null
+++ b/cut-n-paste/meson.build
@@ -0,0 +1 @@
+subdir('toolbar-editor')
diff --git a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
index 135b3bd..6ed923f 100644
--- a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
+++ b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
@@ -506,7 +506,6 @@ configure_item_cursor (GtkToolItem *item,
 }
 }
 
-
 static void
 configure_item_tooltip (GtkToolItem *item)
 {
@@ -522,7 +521,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 d852f86..acc72e7 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);
 
diff --git a/cut-n-paste/toolbar-editor/egg-toolbar-editor.h b/cut-n-paste/toolbar-editor/egg-toolbar-editor.h
index 89bb185..d9f8786 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
 GtkVBoxClass 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 78bf829..cdd340e 100644
--- a/cut-n-paste/toolbar-editor/egg-toolbars-model.c
+++ b/cut-n-paste/toolbar-editor/egg-toolbars-model.c
@@ -27,6 +27,8 @@
 
 #include <unistd.h>
 #include <string.h>
+#include <libxml/globals.h>
+#include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <gdk/gdk.h>
 
@@ -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 0000000..3295507
--- /dev/null
+++ b/cut-n-paste/toolbar-editor/meson.build
@@ -0,0 +1,27 @@
+eggheaders = [
+ 'egg-editable-toolbar.h',
+ 'egg-toolbars-model.h',
+ 'egg-toolbar-editor.h',
+]
+
+eggmarshalers = gnome.genmarshal('eggmarshalers', sources: ['eggmarshalers.list'], prefix: '_egg_marshal')
+eggtypebuiltins = gnome.mkenums_simple('eggtypebuiltins', sources: eggheaders)
+
+src = [
+ eggmarshalers,
+ eggtypebuiltins,
+ 'egg-editable-toolbar.c',
+ 'egg-toolbars-model.c',
+ 'egg-toolbar-editor.c',
+ eggheaders,
+]
+
+toolbareditor = static_library(
+ 'toolbareditor',
+ src,
+ dependencies: all_deps,
+ include_directories: top_inc,
+ c_args: ['-DCURSOR_DIR="' + pkgdatadir + '"'],
+)
+
+toolbareditor_inc = include_directories('.')