gnome-scan r704 - in trunk: . modules/gsane

[bersace svn gnome org]

Author: bersace
Date: Tue Dec 16 18:05:59 2008
New Revision: 704
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=704&view=rev

Log:
Use G_DEFINE_DYNAMIC_TYPE.

Modified:
   trunk/ChangeLog
   trunk/modules/gsane/gsane-backend.c
   trunk/modules/gsane/gsane-backend.h
   trunk/modules/gsane/gsane-module.c
   trunk/modules/gsane/gsane-scanner.c
   trunk/modules/gsane/gsane-scanner.h

Modified: trunk/modules/gsane/gsane-backend.c
==============================================================================
--- trunk/modules/gsane/gsane-backend.c	(original)
+++ trunk/modules/gsane/gsane-backend.c	Tue Dec 16 18:05:59 2008
@@ -20,14 +20,12 @@
  */
 
 #include <sane/sane.h>
-#include <gnome-scan-module.h>
-#include <gnome-scan-module-helper.h>
 #include "gsane-backend.h"
 #include "gsane-scanner.h"
 
 static GnomeScanBackendClass* parent_class = NULL;
 
-GS_DEFINE_MODULE_TYPE (GSaneBackend, gsane_backend, GNOME_SCAN_TYPE_BACKEND);
+G_DEFINE_DYNAMIC_TYPE (GSaneBackend, gsane_backend, GNOME_SCAN_TYPE_BACKEND);
 
 
 static void*
@@ -76,3 +74,14 @@
 	object_class->finalize = gsane_backend_finalize;
 	backend_class->probe_scanners = gsane_backend_probe_scanners;
 }
+
+static void
+gsane_backend_class_finalize(GSaneBackendClass *klass)
+{
+}
+
+void
+gsane_backend_register(GTypeModule *module)
+{
+	gsane_backend_register_type(module);
+}

Modified: trunk/modules/gsane/gsane-backend.h
==============================================================================
--- trunk/modules/gsane/gsane-backend.h	(original)
+++ trunk/modules/gsane/gsane-backend.h	Tue Dec 16 18:05:59 2008
@@ -49,7 +49,7 @@
 };
 
 GType gsane_backend_get_type (void) G_GNUC_CONST;
-void gsane_backend_register_type(GTypeModule *module);
+void gsane_backend_register(GTypeModule *module);
 
 G_END_DECLS
 

Modified: trunk/modules/gsane/gsane-module.c
==============================================================================
--- trunk/modules/gsane/gsane-module.c	(original)
+++ trunk/modules/gsane/gsane-module.c	Tue Dec 16 18:05:59 2008
@@ -32,6 +32,7 @@
 #include "gsane-option-handler-generic.h"
 #include "gsane-backend.h"
 #include "gsane-scanner.h"
+#include "gsane-operation.h"
 
 static GSaneOptionManager *gsane_option_manager;
 
@@ -55,8 +56,8 @@
 		return;
 	}
 	
-	gsane_backend_register_type (G_TYPE_MODULE (module));
-	gsane_scanner_register_type (G_TYPE_MODULE (module));
+	gsane_backend_register (G_TYPE_MODULE (module));
+	gsane_scanner_register (G_TYPE_MODULE (module));
 
 	/* GSane option handling */
 	gsane_option_manager = gsane_option_manager_new();

Modified: trunk/modules/gsane/gsane-scanner.c
==============================================================================
--- trunk/modules/gsane/gsane-scanner.c	(original)
+++ trunk/modules/gsane/gsane-scanner.c	Tue Dec 16 18:05:59 2008
@@ -22,8 +22,6 @@
 #include <config.h>
 #include <gegl.h>
 #include <string.h>
-#include <gnome-scan-module.h>
-#include <gnome-scan-module-helper.h>
 #include <sane/sane.h>
 #include "gsane-common.h"
 #include "gsane-option-manager.h"
@@ -55,7 +53,7 @@
 	GSANE_SCANNER_SANE_TYPE,
 };
 
-GS_DEFINE_MODULE_TYPE (GSaneScanner, gsane_scanner, GNOME_SCAN_TYPE_SCANNER);
+G_DEFINE_DYNAMIC_TYPE (GSaneScanner, gsane_scanner, GNOME_SCAN_TYPE_SCANNER);
 
 GnomeScanScanner*
 gsane_scanner_new(const SANE_Device *device)
@@ -279,5 +277,13 @@
 	g_signal_new("reload-options", GSANE_TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 }
 
+static void
+gsane_scanner_class_finalize(GSaneScannerClass *klass)
+{
+}
 
-
+void
+gsane_scanner_register(GTypeModule *module)
+{
+	gsane_scanner_register_type(module);
+}

Modified: trunk/modules/gsane/gsane-scanner.h
==============================================================================
--- trunk/modules/gsane/gsane-scanner.h	(original)
+++ trunk/modules/gsane/gsane-scanner.h	Tue Dec 16 18:05:59 2008
@@ -56,7 +56,7 @@
 };
 
 GType gsane_scanner_get_type (void) G_GNUC_CONST;
-void gsane_scanner_register_type (GTypeModule *module);
+void gsane_scanner_register (GTypeModule *module);
 GnomeScanScanner* gsane_scanner_new (const SANE_Device *device);
 void gsane_scanner_reload_parameters(GSaneScanner* self);