main: start multi-project preparations

7 files changed, 127 insertions, 143 deletions

diff --git a/src/csexport.c b/src/csexport.c
index 091178b..cad3468 100644
--- a/src/csexport.c
+++ b/src/csexport.c
@@ -54,16 +54,6 @@ typedef struct _EmulationCSClass EmulationCSClass;
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 
-#define GUI_TYPE_MAIN_WINDOW (gui_main_window_get_type ())
-#define GUI_MAIN_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GUI_TYPE_MAIN_WINDOW, GUIMainWindow))
-#define GUI_MAIN_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GUI_TYPE_MAIN_WINDOW, GUIMainWindowClass))
-#define GUI_IS_MAIN_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GUI_TYPE_MAIN_WINDOW))
-#define GUI_IS_MAIN_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GUI_TYPE_MAIN_WINDOW))
-#define GUI_MAIN_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GUI_TYPE_MAIN_WINDOW, GUIMainWindowClass))
-
-typedef struct _GUIMainWindow GUIMainWindow;
-typedef struct _GUIMainWindowClass GUIMainWindowClass;
-
 #define EMULATION_TYPE_SPEC_ENTRY (emulation_spec_entry_get_type ())
 
 #define EMULATION_TYPE_SPEC (emulation_spec_get_type ())
@@ -258,7 +248,6 @@ struct _EmulationSpecEntry {
 
 static char* gui_cs_export_ui_xml;
 static char* gui_cs_export_ui_xml = NULL;
-extern GUIMainWindow* gui_main;
 extern EmulationSpecEntry* emulation_specs;
 extern gint emulation_specs_length1;
 extern guint emulation_spec_default;
@@ -270,9 +259,8 @@ GType emulation_cs_get_type (void);
 enum  {
 	GUI_CS_EXPORT_DUMMY_PROPERTY
 };
-GType gui_main_window_get_type (void);
-static void _lambda10_ (GtkToggleButton* source, GUICSExport* self);
-static void __lambda10__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
+static void _lambda13_ (GtkToggleButton* source, GUICSExport* self);
+static void __lambda13__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
 GType emulation_spec_entry_get_type (void);
 GType emulation_spec_get_type (void);
 EmulationSpecEntry* emulation_spec_entry_dup (const EmulationSpecEntry* self);
@@ -372,14 +360,14 @@ static gpointer _g_object_ref0 (gpointer self) {
 }
 
 
-static void _lambda10_ (GtkToggleButton* source, GUICSExport* self) {
+static void _lambda13_ (GtkToggleButton* source, GUICSExport* self) {
 	g_return_if_fail (source != NULL);
 	gtk_widget_set_sensitive ((GtkWidget*) self->priv->info_frame, gtk_toggle_button_get_active ((GtkToggleButton*) self->priv->tree_radio));
 }
 
 
-static void __lambda10__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
-	_lambda10_ (_sender, self);
+static void __lambda13__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
+	_lambda13_ (_sender, self);
 }
 
 
@@ -454,7 +442,6 @@ GUICSExport* gui_cs_export_construct (GType object_type, EmulationCS* cs) {
 		g_clear_error (&_inner_error_);
 		return NULL;
 	}
-	gtk_window_set_transient_for ((GtkWindow*) self, (GtkWindow*) gui_main);
 	gtk_window_set_title ((GtkWindow*) self, "Export CS");
 	mainbox = _g_object_ref0 ((_tmp0_ = gtk_builder_get_object (builder, "mainbox"), GTK_IS_VBOX (_tmp0_) ? ((GtkVBox*) _tmp0_) : NULL));
 	gtk_box_pack_start ((GtkBox*) ((GtkDialog*) self)->vbox, (GtkWidget*) mainbox, FALSE, FALSE, (guint) 0);
@@ -473,7 +460,7 @@ GUICSExport* gui_cs_export_construct (GType object_type, EmulationCS* cs) {
 	self->priv->check_pkt3_opcode = (_tmp22_ = _g_object_ref0 ((_tmp21_ = gtk_builder_get_object (builder, "check_pkt3_opcode"), GTK_IS_CHECK_BUTTON (_tmp21_) ? ((GtkCheckButton*) _tmp21_) : NULL)), _g_object_unref0 (self->priv->check_pkt3_opcode), _tmp22_);
 	self->priv->check_pkt3_opcode_text = (_tmp24_ = _g_object_ref0 ((_tmp23_ = gtk_builder_get_object (builder, "check_pkt3_opcode_text"), GTK_IS_CHECK_BUTTON (_tmp23_) ? ((GtkCheckButton*) _tmp23_) : NULL)), _g_object_unref0 (self->priv->check_pkt3_opcode_text), _tmp24_);
 	self->priv->check_pkt3_count = (_tmp26_ = _g_object_ref0 ((_tmp25_ = gtk_builder_get_object (builder, "check_pkt3_count"), GTK_IS_CHECK_BUTTON (_tmp25_) ? ((GtkCheckButton*) _tmp25_) : NULL)), _g_object_unref0 (self->priv->check_pkt3_count), _tmp26_);
-	g_signal_connect_object ((GtkToggleButton*) self->priv->plain_radio, "toggled", (GCallback) __lambda10__gtk_toggle_button_toggled, self, 0);
+	g_signal_connect_object ((GtkToggleButton*) self->priv->plain_radio, "toggled", (GCallback) __lambda13__gtk_toggle_button_toggled, self, 0);
 	chip_combo_align = _g_object_ref0 ((_tmp27_ = gtk_builder_get_object (builder, "chip_combo_align"), GTK_IS_ALIGNMENT (_tmp27_) ? ((GtkAlignment*) _tmp27_) : NULL));
 	gtk_container_add ((GtkContainer*) chip_combo_align, (GtkWidget*) (self->priv->chip_combo = (_tmp28_ = g_object_ref_sink ((GtkComboBox*) gtk_combo_box_new_text ()), _g_object_unref0 (self->priv->chip_combo), _tmp28_)));
 	{
diff --git a/src/csexport.vala b/src/csexport.vala
index 92310ea..1a185b3 100644
--- a/src/csexport.vala
+++ b/src/csexport.vala
@@ -392,7 +392,6 @@ namespace GUI
                 stderr.printf("Unable to construct export dialog.\n");
                 return;
             }
-            set_transient_for(main);
             title = "Export CS";
 
             var mainbox = builder.get_object("mainbox") as VBox;
diff --git a/src/csimport.c b/src/csimport.c
index aff2663..d2dffbc 100644
--- a/src/csimport.c
+++ b/src/csimport.c
@@ -45,6 +45,8 @@ typedef struct _GUICSImportPrivate GUICSImportPrivate;
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define _g_array_free0(var) ((var == NULL) ? NULL : (var = (g_array_free (var, TRUE), NULL)))
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
+#define _g_free0(var) (var = (g_free (var), NULL))
+#define _gtk_tree_path_free0(var) ((var == NULL) ? NULL : (var = (gtk_tree_path_free (var), NULL)))
 
 #define GUI_TYPE_MAIN_WINDOW (gui_main_window_get_type ())
 #define GUI_MAIN_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GUI_TYPE_MAIN_WINDOW, GUIMainWindow))
@@ -55,8 +57,6 @@ typedef struct _GUICSImportPrivate GUICSImportPrivate;
 
 typedef struct _GUIMainWindow GUIMainWindow;
 typedef struct _GUIMainWindowClass GUIMainWindowClass;
-#define _g_free0(var) (var = (g_free (var), NULL))
-#define _gtk_tree_path_free0(var) ((var == NULL) ? NULL : (var = (gtk_tree_path_free (var), NULL)))
 
 #define EMULATION_TYPE_CS (emulation_cs_get_type ())
 #define EMULATION_CS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMULATION_TYPE_CS, EmulationCS))
@@ -113,20 +113,20 @@ GType gui_cs_import_get_type (void);
 enum  {
 	GUI_CS_IMPORT_DUMMY_PROPERTY
 };
-GType gui_main_window_get_type (void);
-static void _lambda20_ (GtkCellLayout* coll, GtkCellRenderer* celll, GtkTreeModel* model, GtkTreeIter* iter, GUICSImport* self);
-static void __lambda20__gtk_cell_layout_data_func (GtkCellLayout* cell_layout, GtkCellRenderer* cell, GtkTreeModel* tree_model, GtkTreeIter* iter, gpointer self);
+static void _lambda0_ (GtkCellLayout* coll, GtkCellRenderer* celll, GtkTreeModel* model, GtkTreeIter* iter, GUICSImport* self);
+static void __lambda0__gtk_cell_layout_data_func (GtkCellLayout* cell_layout, GtkCellRenderer* cell, GtkTreeModel* tree_model, GtkTreeIter* iter, gpointer self);
 static void gui_cs_import_open_cs (GUICSImport* self, const char* filename);
-static void _lambda21_ (GtkButton* source, GUICSImport* self);
-static void __lambda21__gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _lambda1_ (GtkButton* source, GUICSImport* self);
+static void __lambda1__gtk_button_clicked (GtkButton* _sender, gpointer self);
 static void gui_cs_import_update_ok_button (GUICSImport* self);
 static void _gui_cs_import_update_ok_button_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+GType gui_main_window_get_type (void);
 GType emulation_cs_get_type (void);
 void gui_main_window_add_cs (GUIMainWindow* self, const char* name, EmulationCS* cs);
 EmulationCS* emulation_cs_new (guint32* dwords, guint len);
 EmulationCS* emulation_cs_construct (GType object_type, guint32* dwords, guint len);
-static void _lambda22_ (GtkDialog* source, gint id, GUICSImport* self);
-static void __lambda22__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self);
+static void _lambda2_ (GtkDialog* source, gint id, GUICSImport* self);
+static void __lambda2__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self);
 GUICSImport* gui_cs_import_new (void);
 GUICSImport* gui_cs_import_construct (GType object_type);
 GType emulation_packet_get_type (void);
@@ -150,7 +150,7 @@ static gpointer _g_object_ref0 (gpointer self) {
 }
 
 
-static void _lambda20_ (GtkCellLayout* coll, GtkCellRenderer* celll, GtkTreeModel* model, GtkTreeIter* iter, GUICSImport* self) {
+static void _lambda0_ (GtkCellLayout* coll, GtkCellRenderer* celll, GtkTreeModel* model, GtkTreeIter* iter, GUICSImport* self) {
 	GtkTreePath* path;
 	gint* indices;
 	char* _tmp0_;
@@ -168,12 +168,12 @@ static void _lambda20_ (GtkCellLayout* coll, GtkCellRenderer* celll, GtkTreeMode
 }
 
 
-static void __lambda20__gtk_cell_layout_data_func (GtkCellLayout* cell_layout, GtkCellRenderer* cell, GtkTreeModel* tree_model, GtkTreeIter* iter, gpointer self) {
-	_lambda20_ (cell_layout, cell, tree_model, iter, self);
+static void __lambda0__gtk_cell_layout_data_func (GtkCellLayout* cell_layout, GtkCellRenderer* cell, GtkTreeModel* tree_model, GtkTreeIter* iter, gpointer self) {
+	_lambda0_ (cell_layout, cell, tree_model, iter, self);
 }
 
 
-static void _lambda21_ (GtkButton* source, GUICSImport* self) {
+static void _lambda1_ (GtkButton* source, GUICSImport* self) {
 	GtkFileChooserDialog* fc;
 	g_return_if_fail (source != NULL);
 	fc = g_object_ref_sink ((GtkFileChooserDialog*) gtk_file_chooser_dialog_new ("Open File", (GtkWindow*) self, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL, NULL));
@@ -187,8 +187,8 @@ static void _lambda21_ (GtkButton* source, GUICSImport* self) {
 }
 
 
-static void __lambda21__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-	_lambda21_ (_sender, self);
+static void __lambda1__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+	_lambda1_ (_sender, self);
 }
 
 
@@ -197,7 +197,7 @@ static void _gui_cs_import_update_ok_button_gtk_editable_changed (GtkEditable* _
 }
 
 
-static void _lambda22_ (GtkDialog* source, gint id, GUICSImport* self) {
+static void _lambda2_ (GtkDialog* source, gint id, GUICSImport* self) {
 	g_return_if_fail (source != NULL);
 	if (id == GTK_RESPONSE_OK) {
 		EmulationCS* _tmp0_;
@@ -208,8 +208,8 @@ static void _lambda22_ (GtkDialog* source, gint id, GUICSImport* self) {
 }
 
 
-static void __lambda22__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
-	_lambda22_ (_sender, response_id, self);
+static void __lambda2__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
+	_lambda2_ (_sender, response_id, self);
 }
 
 
@@ -264,17 +264,16 @@ GUICSImport* gui_cs_import_construct (GType object_type) {
 		g_clear_error (&_inner_error_);
 		return NULL;
 	}
-	gtk_window_set_transient_for ((GtkWindow*) self, (GtkWindow*) gui_main);
 	gtk_window_set_title ((GtkWindow*) self, "Import CS");
 	col = _g_object_ref0 ((_tmp0_ = gtk_builder_get_object (builder, "value_column"), GTK_IS_TREE_VIEW_COLUMN (_tmp0_) ? ((GtkTreeViewColumn*) _tmp0_) : NULL));
 	cell = _g_object_ref0 ((_tmp1_ = gtk_builder_get_object (builder, "value_cell"), GTK_IS_CELL_RENDERER_TEXT (_tmp1_) ? ((GtkCellRendererText*) _tmp1_) : NULL));
-	gtk_cell_layout_set_cell_data_func ((GtkCellLayout*) col, (GtkCellRenderer*) cell, __lambda20__gtk_cell_layout_data_func, g_object_ref (self), g_object_unref);
+	gtk_cell_layout_set_cell_data_func ((GtkCellLayout*) col, (GtkCellRenderer*) cell, __lambda0__gtk_cell_layout_data_func, g_object_ref (self), g_object_unref);
 	self->priv->meta_store = (_tmp3_ = _g_object_ref0 ((_tmp2_ = gtk_builder_get_object (builder, "meta_store"), GTK_IS_LIST_STORE (_tmp2_) ? ((GtkListStore*) _tmp2_) : NULL)), _g_object_unref0 (self->priv->meta_store), _tmp3_);
 	gtk_dialog_add_button ((GtkDialog*) self, GTK_STOCK_CANCEL, (gint) GTK_RESPONSE_CANCEL);
 	self->priv->ok_button = (_tmp5_ = _g_object_ref0 ((_tmp4_ = gtk_dialog_add_button ((GtkDialog*) self, GTK_STOCK_OK, (gint) GTK_RESPONSE_OK), GTK_IS_BUTTON (_tmp4_) ? ((GtkButton*) _tmp4_) : NULL)), _g_object_unref0 (self->priv->ok_button), _tmp5_);
 	gtk_widget_set_sensitive ((GtkWidget*) self->priv->ok_button, FALSE);
 	load_button = _g_object_ref0 ((_tmp6_ = gtk_builder_get_object (builder, "load_button"), GTK_IS_BUTTON (_tmp6_) ? ((GtkButton*) _tmp6_) : NULL));
-	g_signal_connect_object (load_button, "clicked", (GCallback) __lambda21__gtk_button_clicked, self, 0);
+	g_signal_connect_object (load_button, "clicked", (GCallback) __lambda1__gtk_button_clicked, self, 0);
 	self->priv->validcs = FALSE;
 	self->priv->dwords = (_tmp7_ = g_array_new (FALSE, FALSE, (guint) sizeof (guint32)), _g_array_free0 (self->priv->dwords), _tmp7_);
 	self->priv->name_entry = (_tmp9_ = _g_object_ref0 ((_tmp8_ = gtk_builder_get_object (builder, "name_entry"), GTK_IS_ENTRY (_tmp8_) ? ((GtkEntry*) _tmp8_) : NULL)), _g_object_unref0 (self->priv->name_entry), _tmp9_);
@@ -286,7 +285,7 @@ GUICSImport* gui_cs_import_construct (GType object_type) {
 	self->priv->status_label = (_tmp12_ = _g_object_ref0 ((_tmp11_ = gtk_builder_get_object (builder, "status_label"), GTK_IS_LABEL (_tmp11_) ? ((GtkLabel*) _tmp11_) : NULL)), _g_object_unref0 (self->priv->status_label), _tmp12_);
 	gtk_widget_modify_fg ((GtkWidget*) self->priv->status_label, GTK_STATE_NORMAL, &color);
 	gtk_box_pack_start ((GtkBox*) ((GtkDialog*) self)->vbox, (GtkWidget*) (_tmp13_ = gtk_builder_get_object (builder, "mainbox"), GTK_IS_VBOX (_tmp13_) ? ((GtkVBox*) _tmp13_) : NULL), TRUE, TRUE, (guint) 0);
-	g_signal_connect_object ((GtkDialog*) self, "response", (GCallback) __lambda22__gtk_dialog_response, self, 0);
+	g_signal_connect_object ((GtkDialog*) self, "response", (GCallback) __lambda2__gtk_dialog_response, self, 0);
 	gtk_window_set_default_size ((GtkWindow*) self, 300, 400);
 	_g_object_unref0 (builder);
 	_g_object_unref0 (col);
diff --git a/src/csimport.vala b/src/csimport.vala
index 9d601e4..dbf9cd4 100644
--- a/src/csimport.vala
+++ b/src/csimport.vala
@@ -209,7 +209,6 @@ namespace GUI
                 stderr.printf("Unable to construct import dialog.\n");
                 return;
             }
-            set_transient_for(main);
             title = "Import CS";
 
             var col = builder.get_object("value_column") as TreeViewColumn;
diff --git a/src/csview.c b/src/csview.c
index 9ba02b9..00c237c 100644
--- a/src/csview.c
+++ b/src/csview.c
@@ -439,8 +439,8 @@ EmulationSpecEntry* emulation_spec_entry_dup (const EmulationSpecEntry* self);
 void emulation_spec_entry_free (EmulationSpecEntry* self);
 void emulation_spec_entry_copy (const EmulationSpecEntry* self, EmulationSpecEntry* dest);
 void emulation_spec_entry_destroy (EmulationSpecEntry* self);
-static void _lambda9_ (GtkComboBox* combo, GUICSView* self);
-static void __lambda9__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void _lambda12_ (GtkComboBox* combo, GUICSView* self);
+static void __lambda12__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
 GUICSView* gui_cs_view_new (EmulationCS* cs);
 GUICSView* gui_cs_view_construct (GType object_type, EmulationCS* cs);
 static void gui_cs_view_finalize (GObject* obj);
@@ -2101,14 +2101,14 @@ static glong string_get_length (const char* self) {
 }
 
 
-static void _lambda9_ (GtkComboBox* combo, GUICSView* self) {
+static void _lambda12_ (GtkComboBox* combo, GUICSView* self) {
 	g_return_if_fail (combo != NULL);
 	gtk_tree_view_set_model (self->priv->cs_view, (GtkTreeModel*) self->priv->models[gtk_combo_box_get_active (combo)]);
 }
 
 
-static void __lambda9__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-	_lambda9_ (_sender, self);
+static void __lambda12__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+	_lambda12_ (_sender, self);
 }
 
 
@@ -2189,7 +2189,7 @@ GUICSView* gui_cs_view_construct (GType object_type, EmulationCS* cs) {
 		}
 	}
 	gtk_combo_box_set_active (chips, (gint) emulation_spec_default);
-	g_signal_connect_object (chips, "changed", (GCallback) __lambda9__gtk_combo_box_changed, self, 0);
+	g_signal_connect_object (chips, "changed", (GCallback) __lambda12__gtk_combo_box_changed, self, 0);
 	chips_box = _g_object_ref0 ((_tmp3_ = gtk_builder_get_object (builder, "chips_box"), GTK_IS_HBOX (_tmp3_) ? ((GtkHBox*) _tmp3_) : NULL));
 	gtk_box_pack_start ((GtkBox*) chips_box, (GtkWidget*) chips, FALSE, FALSE, (guint) 0);
 	self->priv->cs_view = (_tmp5_ = _g_object_ref0 ((_tmp4_ = gtk_builder_get_object (builder, "packet_tree"), GTK_IS_TREE_VIEW (_tmp4_) ? ((GtkTreeView*) _tmp4_) : NULL)), _g_object_unref0 (self->priv->cs_view), _tmp5_);
diff --git a/src/main.c b/src/main.c
index 9d1eaf6..53145c0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -156,27 +156,27 @@ static void gui_main_window_open_csexport (GUIMainWindow* self);
 GUIMainWindow* gui_main_window_new (void);
 GUIMainWindow* gui_main_window_construct (GType object_type);
 guint emulation_cs_get_length (EmulationCS* self);
-static void _lambda11_ (GtkCellLayout* col, GtkCellRenderer* cell, GtkTreeModel* model, GtkTreeIter* iter, GUIMainWindow* self);
-static void __lambda11__gtk_cell_layout_data_func (GtkCellLayout* cell_layout, GtkCellRenderer* cell, GtkTreeModel* tree_model, GtkTreeIter* iter, gpointer self);
-static void _lambda12_ (GtkAction* source, GUIMainWindow* self);
-static void __lambda12__gtk_action_activate (GtkAction* _sender, gpointer self);
+static void _lambda14_ (GtkCellLayout* col, GtkCellRenderer* cell, GtkTreeModel* model, GtkTreeIter* iter, GUIMainWindow* self);
+static void __lambda14__gtk_cell_layout_data_func (GtkCellLayout* cell_layout, GtkCellRenderer* cell, GtkTreeModel* tree_model, GtkTreeIter* iter, gpointer self);
+static void _lambda15_ (GtkAction* source, GUIMainWindow* self);
+static void __lambda15__gtk_action_activate (GtkAction* _sender, gpointer self);
 GUICSImport* gui_cs_import_new (void);
 GUICSImport* gui_cs_import_construct (GType object_type);
 GType gui_cs_import_get_type (void);
-static void _lambda13_ (GtkAction* source, GUIMainWindow* self);
-static void __lambda13__gtk_action_activate (GtkAction* _sender, gpointer self);
-static void _lambda14_ (GtkAction* source, GUIMainWindow* self);
-static void __lambda14__gtk_action_activate (GtkAction* _sender, gpointer self);
-static void _lambda15_ (GtkAction* source, GUIMainWindow* self);
-static void __lambda15__gtk_action_activate (GtkAction* _sender, gpointer self);
 static void _lambda16_ (GtkAction* source, GUIMainWindow* self);
 static void __lambda16__gtk_action_activate (GtkAction* _sender, gpointer self);
-static void _lambda17_ (GtkTreePath* path, GtkTreeViewColumn* column, GUIMainWindow* self);
-static void __lambda17__gtk_tree_view_row_activated (GtkTreeView* _sender, GtkTreePath* path, GtkTreeViewColumn* column, gpointer self);
-static gboolean _lambda18_ (GdkEventButton* event, GUIMainWindow* self);
-static gboolean __lambda18__gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self);
-static void _lambda19_ (GtkTreeView* source, GUIMainWindow* self);
-static void __lambda19__gtk_tree_view_cursor_changed (GtkTreeView* _sender, gpointer self);
+static void _lambda17_ (GtkAction* source, GUIMainWindow* self);
+static void __lambda17__gtk_action_activate (GtkAction* _sender, gpointer self);
+static void _lambda18_ (GtkAction* source, GUIMainWindow* self);
+static void __lambda18__gtk_action_activate (GtkAction* _sender, gpointer self);
+static void _lambda19_ (GtkAction* source, GUIMainWindow* self);
+static void __lambda19__gtk_action_activate (GtkAction* _sender, gpointer self);
+static void _lambda20_ (GtkTreePath* path, GtkTreeViewColumn* column, GUIMainWindow* self);
+static void __lambda20__gtk_tree_view_row_activated (GtkTreeView* _sender, GtkTreePath* path, GtkTreeViewColumn* column, gpointer self);
+static gboolean _lambda21_ (GdkEventButton* event, GUIMainWindow* self);
+static gboolean __lambda21__gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self);
+static void _lambda22_ (GtkTreeView* source, GUIMainWindow* self);
+static void __lambda22__gtk_tree_view_cursor_changed (GtkTreeView* _sender, gpointer self);
 static void _gtk_main_quit_gtk_object_destroy (GtkObject* _sender, gpointer self);
 static GObject * gui_main_window_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties);
 static void gui_main_window_finalize (GObject* obj);
@@ -317,7 +317,7 @@ static glong string_get_length (const char* self) {
 }
 
 
-static void _lambda11_ (GtkCellLayout* col, GtkCellRenderer* cell, GtkTreeModel* model, GtkTreeIter* iter, GUIMainWindow* self) {
+static void _lambda14_ (GtkCellLayout* col, GtkCellRenderer* cell, GtkTreeModel* model, GtkTreeIter* iter, GUIMainWindow* self) {
 	EmulationCS* cs;
 	char* _tmp0_;
 	GtkCellRenderer* _tmp1_;
@@ -333,23 +333,23 @@ static void _lambda11_ (GtkCellLayout* col, GtkCellRenderer* cell, GtkTreeModel*
 }
 
 
-static void __lambda11__gtk_cell_layout_data_func (GtkCellLayout* cell_layout, GtkCellRenderer* cell, GtkTreeModel* tree_model, GtkTreeIter* iter, gpointer self) {
-	_lambda11_ (cell_layout, cell, tree_model, iter, self);
+static void __lambda14__gtk_cell_layout_data_func (GtkCellLayout* cell_layout, GtkCellRenderer* cell, GtkTreeModel* tree_model, GtkTreeIter* iter, gpointer self) {
+	_lambda14_ (cell_layout, cell, tree_model, iter, self);
 }
 
 
-static void _lambda12_ (GtkAction* source, GUIMainWindow* self) {
+static void _lambda15_ (GtkAction* source, GUIMainWindow* self) {
 	g_return_if_fail (source != NULL);
 	gui_main_window_open_csview (self);
 }
 
 
-static void __lambda12__gtk_action_activate (GtkAction* _sender, gpointer self) {
-	_lambda12_ (_sender, self);
+static void __lambda15__gtk_action_activate (GtkAction* _sender, gpointer self) {
+	_lambda15_ (_sender, self);
 }
 
 
-static void _lambda13_ (GtkAction* source, GUIMainWindow* self) {
+static void _lambda16_ (GtkAction* source, GUIMainWindow* self) {
 	GUICSImport* d;
 	g_return_if_fail (source != NULL);
 	d = g_object_ref_sink (gui_cs_import_new ());
@@ -358,34 +358,34 @@ static void _lambda13_ (GtkAction* source, GUIMainWindow* self) {
 }
 
 
-static void __lambda13__gtk_action_activate (GtkAction* _sender, gpointer self) {
-	_lambda13_ (_sender, self);
+static void __lambda16__gtk_action_activate (GtkAction* _sender, gpointer self) {
+	_lambda16_ (_sender, self);
 }
 
 
-static void _lambda14_ (GtkAction* source, GUIMainWindow* self) {
+static void _lambda17_ (GtkAction* source, GUIMainWindow* self) {
 	g_return_if_fail (source != NULL);
 	gui_main_window_open_csexport (self);
 }
 
 
-static void __lambda14__gtk_action_activate (GtkAction* _sender, gpointer self) {
-	_lambda14_ (_sender, self);
+static void __lambda17__gtk_action_activate (GtkAction* _sender, gpointer self) {
+	_lambda17_ (_sender, self);
 }
 
 
-static void _lambda15_ (GtkAction* source, GUIMainWindow* self) {
+static void _lambda18_ (GtkAction* source, GUIMainWindow* self) {
 	g_return_if_fail (source != NULL);
 	gui_main_window_remove_cs (self);
 }
 
 
-static void __lambda15__gtk_action_activate (GtkAction* _sender, gpointer self) {
-	_lambda15_ (_sender, self);
+static void __lambda18__gtk_action_activate (GtkAction* _sender, gpointer self) {
+	_lambda18_ (_sender, self);
 }
 
 
-static void _lambda16_ (GtkAction* source, GUIMainWindow* self) {
+static void _lambda19_ (GtkAction* source, GUIMainWindow* self) {
 	GError * _inner_error_;
 	GtkBuilder* about;
 	g_return_if_fail (source != NULL);
@@ -424,24 +424,24 @@ static void _lambda16_ (GtkAction* source, GUIMainWindow* self) {
 }
 
 
-static void __lambda16__gtk_action_activate (GtkAction* _sender, gpointer self) {
-	_lambda16_ (_sender, self);
+static void __lambda19__gtk_action_activate (GtkAction* _sender, gpointer self) {
+	_lambda19_ (_sender, self);
 }
 
 
-static void _lambda17_ (GtkTreePath* path, GtkTreeViewColumn* column, GUIMainWindow* self) {
+static void _lambda20_ (GtkTreePath* path, GtkTreeViewColumn* column, GUIMainWindow* self) {
 	g_return_if_fail (path != NULL);
 	g_return_if_fail (column != NULL);
 	gui_main_window_open_csview (self);
 }
 
 
-static void __lambda17__gtk_tree_view_row_activated (GtkTreeView* _sender, GtkTreePath* path, GtkTreeViewColumn* column, gpointer self) {
-	_lambda17_ (path, column, self);
+static void __lambda20__gtk_tree_view_row_activated (GtkTreeView* _sender, GtkTreePath* path, GtkTreeViewColumn* column, gpointer self) {
+	_lambda20_ (path, column, self);
 }
 
 
-static gboolean _lambda18_ (GdkEventButton* event, GUIMainWindow* self) {
+static gboolean _lambda21_ (GdkEventButton* event, GUIMainWindow* self) {
 	gboolean result;
 	EmulationCS* cs;
 	gboolean _tmp0_ = FALSE;
@@ -464,19 +464,19 @@ static gboolean _lambda18_ (GdkEventButton* event, GUIMainWindow* self) {
 }
 
 
-static gboolean __lambda18__gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
-	return _lambda18_ (event, self);
+static gboolean __lambda21__gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
+	return _lambda21_ (event, self);
 }
 
 
-static void _lambda19_ (GtkTreeView* source, GUIMainWindow* self) {
+static void _lambda22_ (GtkTreeView* source, GUIMainWindow* self) {
 	g_return_if_fail (source != NULL);
 	gui_main_window_edit_set_sensitive (self, gtk_tree_selection_get_selected (gtk_tree_view_get_selection (self->priv->cs_list), NULL, NULL));
 }
 
 
-static void __lambda19__gtk_tree_view_cursor_changed (GtkTreeView* _sender, gpointer self) {
-	_lambda19_ (_sender, self);
+static void __lambda22__gtk_tree_view_cursor_changed (GtkTreeView* _sender, gpointer self) {
+	_lambda22_ (_sender, self);
 }
 
 
@@ -545,22 +545,22 @@ static GObject * gui_main_window_constructor (GType type, guint n_construct_prop
 		gtk_window_set_title ((GtkWindow*) self, "Radeon Simulator");
 		col = _g_object_ref0 ((_tmp0_ = gtk_builder_get_object (builder, "pkts_column"), GTK_IS_TREE_VIEW_COLUMN (_tmp0_) ? ((GtkTreeViewColumn*) _tmp0_) : NULL));
 		cell = _g_object_ref0 ((_tmp1_ = gtk_builder_get_object (builder, "pkts_cell"), GTK_IS_CELL_RENDERER_TEXT (_tmp1_) ? ((GtkCellRendererText*) _tmp1_) : NULL));
-		gtk_cell_layout_set_cell_data_func ((GtkCellLayout*) col, (GtkCellRenderer*) cell, __lambda11__gtk_cell_layout_data_func, g_object_ref (self), g_object_unref);
+		gtk_cell_layout_set_cell_data_func ((GtkCellLayout*) col, (GtkCellRenderer*) cell, __lambda14__gtk_cell_layout_data_func, g_object_ref (self), g_object_unref);
 		self->priv->action_viewcs = (_tmp3_ = _g_object_ref0 ((_tmp2_ = gtk_builder_get_object (builder, "ViewCS"), GTK_IS_ACTION (_tmp2_) ? ((GtkAction*) _tmp2_) : NULL)), _g_object_unref0 (self->priv->action_viewcs), _tmp3_);
 		self->priv->action_exportcs = (_tmp5_ = _g_object_ref0 ((_tmp4_ = gtk_builder_get_object (builder, "ExportCS"), GTK_IS_ACTION (_tmp4_) ? ((GtkAction*) _tmp4_) : NULL)), _g_object_unref0 (self->priv->action_exportcs), _tmp5_);
 		self->priv->action_removecs = (_tmp7_ = _g_object_ref0 ((_tmp6_ = gtk_builder_get_object (builder, "RemoveCS"), GTK_IS_ACTION (_tmp6_) ? ((GtkAction*) _tmp6_) : NULL)), _g_object_unref0 (self->priv->action_removecs), _tmp7_);
 		action_importcs = _g_object_ref0 ((_tmp8_ = gtk_builder_get_object (builder, "ImportCS"), GTK_IS_ACTION (_tmp8_) ? ((GtkAction*) _tmp8_) : NULL));
-		g_signal_connect_object (self->priv->action_viewcs, "activate", (GCallback) __lambda12__gtk_action_activate, self, 0);
-		g_signal_connect_object (action_importcs, "activate", (GCallback) __lambda13__gtk_action_activate, self, 0);
-		g_signal_connect_object (self->priv->action_exportcs, "activate", (GCallback) __lambda14__gtk_action_activate, self, 0);
-		g_signal_connect_object (self->priv->action_removecs, "activate", (GCallback) __lambda15__gtk_action_activate, self, 0);
-		g_signal_connect_object ((_tmp9_ = gtk_builder_get_object (builder, "About"), GTK_IS_ACTION (_tmp9_) ? ((GtkAction*) _tmp9_) : NULL), "activate", (GCallback) __lambda16__gtk_action_activate, self, 0);
+		g_signal_connect_object (self->priv->action_viewcs, "activate", (GCallback) __lambda15__gtk_action_activate, self, 0);
+		g_signal_connect_object (action_importcs, "activate", (GCallback) __lambda16__gtk_action_activate, self, 0);
+		g_signal_connect_object (self->priv->action_exportcs, "activate", (GCallback) __lambda17__gtk_action_activate, self, 0);
+		g_signal_connect_object (self->priv->action_removecs, "activate", (GCallback) __lambda18__gtk_action_activate, self, 0);
+		g_signal_connect_object ((_tmp9_ = gtk_builder_get_object (builder, "About"), GTK_IS_ACTION (_tmp9_) ? ((GtkAction*) _tmp9_) : NULL), "activate", (GCallback) __lambda19__gtk_action_activate, self, 0);
 		self->priv->cs_store = (_tmp11_ = _g_object_ref0 ((_tmp10_ = gtk_builder_get_object (builder, "cs_store"), GTK_IS_LIST_STORE (_tmp10_) ? ((GtkListStore*) _tmp10_) : NULL)), _g_object_unref0 (self->priv->cs_store), _tmp11_);
 		self->priv->cs_list = (_tmp13_ = _g_object_ref0 ((_tmp12_ = gtk_builder_get_object (builder, "cs_list"), GTK_IS_TREE_VIEW (_tmp12_) ? ((GtkTreeView*) _tmp12_) : NULL)), _g_object_unref0 (self->priv->cs_list), _tmp13_);
 		self->priv->edit_menu = (_tmp15_ = _g_object_ref0 ((_tmp14_ = gtk_builder_get_object (builder, "popup1"), GTK_IS_MENU (_tmp14_) ? ((GtkMenu*) _tmp14_) : NULL)), _g_object_unref0 (self->priv->edit_menu), _tmp15_);
-		g_signal_connect_object (self->priv->cs_list, "row-activated", (GCallback) __lambda17__gtk_tree_view_row_activated, self, 0);
-		g_signal_connect_object ((GtkWidget*) self->priv->cs_list, "button-press-event", (GCallback) __lambda18__gtk_widget_button_press_event, self, 0);
-		g_signal_connect_object (self->priv->cs_list, "cursor-changed", (GCallback) __lambda19__gtk_tree_view_cursor_changed, self, 0);
+		g_signal_connect_object (self->priv->cs_list, "row-activated", (GCallback) __lambda20__gtk_tree_view_row_activated, self, 0);
+		g_signal_connect_object ((GtkWidget*) self->priv->cs_list, "button-press-event", (GCallback) __lambda21__gtk_widget_button_press_event, self, 0);
+		g_signal_connect_object (self->priv->cs_list, "cursor-changed", (GCallback) __lambda22__gtk_tree_view_cursor_changed, self, 0);
 		gui_main_window_edit_set_sensitive (self, FALSE);
 		gtk_container_add ((GtkContainer*) self, (_tmp16_ = gtk_builder_get_object (builder, "mainbox"), GTK_IS_WIDGET (_tmp16_) ? ((GtkWidget*) _tmp16_) : NULL));
 		g_signal_connect ((GtkObject*) self, "destroy", (GCallback) _gtk_main_quit_gtk_object_destroy, NULL);
diff --git a/src/registers.c b/src/registers.c
index 94711aa..9ff60ea 100644
--- a/src/registers.c
+++ b/src/registers.c
@@ -368,10 +368,10 @@ static guint32* _uint32_dup (guint32* self);
 void emulation_bitfield_enum_append (EmulationBitfieldEnum* self, EmulationBitfieldValue* v);
 EmulationBitfieldEnum* emulation_bitfield_enum_new (void);
 EmulationBitfieldEnum* emulation_bitfield_enum_construct (GType object_type);
-static void _lambda0_ (void* ptr);
-static void __lambda0__gdestroy_notify (void* data);
-static void _lambda1_ (void* ptr);
-static void __lambda1__gdestroy_notify (void* data);
+static void _lambda3_ (void* ptr);
+static void __lambda3__gdestroy_notify (void* data);
+static void _lambda4_ (void* ptr);
+static void __lambda4__gdestroy_notify (void* data);
 static GObject * emulation_bitfield_enum_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties);
 static void emulation_bitfield_enum_finalize (GObject* obj);
 GType emulation_bitfield_get_type (void);
@@ -511,12 +511,6 @@ GType emulation_spec_parser_get_type (void);
 enum  {
 	EMULATION_SPEC_PARSER_DUMMY_PROPERTY
 };
-static void _lambda2_ (void* ptr);
-static void __lambda2__gdestroy_notify (void* data);
-static void _lambda3_ (void* ptr);
-static void __lambda3__gdestroy_notify (void* data);
-static void _lambda4_ (void* ptr);
-static void __lambda4__gdestroy_notify (void* data);
 static void _lambda5_ (void* ptr);
 static void __lambda5__gdestroy_notify (void* data);
 static void _lambda6_ (void* ptr);
@@ -525,6 +519,12 @@ static void _lambda7_ (void* ptr);
 static void __lambda7__gdestroy_notify (void* data);
 static void _lambda8_ (void* ptr);
 static void __lambda8__gdestroy_notify (void* data);
+static void _lambda9_ (void* ptr);
+static void __lambda9__gdestroy_notify (void* data);
+static void _lambda10_ (void* ptr);
+static void __lambda10__gdestroy_notify (void* data);
+static void _lambda11_ (void* ptr);
+static void __lambda11__gdestroy_notify (void* data);
 EmulationSpecParser* emulation_spec_parser_new (GHashTable** _info, GHashTable** _regs);
 EmulationSpecParser* emulation_spec_parser_construct (GType object_type, GHashTable** _info, GHashTable** _regs);
 static inline xmlNode* emulation_spec_parser_find_variant (EmulationSpecParser* self, const char* name);
@@ -762,24 +762,24 @@ EmulationBitfieldEnum* emulation_bitfield_enum_new (void) {
 }
 
 
-static void _lambda0_ (void* ptr) {
+static void _lambda3_ (void* ptr) {
 	g_free (ptr);
 }
 
 
-static void __lambda0__gdestroy_notify (void* data) {
-	_lambda0_ (data);
+static void __lambda3__gdestroy_notify (void* data) {
+	_lambda3_ (data);
 }
 
 
-static void _lambda1_ (void* ptr) {
+static void _lambda4_ (void* ptr) {
 	void* _tmp0_;
 	g_object_unref ((_tmp0_ = ptr, G_IS_OBJECT (_tmp0_) ? ((GObject*) _tmp0_) : NULL));
 }
 
 
-static void __lambda1__gdestroy_notify (void* data) {
-	_lambda1_ (data);
+static void __lambda4__gdestroy_notify (void* data) {
+	_lambda4_ (data);
 }
 
 
@@ -792,7 +792,7 @@ static GObject * emulation_bitfield_enum_constructor (GType type, guint n_constr
 	self = EMULATION_BITFIELD_ENUM (obj);
 	{
 		GHashTable* _tmp0_;
-		self->priv->vals = (_tmp0_ = g_hash_table_new_full (g_int_hash, g_int_equal, __lambda0__gdestroy_notify, __lambda1__gdestroy_notify), _g_hash_table_unref0 (self->priv->vals), _tmp0_);
+		self->priv->vals = (_tmp0_ = g_hash_table_new_full (g_int_hash, g_int_equal, __lambda3__gdestroy_notify, __lambda4__gdestroy_notify), _g_hash_table_unref0 (self->priv->vals), _tmp0_);
 	}
 	return obj;
 }
@@ -1893,24 +1893,24 @@ static void emulation_register_list_get_property (GObject * object, guint proper
 }
 
 
-static void _lambda2_ (void* ptr) {
+static void _lambda5_ (void* ptr) {
 	g_free (ptr);
 }
 
 
-static void __lambda2__gdestroy_notify (void* data) {
-	_lambda2_ (data);
+static void __lambda5__gdestroy_notify (void* data) {
+	_lambda5_ (data);
 }
 
 
-static void _lambda3_ (void* ptr) {
+static void _lambda6_ (void* ptr) {
 	void* _tmp0_;
 	g_object_unref ((_tmp0_ = ptr, G_IS_OBJECT (_tmp0_) ? ((GObject*) _tmp0_) : NULL));
 }
 
 
-static void __lambda3__gdestroy_notify (void* data) {
-	_lambda3_ (data);
+static void __lambda6__gdestroy_notify (void* data) {
+	_lambda6_ (data);
 }
 
 
@@ -1919,55 +1919,55 @@ static gpointer _g_hash_table_ref0 (gpointer self) {
 }
 
 
-static void _lambda4_ (void* ptr) {
+static void _lambda7_ (void* ptr) {
 	g_free (ptr);
 }
 
 
-static void __lambda4__gdestroy_notify (void* data) {
-	_lambda4_ (data);
+static void __lambda7__gdestroy_notify (void* data) {
+	_lambda7_ (data);
 }
 
 
-static void _lambda5_ (void* ptr) {
+static void _lambda8_ (void* ptr) {
 	void* _tmp0_;
 	g_object_unref ((_tmp0_ = ptr, G_IS_OBJECT (_tmp0_) ? ((GObject*) _tmp0_) : NULL));
 }
 
 
-static void __lambda5__gdestroy_notify (void* data) {
-	_lambda5_ (data);
+static void __lambda8__gdestroy_notify (void* data) {
+	_lambda8_ (data);
 }
 
 
-static void _lambda6_ (void* ptr) {
+static void _lambda9_ (void* ptr) {
 	g_free (ptr);
 }
 
 
-static void __lambda6__gdestroy_notify (void* data) {
-	_lambda6_ (data);
+static void __lambda9__gdestroy_notify (void* data) {
+	_lambda9_ (data);
 }
 
 
-static void _lambda7_ (void* ptr) {
+static void _lambda10_ (void* ptr) {
 	g_free (ptr);
 }
 
 
-static void __lambda7__gdestroy_notify (void* data) {
-	_lambda7_ (data);
+static void __lambda10__gdestroy_notify (void* data) {
+	_lambda10_ (data);
 }
 
 
-static void _lambda8_ (void* ptr) {
+static void _lambda11_ (void* ptr) {
 	void* _tmp0_;
 	g_object_unref ((_tmp0_ = ptr, G_IS_OBJECT (_tmp0_) ? ((GObject*) _tmp0_) : NULL));
 }
 
 
-static void __lambda8__gdestroy_notify (void* data) {
-	_lambda8_ (data);
+static void __lambda11__gdestroy_notify (void* data) {
+	_lambda11_ (data);
 }
 
 
@@ -1986,10 +1986,10 @@ EmulationSpecParser* emulation_spec_parser_construct (GType object_type, GHashTa
 		*_regs = NULL;
 	}
 	self = (EmulationSpecParser*) g_type_create_instance (object_type);
-	self->priv->info = (_tmp1_ = _g_hash_table_ref0 (*_info = (_tmp0_ = g_hash_table_new_full (g_str_hash, g_str_equal, __lambda2__gdestroy_notify, __lambda3__gdestroy_notify), _g_hash_table_unref0 (*_info), _tmp0_)), _g_hash_table_unref0 (self->priv->info), _tmp1_);
-	self->priv->regs = (_tmp3_ = _g_hash_table_ref0 (*_regs = (_tmp2_ = g_hash_table_new_full (g_int_hash, g_int_equal, __lambda4__gdestroy_notify, __lambda5__gdestroy_notify), _g_hash_table_unref0 (*_regs), _tmp2_)), _g_hash_table_unref0 (self->priv->regs), _tmp3_);
-	self->priv->groups_map = (_tmp4_ = g_hash_table_new_full (g_str_hash, g_str_equal, __lambda6__gdestroy_notify, NULL), _g_hash_table_unref0 (self->priv->groups_map), _tmp4_);
-	self->priv->enums_map = (_tmp5_ = g_hash_table_new_full (g_str_hash, g_str_equal, __lambda7__gdestroy_notify, __lambda8__gdestroy_notify), _g_hash_table_unref0 (self->priv->enums_map), _tmp5_);
+	self->priv->info = (_tmp1_ = _g_hash_table_ref0 (*_info = (_tmp0_ = g_hash_table_new_full (g_str_hash, g_str_equal, __lambda5__gdestroy_notify, __lambda6__gdestroy_notify), _g_hash_table_unref0 (*_info), _tmp0_)), _g_hash_table_unref0 (self->priv->info), _tmp1_);
+	self->priv->regs = (_tmp3_ = _g_hash_table_ref0 (*_regs = (_tmp2_ = g_hash_table_new_full (g_int_hash, g_int_equal, __lambda7__gdestroy_notify, __lambda8__gdestroy_notify), _g_hash_table_unref0 (*_regs), _tmp2_)), _g_hash_table_unref0 (self->priv->regs), _tmp3_);
+	self->priv->groups_map = (_tmp4_ = g_hash_table_new_full (g_str_hash, g_str_equal, __lambda9__gdestroy_notify, NULL), _g_hash_table_unref0 (self->priv->groups_map), _tmp4_);
+	self->priv->enums_map = (_tmp5_ = g_hash_table_new_full (g_str_hash, g_str_equal, __lambda10__gdestroy_notify, __lambda11__gdestroy_notify), _g_hash_table_unref0 (self->priv->enums_map), _tmp5_);
 	return self;
 }