[nautilus-actions] Review interface initialization in implementations
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions] Review interface initialization in implementations
- Date: Wed, 4 Jan 2012 21:15:13 +0000 (UTC)
commit 07b42ce2ecfea094eae2726071e670d1b31bb5ae
Author: Pierre Wieser <pwieser trychlos org>
Date: Wed Jan 4 22:13:48 2012 +0100
Review interface initialization in implementations
Add user_data parameter.
ChangeLog | 27 ++++++++++++++++
src/core/na-export-format.c | 6 ++--
src/core/na-import-mode.c | 6 ++--
src/core/na-importer-ask.c | 6 ++--
src/core/na-object-action.c | 12 +++---
src/core/na-object-menu.c | 12 +++---
src/core/na-object-profile.c | 12 +++---
src/core/na-object.c | 6 ++--
src/nact/nact-assistant-export.c | 50 +++++++++++++++---------------
src/nact/nact-assistant-import.c | 6 ++--
src/nact/nact-export-ask.c | 6 ++--
src/nact/nact-main-window.c | 60 ++++++++++++++++++------------------
src/nact/nact-preferences-editor.c | 6 ++--
src/nact/nact-tree-model.c | 12 +++---
src/nact/nact-tree-view.c | 6 ++--
src/test/test-iface-base.c | 6 ++--
16 files changed, 133 insertions(+), 106 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 2babba8..5c21aeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,32 @@
2012-01-04 Pierre Wieser <pwieser trychlos org>
+ Review interface initialization in implementations.
+
+ * src/core/na-export-format.c (ioption_iface_init):
+ * src/core/na-import-mode.c (ioption_iface_init):
+ * src/core/na-importer-ask.c (ioptions_list_iface_init):
+ * src/core/na-object-action.c
+ (ifactory_object_iface_init, icontext_iface_init):
+ * src/core/na-object-menu.c
+ (ifactory_object_iface_init, icontext_iface_init):
+ * src/core/na-object-profile.c
+ (ifactory_object_iface_init, icontext_iface_init):
+ * src/core/na-object.c (iduplicable_iface_init):
+ * src/nact/nact-assistant-export.c (ioptions_list_iface_init):
+ * src/nact/nact-assistant-import.c (ioptions_list_iface_init):
+ * src/nact/nact-export-ask.c (ioptions_list_iface_init):
+ * src/nact/nact-main-window.c
+ (iaction_tab_iface_init, icommand_tab_iface_init,
+ ibasenames_tab_iface_init, imimetypes_tab_iface_init,
+ ifolders_tab_iface_init, ischemes_tab_iface_init,
+ icapabilities_tab_iface_init, ienvironment_tab_iface_init,
+ iexecution_tab_iface_init, iproperties_tab_iface_init):
+ * src/nact/nact-preferences-editor.c (ioptions_list_iface_init):
+ * src/nact/nact-tree-model.c
+ (imulti_drag_source_init, idrag_dest_init):
+ * src/nact/nact-tree-view.c (tree_ieditable_iface_init):
+ * src/test/test-iface-base.c (iface_iface_init): Add user_data parameter.
+
* src/nact/nact-tree-ieditable.c: Review NactTreeIEditable interface.
* src/nact/nact-ischemes-tab.c: Review NactISchemesTab interface.
diff --git a/src/core/na-export-format.c b/src/core/na-export-format.c
index 8c37f08..69e0a17 100644
--- a/src/core/na-export-format.c
+++ b/src/core/na-export-format.c
@@ -57,7 +57,7 @@ static GObjectClass *st_parent_class = NULL;
static GType register_type( void );
static void class_init( NAExportFormatClass *klass );
-static void ioption_iface_init( NAIOptionInterface *iface );
+static void ioption_iface_init( NAIOptionInterface *iface, void *user_data );
static void instance_init( GTypeInstance *instance, gpointer klass );
static void instance_dispose( GObject *object );
static void instance_finalize( GObject *object );
@@ -129,11 +129,11 @@ class_init( NAExportFormatClass *klass )
}
static void
-ioption_iface_init( NAIOptionInterface *iface )
+ioption_iface_init( NAIOptionInterface *iface, void *user_data )
{
static const gchar *thisfn = "na_export_format_ioption_iface_init";
- g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
+ g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
iface->get_id = ioption_get_id;
iface->get_label = ioption_get_label;
diff --git a/src/core/na-import-mode.c b/src/core/na-import-mode.c
index 81069f8..a118df1 100644
--- a/src/core/na-import-mode.c
+++ b/src/core/na-import-mode.c
@@ -74,7 +74,7 @@ static GObjectClass *st_parent_class = NULL;
static GType register_type( void );
static void class_init( NAImportModeClass *klass );
-static void ioption_iface_init( NAIOptionInterface *iface );
+static void ioption_iface_init( NAIOptionInterface *iface, void *user_data );
static gchar *ioption_get_id( const NAIOption *option );
static gchar *ioption_get_label( const NAIOption *option );
static gchar *ioption_get_description( const NAIOption *option );
@@ -181,11 +181,11 @@ class_init( NAImportModeClass *klass )
}
static void
-ioption_iface_init( NAIOptionInterface *iface )
+ioption_iface_init( NAIOptionInterface *iface, void *user_data )
{
static const gchar *thisfn = "na_import_mode_ioption_iface_init";
- g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
+ g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
iface->get_id = ioption_get_id;
iface->get_label = ioption_get_label;
diff --git a/src/core/na-importer-ask.c b/src/core/na-importer-ask.c
index ffff94c..00638ae 100644
--- a/src/core/na-importer-ask.c
+++ b/src/core/na-importer-ask.c
@@ -67,7 +67,7 @@ static const gchar *st_uixml = PKGDATADIR "/na-importer-ask.ui";
static GType register_type( void );
static void class_init( NAImporterAskClass *klass );
-static void ioptions_list_iface_init( NAIOptionsListInterface *iface );
+static void ioptions_list_iface_init( NAIOptionsListInterface *iface, void *user_data );
static GList *ioptions_list_get_modes( const NAIOptionsList *instance, GtkWidget *container );
static void ioptions_list_free_modes( const NAIOptionsList *instance, GtkWidget *container, GList *modes );
static void instance_init( GTypeInstance *instance, gpointer klass );
@@ -143,11 +143,11 @@ class_init( NAImporterAskClass *klass )
}
static void
-ioptions_list_iface_init( NAIOptionsListInterface *iface )
+ioptions_list_iface_init( NAIOptionsListInterface *iface, void *user_data )
{
static const gchar *thisfn = "nact_assistant_import_ioptions_list_iface_init";
- g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
+ g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
iface->get_options = ioptions_list_get_modes;
iface->free_options = ioptions_list_free_modes;
diff --git a/src/core/na-object-action.c b/src/core/na-object-action.c
index b1abfff..3760b08 100644
--- a/src/core/na-object-action.c
+++ b/src/core/na-object-action.c
@@ -76,14 +76,14 @@ static void object_dump( const NAObject *object );
static gboolean object_are_equal( const NAObject *a, const NAObject *b );
static gboolean object_is_valid( const NAObject *object );
-static void ifactory_object_iface_init( NAIFactoryObjectInterface *iface );
+static void ifactory_object_iface_init( NAIFactoryObjectInterface *iface, void *user_data );
static guint ifactory_object_get_version( const NAIFactoryObject *instance );
static NADataGroup *ifactory_object_get_groups( const NAIFactoryObject *instance );
static void ifactory_object_read_done( NAIFactoryObject *instance, const NAIFactoryProvider *reader, void *reader_data, GSList **messages );
static guint ifactory_object_write_start( NAIFactoryObject *instance, const NAIFactoryProvider *writer, void *writer_data, GSList **messages );
static guint ifactory_object_write_done( NAIFactoryObject *instance, const NAIFactoryProvider *writer, void *writer_data, GSList **messages );
-static void icontext_iface_init( NAIContextInterface *iface );
+static void icontext_iface_init( NAIContextInterface *iface, void *user_data );
static gboolean icontext_is_candidate( NAIContext *object, guint target, GList *selection );
static NAObjectProfile *read_done_convert_v1_to_v2( NAIFactoryObject *instance );
@@ -351,11 +351,11 @@ object_is_valid( const NAObject *object )
}
static void
-ifactory_object_iface_init( NAIFactoryObjectInterface *iface )
+ifactory_object_iface_init( NAIFactoryObjectInterface *iface, void *user_data )
{
static const gchar *thisfn = "na_object_action_ifactory_object_iface_init";
- g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
+ g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
iface->get_version = ifactory_object_get_version;
iface->get_groups = ifactory_object_get_groups;
@@ -437,11 +437,11 @@ ifactory_object_write_done( NAIFactoryObject *instance, const NAIFactoryProvider
}
static void
-icontext_iface_init( NAIContextInterface *iface )
+icontext_iface_init( NAIContextInterface *iface, void *user_data )
{
static const gchar *thisfn = "na_object_action_icontext_iface_init";
- g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
+ g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
iface->is_candidate = icontext_is_candidate;
}
diff --git a/src/core/na-object-menu.c b/src/core/na-object-menu.c
index 5f972ef..3560711 100644
--- a/src/core/na-object-menu.c
+++ b/src/core/na-object-menu.c
@@ -71,14 +71,14 @@ static void instance_finalize( GObject *object );
static void object_dump( const NAObject *object );
-static void ifactory_object_iface_init( NAIFactoryObjectInterface *iface );
+static void ifactory_object_iface_init( NAIFactoryObjectInterface *iface, void *user_data );
static guint ifactory_object_get_version( const NAIFactoryObject *instance );
static NADataGroup *ifactory_object_get_groups( const NAIFactoryObject *instance );
static void ifactory_object_read_done( NAIFactoryObject *instance, const NAIFactoryProvider *reader, void *reader_data, GSList **messages );
static guint ifactory_object_write_start( NAIFactoryObject *instance, const NAIFactoryProvider *writer, void *writer_data, GSList **messages );
static guint ifactory_object_write_done( NAIFactoryObject *instance, const NAIFactoryProvider *writer, void *writer_data, GSList **messages );
-static void icontext_iface_init( NAIContextInterface *iface );
+static void icontext_iface_init( NAIContextInterface *iface, void *user_data );
static gboolean icontext_is_candidate( NAIContext *object, guint target, GList *selection );
GType
@@ -267,11 +267,11 @@ object_dump( const NAObject *object )
}
static void
-ifactory_object_iface_init( NAIFactoryObjectInterface *iface )
+ifactory_object_iface_init( NAIFactoryObjectInterface *iface, void *user_data )
{
static const gchar *thisfn = "na_object_menu_ifactory_object_iface_init";
- g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
+ g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
iface->get_version = ifactory_object_get_version;
iface->get_groups = ifactory_object_get_groups;
@@ -325,11 +325,11 @@ ifactory_object_write_done( NAIFactoryObject *instance, const NAIFactoryProvider
}
static void
-icontext_iface_init( NAIContextInterface *iface )
+icontext_iface_init( NAIContextInterface *iface, void *user_data )
{
static const gchar *thisfn = "na_object_menu_icontext_iface_init";
- g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
+ g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
iface->is_candidate = icontext_is_candidate;
}
diff --git a/src/core/na-object-profile.c b/src/core/na-object-profile.c
index b5b821a..da32997 100644
--- a/src/core/na-object-profile.c
+++ b/src/core/na-object-profile.c
@@ -80,13 +80,13 @@ static void instance_finalize( GObject *object );
static void object_dump( const NAObject *object );
static gboolean object_is_valid( const NAObject *object );
-static void ifactory_object_iface_init( NAIFactoryObjectInterface *iface );
+static void ifactory_object_iface_init( NAIFactoryObjectInterface *iface, void *user_data );
static guint ifactory_object_get_version( const NAIFactoryObject *instance );
static NADataGroup *ifactory_object_get_groups( const NAIFactoryObject *instance );
static void ifactory_object_read_done( NAIFactoryObject *instance, const NAIFactoryProvider *reader, void *reader_data, GSList **messages );
static guint ifactory_object_write_done( NAIFactoryObject *instance, const NAIFactoryProvider *writer, void *writer_data, GSList **messages );
-static void icontext_iface_init( NAIContextInterface *iface );
+static void icontext_iface_init( NAIContextInterface *iface, void *user_data );
static gboolean icontext_is_candidate( NAIContext *object, guint target, GList *selection );
static gboolean convert_pre_v3_parameters( NAObjectProfile *profile );
@@ -317,11 +317,11 @@ object_is_valid( const NAObject *object )
}
static void
-ifactory_object_iface_init( NAIFactoryObjectInterface *iface )
+ifactory_object_iface_init( NAIFactoryObjectInterface *iface, void *user_data )
{
static const gchar *thisfn = "na_object_profile_ifactory_object_iface_init";
- g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
+ g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
iface->get_version = ifactory_object_get_version;
iface->get_groups = ifactory_object_get_groups;
@@ -375,11 +375,11 @@ ifactory_object_write_done( NAIFactoryObject *instance, const NAIFactoryProvider
}
static void
-icontext_iface_init( NAIContextInterface *iface )
+icontext_iface_init( NAIContextInterface *iface, void *user_data )
{
static const gchar *thisfn = "na_object_profile_icontext_iface_init";
- g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
+ g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
iface->is_candidate = icontext_is_candidate;
}
diff --git a/src/core/na-object.c b/src/core/na-object.c
index f2f8d5e..00fb9cd 100644
--- a/src/core/na-object.c
+++ b/src/core/na-object.c
@@ -58,7 +58,7 @@ static void instance_finalize( GObject *object );
static void object_dump( const NAObject *object );
-static void iduplicable_iface_init( NAIDuplicableInterface *iface );
+static void iduplicable_iface_init( NAIDuplicableInterface *iface, void *user_data );
static void iduplicable_copy( NAIDuplicable *target, const NAIDuplicable *source );
static gboolean iduplicable_are_equal( const NAIDuplicable *a, const NAIDuplicable *b );
static gboolean iduplicable_is_valid( const NAIDuplicable *object );
@@ -217,11 +217,11 @@ object_dump( const NAObject *object )
}
static void
-iduplicable_iface_init( NAIDuplicableInterface *iface )
+iduplicable_iface_init( NAIDuplicableInterface *iface, void *user_data )
{
static const gchar *thisfn = "na_object_iduplicable_iface_init";
- g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
+ g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
iface->copy = iduplicable_copy;
iface->are_equal = iduplicable_are_equal;
diff --git a/src/nact/nact-assistant-export.c b/src/nact/nact-assistant-export.c
index 864f2a5..d28a903 100644
--- a/src/nact/nact-assistant-export.c
+++ b/src/nact/nact-assistant-export.c
@@ -103,29 +103,29 @@ static const gchar *st_wsp_name = NA_IPREFS_EXPORT_ASSISTANT_WSP;
static BaseAssistantClass *st_parent_class = NULL;
-static GType register_type( void );
-static void class_init( NactAssistantExportClass *klass );
-static void ioptions_list_iface_init( NAIOptionsListInterface *iface );
-static GList *ioptions_list_get_formats( const NAIOptionsList *instance, GtkWidget *container );
-static void ioptions_list_free_formats( const NAIOptionsList *instance, GtkWidget *container, GList *formats );
-static NAIOption *ioptions_list_get_ask_option( const NAIOptionsList *instance, GtkWidget *container );
-static void instance_init( GTypeInstance *instance, gpointer klass );
-static void instance_constructed( GObject *instance );
-static void instance_dispose( GObject *instance );
-static void instance_finalize( GObject *instance );
-static void on_base_initialize_gtk_toplevel( NactAssistantExport *window, GtkAssistant *toplevel, gpointer user_data );
-static void items_tree_view_initialize_gtk( NactAssistantExport *window, GtkAssistant *toplevel );
-static void folder_chooser_initialize_gtk( NactAssistantExport *window );
-static void format_tree_view_initialize_gtk( NactAssistantExport *window );
-static void on_base_initialize_base_window( NactAssistantExport *window, gpointer user_data );
-static void on_base_all_widgets_showed( NactAssistantExport *window, gpointer user_data );
-static void on_items_tree_view_selection_changed( NactAssistantExport *window, GList *selected_items, gpointer user_data );
-static void on_folder_chooser_selection_changed( GtkFileChooser *chooser, NactAssistantExport *window );
-static void assistant_prepare( BaseAssistant *window, GtkAssistant *assistant, GtkWidget *page );
-static void assist_prepare_confirm( NactAssistantExport *window, GtkAssistant *assistant, GtkWidget *page );
-static void assistant_apply( BaseAssistant *window, GtkAssistant *assistant );
-static void assist_prepare_exportdone( NactAssistantExport *window, GtkAssistant *assistant, GtkWidget *page );
-static void free_results( GList *list );
+static GType register_type( void );
+static void class_init( NactAssistantExportClass *klass );
+static void ioptions_list_iface_init( NAIOptionsListInterface *iface, void *user_data );
+static GList *ioptions_list_get_formats( const NAIOptionsList *instance, GtkWidget *container );
+static void ioptions_list_free_formats( const NAIOptionsList *instance, GtkWidget *container, GList *formats );
+static NAIOption *ioptions_list_get_ask_option( const NAIOptionsList *instance, GtkWidget *container );
+static void instance_init( GTypeInstance *instance, gpointer klass );
+static void instance_constructed( GObject *instance );
+static void instance_dispose( GObject *instance );
+static void instance_finalize( GObject *instance );
+static void on_base_initialize_gtk_toplevel( NactAssistantExport *window, GtkAssistant *toplevel, gpointer user_data );
+static void items_tree_view_initialize_gtk( NactAssistantExport *window, GtkAssistant *toplevel );
+static void folder_chooser_initialize_gtk( NactAssistantExport *window );
+static void format_tree_view_initialize_gtk( NactAssistantExport *window );
+static void on_base_initialize_base_window( NactAssistantExport *window, gpointer user_data );
+static void on_base_all_widgets_showed( NactAssistantExport *window, gpointer user_data );
+static void on_items_tree_view_selection_changed( NactAssistantExport *window, GList *selected_items, gpointer user_data );
+static void on_folder_chooser_selection_changed( GtkFileChooser *chooser, NactAssistantExport *window );
+static void assistant_prepare( BaseAssistant *window, GtkAssistant *assistant, GtkWidget *page );
+static void assist_prepare_confirm( NactAssistantExport *window, GtkAssistant *assistant, GtkWidget *page );
+static void assistant_apply( BaseAssistant *window, GtkAssistant *assistant );
+static void assist_prepare_exportdone( NactAssistantExport *window, GtkAssistant *assistant, GtkWidget *page );
+static void free_results( GList *list );
GType
nact_assistant_export_get_type( void )
@@ -196,11 +196,11 @@ class_init( NactAssistantExportClass *klass )
}
static void
-ioptions_list_iface_init( NAIOptionsListInterface *iface )
+ioptions_list_iface_init( NAIOptionsListInterface *iface, void *user_data )
{
static const gchar *thisfn = "nact_assistant_export_ioptions_list_iface_init";
- g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
+ g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
iface->get_options = ioptions_list_get_formats;
iface->free_options = ioptions_list_free_formats;
diff --git a/src/nact/nact-assistant-import.c b/src/nact/nact-assistant-import.c
index 102567b..b9ecb7f 100644
--- a/src/nact/nact-assistant-import.c
+++ b/src/nact/nact-assistant-import.c
@@ -103,7 +103,7 @@ static BaseAssistantClass *st_parent_class = NULL;
static GType register_type( void );
static void class_init( NactAssistantImportClass *klass );
-static void ioptions_list_iface_init( NAIOptionsListInterface *iface );
+static void ioptions_list_iface_init( NAIOptionsListInterface *iface, void *user_data );
static GList *ioptions_list_get_modes( const NAIOptionsList *instance, GtkWidget *container );
static void ioptions_list_free_modes( const NAIOptionsList *instance, GtkWidget *container, GList *modes );
static NAIOption *ioptions_list_get_ask_option( const NAIOptionsList *instance, GtkWidget *container );
@@ -199,11 +199,11 @@ class_init( NactAssistantImportClass *klass )
}
static void
-ioptions_list_iface_init( NAIOptionsListInterface *iface )
+ioptions_list_iface_init( NAIOptionsListInterface *iface, void *user_data )
{
static const gchar *thisfn = "nact_assistant_import_ioptions_list_iface_init";
- g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
+ g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
iface->get_options = ioptions_list_get_modes;
iface->free_options = ioptions_list_free_modes;
diff --git a/src/nact/nact-export-ask.c b/src/nact/nact-export-ask.c
index a3ecc8e..c30b838 100644
--- a/src/nact/nact-export-ask.c
+++ b/src/nact/nact-export-ask.c
@@ -74,7 +74,7 @@ static BaseDialogClass *st_parent_class = NULL;
static GType register_type( void );
static void class_init( NactExportAskClass *klass );
-static void ioptions_list_iface_init( NAIOptionsListInterface *iface );
+static void ioptions_list_iface_init( NAIOptionsListInterface *iface, void *user_data );
static GList *ioptions_list_get_formats( const NAIOptionsList *instance, GtkWidget *container );
static void ioptions_list_free_formats( const NAIOptionsList *instance, GtkWidget *container, GList *formats );
static void instance_init( GTypeInstance *instance, gpointer klass );
@@ -150,11 +150,11 @@ class_init( NactExportAskClass *klass )
}
static void
-ioptions_list_iface_init( NAIOptionsListInterface *iface )
+ioptions_list_iface_init( NAIOptionsListInterface *iface, void *user_data )
{
static const gchar *thisfn = "nact_assistant_export_ioptions_list_iface_init";
- g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
+ g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
iface->get_options = ioptions_list_get_formats;
iface->free_options = ioptions_list_free_formats;
diff --git a/src/nact/nact-main-window.c b/src/nact/nact-main-window.c
index 7268f55..e8763b2 100644
--- a/src/nact/nact-main-window.c
+++ b/src/nact/nact-main-window.c
@@ -161,16 +161,16 @@ static gint st_signals[ LAST_SIGNAL ] = { 0 };
static GType register_type( void );
static void class_init( NactMainWindowClass *klass );
-static void iaction_tab_iface_init( NactIActionTabInterface *iface );
-static void icommand_tab_iface_init( NactICommandTabInterface *iface );
-static void ibasenames_tab_iface_init( NactIBasenamesTabInterface *iface );
-static void imimetypes_tab_iface_init( NactIMimetypesTabInterface *iface );
-static void ifolders_tab_iface_init( NactIFoldersTabInterface *iface );
-static void ischemes_tab_iface_init( NactISchemesTabInterface *iface );
-static void icapabilities_tab_iface_init( NactICapabilitiesTabInterface *iface );
-static void ienvironment_tab_iface_init( NactIEnvironmentTabInterface *iface );
-static void iexecution_tab_iface_init( NactIExecutionTabInterface *iface );
-static void iproperties_tab_iface_init( NactIPropertiesTabInterface *iface );
+static void iaction_tab_iface_init( NactIActionTabInterface *iface, void *user_data );
+static void icommand_tab_iface_init( NactICommandTabInterface *iface, void *user_data );
+static void ibasenames_tab_iface_init( NactIBasenamesTabInterface *iface, void *user_data );
+static void imimetypes_tab_iface_init( NactIMimetypesTabInterface *iface, void *user_data );
+static void ifolders_tab_iface_init( NactIFoldersTabInterface *iface, void *user_data );
+static void ischemes_tab_iface_init( NactISchemesTabInterface *iface, void *user_data );
+static void icapabilities_tab_iface_init( NactICapabilitiesTabInterface *iface, void *user_data );
+static void ienvironment_tab_iface_init( NactIEnvironmentTabInterface *iface, void *user_data );
+static void iexecution_tab_iface_init( NactIExecutionTabInterface *iface, void *user_data );
+static void iproperties_tab_iface_init( NactIPropertiesTabInterface *iface, void *user_data );
static void instance_init( GTypeInstance *instance, gpointer klass );
static void instance_get_property( GObject *object, guint property_id, GValue *value, GParamSpec *spec );
static void instance_set_property( GObject *object, guint property_id, const GValue *value, GParamSpec *spec );
@@ -454,83 +454,83 @@ class_init( NactMainWindowClass *klass )
}
static void
-iaction_tab_iface_init( NactIActionTabInterface *iface )
+iaction_tab_iface_init( NactIActionTabInterface *iface, void *user_data )
{
static const gchar *thisfn = "nact_main_window_iaction_tab_iface_init";
- g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
+ g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
}
static void
-icommand_tab_iface_init( NactICommandTabInterface *iface )
+icommand_tab_iface_init( NactICommandTabInterface *iface, void *user_data )
{
static const gchar *thisfn = "nact_main_window_icommand_tab_iface_init";
- g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
+ g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
}
static void
-ibasenames_tab_iface_init( NactIBasenamesTabInterface *iface )
+ibasenames_tab_iface_init( NactIBasenamesTabInterface *iface, void *user_data )
{
static const gchar *thisfn = "nact_main_window_ibasenames_tab_iface_init";
- g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
+ g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
}
static void
-imimetypes_tab_iface_init( NactIMimetypesTabInterface *iface )
+imimetypes_tab_iface_init( NactIMimetypesTabInterface *iface, void *user_data )
{
static const gchar *thisfn = "nact_main_window_imimetypes_tab_iface_init";
- g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
+ g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
}
static void
-ifolders_tab_iface_init( NactIFoldersTabInterface *iface )
+ifolders_tab_iface_init( NactIFoldersTabInterface *iface, void *user_data )
{
static const gchar *thisfn = "nact_main_window_ifolders_tab_iface_init";
- g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
+ g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
}
static void
-ischemes_tab_iface_init( NactISchemesTabInterface *iface )
+ischemes_tab_iface_init( NactISchemesTabInterface *iface, void *user_data )
{
static const gchar *thisfn = "nact_main_window_ischemes_tab_iface_init";
- g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
+ g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
}
static void
-icapabilities_tab_iface_init( NactICapabilitiesTabInterface *iface )
+icapabilities_tab_iface_init( NactICapabilitiesTabInterface *iface, void *user_data )
{
static const gchar *thisfn = "nact_main_window_icapabilities_tab_iface_init";
- g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
+ g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
}
static void
-ienvironment_tab_iface_init( NactIEnvironmentTabInterface *iface )
+ienvironment_tab_iface_init( NactIEnvironmentTabInterface *iface, void *user_data )
{
static const gchar *thisfn = "nact_main_window_ienvironment_tab_iface_init";
- g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
+ g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
}
static void
-iexecution_tab_iface_init( NactIExecutionTabInterface *iface )
+iexecution_tab_iface_init( NactIExecutionTabInterface *iface, void *user_data )
{
static const gchar *thisfn = "nact_main_window_iexecution_tab_iface_init";
- g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
+ g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
}
static void
-iproperties_tab_iface_init( NactIPropertiesTabInterface *iface )
+iproperties_tab_iface_init( NactIPropertiesTabInterface *iface, void *user_data )
{
static const gchar *thisfn = "nact_main_window_iproperties_tab_iface_init";
- g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
+ g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
}
static void
diff --git a/src/nact/nact-preferences-editor.c b/src/nact/nact-preferences-editor.c
index ebb1591..a3c4e81 100644
--- a/src/nact/nact-preferences-editor.c
+++ b/src/nact/nact-preferences-editor.c
@@ -128,7 +128,7 @@ static guint st_last_tab = 0;
static GType register_type( void );
static void class_init( NactPreferencesEditorClass *klass );
-static void ioptions_list_iface_init( NAIOptionsListInterface *iface );
+static void ioptions_list_iface_init( NAIOptionsListInterface *iface, void *user_data );
static GList *ioptions_list_get_options( const NAIOptionsList *instance, GtkWidget *container );
static void ioptions_list_free_options( const NAIOptionsList *instance, GtkWidget *container, GList *options );
static NAIOption *ioptions_list_get_ask_option( const NAIOptionsList *instance, GtkWidget *container );
@@ -236,11 +236,11 @@ class_init( NactPreferencesEditorClass *klass )
}
static void
-ioptions_list_iface_init( NAIOptionsListInterface *iface )
+ioptions_list_iface_init( NAIOptionsListInterface *iface, void *user_data )
{
static const gchar *thisfn = "nact_assistant_export_ioptions_list_iface_init";
- g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
+ g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
iface->get_options = ioptions_list_get_options;
iface->free_options = ioptions_list_free_options;
diff --git a/src/nact/nact-tree-model.c b/src/nact/nact-tree-model.c
index 4907c61..5128000 100644
--- a/src/nact/nact-tree-model.c
+++ b/src/nact/nact-tree-model.c
@@ -104,8 +104,8 @@ static GtkTreeModelFilterClass *st_parent_class = NULL;
static GType register_type( void );
static void class_init( NactTreeModelClass *klass );
-static void imulti_drag_source_init( EggTreeMultiDragSourceIface *iface );
-static void idrag_dest_init( GtkTreeDragDestIface *iface );
+static void imulti_drag_source_init( EggTreeMultiDragSourceIface *iface, void *user_data );
+static void idrag_dest_init( GtkTreeDragDestIface *iface, void *user_data );
static void instance_init( GTypeInstance *instance, gpointer klass );
static void instance_dispose( GObject *model );
static void instance_finalize( GObject *model );
@@ -203,11 +203,11 @@ class_init( NactTreeModelClass *klass )
}
static void
-imulti_drag_source_init( EggTreeMultiDragSourceIface *iface )
+imulti_drag_source_init( EggTreeMultiDragSourceIface *iface, void *user_data )
{
static const gchar *thisfn = "nact_tree_model_imulti_drag_source_init";
- g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
+ g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
iface->row_draggable = nact_tree_model_dnd_imulti_drag_source_row_draggable;
iface->drag_data_get = nact_tree_model_dnd_imulti_drag_source_drag_data_get;
@@ -218,11 +218,11 @@ imulti_drag_source_init( EggTreeMultiDragSourceIface *iface )
}
static void
-idrag_dest_init( GtkTreeDragDestIface *iface )
+idrag_dest_init( GtkTreeDragDestIface *iface, void *user_data )
{
static const gchar *thisfn = "nact_tree_model_idrag_dest_init";
- g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
+ g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
iface->drag_data_received = nact_tree_model_dnd_idrag_dest_drag_data_received;
iface->row_drop_possible = nact_tree_model_dnd_idrag_dest_row_drop_possible;
diff --git a/src/nact/nact-tree-view.c b/src/nact/nact-tree-view.c
index 050bbf4..717a741 100644
--- a/src/nact/nact-tree-view.c
+++ b/src/nact/nact-tree-view.c
@@ -133,7 +133,7 @@ static GObjectClass *st_parent_class = NULL;
static GType register_type( void );
static void class_init( NactTreeViewClass *klass );
-static void tree_ieditable_iface_init( NactTreeIEditableInterface *iface );
+static void tree_ieditable_iface_init( NactTreeIEditableInterface *iface, void *user_data );
static void instance_init( GTypeInstance *instance, gpointer klass );
static void instance_get_property( GObject *object, guint property_id, GValue *value, GParamSpec *spec );
static void instance_set_property( GObject *object, guint property_id, const GValue *value, GParamSpec *spec );
@@ -465,11 +465,11 @@ class_init( NactTreeViewClass *klass )
}
static void
-tree_ieditable_iface_init( NactTreeIEditableInterface *iface )
+tree_ieditable_iface_init( NactTreeIEditableInterface *iface, void *user_data )
{
static const gchar *thisfn = "nact_main_window_tree_ieditable_iface_init";
- g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
+ g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
}
static void
diff --git a/src/test/test-iface-base.c b/src/test/test-iface-base.c
index f867297..43839d2 100644
--- a/src/test/test-iface-base.c
+++ b/src/test/test-iface-base.c
@@ -55,7 +55,7 @@ static void instance_init( GTypeInstance *instance, gpointer klass );
static void instance_dispose( GObject *object );
static void instance_finalize( GObject *object );
-static void iface_iface_init( TestIFaceInterface *iface );
+static void iface_iface_init( TestIFaceInterface *iface, void *user_data );
static void iface_fna( TestIFace *object );
static void iface_fnb( TestIFace *object );
@@ -182,11 +182,11 @@ test_base_new( void )
}
static void
-iface_iface_init( TestIFaceInterface *iface )
+iface_iface_init( TestIFaceInterface *iface, void *user_data )
{
static const gchar *thisfn = "test_iface_base_iface_iface_init";
- g_debug( "%s: iface=%p", thisfn, ( void * ) iface );
+ g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
iface->fna = iface_fna;
iface->fnb = iface_fnb;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
