gnome-scan r705 - in trunk: . modules/gsfile

From: bersace svn gnome org
To: svn-commits-list gnome org
Subject: gnome-scan r705 - in trunk: . modules/gsfile
Date: Tue, 16 Dec 2008 18:17:14 +0000 (UTC)
Author: bersace
Date: Tue Dec 16 18:17:14 2008
New Revision: 705
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=705&view=rev

Log:
Use G_DEFINE_DYNAMIC_TYPE.

Modified:
   trunk/ChangeLog
   trunk/modules/gsfile/gsfile-backend.c
   trunk/modules/gsfile/gsfile-backend.h
   trunk/modules/gsfile/gsfile-filenames-widget.c
   trunk/modules/gsfile/gsfile-filenames-widget.h
   trunk/modules/gsfile/gsfile-module.c
   trunk/modules/gsfile/gsfile-options.c
   trunk/modules/gsfile/gsfile-options.h
   trunk/modules/gsfile/gsfile-scanner.c
   trunk/modules/gsfile/gsfile-scanner.h

Modified: trunk/modules/gsfile/gsfile-backend.c
==============================================================================
--- trunk/modules/gsfile/gsfile-backend.c	(original)
+++ trunk/modules/gsfile/gsfile-backend.c	Tue Dec 16 18:17:14 2008
@@ -20,14 +20,10 @@
  * 	Boston, MA  02110-1301, USA.
  */
 
-#include <gnome-scan-module.h>
-#include <gnome-scan-module-helper.h>
 #include "gsfile-backend.h"
 #include "gsfile-scanner.h"
 
-static GnomeScanBackendClass* parent_class = NULL;
-
-GS_DEFINE_MODULE_TYPE (GSFileBackend, gsfile_backend, GNOME_SCAN_TYPE_BACKEND);
+G_DEFINE_DYNAMIC_TYPE (GSFileBackend, gsfile_backend, GNOME_SCAN_TYPE_BACKEND);
 
 void*
 gsfile_backend_probe_scanners (GnomeScanBackend *self)
@@ -51,7 +47,7 @@
 {
 	/* TODO: Add deinitalization code here */
 
-	G_OBJECT_CLASS (parent_class)->finalize (self);
+	G_OBJECT_CLASS (gsfile_backend_parent_class)->finalize (self);
 }
 
 static void
@@ -59,8 +55,18 @@
 {
 	GObjectClass* object_class = G_OBJECT_CLASS (klass);
 	GnomeScanBackendClass *backend_class = GNOME_SCAN_BACKEND_CLASS (klass);
-	parent_class = GNOME_SCAN_BACKEND_CLASS (g_type_class_peek_parent (klass));
 	
 	object_class->finalize = gsfile_backend_finalize;
 	backend_class->probe_scanners = gsfile_backend_probe_scanners;
 }
+
+static void
+gsfile_backend_class_finalize(GSFileBackendClass *klass)
+{
+}
+
+void
+gsfile_backend_register(GTypeModule *module)
+{
+	gsfile_backend_register_type(module);
+}

Modified: trunk/modules/gsfile/gsfile-backend.h
==============================================================================
--- trunk/modules/gsfile/gsfile-backend.h	(original)
+++ trunk/modules/gsfile/gsfile-backend.h	Tue Dec 16 18:17:14 2008
@@ -48,7 +48,8 @@
 	GnomeScanBackend parent_instance;
 };
 
-void	gsfile_backend_register_type (GTypeModule *module);
+GType gsfile_backend_get_type (void) G_GNUC_CONST;
+void gsfile_backend_register (GTypeModule *module);
 
 G_END_DECLS
 

Modified: trunk/modules/gsfile/gsfile-filenames-widget.c
==============================================================================
--- trunk/modules/gsfile/gsfile-filenames-widget.c	(original)
+++ trunk/modules/gsfile/gsfile-filenames-widget.c	Tue Dec 16 18:17:14 2008
@@ -24,17 +24,13 @@
 #include <config.h>
 #endif
 
-#include <glib/gi18n.h>
-#include <gnome-scan-module-helper.h>
+#include <glib/gi18n-lib.h>
 #include <gnome-scan-option-widget.h>
 #include "gsfile-options.h"
 #include "gsfile-filenames-widget.h"
 
 #define	GSFILE_FILENAMES_WIDGET_GET_PRIVATE(o)	(G_TYPE_INSTANCE_GET_PRIVATE ((o), GSFILE_TYPE_FILENAMES_WIDGET, GSFileFilenamesWidgetPrivate))
 
-#undef  _
-#define _(string)   dgettext(GETTEXT_PACKAGE, string)
-
 #define	PREVIEW_SIZE	96
 
 struct _GSFileFilenamesWidgetPrivate
@@ -53,131 +49,32 @@
 	FILENAMES_N_COLUMNS
 };
 
-static void gsffw_populate(GSFileFilenamesWidget *self,
+static void gsfile_filenames_widget_populate(GSFileFilenamesWidget *self,
 						   GSList* filenames);
-static void	gsffw_filenames_add (GtkButton *button,
+static void	gsfile_filenames_widget_filenames_add (GtkButton *button,
 								 GSFileFilenamesWidget *self);
-static void	gsffw_filenames_remove (GtkButton *button,
+static void	gsfile_filenames_widget_filenames_remove (GtkButton *button,
 									GSFileFilenamesWidget *self);
-static void	gsffw_filenames_clear (GtkButton *button,
+static void	gsfile_filenames_widget_filenames_clear (GtkButton *button,
 								   GSFileFilenamesWidget *self);
-static void	gsffw_filenames_preview (GSFileFilenamesWidget *self);
-static gboolean gsffw_filenames_foreach_preview (GtkTreeModel *model,
+static void	gsfile_filenames_widget_filenames_preview (GSFileFilenamesWidget *self);
+static gboolean gsfile_filenames_widget_filenames_foreach_preview (GtkTreeModel *model,
 												 GtkTreePath *path,
 												 GtkTreeIter *iter,
 												 GSFileFilenamesWidget *self);
-static gboolean	gsffw_filenames_foreach_fetch (GtkTreeModel *model,
+static gboolean	gsfile_filenames_widget_filenames_foreach_fetch (GtkTreeModel *model,
 											   GtkTreePath *path,
 											   GtkTreeIter *iter,
 											   GSList **list);
 
-static void gsffw_filenames_changed(GSFileFilenamesWidget *self);
-static void gsffw_selection_changed(GSFileFilenamesWidget *self);
-static void gsffw_filenames_update(GSFileFilenamesWidget *self);
+static void gsfile_filenames_widget_filenames_changed(GSFileFilenamesWidget *self);
+static void gsfile_filenames_widget_selection_changed(GSFileFilenamesWidget *self);
+static void gsfile_filenames_widget_filenames_update(GSFileFilenamesWidget *self);
 
-GS_DEFINE_MODULE_TYPE (GSFileFilenamesWidget, gsfile_filenames_widget, GNOME_SCAN_TYPE_OPTION_WIDGET)
-
-static GObject*
-gsfile_filenames_widget_construct (GType type, guint n_construct_properties, GObjectConstructParam* construct_properties)
-{
-	GObject* object = G_OBJECT_CLASS(gsfile_filenames_widget_parent_class)->constructor(type, n_construct_properties, construct_properties);
-	GSFileFilenamesWidget* self = GSFILE_FILENAMES_WIDGET(object);
-	GtkWidget *scrolled, *tree_view, *box, *button;
-	GtkTreeViewColumn *column;
-	GtkCellRenderer *renderer;
-	GnomeScanOption *option;
-	GSList *filenames;
-	
-	gtk_box_set_spacing (GTK_BOX (self), 6);
-	g_object_set(self, "no_label", TRUE, "expand", TRUE, NULL);
-	
-	self->priv->liststore = gtk_list_store_new (FILENAMES_N_COLUMNS,
-												GDK_TYPE_PIXBUF,
-												G_TYPE_STRING,
-												G_TYPE_STRING);
-	g_signal_connect_swapped(self->priv->liststore, "row-inserted", G_CALLBACK(gsffw_filenames_changed), self);
-	g_signal_connect_swapped(self->priv->liststore, "row-deleted", G_CALLBACK(gsffw_filenames_changed), self);
-	
-	tree_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (self->priv->liststore));
-	gtk_tree_view_set_reorderable (GTK_TREE_VIEW (tree_view), TRUE);
-	gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW (tree_view), TRUE);
-	self->priv->selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
-	g_signal_connect_swapped(self->priv->selection, "changed", G_CALLBACK(gsffw_selection_changed), self);	
-	
-	/* preview */
-	renderer = gtk_cell_renderer_pixbuf_new ();
-	column = gtk_tree_view_column_new_with_attributes (_("Preview"), renderer,
-													   "pixbuf", FILENAMES_PREVIEW,
-													   NULL);
-	gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
-	
-	/* basename */
-	renderer = gtk_cell_renderer_text_new ();
-	column = gtk_tree_view_column_new_with_attributes (_("Filename"), renderer,
-													   "markup", FILENAMES_BASENAME,
-													   NULL);
-	gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
-	
-	/* scrolled window */
-	scrolled = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
-									GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled),
-										   tree_view);
-	gtk_box_pack_start (GTK_BOX (self), scrolled, TRUE, TRUE, 0);
-	
-	/* buttons */
-	box = gtk_vbutton_box_new ();
-	gtk_box_set_spacing (GTK_BOX (box), 4);
-	gtk_button_box_set_layout (GTK_BUTTON_BOX (box), GTK_BUTTONBOX_START);
-	gtk_box_pack_start (GTK_BOX (self), box, FALSE, FALSE, 0);
-	
-	/* add */
-	button = gtk_button_new_from_stock (GTK_STOCK_ADD);
-	g_signal_connect (button, "clicked",
-					  (GCallback) gsffw_filenames_add, self);
-	gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
-	
-	/* remove */
-	self->priv->remove = button = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
-	gtk_widget_set_sensitive(button, FALSE);
-	g_signal_connect (button, "clicked",
-					  (GCallback) gsffw_filenames_remove, self);
-	gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
-	
-	/* clear */
-	self->priv->clear = button = gtk_button_new_from_stock (GTK_STOCK_CLEAR);
-	gtk_widget_set_sensitive(button, FALSE);
-	g_signal_connect (button, "clicked",
-					  (GCallback) gsffw_filenames_clear, self);
-	gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
-
-	/* populate */
-	g_object_get(self, "option", &option, NULL);
-	g_object_get(option, "value", &filenames, NULL);
-	gsffw_populate(self, filenames);
-
-	return object;
-}
-
-static void
-gsfile_filenames_widget_class_init (GSFileFilenamesWidgetClass *klass)
-{
-	g_type_class_add_private(klass, sizeof(GSFileFilenamesWidgetPrivate));
-	G_OBJECT_CLASS(klass)->constructor = gsfile_filenames_widget_construct;
-}
-
-static void
-gsfile_filenames_widget_init (GSFileFilenamesWidget *self)
-{
-	self->priv = GSFILE_FILENAMES_WIDGET_GET_PRIVATE(self);
-}
-
-
-/* INTERNALS */
+G_DEFINE_DYNAMIC_TYPE (GSFileFilenamesWidget, gsfile_filenames_widget, GNOME_SCAN_TYPE_OPTION_WIDGET)
 
 static GtkWidget*
-gsffw_build_filechooser(GSFileFilenamesWidget *self)
+gsfile_filenames_widget_build_filechooser(GSFileFilenamesWidget *self)
 {
 	GnomeScanOption *option;
 	GtkWidget* filechooser;
@@ -234,7 +131,7 @@
 }
 
 static void
-gsffw_populate(GSFileFilenamesWidget *self, GSList *filenames)
+gsfile_filenames_widget_populate(GSFileFilenamesWidget *self, GSList *filenames)
 {
 	GError *error = NULL;
 	GSList* node;
@@ -248,42 +145,42 @@
 										   -1);
 	}
 	/* delegate populate creation in a thread */
-	g_thread_create ((GThreadFunc) gsffw_filenames_preview,
+	g_thread_create ((GThreadFunc) gsfile_filenames_widget_filenames_preview,
 					 self, FALSE, &error);
 }
 
 static void
-gsffw_filenames_add (GtkButton *button, GSFileFilenamesWidget *self)
+gsfile_filenames_widget_filenames_add (GtkButton *button, GSFileFilenamesWidget *self)
 {
 	GSList *node;
 
 	/* filechooser */
 	if (!self->priv->filechooser) {
-		self->priv->filechooser = gsffw_build_filechooser(self);
+		self->priv->filechooser = gsfile_filenames_widget_build_filechooser(self);
 	}
 	
 	/* run filechooser */
 	if (gtk_dialog_run (GTK_DIALOG (self->priv->filechooser)) == GTK_RESPONSE_ACCEPT) {
 		gtk_widget_hide (self->priv->filechooser);
 		node = gtk_file_chooser_get_filenames (GTK_FILE_CHOOSER (self->priv->filechooser));
-		gsffw_populate(self, node);
-		gsffw_filenames_update(self);
+		gsfile_filenames_widget_populate(self, node);
+		gsfile_filenames_widget_filenames_update(self);
 	}
 	gtk_widget_hide (self->priv->filechooser);
 }
 
 static void
-gsffw_filenames_preview (GSFileFilenamesWidget *self)
+gsfile_filenames_widget_filenames_preview (GSFileFilenamesWidget *self)
 {
 	/* trigger preview update (this may take some time considering list length and image size) */
 	gtk_tree_model_foreach (GTK_TREE_MODEL (self->priv->liststore),
-							(GtkTreeModelForeachFunc) gsffw_filenames_foreach_preview,
+							(GtkTreeModelForeachFunc) gsfile_filenames_widget_filenames_foreach_preview,
 							self);
 }
 
 /* create a preview if not present */
 gboolean
-gsffw_filenames_foreach_preview (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, GSFileFilenamesWidget *self)
+gsfile_filenames_widget_filenames_foreach_preview (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, GSFileFilenamesWidget *self)
 {
 	GdkPixbuf *preview;
 	GError *error = NULL;
@@ -305,7 +202,7 @@
 }
 
 static void
-gsffw_filenames_remove (GtkButton *button, GSFileFilenamesWidget *self)
+gsfile_filenames_widget_filenames_remove (GtkButton *button, GSFileFilenamesWidget *self)
 {
 	GtkTreeModel *model = GTK_TREE_MODEL (self->priv->liststore);
 	GList *node, *first = gtk_tree_selection_get_selected_rows (self->priv->selection,
@@ -318,30 +215,30 @@
 		gtk_tree_path_free (node->data);
 	}
 	g_list_free (first);
-	gsffw_filenames_update(self);
+	gsfile_filenames_widget_filenames_update(self);
 }
 
 static void
-gsffw_filenames_clear (GtkButton *button, GSFileFilenamesWidget *self)
+gsfile_filenames_widget_filenames_clear (GtkButton *button, GSFileFilenamesWidget *self)
 {
 	gtk_list_store_clear (self->priv->liststore);
-	gsffw_filenames_update(self);
+	gsfile_filenames_widget_filenames_update(self);
 }
 
 static void
-gsffw_filenames_update (GSFileFilenamesWidget *self)
+gsfile_filenames_widget_filenames_update (GSFileFilenamesWidget *self)
 {
 	GSList *list = NULL;
 	GnomeScanOption *option;
 	gtk_tree_model_foreach (GTK_TREE_MODEL (self->priv->liststore),
-							(GtkTreeModelForeachFunc) gsffw_filenames_foreach_fetch,
+							(GtkTreeModelForeachFunc) gsfile_filenames_widget_filenames_foreach_fetch,
 							&list);
 	g_object_get(self, "option", &option, NULL);
 	g_object_set(option, "value", list, NULL);
 }
 
 static gboolean
-gsffw_filenames_foreach_fetch (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, GSList **list)
+gsfile_filenames_widget_filenames_foreach_fetch (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, GSList **list)
 {
 	gchar*pathname;
 	gtk_tree_model_get (model, iter,
@@ -353,7 +250,7 @@
 }
 
 static void
-gsffw_filenames_changed(GSFileFilenamesWidget *self)
+gsfile_filenames_widget_filenames_changed(GSFileFilenamesWidget *self)
 {
 	GtkTreePath*path = gtk_tree_path_new_first();
 	GtkTreeIter iter;
@@ -362,9 +259,117 @@
 }
 
 static void
-gsffw_selection_changed(GSFileFilenamesWidget *self)
+gsfile_filenames_widget_selection_changed(GSFileFilenamesWidget *self)
 {
 	gtk_widget_set_sensitive(self->priv->remove,
 							 gtk_tree_selection_get_selected(self->priv->selection,
 															 NULL, NULL));
 }
+
+
+static GObject*
+gsfile_filenames_widget_construct (GType type, guint n_construct_properties, GObjectConstructParam* construct_properties)
+{
+	GObject* object = G_OBJECT_CLASS(gsfile_filenames_widget_parent_class)->constructor(type, n_construct_properties, construct_properties);
+	GSFileFilenamesWidget* self = GSFILE_FILENAMES_WIDGET(object);
+	GtkWidget *scrolled, *tree_view, *box, *button;
+	GtkTreeViewColumn *column;
+	GtkCellRenderer *renderer;
+	GnomeScanOption *option;
+	GSList *filenames;
+	
+	gtk_box_set_spacing (GTK_BOX (self), 6);
+	g_object_set(self, "no_label", TRUE, "expand", TRUE, NULL);
+	
+	self->priv->liststore = gtk_list_store_new (FILENAMES_N_COLUMNS,
+												GDK_TYPE_PIXBUF,
+												G_TYPE_STRING,
+												G_TYPE_STRING);
+	g_signal_connect_swapped(self->priv->liststore, "row-inserted", G_CALLBACK(gsfile_filenames_widget_filenames_changed), self);
+	g_signal_connect_swapped(self->priv->liststore, "row-deleted", G_CALLBACK(gsfile_filenames_widget_filenames_changed), self);
+	
+	tree_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (self->priv->liststore));
+	gtk_tree_view_set_reorderable (GTK_TREE_VIEW (tree_view), TRUE);
+	gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW (tree_view), TRUE);
+	self->priv->selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
+	g_signal_connect_swapped(self->priv->selection, "changed", G_CALLBACK(gsfile_filenames_widget_selection_changed), self);	
+	
+	/* preview */
+	renderer = gtk_cell_renderer_pixbuf_new ();
+	column = gtk_tree_view_column_new_with_attributes (_("Preview"), renderer,
+													   "pixbuf", FILENAMES_PREVIEW,
+													   NULL);
+	gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
+	
+	/* basename */
+	renderer = gtk_cell_renderer_text_new ();
+	column = gtk_tree_view_column_new_with_attributes (_("Filename"), renderer,
+													   "markup", FILENAMES_BASENAME,
+													   NULL);
+	gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
+	
+	/* scrolled window */
+	scrolled = gtk_scrolled_window_new (NULL, NULL);
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
+									GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled),
+										   tree_view);
+	gtk_box_pack_start (GTK_BOX (self), scrolled, TRUE, TRUE, 0);
+	
+	/* buttons */
+	box = gtk_vbutton_box_new ();
+	gtk_box_set_spacing (GTK_BOX (box), 4);
+	gtk_button_box_set_layout (GTK_BUTTON_BOX (box), GTK_BUTTONBOX_START);
+	gtk_box_pack_start (GTK_BOX (self), box, FALSE, FALSE, 0);
+	
+	/* add */
+	button = gtk_button_new_from_stock (GTK_STOCK_ADD);
+	g_signal_connect (button, "clicked",
+					  (GCallback) gsfile_filenames_widget_filenames_add, self);
+	gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
+	
+	/* remove */
+	self->priv->remove = button = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
+	gtk_widget_set_sensitive(button, FALSE);
+	g_signal_connect (button, "clicked",
+					  (GCallback) gsfile_filenames_widget_filenames_remove, self);
+	gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
+	
+	/* clear */
+	self->priv->clear = button = gtk_button_new_from_stock (GTK_STOCK_CLEAR);
+	gtk_widget_set_sensitive(button, FALSE);
+	g_signal_connect (button, "clicked",
+					  (GCallback) gsfile_filenames_widget_filenames_clear, self);
+	gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
+
+	/* populate */
+	g_object_get(self, "option", &option, NULL);
+	g_object_get(option, "value", &filenames, NULL);
+	gsfile_filenames_widget_populate(self, filenames);
+
+	return object;
+}
+
+static void
+gsfile_filenames_widget_class_init (GSFileFilenamesWidgetClass *klass)
+{
+	g_type_class_add_private(klass, sizeof(GSFileFilenamesWidgetPrivate));
+	G_OBJECT_CLASS(klass)->constructor = gsfile_filenames_widget_construct;
+}
+
+static void
+gsfile_filenames_widget_class_finalize(GSFileFilenamesWidgetClass *klass)
+{
+}
+
+static void
+gsfile_filenames_widget_init (GSFileFilenamesWidget *self)
+{
+	self->priv = GSFILE_FILENAMES_WIDGET_GET_PRIVATE(self);
+}
+
+void
+gsfile_filenames_widget_register(GTypeModule *module)
+{
+	gsfile_filenames_widget_register_type(module);
+}

Modified: trunk/modules/gsfile/gsfile-filenames-widget.h
==============================================================================
--- trunk/modules/gsfile/gsfile-filenames-widget.h	(original)
+++ trunk/modules/gsfile/gsfile-filenames-widget.h	Tue Dec 16 18:17:14 2008
@@ -50,7 +50,7 @@
 	GnomeScanOptionWidgetClass parent_class;
 };
 
-void gsfile_filenames_widget_register_type(GTypeModule* module);
+void gsfile_filenames_widget_register(GTypeModule* module);
 GType gsfile_filenames_widget_get_type(void) G_GNUC_CONST;
 
 

Modified: trunk/modules/gsfile/gsfile-module.c
==============================================================================
--- trunk/modules/gsfile/gsfile-module.c	(original)
+++ trunk/modules/gsfile/gsfile-module.c	Tue Dec 16 18:17:14 2008
@@ -30,10 +30,10 @@
 G_MODULE_EXPORT void
 gnome_scan_module_init (GnomeScanModule *module)
 {
-	gsfile_backend_register_type (G_TYPE_MODULE (module));
-	gsfile_scanner_register_type (G_TYPE_MODULE (module));
-	gsfile_option_filenames_register_type(G_TYPE_MODULE(module));
-	gsfile_filenames_widget_register_type(G_TYPE_MODULE(module));
+	gsfile_backend_register (G_TYPE_MODULE (module));
+	gsfile_scanner_register (G_TYPE_MODULE (module));
+	gsfile_option_filenames_register(G_TYPE_MODULE(module));
+	gsfile_filenames_widget_register(G_TYPE_MODULE(module));
 
 	gnome_scan_option_manager_register_rule_by_type(gnome_scan_option_manager, GSFILE_TYPE_OPTION_FILENAMES, GSFILE_TYPE_FILENAMES_WIDGET);
 }

Modified: trunk/modules/gsfile/gsfile-options.c
==============================================================================
--- trunk/modules/gsfile/gsfile-options.c	(original)
+++ trunk/modules/gsfile/gsfile-options.c	Tue Dec 16 18:17:14 2008
@@ -20,44 +20,54 @@
  */
  
 #include "gsfile-options.h"
-#include <gnome-scan-module-helper.h>
 
-enum {
-	GSFILE_OPTION_FILENAMES_DUMMY_PROPERTY,
-	GSFILE_OPTION_FILENAMES_FORMATS,
-	GSFILE_OPTION_FILENAMES_VALUE,
-};
+#define	GSFILE_OPTION_FILENAMES_GET_PRIVATE(o)	(G_TYPE_INSTANCE_GET_PRIVATE((o), GSFILE_TYPE_OPTION_FILENAMES, GSFileOptionFilenamesPrivate))
+
 struct _GSFileOptionFilenamesPrivate {
 	GSList* formats;
 	GSList* filenames;
 };
 
-#define	GSFILE_OPTION_FILENAMES_GET_PRIVATE(o)	(G_TYPE_INSTANCE_GET_PRIVATE((o), GSFILE_TYPE_OPTION_FILENAMES, GSFileOptionFilenamesPrivate))
+enum {
+	GSFILE_OPTION_FILENAMES_DUMMY_PROPERTY,
+	GSFILE_OPTION_FILENAMES_FORMATS,
+	GSFILE_OPTION_FILENAMES_VALUE,
+};
 
-GS_DEFINE_MODULE_TYPE(GSFileOptionFilenames, gsfile_option_filenames, GNOME_SCAN_TYPE_OPTION);
+G_DEFINE_DYNAMIC_TYPE(GSFileOptionFilenames, gsfile_option_filenames, GNOME_SCAN_TYPE_OPTION);
 
+GSFileOptionFilenames*
+gsfile_option_filenames_new(const gchar* name, const gchar* title, const gchar* desc, const gchar* domain, const gchar* group, GSList* formats, GnomeScanOptionHint hint)
+{
+	return g_object_new(GSFILE_TYPE_OPTION_FILENAMES, "name", name, "title", title, "desc",	desc, "domain",	domain, "group", group, "formats", formats, "hint", hint, NULL);
+}
 
-GSList* gsfile_option_filenames_get_formats(GSFileOptionFilenames*self)
+GSList*
+gsfile_option_filenames_get_formats(GSFileOptionFilenames*self)
 {
 	return self->priv->formats;
 }
 
-void gsfile_option_filenames_set_formats(GSFileOptionFilenames*self, GSList* formats)
+void
+gsfile_option_filenames_set_formats(GSFileOptionFilenames*self, GSList* formats)
 {
 	self->priv->formats = formats;
 }
 
-GSList* gsfile_option_filenames_get_value(GSFileOptionFilenames* self)
+GSList*
+gsfile_option_filenames_get_value(GSFileOptionFilenames* self)
 {
 	return self->priv->filenames;
 }
 
-void gsfile_option_filenames_set_value(GSFileOptionFilenames* self, GSList* filenames)
+void
+gsfile_option_filenames_set_value(GSFileOptionFilenames* self, GSList* filenames)
 {
 	self->priv->filenames = filenames;
 }
 
-static void gsfile_option_filenames_get_property(GObject* object, guint property_id, GValue* value, GParamSpec* pspec)
+static void
+gsfile_option_filenames_get_property(GObject* object, guint property_id, GValue* value, GParamSpec* pspec)
 {
 	GSFileOptionFilenames* self = GSFILE_OPTION_FILENAMES(object);
 	switch(property_id) {
@@ -73,7 +83,8 @@
 	}
 }
 
-static void gsfile_option_filenames_set_property(GObject* object, guint property_id, const GValue* value, GParamSpec* pspec)
+static void
+gsfile_option_filenames_set_property(GObject* object, guint property_id, const GValue* value, GParamSpec* pspec)
 {
 	GSFileOptionFilenames* self = GSFILE_OPTION_FILENAMES(object);
 	switch(property_id) {
@@ -89,7 +100,8 @@
 	}
 }
 
-static void gsfile_option_filenames_class_init(GSFileOptionFilenamesClass *klass)
+static void
+gsfile_option_filenames_class_init(GSFileOptionFilenamesClass *klass)
 {
 	g_type_class_add_private(klass, sizeof(GSFileOptionFilenamesPrivate));
 	GObjectClass* object_class = G_OBJECT_CLASS(klass);
@@ -105,12 +117,19 @@
 							     G_PARAM_STATIC_STRINGS|G_PARAM_READWRITE));
 }
 
-static void gsfile_option_filenames_init(GSFileOptionFilenames* self)
+static void
+gsfile_option_filenames_class_finalize(GSFileOptionFilenamesClass *klass)
+{
+}
+
+static void
+gsfile_option_filenames_init(GSFileOptionFilenames* self)
 {
 	self->priv = GSFILE_OPTION_FILENAMES_GET_PRIVATE(self);
 }
 
-GSFileOptionFilenames* gsfile_option_filenames_new(const gchar* name, const gchar* title, const gchar* desc, const gchar* domain, const gchar* group, GSList* formats, GnomeScanOptionHint hint)
+void
+gsfile_option_filenames_register(GTypeModule *module)
 {
-	return g_object_new(GSFILE_TYPE_OPTION_FILENAMES, "name", name, "title", title, "desc",	desc, "domain",	domain, "group", group, "formats", formats, "hint", hint, NULL);
+	gsfile_option_filenames_register_type(module);
 }

Modified: trunk/modules/gsfile/gsfile-options.h
==============================================================================
--- trunk/modules/gsfile/gsfile-options.h	(original)
+++ trunk/modules/gsfile/gsfile-options.h	Tue Dec 16 18:17:14 2008
@@ -43,7 +43,7 @@
 	GnomeScanOptionClass parent_class;
 };
 
-void gsfile_option_filenames_register_type(GTypeModule* module);
+void gsfile_option_filenames_register(GTypeModule* module);
 GType gsfile_option_filenames_get_type(void) G_GNUC_CONST;
 GSFileOptionFilenames* gsfile_option_filenames_new(const gchar* name, const gchar* title, const gchar* desc, const gchar* domain, const gchar* group, GSList* formats, GnomeScanOptionHint hint);
 GSList* gsfile_option_filenames_get_formats(GSFileOptionFilenames*self);

Modified: trunk/modules/gsfile/gsfile-scanner.c
==============================================================================
--- trunk/modules/gsfile/gsfile-scanner.c	(original)
+++ trunk/modules/gsfile/gsfile-scanner.c	Tue Dec 16 18:17:14 2008
@@ -24,8 +24,6 @@
 #endif
 
 #include <glib/gi18n.h>
-#include <gnome-scan-module.h>
-#include <gnome-scan-module-helper.h>
 #include <gnome-scan-option.h>
 #include <gnome-scan-common.h>
 #include "gsfile-options.h"
@@ -40,7 +38,7 @@
 	GeglNode* load;
 };
 
-GS_DEFINE_MODULE_TYPE (GSFileScanner, gsfile_scanner, GNOME_SCAN_TYPE_SCANNER);
+G_DEFINE_DYNAMIC_TYPE (GSFileScanner, gsfile_scanner, GNOME_SCAN_TYPE_SCANNER);
 
 GnomeScanScanner*
 gsfile_scanner_new ()
@@ -168,9 +166,20 @@
 }
 
 static void
+gsfile_scanner_class_finalize(GSFileScannerClass *klass)
+{
+}
+
+static void
 gsfile_scanner_init (GSFileScanner *self)
 {
 	self->priv = GSFILE_SCANNER_GET_PRIVATE(self);
 	self->priv->filenames = NULL;
 	self->priv->current = NULL;
 }
+
+void
+gsfile_scanner_register(GTypeModule *module)
+{
+	gsfile_scanner_register_type(module);
+}

Modified: trunk/modules/gsfile/gsfile-scanner.h
==============================================================================
--- trunk/modules/gsfile/gsfile-scanner.h	(original)
+++ trunk/modules/gsfile/gsfile-scanner.h	Tue Dec 16 18:17:14 2008
@@ -51,7 +51,7 @@
 };
 
 GType gsfile_scanner_get_type ();
-void gsfile_scanner_register_type (GTypeModule *module);
+void gsfile_scanner_register (GTypeModule *module);
 GnomeScanScanner *gsfile_scanner_new ();
 
 G_END_DECLS
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]