gnome-scan r602 - in trunk: . lib modules src
- From: bersace svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-scan r602 - in trunk: . lib modules src
- Date: Thu, 8 May 2008 13:59:03 +0100 (BST)
Author: bersace
Date: Thu May 8 12:59:02 2008
New Revision: 602
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=602&view=rev
Log:
Use GNOME_SCAN_TYPE_ insteand of GNOME_TYPE_SCAN. Rename GnomeScanner
to GnomeScanScanner.
Added:
trunk/lib/gnome-scan-scanner.c
- copied, changed from r600, /trunk/lib/gnome-scanner.c
trunk/lib/gnome-scan-scanner.h
- copied, changed from r600, /trunk/lib/gnome-scanner.h
Removed:
trunk/lib/gnome-scanner.c
trunk/lib/gnome-scanner.h
Modified:
trunk/ChangeLog
trunk/lib/Makefile.am
trunk/lib/gnome-scan-acquisition-dialog.c
trunk/lib/gnome-scan-acquisition-dialog.h
trunk/lib/gnome-scan-backend.c
trunk/lib/gnome-scan-backend.h
trunk/lib/gnome-scan-boolean-widget.c
trunk/lib/gnome-scan-boolean-widget.h
trunk/lib/gnome-scan-common.vala
trunk/lib/gnome-scan-dialog.c
trunk/lib/gnome-scan-dialog.h
trunk/lib/gnome-scan-enum-widget.c
trunk/lib/gnome-scan-enum-widget.h
trunk/lib/gnome-scan-job.c
trunk/lib/gnome-scan-job.h
trunk/lib/gnome-scan-module-manager.c
trunk/lib/gnome-scan-module-manager.h
trunk/lib/gnome-scan-module.c
trunk/lib/gnome-scan-module.h
trunk/lib/gnome-scan-number-widget.c
trunk/lib/gnome-scan-number-widget.h
trunk/lib/gnome-scan-page-orientation-widget.c
trunk/lib/gnome-scan-page-orientation-widget.h
trunk/lib/gnome-scan-paper-size-widget.c
trunk/lib/gnome-scan-paper-size-widget.h
trunk/lib/gnome-scan-param-specs.c
trunk/lib/gnome-scan-param-widget.c
trunk/lib/gnome-scan-param-widget.h
trunk/lib/gnome-scan-plugin.c
trunk/lib/gnome-scan-plugin.h
trunk/lib/gnome-scan-preview-area.c
trunk/lib/gnome-scan-preview-area.h
trunk/lib/gnome-scan-preview-plugin-area.h
trunk/lib/gnome-scan-preview-plugin-rotation.h
trunk/lib/gnome-scan-preview-plugin.c
trunk/lib/gnome-scan-preview-plugin.h
trunk/lib/gnome-scan-preview-sink.c
trunk/lib/gnome-scan-preview-sink.h
trunk/lib/gnome-scan-processor-common.c
trunk/lib/gnome-scan-processor-common.h
trunk/lib/gnome-scan-range-widget.c
trunk/lib/gnome-scan-range-widget.h
trunk/lib/gnome-scan-settings.c
trunk/lib/gnome-scan-settings.h
trunk/lib/gnome-scan-sink.c
trunk/lib/gnome-scan-sink.h
trunk/lib/gnome-scan-string-widget.c
trunk/lib/gnome-scan-string-widget.h
trunk/lib/gnome-scan-types.c
trunk/lib/gnome-scan-types.h
trunk/modules/gsane-backend.c
trunk/modules/gsane-meta-param.c
trunk/modules/gsane-scanner.c
trunk/modules/gsane-scanner.h
trunk/modules/gsfile-backend.c
trunk/modules/gsfile-scanner.c
trunk/modules/gsfile-scanner.h
trunk/src/flegita-gimp-sink.c
trunk/src/flegita-sink.c
Modified: trunk/lib/Makefile.am
==============================================================================
--- trunk/lib/Makefile.am (original)
+++ trunk/lib/Makefile.am Thu May 8 12:59:02 2008
@@ -18,7 +18,6 @@
types_deps = \
gnome-scan-param-specs.h \
- gnome-scanner.h \
gnome-scan-utils.h \
$(NULL)
@@ -47,8 +46,8 @@
gnome-scan-settings.c \
gnome-scan-plugin.h \
gnome-scan-plugin.c \
- gnome-scanner.h \
- gnome-scanner.c \
+ gnome-scan-scanner.h \
+ gnome-scan-scanner.c \
gnome-scan-sink.h \
gnome-scan-sink.c \
gnome-scan-backend.h \
@@ -114,7 +113,7 @@
gnome-scan-common.h \
gnome-scan-settings.h \
gnome-scan-plugin.h \
- gnome-scanner.h \
+ gnome-scan-scanner.h \
gnome-scan-sink.h \
gnome-scan-backend.h \
gnome-scan-job.h \
Modified: trunk/lib/gnome-scan-acquisition-dialog.c
==============================================================================
--- trunk/lib/gnome-scan-acquisition-dialog.c (original)
+++ trunk/lib/gnome-scan-acquisition-dialog.c Thu May 8 12:59:02 2008
@@ -48,7 +48,7 @@
#include "gnome-scan-private.h"
#include "gnome-scan-acquisition-dialog.h"
-#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_TYPE_SCAN_ACQUISITION_DIALOG, GnomeScanAcquisitionDialogPrivate))
+#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_SCAN_TYPE_ACQUISITION_DIALOG, GnomeScanAcquisitionDialogPrivate))
typedef struct _GnomeScanAcquisitionDialogPrivate GnomeScanAcquisitionDialogPrivate;
@@ -241,7 +241,7 @@
g_param_spec_object ("job",
"Job",
"The job the dialog is handling",
- GNOME_TYPE_SCAN_JOB,
+ GNOME_SCAN_TYPE_JOB,
G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
}
@@ -258,7 +258,7 @@
GtkWidget*
gnome_scan_acquisition_dialog_new (GtkWindow *parent, GnomeScanJob *job)
{
- GObject* object= g_object_new (GNOME_TYPE_SCAN_ACQUISITION_DIALOG,
+ GObject* object= g_object_new (GNOME_SCAN_TYPE_ACQUISITION_DIALOG,
"transient-for", parent,
"job", job,
NULL);
Modified: trunk/lib/gnome-scan-acquisition-dialog.h
==============================================================================
--- trunk/lib/gnome-scan-acquisition-dialog.h (original)
+++ trunk/lib/gnome-scan-acquisition-dialog.h Thu May 8 12:59:02 2008
@@ -28,12 +28,12 @@
G_BEGIN_DECLS
-#define GNOME_TYPE_SCAN_ACQUISITION_DIALOG (gnome_scan_acquisition_dialog_get_type ())
-#define GNOME_SCAN_ACQUISITION_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_SCAN_ACQUISITION_DIALOG, GnomeScanAcquisitionDialog))
-#define GNOME_SCAN_ACQUISITION_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_SCAN_ACQUISITION_DIALOG, GnomeScanAcquisitionDialogClass))
-#define GNOME_IS_SCAN_ACQUISITION_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_SCAN_ACQUISITION_DIALOG))
-#define GNOME_IS_SCAN_ACQUISITION_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_SCAN_ACQUISITION_DIALOG))
-#define GNOME_SCAN_ACQUISITION_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_SCAN_ACQUISITION_DIALOG, GnomeScanAcquisitionDialogClass))
+#define GNOME_SCAN_TYPE_ACQUISITION_DIALOG (gnome_scan_acquisition_dialog_get_type ())
+#define GNOME_SCAN_ACQUISITION_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_SCAN_TYPE_ACQUISITION_DIALOG, GnomeScanAcquisitionDialog))
+#define GNOME_SCAN_ACQUISITION_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_SCAN_TYPE_ACQUISITION_DIALOG, GnomeScanAcquisitionDialogClass))
+#define GNOME_IS_SCAN_ACQUISITION_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_SCAN_TYPE_ACQUISITION_DIALOG))
+#define GNOME_IS_SCAN_ACQUISITION_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_SCAN_TYPE_ACQUISITION_DIALOG))
+#define GNOME_SCAN_ACQUISITION_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_SCAN_TYPE_ACQUISITION_DIALOG, GnomeScanAcquisitionDialogClass))
typedef struct _GnomeScanAcquisitionDialogClass GnomeScanAcquisitionDialogClass;
typedef struct _GnomeScanAcquisitionDialog GnomeScanAcquisitionDialog;
Modified: trunk/lib/gnome-scan-backend.c
==============================================================================
--- trunk/lib/gnome-scan-backend.c (original)
+++ trunk/lib/gnome-scan-backend.c Thu May 8 12:59:02 2008
@@ -76,7 +76,7 @@
static void
gnome_scan_backend_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
{
- g_return_if_fail (GNOME_IS_SCAN_BACKEND (object));
+ g_return_if_fail (GNOME_SCAN_IS_BACKEND (object));
switch (prop_id)
{
@@ -89,7 +89,7 @@
static void
gnome_scan_backend_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
{
- g_return_if_fail (GNOME_IS_SCAN_BACKEND (object));
+ g_return_if_fail (GNOME_SCAN_IS_BACKEND (object));
switch (prop_id)
{
@@ -101,13 +101,13 @@
#endif
static void
-gnome_scan_backend_scanner_added (GnomeScanBackend *backend, GnomeScanner *scanner, gpointer data)
+gnome_scan_backend_scanner_added (GnomeScanBackend *backend, GnomeScanScanner *scanner, gpointer data)
{
/* TODO: Add default signal handler implementation here */
}
static void
-gnome_scan_backend_scanner_removed (GnomeScanBackend *backend, GnomeScanner *scanner, gpointer data)
+gnome_scan_backend_scanner_removed (GnomeScanBackend *backend, GnomeScanScanner *scanner, gpointer data)
{
/* TODO: Add default signal handler implementation here */
}
@@ -126,7 +126,7 @@
/**
* GnomeScanBackend::scanner-added:
* @backend: the emitting #GnomeScanBackend
- * @scanner: the newly added #GnomeScanner
+ * @scanner: the newly added #GnomeScanScanner
*
* This backend is triggered each time it discover a new scanner
* during probe or on plug.
@@ -138,7 +138,7 @@
G_STRUCT_OFFSET (GnomeScanBackendClass, scanner_added),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
- G_TYPE_NONE, 1, GNOME_TYPE_SCANNER);
+ G_TYPE_NONE, 1, GNOME_SCAN_TYPE_SCANNER);
/**
* GnomeScanBackend::scanner-removed:
@@ -155,7 +155,7 @@
G_STRUCT_OFFSET (GnomeScanBackendClass, scanner_removed),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
- G_TYPE_NONE, 1, GNOME_TYPE_SCANNER);
+ G_TYPE_NONE, 1, GNOME_SCAN_TYPE_SCANNER);
/**
* GnomeScanBackend::probe-done:
@@ -166,7 +166,7 @@
* signal is emitted and no #GnomeScanBackend::scanner-added
* signal has been sent, this mean that no scanner has been found
* at all. Remember the backend does not handle a list of
- * #GnomeScanner.
+ * #GnomeScanScanner.
**/
scan_backend_signals[PROBE_DONE] =
g_signal_new ("probe-done",
@@ -190,7 +190,7 @@
GnomeScanBackend*
gnome_scan_backend_new (GType backend_type)
{
- g_return_val_if_fail (g_type_is_a (backend_type, GNOME_TYPE_SCAN_BACKEND), NULL);
+ g_return_val_if_fail (g_type_is_a (backend_type, GNOME_SCAN_TYPE_BACKEND), NULL);
return GNOME_SCAN_BACKEND (g_object_new (backend_type, NULL));
}
@@ -212,13 +212,13 @@
/**
* gnome_scan_backend_add_scanner:
* @backend: a #GnomeScanBackend
- * @scanner: a new #GnomeScanner
+ * @scanner: a new #GnomeScanScanner
*
* This function is used by child class to trigger
* #GnomeScanBackend::scanner-added signal.
**/
void
-gnome_scan_backend_add_scanner (GnomeScanBackend *backend, GnomeScanner *scanner)
+gnome_scan_backend_add_scanner (GnomeScanBackend *backend, GnomeScanScanner *scanner)
{
g_signal_emit (backend, scan_backend_signals[SCANNER_ADDED], 0, scanner);
}
@@ -226,13 +226,13 @@
/**
* gnome_scan_backend_remove_scanner:
* @backend: a #GnomeScanBackend
- * @scanner: a deprecated #GnomeScanner
+ * @scanner: a deprecated #GnomeScanScanner
*
* Trigger #GnomeScanBackend::scanner-removed upon @scanner. This
* function is to be used only by child class.
**/
void
-gnome_scan_backend_remove_scanner (GnomeScanBackend *backend, GnomeScanner *scanner)
+gnome_scan_backend_remove_scanner (GnomeScanBackend *backend, GnomeScanScanner *scanner)
{
g_signal_emit (backend, scan_backend_signals[SCANNER_REMOVED], 0, scanner);
}
Modified: trunk/lib/gnome-scan-backend.h
==============================================================================
--- trunk/lib/gnome-scan-backend.h (original)
+++ trunk/lib/gnome-scan-backend.h Thu May 8 12:59:02 2008
@@ -23,16 +23,16 @@
#define _GNOME_SCAN_BACKEND_H_
#include <glib-object.h>
-#include "gnome-scanner.h"
+#include "gnome-scan-scanner.h"
G_BEGIN_DECLS
-#define GNOME_TYPE_SCAN_BACKEND (gnome_scan_backend_get_type ())
-#define GNOME_SCAN_BACKEND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_SCAN_BACKEND, GnomeScanBackend))
-#define GNOME_SCAN_BACKEND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_SCAN_BACKEND, GnomeScanBackendClass))
-#define GNOME_IS_SCAN_BACKEND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_SCAN_BACKEND))
-#define GNOME_IS_SCAN_BACKEND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_SCAN_BACKEND))
-#define GNOME_SCAN_BACKEND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_SCAN_BACKEND, GnomeScanBackendClass))
+#define GNOME_SCAN_TYPE_BACKEND (gnome_scan_backend_get_type ())
+#define GNOME_SCAN_BACKEND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_SCAN_TYPE_BACKEND, GnomeScanBackend))
+#define GNOME_SCAN_BACKEND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_SCAN_TYPE_BACKEND, GnomeScanBackendClass))
+#define GNOME_SCAN_IS_BACKEND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_SCAN_TYPE_BACKEND))
+#define GNOME_SCAN_IS_BACKEND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_SCAN_TYPE_BACKEND))
+#define GNOME_SCAN_BACKEND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_SCAN_TYPE_BACKEND, GnomeScanBackendClass))
typedef struct _GnomeScanBackendClass GnomeScanBackendClass;
typedef struct _GnomeScanBackend GnomeScanBackend;
@@ -45,8 +45,8 @@
void (* probe_scanners) (GnomeScanBackend *backend);
/* Signals */
- void (* scanner_added) (GnomeScanBackend *backend, GnomeScanner *scanner, gpointer data);
- void (* scanner_removed) (GnomeScanBackend *backend, GnomeScanner *scanner, gpointer data);
+ void (* scanner_added) (GnomeScanBackend *backend, GnomeScanScanner *scanner, gpointer data);
+ void (* scanner_removed) (GnomeScanBackend *backend, GnomeScanScanner *scanner, gpointer data);
void (* probe_done) (GnomeScanBackend *backend, gpointer data);
};
@@ -55,7 +55,7 @@
*
* The #GnomeScanBackend is only responsible to probe scanners,
* emitting signal on scanner plug or unplug. Ideally, most of the
- * acquisition work is done through #GnomeScanner.
+ * acquisition work is done through #GnomeScanScanner.
**/
struct _GnomeScanBackend
{
@@ -67,9 +67,9 @@
GnomeScanBackend* gnome_scan_backend_new (GType backend_type);
void gnome_scan_backend_probe_scanners (GnomeScanBackend *backend);
void gnome_scan_backend_add_scanner (GnomeScanBackend *backend,
- GnomeScanner *scanner);
+ GnomeScanScanner *scanner);
void gnome_scan_backend_remove_scanner (GnomeScanBackend *backend,
- GnomeScanner *scanner);
+ GnomeScanScanner *scanner);
void gnome_scan_backend_probe_done (GnomeScanBackend *backend);
G_END_DECLS
Modified: trunk/lib/gnome-scan-boolean-widget.c
==============================================================================
--- trunk/lib/gnome-scan-boolean-widget.c (original)
+++ trunk/lib/gnome-scan-boolean-widget.c Thu May 8 12:59:02 2008
@@ -24,7 +24,7 @@
#include "gnome-scan-param-specs.h"
#include "gnome-scan-boolean-widget.h"
-#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_TYPE_SCAN_BOOLEAN_WIDGET, GnomeScanBooleanWidgetPrivate))
+#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_SCAN_TYPE_BOOLEAN_WIDGET, GnomeScanBooleanWidgetPrivate))
typedef struct _GnomeScanBooleanWidgetPrivate GnomeScanBooleanWidgetPrivate;
struct _GnomeScanBooleanWidgetPrivate
Modified: trunk/lib/gnome-scan-boolean-widget.h
==============================================================================
--- trunk/lib/gnome-scan-boolean-widget.h (original)
+++ trunk/lib/gnome-scan-boolean-widget.h Thu May 8 12:59:02 2008
@@ -28,12 +28,12 @@
G_BEGIN_DECLS
-#define GNOME_TYPE_SCAN_BOOLEAN_WIDGET (gnome_scan_boolean_widget_get_type ())
-#define GNOME_SCAN_BOOLEAN_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_SCAN_BOOLEAN_WIDGET, GnomeScanBooleanWidget))
-#define GNOME_SCAN_BOOLEAN_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_SCAN_BOOLEAN_WIDGET, GnomeScanBooleanWidgetClass))
-#define GNOME_IS_SCAN_BOOLEAN_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_SCAN_BOOLEAN_WIDGET))
-#define GNOME_IS_SCAN_BOOLEAN_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_SCAN_BOOLEAN_WIDGET))
-#define GNOME_SCAN_BOOLEAN_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_SCAN_BOOLEAN_WIDGET, GnomeScanBooleanWidgetClass))
+#define GNOME_SCAN_TYPE_BOOLEAN_WIDGET (gnome_scan_boolean_widget_get_type ())
+#define GNOME_SCAN_BOOLEAN_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_SCAN_TYPE_BOOLEAN_WIDGET, GnomeScanBooleanWidget))
+#define GNOME_SCAN_BOOLEAN_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_SCAN_TYPE_BOOLEAN_WIDGET, GnomeScanBooleanWidgetClass))
+#define GNOME_SCAN_IS_BOOLEAN_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_SCAN_TYPE_BOOLEAN_WIDGET))
+#define GNOME_SCAN_IS_BOOLEAN_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_SCAN_TYPE_BOOLEAN_WIDGET))
+#define GNOME_SCAN_BOOLEAN_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_SCAN_TYPE_BOOLEAN_WIDGET, GnomeScanBooleanWidgetClass))
typedef struct _GnomeScanBooleanWidget GnomeScanBooleanWidget;
struct _GnomeScanBooleanWidget
Modified: trunk/lib/gnome-scan-common.vala
==============================================================================
--- trunk/lib/gnome-scan-common.vala (original)
+++ trunk/lib/gnome-scan-common.vala Thu May 8 12:59:02 2008
@@ -16,6 +16,12 @@
MICROSECOND
}
+ public enum Status {
+ UNKNOWN,
+ READY,
+ BUSY
+ }
+
private void warn_unsupported_unit(Unit unit)
{
warning("Unit %i conversion not supported.", unit);
Modified: trunk/lib/gnome-scan-dialog.c
==============================================================================
--- trunk/lib/gnome-scan-dialog.c (original)
+++ trunk/lib/gnome-scan-dialog.c Thu May 8 12:59:02 2008
@@ -45,11 +45,10 @@
#include "gnome-scan-module.h"
#include "gnome-scan-backend.h"
#include "gnome-scan-param-specs.h"
-#include "gnome-scanner.h"
#include "gnome-scan-preview-sink.h"
#include "gnome-scan-preview-plugin.h"
-#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_TYPE_SCAN_DIALOG, GnomeScanDialogPrivate))
+#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_SCAN_TYPE_DIALOG, GnomeScanDialogPrivate))
#define GTK_WIDGET_SET_VISIBLE(wid,show) if(wid){gtk_widget_set_no_show_all(wid,!show); \
if(show){gtk_widget_show_all(wid);}else{gtk_widget_hide(wid);}}
@@ -169,15 +168,15 @@
static void gsd_load_backends (GnomeScanDialog *dialog);
static gboolean gsd_select_scanner_if_ready (GnomeScanDialog *gsd);
static void gsd_scanner_added (GnomeScanBackend *backend,
- GnomeScanner *scanner,
+ GnomeScanScanner *scanner,
GnomeScanDialog *dialog);
static void gsd_scanner_removed (GnomeScanBackend *backend,
- GnomeScanner *scanner,
+ GnomeScanScanner *scanner,
GnomeScanDialog *dialog);
static void gsd_plugin_params_changed (GnomeScanPlugin *plugin,
GParamSpec *pspec,
GnomeScanDialog* gsd);
-static void gsd_scanner_status_changed (GnomeScanner *scanner,
+static void gsd_scanner_status_changed (GnomeScanScanner *scanner,
GnomeScanDialog *gsd);
static void gsd_probe_done (GnomeScanBackend *backend,
GnomeScanDialog *dialog);
@@ -339,7 +338,7 @@
{
GnomeScanDialogPrivate *priv = GET_PRIVATE (object);
GSList *node;
- GnomeScanner *scanner;
+ GnomeScanScanner *scanner;
GnomeScanSink *sink;
if (!priv->disposed) {
@@ -394,7 +393,7 @@
static void
gnome_scan_dialog_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
{
- g_return_if_fail (GNOME_IS_SCAN_DIALOG (object));
+ g_return_if_fail (GNOME_SCAN_IS_DIALOG (object));
switch (prop_id)
{
@@ -410,7 +409,7 @@
static void
gnome_scan_dialog_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
{
- g_return_if_fail (GNOME_IS_SCAN_DIALOG (object));
+ g_return_if_fail (GNOME_SCAN_IS_DIALOG (object));
switch (prop_id)
{
@@ -448,7 +447,7 @@
g_param_spec_object ("job",
"Job",
"The job the dialog will configure",
- GNOME_TYPE_SCAN_JOB,
+ GNOME_SCAN_TYPE_JOB,
G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
}
@@ -468,7 +467,7 @@
GtkWidget*
gnome_scan_dialog_new (GtkWindow *parent, GnomeScanJob *job)
{
- GObject* object = g_object_new (GNOME_TYPE_SCAN_DIALOG,
+ GObject* object = g_object_new (GNOME_SCAN_TYPE_DIALOG,
"border-width", 6,
"window-position", GTK_WIN_POS_CENTER,
"default-width", 320,
@@ -802,7 +801,7 @@
GdkCursor *watch_cursor = gdk_cursor_new(GDK_WATCH);
gint i;
guint n;
- backend_types = g_type_children (GNOME_TYPE_SCAN_BACKEND, &n);
+ backend_types = g_type_children (GNOME_SCAN_TYPE_BACKEND, &n);
priv->probing_backends = 0;
priv->probe_done = FALSE;
@@ -830,7 +829,7 @@
}
static void
-gsd_scanner_added (GnomeScanBackend *backend, GnomeScanner *scanner, GnomeScanDialog *dialog)
+gsd_scanner_added (GnomeScanBackend *backend, GnomeScanScanner *scanner, GnomeScanDialog *dialog)
{
GnomeScanDialogPrivate *priv = GET_PRIVATE (dialog);
GtkTreeIter* iter = g_new0 (GtkTreeIter, 1);
@@ -850,7 +849,7 @@
}
static void
-gsd_scanner_removed (GnomeScanBackend *backend, GnomeScanner *scanner, GnomeScanDialog *dialog)
+gsd_scanner_removed (GnomeScanBackend *backend, GnomeScanScanner *scanner, GnomeScanDialog *dialog)
{
GnomeScanDialogPrivate *priv = GET_PRIVATE (dialog);
GtkTreeIter *iter;
@@ -862,7 +861,7 @@
static void
-gsd_scanner_status_changed (GnomeScanner *scanner, GnomeScanDialog *gsd)
+gsd_scanner_status_changed (GnomeScanScanner *scanner, GnomeScanDialog *gsd)
{
GtkTreeIter *iter;
iter = g_object_get_data (G_OBJECT (scanner), "iter");
@@ -913,7 +912,7 @@
G_TYPE_STRING,
G_TYPE_STRING,
G_TYPE_STRING,
- GNOME_TYPE_SCANNER);
+ GNOME_SCAN_TYPE_SCANNER);
/* Tree View */
tree_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (priv->scanners));
@@ -975,7 +974,7 @@
gsd_scanner_selected (GtkTreeSelection *selection, GnomeScanDialog *dialog)
{
GnomeScanDialogPrivate *priv = GET_PRIVATE (dialog);
- GnomeScanner *scanner;
+ GnomeScanScanner *scanner;
GtkTreeIter iter;
GtkTreeModel *model = GTK_TREE_MODEL (priv->scanners);
@@ -1008,8 +1007,8 @@
gsd_select_scanner_if_ready (GnomeScanDialog *gsd)
{
GnomeScanDialogPrivate *priv = GET_PRIVATE (gsd);
- GnomeScanner *scanner = gnome_scan_job_get_scanner (priv->job);
- if (gnome_scanner_get_status (scanner) != GNOME_SCANNER_READY) {
+ GnomeScanScanner *scanner = gnome_scan_job_get_scanner (priv->job);
+ if (gnome_scanner_get_status (scanner) != GNOME_SCAN_STATUS_READY) {
return TRUE;
}
else {
@@ -1064,7 +1063,7 @@
GtkWidget *widget;
GSList *node, *groups = NULL;
GList *params;
- GnomeScanner *scanner = gnome_scan_job_get_scanner (priv->job);
+ GnomeScanScanner *scanner = gnome_scan_job_get_scanner (priv->job);
/* front box */
gsd_build_group_box (gsd, priv->front_scanner_box,
@@ -1149,7 +1148,7 @@
gsd_update_scanner_ui (GnomeScanDialog *gsd)
{
GnomeScanDialogPrivate *priv = GET_PRIVATE (gsd);
- GnomeScanner *scanner = gnome_scan_job_get_scanner (priv->job);
+ GnomeScanScanner *scanner = gnome_scan_job_get_scanner (priv->job);
gnome_scan_plugin_params_foreach (GNOME_SCAN_PLUGIN (scanner),
(GFunc) gsd_show_hide_param_widget,
@@ -1197,7 +1196,7 @@
GParamSpec *pspec;
GSParamSpecPaperSize *psps;
GtkPaperSize *ps;
- GnomeScanner *scanner;
+ GnomeScanScanner *scanner;
GdkPixbuf *pixbuf;
GnomeScanPreviewPlugin *plugin;
GSList *node = NULL, *node0 = NULL;
@@ -1307,7 +1306,7 @@
GValue *value;
GParamSpec *pspec;
GnomeScanSettings *settings = gnome_scan_job_get_settings (priv->preview_job);
- GnomeScanner *scanner = gnome_scan_job_get_scanner (priv->preview_job);
+ GnomeScanScanner *scanner = gnome_scan_job_get_scanner (priv->preview_job);
GTK_WIDGET_SET_VISIBLE(priv->preview_acquisition_box, TRUE);
GTK_WIDGET_SET_VISIBLE(priv->preview_box, FALSE);
Modified: trunk/lib/gnome-scan-dialog.h
==============================================================================
--- trunk/lib/gnome-scan-dialog.h (original)
+++ trunk/lib/gnome-scan-dialog.h Thu May 8 12:59:02 2008
@@ -28,12 +28,12 @@
G_BEGIN_DECLS
-#define GNOME_TYPE_SCAN_DIALOG (gnome_scan_dialog_get_type ())
-#define GNOME_SCAN_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_SCAN_DIALOG, GnomeScanDialog))
-#define GNOME_SCAN_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_SCAN_DIALOG, GnomeScanDialogClass))
-#define GNOME_IS_SCAN_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_SCAN_DIALOG))
-#define GNOME_IS_SCAN_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_SCAN_DIALOG))
-#define GNOME_SCAN_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_SCAN_DIALOG, GnomeScanDialogClass))
+#define GNOME_SCAN_TYPE_DIALOG (gnome_scan_dialog_get_type ())
+#define GNOME_SCAN_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_SCAN_TYPE_DIALOG, GnomeScanDialog))
+#define GNOME_SCAN_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_SCAN_TYPE_DIALOG, GnomeScanDialogClass))
+#define GNOME_SCAN_IS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_SCAN_TYPE_DIALOG))
+#define GNOME_SCAN_IS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_SCAN_TYPE_DIALOG))
+#define GNOME_SCAN_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_SCAN_TYPE_DIALOG, GnomeScanDialogClass))
typedef struct _GnomeScanDialogClass GnomeScanDialogClass;
typedef struct _GnomeScanDialog GnomeScanDialog;
Modified: trunk/lib/gnome-scan-enum-widget.c
==============================================================================
--- trunk/lib/gnome-scan-enum-widget.c (original)
+++ trunk/lib/gnome-scan-enum-widget.c Thu May 8 12:59:02 2008
@@ -24,7 +24,7 @@
#include "gnome-scan-enum-widget.h"
#include "gnome-scan-param-specs.h"
-#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_TYPE_SCAN_ENUM_WIDGET, GnomeScanEnumWidgetPrivate))
+#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_SCAN_TYPE_ENUM_WIDGET, GnomeScanEnumWidgetPrivate))
typedef struct _GnomeScanEnumWidgetPrivate GnomeScanEnumWidgetPrivate;
struct _GnomeScanEnumWidgetPrivate
Modified: trunk/lib/gnome-scan-enum-widget.h
==============================================================================
--- trunk/lib/gnome-scan-enum-widget.h (original)
+++ trunk/lib/gnome-scan-enum-widget.h Thu May 8 12:59:02 2008
@@ -28,12 +28,12 @@
G_BEGIN_DECLS
-#define GNOME_TYPE_SCAN_ENUM_WIDGET (gnome_scan_enum_widget_get_type ())
-#define GNOME_SCAN_ENUM_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_SCAN_ENUM_WIDGET, GnomeScanEnumWidget))
-#define GNOME_SCAN_ENUM_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_SCAN_ENUM_WIDGET, GnomeScanEnumWidgetClass))
-#define GNOME_IS_SCAN_ENUM_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_SCAN_ENUM_WIDGET))
-#define GNOME_IS_SCAN_ENUM_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_SCAN_ENUM_WIDGET))
-#define GNOME_SCAN_ENUM_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_SCAN_ENUM_WIDGET, GnomeScanEnumWidgetClass))
+#define GNOME_SCAN_TYPE_ENUM_WIDGET (gnome_scan_enum_widget_get_type ())
+#define GNOME_SCAN_ENUM_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_SCAN_TYPE_ENUM_WIDGET, GnomeScanEnumWidget))
+#define GNOME_SCAN_ENUM_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_SCAN_TYPE_ENUM_WIDGET, GnomeScanEnumWidgetClass))
+#define GNOME_SCAN_IS_ENUM_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_SCAN_TYPE_ENUM_WIDGET))
+#define GNOME_SCAN_IS_ENUM_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_SCAN_TYPE_ENUM_WIDGET))
+#define GNOME_SCAN_ENUM_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_SCAN_TYPE_ENUM_WIDGET, GnomeScanEnumWidgetClass))
typedef struct _GnomeScanEnumWidget GnomeScanEnumWidget;
struct _GnomeScanEnumWidget
Modified: trunk/lib/gnome-scan-job.c
==============================================================================
--- trunk/lib/gnome-scan-job.c (original)
+++ trunk/lib/gnome-scan-job.c Thu May 8 12:59:02 2008
@@ -29,7 +29,7 @@
*
* In Gnome Scan, the job of scanning is divided in three parts :
* acquiring, processing and outputting. The first stage is handled by
- * #GnomeScanner plugin. The second is handled using
+ * #GnomeScanScanner plugin. The second is handled using
* #GeglOperation. The latter is handled by #GnomeScanSink plugin.
*
* The purpose of GnomeScanJob is to marshal the configuration and
@@ -42,7 +42,7 @@
#include "gnome-scan-processor-common.h"
#include "gnome-scan-job.h"
-#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), GNOME_TYPE_SCAN_JOB, GnomeScanJobPrivate))
+#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), GNOME_SCAN_TYPE_JOB, GnomeScanJobPrivate))
typedef struct _GnomeScanJobPrivate GnomeScanJobPrivate;
@@ -50,7 +50,7 @@
{
gboolean disposed;
GnomeScanSettings *settings;
- GnomeScanner *scanner;
+ GnomeScanScanner *scanner;
GSList *processors;
GnomeScanSink *sink;
@@ -102,7 +102,7 @@
static void
gnome_scan_job_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
{
- g_return_if_fail (GNOME_IS_SCAN_JOB (object));
+ g_return_if_fail (GNOME_SCAN_IS_JOB (object));
switch (prop_id)
{
@@ -127,7 +127,7 @@
static void
gnome_scan_job_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
{
- g_return_if_fail (GNOME_IS_SCAN_JOB (object));
+ g_return_if_fail (GNOME_SCAN_IS_JOB (object));
switch (prop_id)
{
@@ -172,20 +172,20 @@
g_param_spec_object ("settings",
"Settings",
"The set of parameters value for scanner and sink plugin.",
- GNOME_TYPE_SCAN_SETTINGS,
+ GNOME_SCAN_TYPE_SETTINGS,
G_PARAM_READWRITE));
/**
* GnomeScanJob:scanner:
*
- * The #GnomeScanner responsible of image acquisition.
+ * The #GnomeScanScanner responsible of image acquisition.
**/
g_object_class_install_property (object_class,
PROP_SCANNER,
g_param_spec_object ("scanner",
"Scanner",
"The input scanner used for this job.",
- GNOME_TYPE_SCANNER,
+ GNOME_SCAN_TYPE_SCANNER,
G_PARAM_READABLE | G_PARAM_WRITABLE));
@@ -199,7 +199,7 @@
g_param_spec_object ("sink",
"Sink",
"The sink responsible to connect the job to the application.",
- GNOME_TYPE_SCAN_SINK,
+ GNOME_SCAN_TYPE_SINK,
G_PARAM_READABLE | G_PARAM_WRITABLE));
}
@@ -225,7 +225,7 @@
else
g_object_ref(settings);
- GObject *object = g_object_new (GNOME_TYPE_SCAN_JOB,
+ GObject *object = g_object_new (GNOME_SCAN_TYPE_JOB,
"settings", settings,
"sink", sink,
NULL);
@@ -274,12 +274,12 @@
/**
* gnome_scan_job_set_scanner:
* @job: a #GnomeScanJob
- * @scanner: a #GnomeScanner
+ * @scanner: a #GnomeScanScanner
*
* Set the source of the acquisition.
**/
void
-gnome_scan_job_set_scanner (GnomeScanJob *job, GnomeScanner *scanner)
+gnome_scan_job_set_scanner (GnomeScanJob *job, GnomeScanScanner *scanner)
{
GnomeScanJobPrivate *priv = GET_PRIVATE (job);
@@ -295,9 +295,9 @@
*
* Retrieve the scanner used to acquire image.
*
- * Returns: a #GnomeScanner
+ * Returns: a #GnomeScanScanner
**/
-GnomeScanner*
+GnomeScanScanner*
gnome_scan_job_get_scanner (GnomeScanJob *job)
{
return GET_PRIVATE (job)->scanner;
Modified: trunk/lib/gnome-scan-job.h
==============================================================================
--- trunk/lib/gnome-scan-job.h (original)
+++ trunk/lib/gnome-scan-job.h Thu May 8 12:59:02 2008
@@ -28,17 +28,17 @@
#include <glib-object.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include "gnome-scan-settings.h"
-#include "gnome-scanner.h"
+#include "gnome-scan-scanner.h"
#include "gnome-scan-sink.h"
G_BEGIN_DECLS
-#define GNOME_TYPE_SCAN_JOB (gnome_scan_job_get_type ())
-#define GNOME_SCAN_JOB(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_SCAN_JOB, GnomeScanJob))
-#define GNOME_SCAN_JOB_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_SCAN_JOB, GnomeScanJobClass))
-#define GNOME_IS_SCAN_JOB(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_SCAN_JOB))
-#define GNOME_IS_SCAN_JOB_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_SCAN_JOB))
-#define GNOME_SCAN_JOB_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_SCAN_JOB, GnomeScanJobClass))
+#define GNOME_SCAN_TYPE_JOB (gnome_scan_job_get_type ())
+#define GNOME_SCAN_JOB(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_SCAN_TYPE_JOB, GnomeScanJob))
+#define GNOME_SCAN_JOB_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_SCAN_TYPE_JOB, GnomeScanJobClass))
+#define GNOME_SCAN_IS_JOB(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_SCAN_TYPE_JOB))
+#define GNOME_SCAN_IS_JOB_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_SCAN_TYPE_JOB))
+#define GNOME_SCAN_JOB_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_SCAN_TYPE_JOB, GnomeScanJobClass))
typedef struct _GnomeScanJobClass GnomeScanJobClass;
typedef struct _GnomeScanJob GnomeScanJob;
@@ -84,8 +84,8 @@
gnome_scan_job_get_settings (GnomeScanJob *job);
void gnome_scan_job_set_scanner (GnomeScanJob *job,
- GnomeScanner *scanner);
-GnomeScanner*
+ GnomeScanScanner *scanner);
+GnomeScanScanner*
gnome_scan_job_get_scanner (GnomeScanJob *job);
void gnome_scan_job_add_processor (GnomeScanJob *job,
Modified: trunk/lib/gnome-scan-module-manager.c
==============================================================================
--- trunk/lib/gnome-scan-module-manager.c (original)
+++ trunk/lib/gnome-scan-module-manager.c Thu May 8 12:59:02 2008
@@ -88,7 +88,7 @@
const GValue *value,
GParamSpec *pspec)
{
- g_return_if_fail (GNOME_IS_SCAN_MODULE_MANAGER (object));
+ g_return_if_fail (GNOME_SCAN_IS_MODULE_MANAGER (object));
switch (prop_id)
{
@@ -107,7 +107,7 @@
GValue *value,
GParamSpec *pspec)
{
- g_return_if_fail (GNOME_IS_SCAN_MODULE_MANAGER (object));
+ g_return_if_fail (GNOME_SCAN_IS_MODULE_MANAGER (object));
switch (prop_id)
{
@@ -158,7 +158,7 @@
GnomeScanModuleManager*
gnome_scan_module_manager_new (gchar *path)
{
- return g_object_new (GNOME_TYPE_SCAN_MODULE_MANAGER,
+ return g_object_new (GNOME_SCAN_TYPE_MODULE_MANAGER,
"path", path,
NULL);
}
Modified: trunk/lib/gnome-scan-module-manager.h
==============================================================================
--- trunk/lib/gnome-scan-module-manager.h (original)
+++ trunk/lib/gnome-scan-module-manager.h Thu May 8 12:59:02 2008
@@ -26,12 +26,12 @@
G_BEGIN_DECLS
-#define GNOME_TYPE_SCAN_MODULE_MANAGER (gnome_scan_module_manager_get_type ())
-#define GNOME_SCAN_MODULE_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_SCAN_MODULE_MANAGER, GnomeScanModuleManager))
-#define GNOME_SCAN_MODULE_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_SCAN_MODULE_MANAGER, GnomeScanModuleManagerClass))
-#define GNOME_IS_SCAN_MODULE_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_SCAN_MODULE_MANAGER))
-#define GNOME_IS_SCAN_MODULE_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_SCAN_MODULE_MANAGER))
-#define GNOME_SCAN_MODULE_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_SCAN_MODULE_MANAGER, GnomeScanModuleManagerClass))
+#define GNOME_SCAN_TYPE_MODULE_MANAGER (gnome_scan_module_manager_get_type ())
+#define GNOME_SCAN_MODULE_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_SCAN_TYPE_MODULE_MANAGER, GnomeScanModuleManager))
+#define GNOME_SCAN_MODULE_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_SCAN_TYPE_MODULE_MANAGER, GnomeScanModuleManagerClass))
+#define GNOME_SCAN_IS_MODULE_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_SCAN_TYPE_MODULE_MANAGER))
+#define GNOME_SCAN_IS_MODULE_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_SCAN_TYPE_MODULE_MANAGER))
+#define GNOME_SCAN_MODULE_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_SCAN_TYPE_MODULE_MANAGER, GnomeScanModuleManagerClass))
typedef struct _GnomeScanModuleManagerClass GnomeScanModuleManagerClass;
typedef struct _GnomeScanModuleManager GnomeScanModuleManager;
Modified: trunk/lib/gnome-scan-module.c
==============================================================================
--- trunk/lib/gnome-scan-module.c (original)
+++ trunk/lib/gnome-scan-module.c Thu May 8 12:59:02 2008
@@ -62,7 +62,7 @@
static void
gnome_scan_module_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
{
- g_return_if_fail (GNOME_IS_SCAN_MODULE (object));
+ g_return_if_fail (GNOME_SCAN_IS_MODULE (object));
GnomeScanModule *module = GNOME_SCAN_MODULE (object);
switch (prop_id)
@@ -80,7 +80,7 @@
static void
gnome_scan_module_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
{
- g_return_if_fail (GNOME_IS_SCAN_MODULE (object));
+ g_return_if_fail (GNOME_SCAN_IS_MODULE (object));
GnomeScanModule *module = GNOME_SCAN_MODULE (object);
switch (prop_id)
@@ -167,7 +167,7 @@
GnomeScanModule*
gnome_scan_module_new (gchar *filename)
{
- return g_object_new (GNOME_TYPE_SCAN_MODULE,
+ return g_object_new (GNOME_SCAN_TYPE_MODULE,
"filename", filename,
NULL);
}
Modified: trunk/lib/gnome-scan-module.h
==============================================================================
--- trunk/lib/gnome-scan-module.h (original)
+++ trunk/lib/gnome-scan-module.h Thu May 8 12:59:02 2008
@@ -27,12 +27,12 @@
G_BEGIN_DECLS
-#define GNOME_TYPE_SCAN_MODULE (gnome_scan_module_get_type ())
-#define GNOME_SCAN_MODULE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_SCAN_MODULE, GnomeScanModule))
-#define GNOME_SCAN_MODULE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_SCAN_MODULE, GnomeScanModuleClass))
-#define GNOME_IS_SCAN_MODULE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_SCAN_MODULE))
-#define GNOME_IS_SCAN_MODULE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_SCAN_MODULE))
-#define GNOME_SCAN_MODULE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_SCAN_MODULE, GnomeScanModuleClass))
+#define GNOME_SCAN_TYPE_MODULE (gnome_scan_module_get_type ())
+#define GNOME_SCAN_MODULE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_SCAN_TYPE_MODULE, GnomeScanModule))
+#define GNOME_SCAN_MODULE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_SCAN_TYPE_MODULE, GnomeScanModuleClass))
+#define GNOME_SCAN_IS_MODULE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_SCAN_TYPE_MODULE))
+#define GNOME_SCAN_IS_MODULE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_SCAN_TYPE_MODULE))
+#define GNOME_SCAN_MODULE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_SCAN_TYPE_MODULE, GnomeScanModuleClass))
#define NOT_IMPLEMENTED g_warning("%s:%i '%s' not implemented", __FILE__, __LINE__, __FUNCTION__)
Modified: trunk/lib/gnome-scan-number-widget.c
==============================================================================
--- trunk/lib/gnome-scan-number-widget.c (original)
+++ trunk/lib/gnome-scan-number-widget.c Thu May 8 12:59:02 2008
@@ -24,7 +24,7 @@
#include "gnome-scan-number-widget.h"
#include "gnome-scan-param-specs.h"
-#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_TYPE_SCAN_NUMBER_WIDGET, GnomeScanNumberWidgetPrivate))
+#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_SCAN_TYPE_NUMBER_WIDGET, GnomeScanNumberWidgetPrivate))
typedef struct _GnomeScanNumberWidgetPrivate GnomeScanNumberWidgetPrivate;
Modified: trunk/lib/gnome-scan-number-widget.h
==============================================================================
--- trunk/lib/gnome-scan-number-widget.h (original)
+++ trunk/lib/gnome-scan-number-widget.h Thu May 8 12:59:02 2008
@@ -28,12 +28,12 @@
G_BEGIN_DECLS
-#define GNOME_TYPE_SCAN_NUMBER_WIDGET (gnome_scan_number_widget_get_type ())
-#define GNOME_SCAN_NUMBER_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_SCAN_NUMBER_WIDGET, GnomeScanNumberWidget))
-#define GNOME_SCAN_NUMBER_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_SCAN_NUMBER_WIDGET, GnomeScanNumberWidgetClass))
-#define GNOME_IS_SCAN_NUMBER_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_SCAN_NUMBER_WIDGET))
-#define GNOME_IS_SCAN_NUMBER_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_SCAN_NUMBER_WIDGET))
-#define GNOME_SCAN_NUMBER_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_SCAN_NUMBER_WIDGET, GnomeScanNumberWidgetClass))
+#define GNOME_SCAN_TYPE_NUMBER_WIDGET (gnome_scan_number_widget_get_type ())
+#define GNOME_SCAN_NUMBER_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_SCAN_TYPE_NUMBER_WIDGET, GnomeScanNumberWidget))
+#define GNOME_SCAN_NUMBER_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_SCAN_TYPE_NUMBER_WIDGET, GnomeScanNumberWidgetClass))
+#define GNOME_SCAN_IS_NUMBER_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_SCAN_TYPE_NUMBER_WIDGET))
+#define GNOME_SCAN_IS_NUMBER_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_SCAN_TYPE_NUMBER_WIDGET))
+#define GNOME_SCAN_NUMBER_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_SCAN_TYPE_NUMBER_WIDGET, GnomeScanNumberWidgetClass))
typedef struct _GnomeScanNumberWidgetClass GnomeScanNumberWidget;
struct _GnomeScanNumberWidget
Modified: trunk/lib/gnome-scan-page-orientation-widget.c
==============================================================================
--- trunk/lib/gnome-scan-page-orientation-widget.c (original)
+++ trunk/lib/gnome-scan-page-orientation-widget.c Thu May 8 12:59:02 2008
@@ -30,7 +30,7 @@
#include <glib/gi18n.h>
#include "gnome-scan-page-orientation-widget.h"
-#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_TYPE_SCAN_PAGE_ORIENTATION_WIDGET, GnomeScanPageOrientationWidgetPrivate))
+#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_SCAN_TYPE_PAGE_ORIENTATION_WIDGET, GnomeScanPageOrientationWidgetPrivate))
typedef struct _GnomeScanPageOrientationWidgetPrivate GnomeScanPageOrientationWidgetPrivate;
struct _GnomeScanPageOrientationWidgetPrivate
Modified: trunk/lib/gnome-scan-page-orientation-widget.h
==============================================================================
--- trunk/lib/gnome-scan-page-orientation-widget.h (original)
+++ trunk/lib/gnome-scan-page-orientation-widget.h Thu May 8 12:59:02 2008
@@ -29,12 +29,12 @@
G_BEGIN_DECLS
-#define GNOME_TYPE_SCAN_PAGE_ORIENTATION_WIDGET (gnome_scan_page_orientation_widget_get_type ())
-#define GNOME_SCAN_PAGE_ORIENTATION_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_SCAN_PAGE_ORIENTATION_WIDGET, GnomeScanPageOrientationWidget))
-#define GNOME_SCAN_PAGE_ORIENTATION_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_SCAN_PAGE_ORIENTATION_WIDGET, GnomeScanPageOrientationWidgetClass))
-#define GNOME_IS_SCAN_PAGE_ORIENTATION_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_SCAN_PAGE_ORIENTATION_WIDGET))
-#define GNOME_IS_SCAN_PAGE_ORIENTATION_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_SCAN_PAGE_ORIENTATION_WIDGET))
-#define GNOME_SCAN_PAGE_ORIENTATION_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_SCAN_PAGE_ORIENTATION_WIDGET, GnomeScanPageOrientationWidgetClass))
+#define GNOME_SCAN_TYPE_PAGE_ORIENTATION_WIDGET (gnome_scan_page_orientation_widget_get_type ())
+#define GNOME_SCAN_PAGE_ORIENTATION_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_SCAN_TYPE_PAGE_ORIENTATION_WIDGET, GnomeScanPageOrientationWidget))
+#define GNOME_SCAN_PAGE_ORIENTATION_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_SCAN_TYPE_PAGE_ORIENTATION_WIDGET, GnomeScanPageOrientationWidgetClass))
+#define GNOME_SCAN_IS_PAGE_ORIENTATION_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_SCAN_TYPE_PAGE_ORIENTATION_WIDGET))
+#define GNOME_SCAN_IS_PAGE_ORIENTATION_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_SCAN_TYPE_PAGE_ORIENTATION_WIDGET))
+#define GNOME_SCAN_PAGE_ORIENTATION_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_SCAN_TYPE_PAGE_ORIENTATION_WIDGET, GnomeScanPageOrientationWidgetClass))
typedef struct _GnomeScanPageOrientationWidget GnomeScanPageOrientationWidget;
Modified: trunk/lib/gnome-scan-paper-size-widget.c
==============================================================================
--- trunk/lib/gnome-scan-paper-size-widget.c (original)
+++ trunk/lib/gnome-scan-paper-size-widget.c Thu May 8 12:59:02 2008
@@ -29,7 +29,7 @@
#include "gnome-scan-paper-size-widget.h"
#include "gnome-scan-param-specs.h"
-#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_TYPE_SCAN_PAPER_SIZE_WIDGET, GnomeScanPaperSizeWidgetPrivate))
+#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_SCAN_TYPE_PAPER_SIZE_WIDGET, GnomeScanPaperSizeWidgetPrivate))
typedef struct _GnomeScanPaperSizeWidgetPrivate GnomeScanPaperSizeWidgetPrivate;
struct _GnomeScanPaperSizeWidgetPrivate
Modified: trunk/lib/gnome-scan-paper-size-widget.h
==============================================================================
--- trunk/lib/gnome-scan-paper-size-widget.h (original)
+++ trunk/lib/gnome-scan-paper-size-widget.h Thu May 8 12:59:02 2008
@@ -27,12 +27,12 @@
G_BEGIN_DECLS
-#define GNOME_TYPE_SCAN_PAPER_SIZE_WIDGET (gnome_scan_paper_size_widget_get_type ())
-#define GNOME_SCAN_PAPER_SIZE_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_SCAN_PAPER_SIZE_WIDGET, GnomeScanPaperSizeWidget))
-#define GNOME_SCAN_PAPER_SIZE_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_SCAN_PAPER_SIZE_WIDGET, GnomeScanPaperSizeWidgetClass))
-#define GNOME_IS_SCAN_PAPER_SIZE_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_SCAN_PAPER_SIZE_WIDGET))
-#define GNOME_IS_SCAN_PAPER_SIZE_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_SCAN_PAPER_SIZE_WIDGET))
-#define GNOME_SCAN_PAPER_SIZE_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_SCAN_PAPER_SIZE_WIDGET, GnomeScanPaperSizeWidgetClass))
+#define GNOME_SCAN_TYPE_PAPER_SIZE_WIDGET (gnome_scan_paper_size_widget_get_type ())
+#define GNOME_SCAN_PAPER_SIZE_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_SCAN_TYPE_PAPER_SIZE_WIDGET, GnomeScanPaperSizeWidget))
+#define GNOME_SCAN_PAPER_SIZE_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_SCAN_TYPE_PAPER_SIZE_WIDGET, GnomeScanPaperSizeWidgetClass))
+#define GNOME_SCAN_IS_PAPER_SIZE_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_SCAN_TYPE_PAPER_SIZE_WIDGET))
+#define GNOME_SCAN_IS_PAPER_SIZE_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_SCAN_TYPE_PAPER_SIZE_WIDGET))
+#define GNOME_SCAN_PAPER_SIZE_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_SCAN_TYPE_PAPER_SIZE_WIDGET, GnomeScanPaperSizeWidgetClass))
typedef struct _GnomeScanPaperSizeWidget GnomeScanPaperSizeWidget;
Modified: trunk/lib/gnome-scan-param-specs.c
==============================================================================
--- trunk/lib/gnome-scan-param-specs.c (original)
+++ trunk/lib/gnome-scan-param-specs.c Thu May 8 12:59:02 2008
@@ -329,7 +329,7 @@
GParamSpec *spec = g_param_spec_boolean (name, nick, blurb,
default_value, flags);
gs_param_spec_set_group (spec, group);
- gs_param_spec_set_widget_type (spec, GNOME_TYPE_SCAN_BOOLEAN_WIDGET);
+ gs_param_spec_set_widget_type (spec, GNOME_SCAN_TYPE_BOOLEAN_WIDGET);
return spec;
}
@@ -364,7 +364,7 @@
minimum, maximum, default_value,
flags);
gs_param_spec_set_group (spec, group);
- gs_param_spec_set_widget_type (spec, GNOME_TYPE_SCAN_NUMBER_WIDGET);
+ gs_param_spec_set_widget_type (spec, GNOME_SCAN_TYPE_NUMBER_WIDGET);
return spec;
}
@@ -399,7 +399,7 @@
minimum, maximum, default_value,
flags);
gs_param_spec_set_group (spec, group);
- gs_param_spec_set_widget_type (spec, GNOME_TYPE_SCAN_NUMBER_WIDGET);
+ gs_param_spec_set_widget_type (spec, GNOME_SCAN_TYPE_NUMBER_WIDGET);
return spec;
}
@@ -429,7 +429,7 @@
GParamSpec *spec = g_param_spec_string (name, nick, blurb,
default_value, flags);
gs_param_spec_set_group (spec, group);
- gs_param_spec_set_widget_type (spec, GNOME_TYPE_SCAN_STRING_WIDGET);
+ gs_param_spec_set_widget_type (spec, GNOME_SCAN_TYPE_STRING_WIDGET);
return spec;
}
@@ -506,7 +506,7 @@
range->default_value = g_boxed_copy (G_TYPE_VALUE, default_value);
gs_param_spec_set_group (spec, group);
- gs_param_spec_set_widget_type (spec, GNOME_TYPE_SCAN_RANGE_WIDGET);
+ gs_param_spec_set_widget_type (spec, GNOME_SCAN_TYPE_RANGE_WIDGET);
return G_PARAM_SPEC (spec);
}
@@ -593,7 +593,7 @@
enumeration->values = values;
enumeration->default_value = default_value;
gs_param_spec_set_group (spec, group);
- gs_param_spec_set_widget_type (spec, GNOME_TYPE_SCAN_ENUM_WIDGET);
+ gs_param_spec_set_widget_type (spec, GNOME_SCAN_TYPE_ENUM_WIDGET);
return G_PARAM_SPEC (spec);
}
@@ -665,7 +665,7 @@
psspec->enumeration = enumeration;
gs_param_spec_set_group (spec, group);
- gs_param_spec_set_widget_type (spec, GNOME_TYPE_SCAN_PAPER_SIZE_WIDGET);
+ gs_param_spec_set_widget_type (spec, GNOME_SCAN_TYPE_PAPER_SIZE_WIDGET);
return spec;
}
@@ -743,7 +743,7 @@
psspec->default_value = default_value;
gs_param_spec_set_group (spec, group);
- gs_param_spec_set_widget_type (spec, GNOME_TYPE_SCAN_PAGE_ORIENTATION_WIDGET);
+ gs_param_spec_set_widget_type (spec, GNOME_SCAN_TYPE_PAGE_ORIENTATION_WIDGET);
return spec;
}
Modified: trunk/lib/gnome-scan-param-widget.c
==============================================================================
--- trunk/lib/gnome-scan-param-widget.c (original)
+++ trunk/lib/gnome-scan-param-widget.c Thu May 8 12:59:02 2008
@@ -33,7 +33,7 @@
#include "gnome-scan-param-widget.h"
#include "gnome-scan-param-specs.h"
-#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_TYPE_SCAN_PARAM_WIDGET, GnomeScanParamWidgetPrivate))
+#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_SCAN_TYPE_PARAM_WIDGET, GnomeScanParamWidgetPrivate))
#define I18N(gspw,text) dgettext (gs_param_spec_get_domain (GET_PRIVATE ((gspw))->pspec), text)
typedef struct _GnomeScanParamWidgetPrivate GnomeScanParamWidgetPrivate;
@@ -165,7 +165,7 @@
static void
gnome_scan_param_widget_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
{
- g_return_if_fail (GNOME_IS_SCAN_PARAM_WIDGET (object));
+ g_return_if_fail (GNOME_SCAN_IS_PARAM_WIDGET (object));
GnomeScanParamWidget *gspw = GNOME_SCAN_PARAM_WIDGET (object);
switch (prop_id)
@@ -192,7 +192,7 @@
static void
gnome_scan_param_widget_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
{
- g_return_if_fail (GNOME_IS_SCAN_PARAM_WIDGET (object));
+ g_return_if_fail (GNOME_SCAN_IS_PARAM_WIDGET (object));
switch (prop_id)
{
@@ -230,7 +230,7 @@
g_param_spec_object ("settings",
"Settings",
"The #GnomeScanSettings where to store value",
- GNOME_TYPE_SCAN_SETTINGS,
+ GNOME_SCAN_TYPE_SETTINGS,
G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
/**
@@ -242,7 +242,7 @@
g_param_spec_object ("plugin",
"Plugin",
"The #GnomeScanPlugin the widget is configuring",
- GNOME_TYPE_SCAN_PLUGIN,
+ GNOME_SCAN_TYPE_PLUGIN,
G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
/**
Modified: trunk/lib/gnome-scan-param-widget.h
==============================================================================
--- trunk/lib/gnome-scan-param-widget.h (original)
+++ trunk/lib/gnome-scan-param-widget.h Thu May 8 12:59:02 2008
@@ -29,12 +29,12 @@
G_BEGIN_DECLS
-#define GNOME_TYPE_SCAN_PARAM_WIDGET (gnome_scan_param_widget_get_type ())
-#define GNOME_SCAN_PARAM_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_SCAN_PARAM_WIDGET, GnomeScanParamWidget))
-#define GNOME_SCAN_PARAM_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_SCAN_PARAM_WIDGET, GnomeScanParamWidgetClass))
-#define GNOME_IS_SCAN_PARAM_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_SCAN_PARAM_WIDGET))
-#define GNOME_IS_SCAN_PARAM_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_SCAN_PARAM_WIDGET))
-#define GNOME_SCAN_PARAM_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_SCAN_PARAM_WIDGET, GnomeScanParamWidgetClass))
+#define GNOME_SCAN_TYPE_PARAM_WIDGET (gnome_scan_param_widget_get_type ())
+#define GNOME_SCAN_PARAM_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_SCAN_TYPE_PARAM_WIDGET, GnomeScanParamWidget))
+#define GNOME_SCAN_PARAM_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_SCAN_TYPE_PARAM_WIDGET, GnomeScanParamWidgetClass))
+#define GNOME_SCAN_IS_PARAM_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_SCAN_TYPE_PARAM_WIDGET))
+#define GNOME_SCAN_IS_PARAM_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_SCAN_TYPE_PARAM_WIDGET))
+#define GNOME_SCAN_PARAM_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_SCAN_TYPE_PARAM_WIDGET, GnomeScanParamWidgetClass))
/**
* GS_DEFINE_PARAM_WIDGET:
@@ -45,7 +45,7 @@
* derived class.
**/
#define GS_DEFINE_PARAM_WIDGET(TypeName, type_name) \
- G_DEFINE_TYPE(TypeName, type_name, GNOME_TYPE_SCAN_PARAM_WIDGET) \
+ G_DEFINE_TYPE(TypeName, type_name, GNOME_SCAN_TYPE_PARAM_WIDGET) \
\
static void type_name##_finalize (GObject *object); \
static void type_name##_build (GnomeScanParamWidget *widget); \
Modified: trunk/lib/gnome-scan-plugin.c
==============================================================================
--- trunk/lib/gnome-scan-plugin.c (original)
+++ trunk/lib/gnome-scan-plugin.c Thu May 8 12:59:02 2008
@@ -35,7 +35,7 @@
#include "gnome-scan-plugin.h"
#include "gnome-scan-param-specs.h"
-#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_TYPE_SCAN_PLUGIN, GnomeScanPluginPrivate))
+#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_SCAN_TYPE_PLUGIN, GnomeScanPluginPrivate))
typedef struct _GnomeScanPluginPrivate GnomeScanPluginPrivate;
@@ -81,7 +81,7 @@
static void
gnome_scan_plugin_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
{
- g_return_if_fail (GNOME_IS_SCAN_PLUGIN (object));
+ g_return_if_fail (GNOME_SCAN_IS_PLUGIN (object));
switch (prop_id)
{
@@ -100,7 +100,7 @@
static void
gnome_scan_plugin_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
{
- g_return_if_fail (GNOME_IS_SCAN_PLUGIN (object));
+ g_return_if_fail (GNOME_SCAN_IS_PLUGIN (object));
switch (prop_id)
{
@@ -196,7 +196,7 @@
gchar*
gnome_scan_plugin_get_name (GnomeScanPlugin *plugin)
{
- g_return_val_if_fail (GNOME_IS_SCAN_PLUGIN (plugin), NULL);
+ g_return_val_if_fail (GNOME_SCAN_IS_PLUGIN (plugin), NULL);
return g_strdup (GET_PRIVATE (plugin)->name);
}
@@ -210,7 +210,7 @@
void
gnome_scan_plugin_params_add (GnomeScanPlugin *plugin, GParamSpec *param)
{
- g_return_if_fail (GNOME_IS_SCAN_PLUGIN (plugin));
+ g_return_if_fail (GNOME_SCAN_IS_PLUGIN (plugin));
g_param_spec_pool_insert (plugin->params, param, G_OBJECT_TYPE (plugin));
gnome_scan_plugin_params_changed (plugin, param);
}
@@ -225,7 +225,7 @@
void
gnome_scan_plugin_params_remove (GnomeScanPlugin *plugin, GParamSpec *param)
{
- g_return_if_fail (GNOME_IS_SCAN_PLUGIN (plugin));
+ g_return_if_fail (GNOME_SCAN_IS_PLUGIN (plugin));
g_param_spec_pool_remove (plugin->params, param);
gnome_scan_plugin_params_changed (plugin, NULL);
}
@@ -239,7 +239,7 @@
void
gnome_scan_plugin_params_clear (GnomeScanPlugin *plugin)
{
- g_return_if_fail (GNOME_IS_SCAN_PLUGIN (plugin));
+ g_return_if_fail (GNOME_SCAN_IS_PLUGIN (plugin));
GList *node;
node = g_param_spec_pool_list_owned (plugin->params, G_OBJECT_TYPE (plugin));
@@ -261,7 +261,7 @@
GList*
gnome_scan_plugin_get_params (GnomeScanPlugin *plugin)
{
- g_return_val_if_fail (GNOME_IS_SCAN_PLUGIN (plugin), NULL);
+ g_return_val_if_fail (GNOME_SCAN_IS_PLUGIN (plugin), NULL);
GList *params = NULL;
params = g_param_spec_pool_list_owned (plugin->params,
@@ -341,7 +341,7 @@
GSList*
gnome_scan_plugin_get_param_group (GnomeScanPlugin *plugin, GQuark group)
{
- g_return_val_if_fail (GNOME_IS_SCAN_PLUGIN (plugin), NULL);
+ g_return_val_if_fail (GNOME_SCAN_IS_PLUGIN (plugin), NULL);
GSList *list = NULL;
gint i;
guint n;
@@ -441,7 +441,7 @@
void
gnome_scan_plugin_configure (GnomeScanPlugin *plugin, GnomeScanSettings *settings)
{
- g_return_if_fail (GNOME_IS_SCAN_PLUGIN (plugin) && GNOME_IS_SCAN_SETTINGS (settings));
+ g_return_if_fail (GNOME_SCAN_IS_PLUGIN (plugin) && GNOME_SCAN_IS_SETTINGS (settings));
GnomeScanPluginClass *klass = GNOME_SCAN_PLUGIN_GET_CLASS (plugin);
gs_exec_class_func(klass, configure, plugin, settings);
}
@@ -463,7 +463,7 @@
gnome_scan_plugin_get_child_nodes (GnomeScanPlugin *plugin,
GeglNode *root)
{
- g_return_val_if_fail (GNOME_IS_SCAN_PLUGIN (plugin), NULL);
+ g_return_val_if_fail (GNOME_SCAN_IS_PLUGIN (plugin), NULL);
GnomeScanPluginClass *klass = GNOME_SCAN_PLUGIN_GET_CLASS (plugin);
gs_exec_class_func_ret(klass, get_child_nodes, NULL, plugin, root);
}
@@ -479,7 +479,7 @@
void
gnome_scan_plugin_configure_frame (GnomeScanPlugin *plugin)
{
- g_return_if_fail (GNOME_IS_SCAN_PLUGIN (plugin));
+ g_return_if_fail (GNOME_SCAN_IS_PLUGIN (plugin));
GnomeScanPluginClass *klass = GNOME_SCAN_PLUGIN_GET_CLASS (plugin);
gs_exec_class_func(klass, configure_frame, plugin);
}
@@ -495,7 +495,7 @@
gboolean
gnome_scan_plugin_start_frame (GnomeScanPlugin *plugin)
{
- g_return_val_if_fail (GNOME_IS_SCAN_PLUGIN (plugin), FALSE);
+ g_return_val_if_fail (GNOME_SCAN_IS_PLUGIN (plugin), FALSE);
GnomeScanPluginClass *klass = GNOME_SCAN_PLUGIN_GET_CLASS (plugin);
gs_exec_class_func_ret(klass, start_frame, TRUE, plugin);
}
@@ -517,7 +517,7 @@
gnome_scan_plugin_work (GnomeScanPlugin *plugin,
gdouble *progress)
{
- g_return_val_if_fail (GNOME_IS_SCAN_PLUGIN (plugin), FALSE);
+ g_return_val_if_fail (GNOME_SCAN_IS_PLUGIN (plugin), FALSE);
GnomeScanPluginClass *klass = GNOME_SCAN_PLUGIN_GET_CLASS (plugin);
*progress = 1.;
gs_exec_class_func_ret(klass, work, FALSE, plugin, progress);
@@ -533,7 +533,7 @@
void
gnome_scan_plugin_end_frame (GnomeScanPlugin *plugin)
{
- g_return_if_fail (GNOME_IS_SCAN_PLUGIN (plugin));
+ g_return_if_fail (GNOME_SCAN_IS_PLUGIN (plugin));
GnomeScanPluginClass *klass = GNOME_SCAN_PLUGIN_GET_CLASS (plugin);
gs_exec_class_func(klass, end_frame, plugin);
}
@@ -548,7 +548,7 @@
void
gnome_scan_plugin_end_scan (GnomeScanPlugin *plugin)
{
- g_return_if_fail (GNOME_IS_SCAN_PLUGIN (plugin));
+ g_return_if_fail (GNOME_SCAN_IS_PLUGIN (plugin));
GnomeScanPluginClass *klass = GNOME_SCAN_PLUGIN_GET_CLASS (plugin);
gs_exec_class_func(klass, end_scan, plugin);
}
Modified: trunk/lib/gnome-scan-plugin.h
==============================================================================
--- trunk/lib/gnome-scan-plugin.h (original)
+++ trunk/lib/gnome-scan-plugin.h Thu May 8 12:59:02 2008
@@ -32,12 +32,12 @@
G_BEGIN_DECLS
-#define GNOME_TYPE_SCAN_PLUGIN (gnome_scan_plugin_get_type ())
-#define GNOME_SCAN_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_SCAN_PLUGIN, GnomeScanPlugin))
-#define GNOME_SCAN_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_SCAN_PLUGIN, GnomeScanPluginClass))
-#define GNOME_IS_SCAN_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_SCAN_PLUGIN))
-#define GNOME_IS_SCAN_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_SCAN_PLUGIN))
-#define GNOME_SCAN_PLUGIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_SCAN_PLUGIN, GnomeScanPluginClass))
+#define GNOME_SCAN_TYPE_PLUGIN (gnome_scan_plugin_get_type ())
+#define GNOME_SCAN_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_SCAN_TYPE_PLUGIN, GnomeScanPlugin))
+#define GNOME_SCAN_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_SCAN_TYPE_PLUGIN, GnomeScanPluginClass))
+#define GNOME_SCAN_IS_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_SCAN_TYPE_PLUGIN))
+#define GNOME_SCAN_IS_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_SCAN_TYPE_PLUGIN))
+#define GNOME_SCAN_PLUGIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_SCAN_TYPE_PLUGIN, GnomeScanPluginClass))
typedef struct _GnomeScanPluginClass GnomeScanPluginClass;
typedef struct _GnomeScanPlugin GnomeScanPlugin;
Modified: trunk/lib/gnome-scan-preview-area.c
==============================================================================
--- trunk/lib/gnome-scan-preview-area.c (original)
+++ trunk/lib/gnome-scan-preview-area.c Thu May 8 12:59:02 2008
@@ -28,7 +28,7 @@
#include "gnome-scan-preview-area.h"
-#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_TYPE_SCAN_PREVIEW_AREA, GnomeScanPreviewAreaPrivate))
+#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_SCAN_TYPE_PREVIEW_AREA, GnomeScanPreviewAreaPrivate))
typedef struct _GnomeScanPreviewAreaPrivate GnomeScanPreviewAreaPrivate;
struct _GnomeScanPreviewAreaPrivate
@@ -105,7 +105,7 @@
static void
gnome_scan_preview_area_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
{
- g_return_if_fail (GNOME_IS_SCAN_PREVIEW_AREA (object));
+ g_return_if_fail (GNOME_SCAN_IS_PREVIEW_AREA (object));
switch (prop_id)
{
@@ -124,7 +124,7 @@
static void
gnome_scan_preview_area_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
{
- g_return_if_fail (GNOME_IS_SCAN_PREVIEW_AREA (object));
+ g_return_if_fail (GNOME_SCAN_IS_PREVIEW_AREA (object));
switch (prop_id)
{
@@ -193,7 +193,7 @@
GtkWidget*
gnome_scan_preview_area_new (void)
{
- return GTK_WIDGET (g_object_new (GNOME_TYPE_SCAN_PREVIEW_AREA,
+ return GTK_WIDGET (g_object_new (GNOME_SCAN_TYPE_PREVIEW_AREA,
NULL));
}
@@ -243,7 +243,7 @@
gdouble
gnome_scan_preview_area_get_resolution (GnomeScanPreviewArea *preview_area)
{
- g_return_val_if_fail (GNOME_IS_SCAN_PREVIEW_AREA (preview_area), 72.);
+ g_return_val_if_fail (GNOME_SCAN_IS_PREVIEW_AREA (preview_area), 72.);
return GET_PRIVATE (preview_area)->resolution;
}
@@ -252,7 +252,7 @@
gint *width,
gint*height)
{
- g_return_if_fail (GNOME_IS_SCAN_PREVIEW_AREA (preview_area));
+ g_return_if_fail (GNOME_SCAN_IS_PREVIEW_AREA (preview_area));
GnomeScanPreviewAreaPrivate *priv = GET_PRIVATE (preview_area);
*width = gdk_pixbuf_get_width (priv->image);
*height = gdk_pixbuf_get_height (priv->image);
@@ -263,7 +263,7 @@
gnome_scan_preview_area_update (GnomeScanPreviewArea *preview_area,
GdkRectangle *r)
{
- g_return_if_fail (GNOME_IS_SCAN_PREVIEW_AREA (preview_area));
+ g_return_if_fail (GNOME_SCAN_IS_PREVIEW_AREA (preview_area));
GET_PRIVATE (preview_area)->buffer_deprecated = TRUE;
if (r) {
Modified: trunk/lib/gnome-scan-preview-area.h
==============================================================================
--- trunk/lib/gnome-scan-preview-area.h (original)
+++ trunk/lib/gnome-scan-preview-area.h Thu May 8 12:59:02 2008
@@ -30,12 +30,12 @@
G_BEGIN_DECLS
-#define GNOME_TYPE_SCAN_PREVIEW_AREA (gnome_scan_preview_area_get_type ())
-#define GNOME_SCAN_PREVIEW_AREA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_SCAN_PREVIEW_AREA, GnomeScanPreviewArea))
-#define GNOME_SCAN_PREVIEW_AREA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_SCAN_PREVIEW_AREA, GnomeScanPreviewAreaClass))
-#define GNOME_IS_SCAN_PREVIEW_AREA(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_SCAN_PREVIEW_AREA))
-#define GNOME_IS_SCAN_PREVIEW_AREA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_SCAN_PREVIEW_AREA))
-#define GNOME_SCAN_PREVIEW_AREA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_SCAN_PREVIEW_AREA, GnomeScanPreviewAreaClass))
+#define GNOME_SCAN_TYPE_PREVIEW_AREA (gnome_scan_preview_area_get_type ())
+#define GNOME_SCAN_PREVIEW_AREA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_SCAN_TYPE_PREVIEW_AREA, GnomeScanPreviewArea))
+#define GNOME_SCAN_PREVIEW_AREA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_SCAN_TYPE_PREVIEW_AREA, GnomeScanPreviewAreaClass))
+#define GNOME_SCAN_IS_PREVIEW_AREA(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_SCAN_TYPE_PREVIEW_AREA))
+#define GNOME_SCAN_IS_PREVIEW_AREA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_SCAN_TYPE_PREVIEW_AREA))
+#define GNOME_SCAN_PREVIEW_AREA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_SCAN_TYPE_PREVIEW_AREA, GnomeScanPreviewAreaClass))
typedef struct _GnomeScanPreviewAreaClass GnomeScanPreviewAreaClass;
typedef struct _GnomeScanPreviewArea GnomeScanPreviewArea;
Modified: trunk/lib/gnome-scan-preview-plugin-area.h
==============================================================================
--- trunk/lib/gnome-scan-preview-plugin-area.h (original)
+++ trunk/lib/gnome-scan-preview-plugin-area.h Thu May 8 12:59:02 2008
@@ -27,8 +27,8 @@
G_BEGIN_DECLS
-#define GNOME_TYPE_SCAN_PREVIEW_PLUGIN_AREA (gnome_scan_preview_plugin_area_get_type())
-#define GNOME_SCAN_PREVIEW_PLUGIN_AREA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_SCAN_PREVIEW_PLUGIN_AREA, GnomeScanPreviewPluginArea))
+#define GNOME_SCAN_TYPE_PREVIEW_PLUGIN_AREA (gnome_scan_preview_plugin_area_get_type())
+#define GNOME_SCAN_PREVIEW_PLUGIN_AREA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_SCAN_TYPE_PREVIEW_PLUGIN_AREA, GnomeScanPreviewPluginArea))
typedef struct _GnomeScanPreviewPluginArea GnomeScanPreviewPluginArea;
Modified: trunk/lib/gnome-scan-preview-plugin-rotation.h
==============================================================================
--- trunk/lib/gnome-scan-preview-plugin-rotation.h (original)
+++ trunk/lib/gnome-scan-preview-plugin-rotation.h Thu May 8 12:59:02 2008
@@ -28,12 +28,12 @@
G_BEGIN_DECLS
-#define GNOME_TYPE_SCAN_PREVIEW_PLUGIN_ROTATION (gnome_scan_preview_plugin_rotation_get_type ())
-#define GNOME_SCAN_PREVIEW_PLUGIN_ROTATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_SCAN_PREVIEW_PLUGIN_ROTATION, GnomeScanPreviewPluginRotation))
-#define GNOME_SCAN_PREVIEW_PLUGIN_ROTATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_SCAN_PREVIEW_PLUGIN_ROTATION, GnomeScanPreviewPluginRotationClass))
-#define GNOME_IS_SCAN_PREVIEW_PLUGIN_ROTATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_SCAN_PREVIEW_PLUGIN_ROTATION))
-#define GNOME_IS_SCAN_PREVIEW_PLUGIN_ROTATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_SCAN_PREVIEW_PLUGIN_ROTATION))
-#define GNOME_SCAN_PREVIEW_PLUGIN_ROTATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_SCAN_PREVIEW_PLUGIN_ROTATION, GnomeScanPreviewPluginRotationClass))
+#define GNOME_SCAN_TYPE_PREVIEW_PLUGIN_ROTATION (gnome_scan_preview_plugin_rotation_get_type ())
+#define GNOME_SCAN_PREVIEW_PLUGIN_ROTATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_SCAN_TYPE_PREVIEW_PLUGIN_ROTATION, GnomeScanPreviewPluginRotation))
+#define GNOME_SCAN_PREVIEW_PLUGIN_ROTATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_SCAN_TYPE_PREVIEW_PLUGIN_ROTATION, GnomeScanPreviewPluginRotationClass))
+#define GNOME_SCAN_IS_PREVIEW_PLUGIN_ROTATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_SCAN_TYPE_PREVIEW_PLUGIN_ROTATION))
+#define GNOME_SCAN_IS_PREVIEW_PLUGIN_ROTATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_SCAN_TYPE_PREVIEW_PLUGIN_ROTATION))
+#define GNOME_SCAN_PREVIEW_PLUGIN_ROTATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_SCAN_TYPE_PREVIEW_PLUGIN_ROTATION, GnomeScanPreviewPluginRotationClass))
typedef struct _GnomeScanPreviewPluginRotationClass GnomeScanPreviewPluginRotationClass;
typedef struct _GnomeScanPreviewPluginRotation GnomeScanPreviewPluginRotation;
Modified: trunk/lib/gnome-scan-preview-plugin.c
==============================================================================
--- trunk/lib/gnome-scan-preview-plugin.c (original)
+++ trunk/lib/gnome-scan-preview-plugin.c Thu May 8 12:59:02 2008
@@ -90,7 +90,7 @@
NULL, NULL,
};
- return g_type_register_static (GNOME_TYPE_SCAN_PREVIEW_PLUGIN,
+ return g_type_register_static (GNOME_SCAN_TYPE_PREVIEW_PLUGIN,
name, &info, 0);
}
@@ -138,7 +138,7 @@
GnomeScanSettings *settings,
GtkBox *box)
{
- g_return_val_if_fail (g_type_is_a (type, GNOME_TYPE_SCAN_PREVIEW_PLUGIN), NULL);
+ g_return_val_if_fail (g_type_is_a (type, GNOME_SCAN_TYPE_PREVIEW_PLUGIN), NULL);
GnomeScanPreviewPlugin* plugin = GNOME_SCAN_PREVIEW_PLUGIN (g_type_create_instance (type));
GnomeScanPreviewPluginClass *klass = GNOME_SCAN_PREVIEW_PLUGIN_GET_CLASS (plugin);
@@ -233,7 +233,7 @@
void
gnome_scan_preview_plugin_destroy (GnomeScanPreviewPlugin *gspp)
{
- g_return_if_fail (GNOME_IS_SCAN_PREVIEW_PLUGIN (gspp));
+ g_return_if_fail (GNOME_SCAN_IS_PREVIEW_PLUGIN (gspp));
GnomeScanPreviewPluginClass *klass = GNOME_SCAN_PREVIEW_PLUGIN_GET_CLASS (gspp);
g_signal_handler_disconnect (gspp->settings, gspp->settings_changed);
g_signal_handler_disconnect (gspp->preview_area, gspp->preview_changed);
Modified: trunk/lib/gnome-scan-preview-plugin.h
==============================================================================
--- trunk/lib/gnome-scan-preview-plugin.h (original)
+++ trunk/lib/gnome-scan-preview-plugin.h Thu May 8 12:59:02 2008
@@ -30,12 +30,12 @@
G_BEGIN_DECLS
-#define GNOME_TYPE_SCAN_PREVIEW_PLUGIN (gnome_scan_preview_plugin_get_type ())
-#define GNOME_SCAN_PREVIEW_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_SCAN_PREVIEW_PLUGIN, GnomeScanPreviewPlugin))
-#define GNOME_SCAN_PREVIEW_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_SCAN_PREVIEW_PLUGIN, GnomeScanPreviewPluginClass))
-#define GNOME_IS_SCAN_PREVIEW_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_SCAN_PREVIEW_PLUGIN))
-#define GNOME_IS_SCAN_PREVIEW_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_SCAN_PREVIEW_PLUGIN))
-#define GNOME_SCAN_PREVIEW_PLUGIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_SCAN_PREVIEW_PLUGIN, GnomeScanPreviewPluginClass))
+#define GNOME_SCAN_TYPE_PREVIEW_PLUGIN (gnome_scan_preview_plugin_get_type ())
+#define GNOME_SCAN_PREVIEW_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_SCAN_TYPE_PREVIEW_PLUGIN, GnomeScanPreviewPlugin))
+#define GNOME_SCAN_PREVIEW_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_SCAN_TYPE_PREVIEW_PLUGIN, GnomeScanPreviewPluginClass))
+#define GNOME_SCAN_IS_PREVIEW_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_SCAN_TYPE_PREVIEW_PLUGIN))
+#define GNOME_SCAN_IS_PREVIEW_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_SCAN_TYPE_PREVIEW_PLUGIN))
+#define GNOME_SCAN_PREVIEW_PLUGIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_SCAN_TYPE_PREVIEW_PLUGIN, GnomeScanPreviewPluginClass))
/* max param to watch per plugin */
#define GSPP_MAX_WATCH 4
Modified: trunk/lib/gnome-scan-preview-sink.c
==============================================================================
--- trunk/lib/gnome-scan-preview-sink.c (original)
+++ trunk/lib/gnome-scan-preview-sink.c Thu May 8 12:59:02 2008
@@ -35,11 +35,11 @@
GeglNode* save;
};
-#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_TYPE_SCAN_PREVIEW_SINK, GnomeScanPreviewSinkPrivate))
+#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_SCAN_TYPE_PREVIEW_SINK, GnomeScanPreviewSinkPrivate))
-G_DEFINE_TYPE (GnomeScanPreviewSink, gnome_scan_preview_sink, GNOME_TYPE_SCAN_SINK);
+G_DEFINE_TYPE (GnomeScanPreviewSink, gnome_scan_preview_sink, GNOME_SCAN_TYPE_SINK);
static void
gnome_scan_preview_sink_init (GnomeScanPreviewSink *object)
@@ -58,7 +58,7 @@
GnomeScanSink*
gnome_scan_preview_sink_new (void)
{
- GObject* object = g_object_new (GNOME_TYPE_SCAN_PREVIEW_SINK,
+ GObject* object = g_object_new (GNOME_SCAN_TYPE_PREVIEW_SINK,
NULL);
return GNOME_SCAN_SINK (object);
}
Modified: trunk/lib/gnome-scan-preview-sink.h
==============================================================================
--- trunk/lib/gnome-scan-preview-sink.h (original)
+++ trunk/lib/gnome-scan-preview-sink.h Thu May 8 12:59:02 2008
@@ -28,12 +28,12 @@
G_BEGIN_DECLS
-#define GNOME_TYPE_SCAN_PREVIEW_SINK (gnome_scan_preview_sink_get_type ())
-#define GNOME_SCAN_PREVIEW_SINK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_SCAN_PREVIEW_SINK, GnomeScanPreviewSink))
-#define GNOME_SCAN_PREVIEW_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_SCAN_PREVIEW_SINK, GnomeScanPreviewSinkClass))
-#define GNOME_IS_SCAN_PREVIEW_SINK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_SCAN_PREVIEW_SINK))
-#define GNOME_IS_SCAN_PREVIEW_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_SCAN_PREVIEW_SINK))
-#define GNOME_SCAN_PREVIEW_SINK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_SCAN_PREVIEW_SINK, GnomeScanPreviewSinkClass))
+#define GNOME_SCAN_TYPE_PREVIEW_SINK (gnome_scan_preview_sink_get_type ())
+#define GNOME_SCAN_PREVIEW_SINK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_SCAN_TYPE_PREVIEW_SINK, GnomeScanPreviewSink))
+#define GNOME_SCAN_PREVIEW_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_SCAN_TYPE_PREVIEW_SINK, GnomeScanPreviewSinkClass))
+#define GNOME_SCAN_IS_PREVIEW_SINK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_SCAN_TYPE_PREVIEW_SINK))
+#define GNOME_SCAN_IS_PREVIEW_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_SCAN_TYPE_PREVIEW_SINK))
+#define GNOME_SCAN_PREVIEW_SINK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_SCAN_TYPE_PREVIEW_SINK, GnomeScanPreviewSinkClass))
typedef struct _GnomeScanPreviewSinkClass GnomeScanPreviewSinkClass;
typedef struct _GnomeScanPreviewSink GnomeScanPreviewSink;
Modified: trunk/lib/gnome-scan-processor-common.c
==============================================================================
--- trunk/lib/gnome-scan-processor-common.c (original)
+++ trunk/lib/gnome-scan-processor-common.c Thu May 8 12:59:02 2008
@@ -37,9 +37,9 @@
gboolean enhance;
};
-#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_TYPE_SCAN_PROCESSOR_COMMON, GnomeScanProcessorCommonPrivate))
+#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_SCAN_TYPE_PROCESSOR_COMMON, GnomeScanProcessorCommonPrivate))
-G_DEFINE_TYPE (GnomeScanProcessorCommon, gnome_scan_processor_common, GNOME_TYPE_SCAN_PLUGIN);
+G_DEFINE_TYPE (GnomeScanProcessorCommon, gnome_scan_processor_common, GNOME_SCAN_TYPE_PLUGIN);
GS_DEFINE_QUARK(gs_param_group_processing_common, N_("Common Processing"));
#define GS_PARAM_GROUP_PROCESSING_COMMON (gs_param_group_processing_common_quark ())
@@ -64,7 +64,7 @@
GS_PARAM_GROUP_PREVIEW,
min, max, step, val,
G_PARAM_WRITABLE);
- gs_param_spec_set_widget_type(pspec, GNOME_TYPE_SCAN_PREVIEW_PLUGIN_ROTATION);
+ gs_param_spec_set_widget_type(pspec, GNOME_SCAN_TYPE_PREVIEW_PLUGIN_ROTATION);
gnome_scan_plugin_params_add (GNOME_SCAN_PLUGIN (object), pspec);
pspec = gs_param_spec_boolean ("enhance", N_("Automatic color enhancement"),
@@ -89,7 +89,7 @@
GnomeScanPlugin*
gnome_scan_processor_common_new(void)
{
- return g_object_new (GNOME_TYPE_SCAN_PROCESSOR_COMMON, NULL);
+ return g_object_new (GNOME_SCAN_TYPE_PROCESSOR_COMMON, NULL);
}
void
Modified: trunk/lib/gnome-scan-processor-common.h
==============================================================================
--- trunk/lib/gnome-scan-processor-common.h (original)
+++ trunk/lib/gnome-scan-processor-common.h Thu May 8 12:59:02 2008
@@ -27,12 +27,12 @@
G_BEGIN_DECLS
-#define GNOME_TYPE_SCAN_PROCESSOR_COMMON (gnome_scan_processor_common_get_type ())
-#define GNOME_SCAN_PROCESSOR_COMMON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_SCAN_PROCESSOR_COMMON, GnomeScanProcessorCommon))
-#define GNOME_SCAN_PROCESSOR_COMMON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_SCAN_PROCESSOR_COMMON, GnomeScanProcessorCommonClass))
-#define GNOME_IS_SCAN_PROCESSOR_COMMON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_SCAN_PROCESSOR_COMMON))
-#define GNOME_IS_SCAN_PROCESSOR_COMMON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_SCAN_PROCESSOR_COMMON))
-#define GNOME_SCAN_PROCESSOR_COMMON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_SCAN_PROCESSOR_COMMON, GnomeScanProcessorCommonClass))
+#define GNOME_SCAN_TYPE_PROCESSOR_COMMON (gnome_scan_processor_common_get_type ())
+#define GNOME_SCAN_PROCESSOR_COMMON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_SCAN_TYPE_PROCESSOR_COMMON, GnomeScanProcessorCommon))
+#define GNOME_SCAN_PROCESSOR_COMMON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_SCAN_TYPE_PROCESSOR_COMMON, GnomeScanProcessorCommonClass))
+#define GNOME_SCAN_IS_PROCESSOR_COMMON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_SCAN_TYPE_PROCESSOR_COMMON))
+#define GNOME_SCAN_IS_PROCESSOR_COMMON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_SCAN_TYPE_PROCESSOR_COMMON))
+#define GNOME_SCAN_PROCESSOR_COMMON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_SCAN_TYPE_PROCESSOR_COMMON, GnomeScanProcessorCommonClass))
typedef struct _GnomeScanProcessorCommonClass GnomeScanProcessorCommonClass;
typedef struct _GnomeScanProcessorCommon GnomeScanProcessorCommon;
Modified: trunk/lib/gnome-scan-range-widget.c
==============================================================================
--- trunk/lib/gnome-scan-range-widget.c (original)
+++ trunk/lib/gnome-scan-range-widget.c Thu May 8 12:59:02 2008
@@ -23,7 +23,7 @@
#include "gnome-scan-range-widget.h"
#include "gnome-scan-param-specs.h"
-#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_TYPE_SCAN_RANGE_WIDGET, GnomeScanRangeWidgetPrivate))
+#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_SCAN_TYPE_RANGE_WIDGET, GnomeScanRangeWidgetPrivate))
typedef struct _GnomeScanRangeWidgetPrivate GnomeScanRangeWidgetPrivate;
struct _GnomeScanRangeWidgetPrivate
Modified: trunk/lib/gnome-scan-range-widget.h
==============================================================================
--- trunk/lib/gnome-scan-range-widget.h (original)
+++ trunk/lib/gnome-scan-range-widget.h Thu May 8 12:59:02 2008
@@ -28,12 +28,12 @@
G_BEGIN_DECLS
-#define GNOME_TYPE_SCAN_RANGE_WIDGET (gnome_scan_range_widget_get_type ())
-#define GNOME_SCAN_RANGE_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_SCAN_RANGE_WIDGET, GnomeScanRangeWidget))
-#define GNOME_SCAN_RANGE_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_SCAN_RANGE_WIDGET, GnomeScanRangeWidgetClass))
-#define GNOME_IS_SCAN_RANGE_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_SCAN_RANGE_WIDGET))
-#define GNOME_IS_SCAN_RANGE_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_SCAN_RANGE_WIDGET))
-#define GNOME_SCAN_RANGE_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_SCAN_RANGE_WIDGET, GnomeScanRangeWidgetClass))
+#define GNOME_SCAN_TYPE_RANGE_WIDGET (gnome_scan_range_widget_get_type ())
+#define GNOME_SCAN_RANGE_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_SCAN_TYPE_RANGE_WIDGET, GnomeScanRangeWidget))
+#define GNOME_SCAN_RANGE_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_SCAN_TYPE_RANGE_WIDGET, GnomeScanRangeWidgetClass))
+#define GNOME_SCAN_IS_RANGE_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_SCAN_TYPE_RANGE_WIDGET))
+#define GNOME_SCAN_IS_RANGE_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_SCAN_TYPE_RANGE_WIDGET))
+#define GNOME_SCAN_RANGE_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_SCAN_TYPE_RANGE_WIDGET, GnomeScanRangeWidgetClass))
typedef struct _GnomeScanRangeWidget GnomeScanRangeWidget;
struct _GnomeScanRangeWidget
Copied: trunk/lib/gnome-scan-scanner.c (from r600, /trunk/lib/gnome-scanner.c)
==============================================================================
--- /trunk/lib/gnome-scanner.c (original)
+++ trunk/lib/gnome-scan-scanner.c Thu May 8 12:59:02 2008
@@ -24,24 +24,24 @@
* @short_description: Acquisition plugin
* @include: gnome-scanner.h
*
- * #GnomeScanner is the base class for backend specific scanner (like
+ * #GnomeScanScanner is the base class for backend specific scanner (like
* e.g SANE). Following SANE design, Gnome Scan scanner has an
* undefined set of option. But unlike SANE, the scanner itself handle
* acquisition.
*
- * Each #GnomeScanner should monitor its sensor (e.g. paper-in) and
+ * Each #GnomeScanScanner should monitor its sensor (e.g. paper-in) and
* trigger an event on sensor state changes.
**/
#include <glib/gi18n.h>
#include "gnome-scan-private.h"
-#include "gnome-scanner.h"
+#include "gnome-scan-scanner.h"
#include "gnome-scan-types.h"
-#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_TYPE_SCANNER, GnomeScannerPrivate))
+#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_SCAN_TYPE_SCANNER, GnomeScanScannerPrivate))
-typedef struct _GnomeScannerPrivate GnomeScannerPrivate;
+typedef struct _GnomeScanScannerPrivate GnomeScanScannerPrivate;
-struct _GnomeScannerPrivate
+struct _GnomeScanScannerPrivate
{
const gchar* icon_name;
};
@@ -66,10 +66,10 @@
static GnomeScanPluginClass* parent_class = NULL;
static guint signals[LAST_SIGNAL] = { 0 };
-G_DEFINE_TYPE (GnomeScanner, gnome_scanner, GNOME_TYPE_SCAN_PLUGIN);
+G_DEFINE_TYPE (GnomeScanScanner, gnome_scanner, GNOME_SCAN_TYPE_PLUGIN);
static void
-gnome_scanner_init (GnomeScanner *object)
+gnome_scanner_init (GnomeScanScanner *object)
{
}
@@ -82,7 +82,7 @@
static void
gnome_scanner_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
{
- g_return_if_fail (GNOME_IS_SCANNER (object));
+ g_return_if_fail (GNOME_SCAN_IS_SCANNER (object));
switch (prop_id)
{
@@ -101,7 +101,7 @@
static void
gnome_scanner_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
{
- g_return_if_fail (GNOME_IS_SCANNER (object));
+ g_return_if_fail (GNOME_SCAN_IS_SCANNER (object));
switch (prop_id)
{
@@ -109,10 +109,10 @@
/* TODO: Add getter for "sensors" property here */
break;
case PROP_ICON_NAME:
- g_value_set_string (value, gnome_scanner_get_icon_name (GNOME_SCANNER (object)));
+ g_value_set_string (value, gnome_scanner_get_icon_name (GNOME_SCAN_SCANNER (object)));
break;
case PROP_STATUS:
- g_value_set_enum (value, GNOME_SCANNER (object)->status);
+ g_value_set_enum (value, GNOME_SCAN_SCANNER (object)->status);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -121,26 +121,18 @@
}
static void
-gnome_scanner_event (GnomeScanner *scanner, GnomeScanEvent *event, gpointer data)
-{
- /* TODO: Add default signal handler implementation here */
-}
-
-static void
-gnome_scanner_class_init (GnomeScannerClass *klass)
+gnome_scanner_class_init (GnomeScanScannerClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- parent_class = GNOME_SCAN_PLUGIN_CLASS (g_type_class_peek_parent (klass));
+ parent_class = GNOME_SCAN_SCAN_PLUGIN_CLASS (g_type_class_peek_parent (klass));
- g_type_class_add_private (klass, sizeof (GnomeScannerPrivate));
+ g_type_class_add_private (klass, sizeof (GnomeScanScannerPrivate));
object_class->finalize = gnome_scanner_finalize;
object_class->set_property = gnome_scanner_set_property;
object_class->get_property = gnome_scanner_get_property;
- klass->event = gnome_scanner_event;
-
/**
- * GnomeScanner:sensors:
+ * GnomeScanScanner:sensors:
*
* A list of sensor specification.
**/
@@ -152,7 +144,7 @@
G_PARAM_READABLE));
/**
- * GnomeScanner:icon-name:
+ * GnomeScanScanner:icon-name:
*
* The icon name representing the device.
**/
@@ -164,7 +156,7 @@
NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
/**
- * GnomeScanner:status:
+ * GnomeScanScanner:status:
*
* Device status
**/
@@ -173,29 +165,13 @@
g_param_spec_enum ("status",
"Status",
"Current device status",
- GNOME_TYPE_SCANNER_STATUS,
- GNOME_SCANNER_UNKNOWN,
+ GNOME_SCAN_TYPE_STATUS,
+ GNOME_SCAN_STATUS_UNKNOWN,
G_PARAM_READABLE));
/**
- * GnomeScanner::event:
- * @scanner: the emitting #GnomeScanner
- * @event: the emitted even.
- *
- * Emitted when an hardware event is triggered. (button, wheel, paper-in, etc.)
- **/
- signals[EVENT] =
- g_signal_new ("event",
- G_OBJECT_CLASS_TYPE (klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GnomeScannerClass, event),
- NULL, NULL,
- g_cclosure_marshal_VOID__POINTER,
- G_TYPE_NONE, 1, G_TYPE_POINTER);
-
- /**
- * GnomeScanner::settings-changed:
- * @scanner: the emitting #GnomeScanner
+ * GnomeScanScanner::settings-changed:
+ * @scanner: the emitting #GnomeScanScanner
*
* Emitted when the scanner has settings are hard setted.
**/
@@ -203,13 +179,13 @@
g_signal_new ("settings-changed",
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GnomeScannerClass, settings_changed),
+ G_STRUCT_OFFSET (GnomeScanScannerClass, settings_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
/**
- * GnomeScanner::status-changed:
- * @scanner: the emitting #GnomeScanner
+ * GnomeScanScanner::status-changed:
+ * @scanner: the emitting #GnomeScanScanner
*
* Emitted when the scanner status as changed.
**/
@@ -217,7 +193,7 @@
g_signal_new ("status-changed",
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GnomeScannerClass, status_changed),
+ G_STRUCT_OFFSET (GnomeScanScannerClass, status_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
@@ -226,48 +202,48 @@
/**
* gnome_scanner_get_icon_name:
- * @scanner: a #GnomeScanner
+ * @scanner: a #GnomeScanScanner
*
* Return the icon-name representing the type of the device.
*
* Returns: a icon-name string
**/
const gchar*
-gnome_scanner_get_icon_name (GnomeScanner *scanner)
+gnome_scanner_get_icon_name (GnomeScanScanner *scanner)
{
return GET_PRIVATE (scanner)->icon_name;
}
/**
* gnome_scanner_settings_changed:
- * @scanner: a #GnomeScanner
+ * @scanner: a #GnomeScanScanner
*
- * Emit #GnomeScanner::settings-changed signal.
+ * Emit #GnomeScanScanner::settings-changed signal.
*
*/
void
-gnome_scanner_settings_changed (GnomeScanner *scanner)
+gnome_scanner_settings_changed (GnomeScanScanner *scanner)
{
g_signal_emit (scanner, signals[SETTINGS_CHANGED], 0);
}
-GnomeScannerStatus
-gnome_scanner_get_status (GnomeScanner *scanner)
+GnomeScanStatus
+gnome_scanner_get_status (GnomeScanScanner *scanner)
{
- return GNOME_SCANNER (scanner)->status;
+ return GNOME_SCAN_SCANNER (scanner)->status;
}
/**
* gnome_scanner_get_status_string:
- * @scanner: a #GnomeScanner
+ * @scanner: a #GnomeScanScanner
*
* Returns the translated string for the current @scanner status.
*
* Returns: a translated string.
**/
const gchar*
-gnome_scanner_get_status_string (GnomeScanner *scanner)
+gnome_scanner_get_status_string (GnomeScanScanner *scanner)
{
static const gchar* status_strings[] = {
N_("Unknown"),
@@ -280,7 +256,7 @@
void
-gnome_scanner_set_status (GnomeScanner *scanner, GnomeScannerStatus status)
+gnome_scanner_set_status (GnomeScanScanner *scanner, GnomeScanStatus status)
{
if (scanner->status != status) {
scanner->status = status;
@@ -289,9 +265,9 @@
}
const gchar*
-gnome_scanner_get_output_format (GnomeScanner *scanner)
+gnome_scanner_get_output_format (GnomeScanScanner *scanner)
{
- GnomeScannerClass *klass = GNOME_SCANNER_GET_CLASS (scanner);
+ GnomeScanScannerClass *klass = GNOME_SCAN_SCANNER_GET_CLASS (scanner);
if (klass->get_output_format) {
return klass->get_output_format(scanner);
}
Copied: trunk/lib/gnome-scan-scanner.h (from r600, /trunk/lib/gnome-scanner.h)
==============================================================================
--- /trunk/lib/gnome-scanner.h (original)
+++ trunk/lib/gnome-scan-scanner.h Thu May 8 12:59:02 2008
@@ -19,76 +19,65 @@
* Boston, MA 02110-1301, USA
*/
-#ifndef _GNOME_SCANNER_H_
-#define _GNOME_SCANNER_H_
+#ifndef _GNOME_SCAN_SCANNER_H_
+#define _GNOME_SCAN_SCANNER_H_
#include <glib-object.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include "gnome-scan-plugin.h"
+#include "gnome-scan-common.h"
G_BEGIN_DECLS
-#define GNOME_TYPE_SCANNER (gnome_scanner_get_type ())
-#define GNOME_SCANNER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_SCANNER, GnomeScanner))
-#define GNOME_SCANNER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_SCANNER, GnomeScannerClass))
-#define GNOME_IS_SCANNER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_SCANNER))
-#define GNOME_IS_SCANNER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_SCANNER))
-#define GNOME_SCANNER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_SCANNER, GnomeScannerClass))
+#define GNOME_SCAN_TYPE_SCANNER (gnome_scanner_get_type ())
+#define GNOME_SCAN_SCANNER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_SCAN_TYPE_SCANNER, GnomeScanScanner))
+#define GNOME_SCAN_SCANNER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_SCAN_TYPE_SCANNER, GnomeScanScannerClass))
+#define GNOME_SCAN_IS_SCANNER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_SCAN_TYPE_SCANNER))
+#define GNOME_SCAN_IS_SCANNER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_SCAN_TYPE_SCANNER))
+#define GNOME_SCAN_SCANNER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_SCAN_TYPE_SCANNER, GnomeScanScannerClass))
-typedef enum
-{
- GNOME_SCANNER_UNKNOWN,
- GNOME_SCANNER_READY,
- GNOME_SCANNER_BUSY
-} GnomeScannerStatus;
-
-
-typedef struct _GnomeScannerClass GnomeScannerClass;
-typedef struct _GnomeScanner GnomeScanner;
-typedef gpointer GnomeScanEvent;
+typedef struct _GnomeScanScannerClass GnomeScanScannerClass;
+typedef struct _GnomeScanScanner GnomeScanScanner;
-struct _GnomeScannerClass
+struct _GnomeScanScannerClass
{
GnomeScanPluginClass parent_class;
/* API */
- gchar* (* get_output_format) (GnomeScanner *Scanner);
+ gchar* (* get_output_format) (GnomeScanScanner *Scanner);
/* Signals */
- void (* event) (GnomeScanner *scanner,
- GnomeScanEvent *event,
+ void (* settings_changed) (GnomeScanScanner *scanner,
gpointer data);
- void (* settings_changed) (GnomeScanner *scanner,
- gpointer data);
- void (* status_changed) (GnomeScanner *scanner);
+ void (* status_changed) (GnomeScanScanner *scanner);
};
/**
- * GnomeScanner:
+ * GnomeScanScanner:
*
- * A #GnomeScanner publish all instance specific plugins parameters
+ * A #GnomeScanScanner publish all instance specific plugins parameters
* and handle the real acquisition work (e.g. throug SANE, TWAIN,
* etc.)
**/
-struct _GnomeScanner
+struct _GnomeScanScanner
{
/*< private >*/
GnomeScanPlugin parent_instance;
-
+
/*< public >*/
- GnomeScannerStatus status;
+ GnomeScanStatus status;
};
GType gnome_scanner_get_type (void) G_GNUC_CONST;
-const gchar* gnome_scanner_get_icon_name (GnomeScanner *scanner);
-void gnome_scanner_settings_changed (GnomeScanner *scanner);
-void gnome_scanner_set_status (GnomeScanner *scanner,
- GnomeScannerStatus status);
-GnomeScannerStatus gnome_scanner_get_status (GnomeScanner *scanner);
-const gchar* gnome_scanner_get_status_string (GnomeScanner *scanner);
-const gchar* gnome_scanner_get_output_format (GnomeScanner *scanner);
+const gchar* gnome_scanner_get_icon_name (GnomeScanScanner *scanner);
+void gnome_scanner_settings_changed (GnomeScanScanner *scanner);
+void gnome_scanner_set_status (GnomeScanScanner *scanner,
+ GnomeScanStatus status);
+GnomeScanStatus gnome_scanner_get_status (GnomeScanScanner *scanner);
+const gchar* gnome_scanner_get_status_string (GnomeScanScanner *scanner);
+const gchar* gnome_scanner_get_output_format (GnomeScanScanner *scanner);
G_END_DECLS
-#endif /* _GNOME_SCANNER_H_ */
+#endif /* _GNOME_SCAN_SCANNER_H_ */
Modified: trunk/lib/gnome-scan-settings.c
==============================================================================
--- trunk/lib/gnome-scan-settings.c (original)
+++ trunk/lib/gnome-scan-settings.c Thu May 8 12:59:02 2008
@@ -42,7 +42,7 @@
#include <gconf/gconf-client.h>
#include "gnome-scan-settings.h"
-#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_TYPE_SCAN_SETTINGS, GnomeScanSettingsPrivate))
+#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_SCAN_TYPE_SETTINGS, GnomeScanSettingsPrivate))
typedef struct _GnomeScanSettingsPrivate GnomeScanSettingsPrivate;
@@ -326,7 +326,7 @@
GnomeScanSettings*
gnome_scan_settings_new (void)
{
- GObject *object = g_object_new (GNOME_TYPE_SCAN_SETTINGS, NULL);
+ GObject *object = g_object_new (GNOME_SCAN_TYPE_SETTINGS, NULL);
return GNOME_SCAN_SETTINGS (object);
}
@@ -343,7 +343,7 @@
GParamSpec *pspec)
{
/* TODO: store schemas in gconf */
- g_return_if_fail (GNOME_IS_SCAN_SETTINGS (settings));
+ g_return_if_fail (GNOME_SCAN_IS_SETTINGS (settings));
GValue *value = g_new0 (GValue, 1);
g_value_init (value, G_PARAM_SPEC_VALUE_TYPE (pspec));
g_param_value_set_default (pspec, value);
@@ -368,7 +368,7 @@
const gchar *name,
const GValue *value)
{
- g_return_if_fail (GNOME_IS_SCAN_SETTINGS (settings) && G_IS_VALUE (value));
+ g_return_if_fail (GNOME_SCAN_IS_SETTINGS (settings) && G_IS_VALUE (value));
g_hash_table_insert (GET_PRIVATE (settings)->values, g_strdup (name),
g_boxed_copy (G_TYPE_VALUE, value));
g_signal_emit (settings, signals[CHANGED], 0, name);
@@ -391,7 +391,7 @@
const gchar *name,
const GValue *value)
{
- g_return_if_fail (GNOME_IS_SCAN_SETTINGS (settings) && G_IS_VALUE (value));
+ g_return_if_fail (GNOME_SCAN_IS_SETTINGS (settings) && G_IS_VALUE (value));
GValue *v = gnome_scan_settings_get (settings, name);
if (v) {
g_value_transform (value, v);
@@ -419,7 +419,7 @@
const gchar *name,
gdouble value)
{
- g_return_if_fail (GNOME_IS_SCAN_SETTINGS (settings));
+ g_return_if_fail (GNOME_SCAN_IS_SETTINGS (settings));
GValue *v = g_new0 (GValue, 1);
g_value_init (v, G_TYPE_DOUBLE);
g_value_set_double (v, value);
@@ -440,7 +440,7 @@
const gchar *name,
gint value)
{
- g_return_if_fail (GNOME_IS_SCAN_SETTINGS (settings));
+ g_return_if_fail (GNOME_SCAN_IS_SETTINGS (settings));
GValue *v = g_new0 (GValue, 1);
g_value_init (v, G_TYPE_INT);
g_value_set_int (v, value);
@@ -461,7 +461,7 @@
const gchar *name,
gboolean value)
{
- g_return_if_fail (GNOME_IS_SCAN_SETTINGS (settings));
+ g_return_if_fail (GNOME_SCAN_IS_SETTINGS (settings));
GValue *v = g_new0 (GValue, 1);
g_value_init (v, G_TYPE_BOOLEAN);
g_value_set_boolean (v, value);
@@ -483,7 +483,7 @@
GType type,
gint value)
{
- g_return_if_fail (GNOME_IS_SCAN_SETTINGS (settings));
+ g_return_if_fail (GNOME_SCAN_IS_SETTINGS (settings));
GValue *v = g_new0 (GValue, 1);
g_value_init (v, type);
g_value_set_enum (v, value);
@@ -505,7 +505,7 @@
GType type,
gpointer value)
{
- g_return_if_fail (GNOME_IS_SCAN_SETTINGS (settings));
+ g_return_if_fail (GNOME_SCAN_IS_SETTINGS (settings));
GValue *v = g_new0 (GValue, 1);
g_value_init (v, type);
g_value_set_boxed (v, g_boxed_copy (type, value));
@@ -526,7 +526,7 @@
const gchar *name,
GObject* value)
{
- g_return_if_fail (GNOME_IS_SCAN_SETTINGS (settings));
+ g_return_if_fail (GNOME_SCAN_IS_SETTINGS (settings));
GValue *v = g_new0 (GValue, 1);
g_value_init (v, G_TYPE_OBJECT);
g_value_set_object (v, value);
@@ -547,7 +547,7 @@
const gchar *name,
gpointer value)
{
- g_return_if_fail (GNOME_IS_SCAN_SETTINGS (settings));
+ g_return_if_fail (GNOME_SCAN_IS_SETTINGS (settings));
GValue *v = g_new0 (GValue, 1);
g_value_init (v, G_TYPE_POINTER);
g_value_set_pointer (v, value);
@@ -568,7 +568,7 @@
gnome_scan_settings_get (GnomeScanSettings *settings,
const gchar *name)
{
- g_return_val_if_fail (GNOME_IS_SCAN_SETTINGS (settings), NULL);
+ g_return_val_if_fail (GNOME_SCAN_IS_SETTINGS (settings), NULL);
GValue *v = g_hash_table_lookup (GET_PRIVATE (settings)->values, name);
if (v)
v = g_boxed_copy (G_TYPE_VALUE, v);
@@ -592,7 +592,7 @@
const gchar *name,
GType type)
{
- g_return_val_if_fail (GNOME_IS_SCAN_SETTINGS (settings), NULL);
+ g_return_val_if_fail (GNOME_SCAN_IS_SETTINGS (settings), NULL);
GValue *v = gnome_scan_settings_get (settings, name);
GValue *t = g_new0 (GValue, 1);
g_value_init (t, type);
@@ -622,7 +622,7 @@
gnome_scan_settings_get_string (GnomeScanSettings *settings,
const gchar *name)
{
- g_return_val_if_fail (GNOME_IS_SCAN_SETTINGS (settings), NULL);
+ g_return_val_if_fail (GNOME_SCAN_IS_SETTINGS (settings), NULL);
GValue *v = gnome_scan_settings_get_transformed (settings,
name,
G_TYPE_STRING);
@@ -646,7 +646,7 @@
gnome_scan_settings_get_double (GnomeScanSettings *settings,
const gchar *name)
{
- g_return_val_if_fail (GNOME_IS_SCAN_SETTINGS (settings), 0.);
+ g_return_val_if_fail (GNOME_SCAN_IS_SETTINGS (settings), 0.);
GValue *v = gnome_scan_settings_get_transformed (settings,
name,
G_TYPE_DOUBLE);
@@ -669,7 +669,7 @@
gnome_scan_settings_get_int (GnomeScanSettings *settings,
const gchar *name)
{
- g_return_val_if_fail (GNOME_IS_SCAN_SETTINGS (settings), 0);
+ g_return_val_if_fail (GNOME_SCAN_IS_SETTINGS (settings), 0);
GValue *v = gnome_scan_settings_get_transformed (settings,
name,
G_TYPE_INT);
@@ -690,7 +690,7 @@
gnome_scan_settings_get_boolean (GnomeScanSettings *settings,
const gchar *name)
{
- g_return_val_if_fail (GNOME_IS_SCAN_SETTINGS (settings), 0);
+ g_return_val_if_fail (GNOME_SCAN_IS_SETTINGS (settings), 0);
GValue *v = gnome_scan_settings_get_transformed (settings,
name, G_TYPE_BOOLEAN);
gboolean val = g_value_get_boolean (v);
@@ -715,7 +715,7 @@
const gchar *name,
GType type)
{
- g_return_val_if_fail (GNOME_IS_SCAN_SETTINGS (settings), 0);
+ g_return_val_if_fail (GNOME_SCAN_IS_SETTINGS (settings), 0);
GValue *v = gnome_scan_settings_get_transformed (settings,
name,
type);
@@ -741,7 +741,7 @@
const gchar *name,
GType type)
{
- g_return_val_if_fail (GNOME_IS_SCAN_SETTINGS (settings), NULL);
+ g_return_val_if_fail (GNOME_SCAN_IS_SETTINGS (settings), NULL);
GValue *v = gnome_scan_settings_get_transformed (settings,
name,
type);
@@ -765,7 +765,7 @@
gnome_scan_settings_get_object (GnomeScanSettings *settings,
const gchar *name)
{
- g_return_val_if_fail (GNOME_IS_SCAN_SETTINGS (settings), NULL);
+ g_return_val_if_fail (GNOME_SCAN_IS_SETTINGS (settings), NULL);
GValue *v = gnome_scan_settings_get_transformed (settings,
name,
G_TYPE_OBJECT);
@@ -789,7 +789,7 @@
gnome_scan_settings_get_pointer (GnomeScanSettings *settings,
const gchar *name)
{
- g_return_val_if_fail (GNOME_IS_SCAN_SETTINGS (settings), NULL);
+ g_return_val_if_fail (GNOME_SCAN_IS_SETTINGS (settings), NULL);
GValue *v = gnome_scan_settings_get_transformed (settings,
name,
G_TYPE_POINTER);
Modified: trunk/lib/gnome-scan-settings.h
==============================================================================
--- trunk/lib/gnome-scan-settings.h (original)
+++ trunk/lib/gnome-scan-settings.h Thu May 8 12:59:02 2008
@@ -27,12 +27,12 @@
G_BEGIN_DECLS
-#define GNOME_TYPE_SCAN_SETTINGS (gnome_scan_settings_get_type ())
-#define GNOME_SCAN_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_SCAN_SETTINGS, GnomeScanSettings))
-#define GNOME_SCAN_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_SCAN_SETTINGS, GnomeScanSettingsClass))
-#define GNOME_IS_SCAN_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_SCAN_SETTINGS))
-#define GNOME_IS_SCAN_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_SCAN_SETTINGS))
-#define GNOME_SCAN_SETTINGS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_SCAN_SETTINGS, GnomeScanSettingsClass))
+#define GNOME_SCAN_TYPE_SETTINGS (gnome_scan_settings_get_type ())
+#define GNOME_SCAN_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_SCAN_TYPE_SETTINGS, GnomeScanSettings))
+#define GNOME_SCAN_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_SCAN_TYPE_SETTINGS, GnomeScanSettingsClass))
+#define GNOME_SCAN_IS_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_SCAN_TYPE_SETTINGS))
+#define GNOME_SCAN_IS_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_SCAN_TYPE_SETTINGS))
+#define GNOME_SCAN_SETTINGS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_SCAN_TYPE_SETTINGS, GnomeScanSettingsClass))
typedef struct _GnomeScanSettingsClass GnomeScanSettingsClass;
typedef struct _GnomeScanSettings GnomeScanSettings;
Modified: trunk/lib/gnome-scan-sink.c
==============================================================================
--- trunk/lib/gnome-scan-sink.c (original)
+++ trunk/lib/gnome-scan-sink.c Thu May 8 12:59:02 2008
@@ -37,7 +37,7 @@
static GObjectClass* parent_class = NULL;
-G_DEFINE_TYPE (GnomeScanSink, gnome_scan_sink, GNOME_TYPE_SCAN_PLUGIN);
+G_DEFINE_TYPE (GnomeScanSink, gnome_scan_sink, GNOME_SCAN_TYPE_PLUGIN);
static void
gnome_scan_sink_init (GnomeScanSink *object)
Modified: trunk/lib/gnome-scan-sink.h
==============================================================================
--- trunk/lib/gnome-scan-sink.h (original)
+++ trunk/lib/gnome-scan-sink.h Thu May 8 12:59:02 2008
@@ -27,12 +27,12 @@
G_BEGIN_DECLS
-#define GNOME_TYPE_SCAN_SINK (gnome_scan_sink_get_type ())
-#define GNOME_SCAN_SINK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_SCAN_SINK, GnomeScanSink))
-#define GNOME_SCAN_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_SCAN_SINK, GnomeScanSinkClass))
-#define GNOME_IS_SCAN_SINK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_SCAN_SINK))
-#define GNOME_IS_SCAN_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_SCAN_SINK))
-#define GNOME_SCAN_SINK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_SCAN_SINK, GnomeScanSinkClass))
+#define GNOME_SCAN_TYPE_SINK (gnome_scan_sink_get_type ())
+#define GNOME_SCAN_SINK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_SCAN_TYPE_SINK, GnomeScanSink))
+#define GNOME_SCAN_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_SCAN_TYPE_SINK, GnomeScanSinkClass))
+#define GNOME_SCAN_IS_SINK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_SCAN_TYPE_SINK))
+#define GNOME_SCAN_IS_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_SCAN_TYPE_SINK))
+#define GNOME_SCAN_SINK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_SCAN_TYPE_SINK, GnomeScanSinkClass))
typedef struct _GnomeScanSinkClass GnomeScanSinkClass;
typedef struct _GnomeScanSink GnomeScanSink;
Modified: trunk/lib/gnome-scan-string-widget.c
==============================================================================
--- trunk/lib/gnome-scan-string-widget.c (original)
+++ trunk/lib/gnome-scan-string-widget.c Thu May 8 12:59:02 2008
@@ -22,7 +22,7 @@
#include "gnome-scan-string-widget.h"
-#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_TYPE_SCAN_STRING_WIDGET, GnomeScanStringWidgetPrivate))
+#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_SCAN_TYPE_STRING_WIDGET, GnomeScanStringWidgetPrivate))
typedef struct _GnomeScanStringWidgetPrivate GnomeScanStringWidgetPrivate;
struct _GnomeScanStringWidgetPrivate
Modified: trunk/lib/gnome-scan-string-widget.h
==============================================================================
--- trunk/lib/gnome-scan-string-widget.h (original)
+++ trunk/lib/gnome-scan-string-widget.h Thu May 8 12:59:02 2008
@@ -28,12 +28,12 @@
G_BEGIN_DECLS
-#define GNOME_TYPE_SCAN_STRING_WIDGET (gnome_scan_string_widget_get_type ())
-#define GNOME_SCAN_STRING_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_SCAN_STRING_WIDGET, GnomeScanStringWidget))
-#define GNOME_SCAN_STRING_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_SCAN_STRING_WIDGET, GnomeScanStringWidgetClass))
-#define GNOME_IS_SCAN_STRING_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_SCAN_STRING_WIDGET))
-#define GNOME_IS_SCAN_STRING_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_SCAN_STRING_WIDGET))
-#define GNOME_SCAN_STRING_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_SCAN_STRING_WIDGET, GnomeScanStringWidgetClass))
+#define GNOME_SCAN_TYPE_STRING_WIDGET (gnome_scan_string_widget_get_type ())
+#define GNOME_SCAN_STRING_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_SCAN_TYPE_STRING_WIDGET, GnomeScanStringWidget))
+#define GNOME_SCAN_STRING_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_SCAN_TYPE_STRING_WIDGET, GnomeScanStringWidgetClass))
+#define GNOME_SCAN_IS_STRING_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_SCAN_TYPE_STRING_WIDGET))
+#define GNOME_SCAN_IS_STRING_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_SCAN_TYPE_STRING_WIDGET))
+#define GNOME_SCAN_STRING_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_SCAN_TYPE_STRING_WIDGET, GnomeScanStringWidgetClass))
typedef struct _GnomeScanStringWidget GnomeScanStringWidget;
struct _GnomeScanStringWidget
Modified: trunk/lib/gnome-scan-types.c
==============================================================================
--- trunk/lib/gnome-scan-types.c (original)
+++ trunk/lib/gnome-scan-types.c Thu May 8 12:59:02 2008
@@ -30,27 +30,6 @@
* @short_description: Declared enumeration and flags
*/
-/* Enumerations from "gnome-scanner.h" */
-#include "gnome-scanner.h"
-
-GType
-gnome_scanner_status_get_type (void)
-{
- static GType type = 0;
- static const GEnumValue _gnome_scanner_status_values[] = {
- { GNOME_SCANNER_UNKNOWN, "GNOME_SCANNER_UNKNOWN", "unknown" },
- { GNOME_SCANNER_READY, "GNOME_SCANNER_READY", "ready" },
- { GNOME_SCANNER_BUSY, "GNOME_SCANNER_BUSY", "busy" },
- { 0, NULL, NULL }
-};
-
- if (type == 0) {
- type = g_enum_register_static ("GnomeScannerStatus", _gnome_scanner_status_values);
- }
-
- return type;
-}
-
/* Generated data ends here */
Modified: trunk/lib/gnome-scan-types.h
==============================================================================
--- trunk/lib/gnome-scan-types.h (original)
+++ trunk/lib/gnome-scan-types.h Thu May 8 12:59:02 2008
@@ -27,10 +27,6 @@
#include <glib-object.h>
-/* Enumerations from "gnome-scanner.h" */
-#define GNOME_TYPE_SCANNER_STATUS (gnome_scanner_status_get_type ())
-GType gnome_scanner_status_get_type (void) G_GNUC_CONST;
-
G_END_DECLS
Modified: trunk/modules/gsane-backend.c
==============================================================================
--- trunk/modules/gsane-backend.c (original)
+++ trunk/modules/gsane-backend.c Thu May 8 12:59:02 2008
@@ -28,7 +28,7 @@
static GnomeScanBackendClass* parent_class = NULL;
-GS_DEFINE_MODULE_TYPE (GSaneBackend, gsane_backend, GNOME_TYPE_SCAN_BACKEND);
+GS_DEFINE_MODULE_TYPE (GSaneBackend, gsane_backend, GNOME_SCAN_TYPE_BACKEND);
static void
gsane_backend_init (GSaneBackend *object)
@@ -60,7 +60,7 @@
{
const SANE_Device **devices;
SANE_Status status;
- GnomeScanner *scanner;
+ GnomeScanScanner *scanner;
gint i;
status = sane_get_devices(&devices, SANE_FALSE);
Modified: trunk/modules/gsane-meta-param.c
==============================================================================
--- trunk/modules/gsane-meta-param.c (original)
+++ trunk/modules/gsane-meta-param.c Thu May 8 12:59:02 2008
@@ -284,7 +284,7 @@
/* ORIG */
pspec = gs_param_spec_pointer ("origin", N_("Origin"), N_("Origin of scan window"),
GS_PARAM_GROUP_PREVIEW,
- GNOME_TYPE_SCAN_PREVIEW_PLUGIN_AREA,
+ GNOME_SCAN_TYPE_PREVIEW_PLUGIN_AREA,
G_PARAM_SPEC (mpps->tl_x)->flags);
gs_param_spec_set_index (pspec,
gs_param_spec_get_index (G_PARAM_SPEC (mpps->tl_x))+1);
Modified: trunk/modules/gsane-scanner.c
==============================================================================
--- trunk/modules/gsane-scanner.c (original)
+++ trunk/modules/gsane-scanner.c Thu May 8 12:59:02 2008
@@ -76,7 +76,7 @@
PROP_SANE_TYPE
};
-static GnomeScannerClass* parent_class = NULL;
+static GnomeScanScannerClass* parent_class = NULL;
/* PLUGIN API */
static void gss_configure (GnomeScanPlugin *plugin,
@@ -89,7 +89,7 @@
static void gss_end_frame (GnomeScanPlugin *plugin);
/* SCANNER API */
-gchar* gss_get_output_format (GnomeScanner *scanner);
+gchar* gss_get_output_format (GnomeScanScanner *scanner);
/* INTERNALS */
@@ -120,7 +120,7 @@
/* utils */
#define gss_option_name_matches_array(spec,names) gsane_str_matches_strv(g_param_spec_get_name(spec),names)
-GS_DEFINE_MODULE_TYPE (GSaneScanner, gsane_scanner, GNOME_TYPE_SCANNER);
+GS_DEFINE_MODULE_TYPE (GSaneScanner, gsane_scanner, GNOME_SCAN_TYPE_SCANNER);
#define GSANE_OPTION_DESC_QUARK (gsane_option_desc_quark ())
GS_DEFINE_QUARK(gsane_option_desc, "sane-option-desc");
@@ -230,9 +230,9 @@
gsane_scanner_class_init (GSaneScannerClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- parent_class = GNOME_SCANNER_CLASS (g_type_class_peek_parent (klass));
+ parent_class = GNOME_SCAN_SCANNER_CLASS (g_type_class_peek_parent (klass));
GnomeScanPluginClass* plugin_class = GNOME_SCAN_PLUGIN_CLASS (klass);
- GnomeScannerClass* scanner_class = GNOME_SCANNER_CLASS (klass);
+ GnomeScanScannerClass* scanner_class = GNOME_SCAN_SCANNER_CLASS (klass);
g_type_class_add_private(object_class, sizeof(GSaneScannerPrivate));
@@ -266,7 +266,7 @@
}
-GnomeScanner*
+GnomeScanScanner*
gsane_scanner_new (const SANE_Device *device)
{
GObject *object =
@@ -280,7 +280,7 @@
"sane-id", device->name,
"sane-type", device->type,
NULL);
- return GNOME_SCANNER (object);
+ return GNOME_SCAN_SCANNER (object);
}
/* PLUGIN API */
@@ -389,7 +389,7 @@
}
gchar*
-gss_get_output_format (GnomeScanner *scanner)
+gss_get_output_format (GnomeScanScanner *scanner)
{
return GET_PRIVATE (scanner)->format;
}
@@ -689,8 +689,8 @@
NULL
};
- gnome_scanner_set_status (GNOME_SCANNER (gss),
- GNOME_SCANNER_BUSY);
+ gnome_scanner_set_status (GNOME_SCAN_SCANNER (gss),
+ GNOME_SCAN_STATUS_BUSY);
spec = gss_option_get_param_spec (gss, 0);
value = gsane_scanner_option_get_value(gss, spec);
@@ -742,9 +742,9 @@
- gnome_scanner_set_status (GNOME_SCANNER (gss), GNOME_SCANNER_READY);
+ gnome_scanner_set_status (GNOME_SCAN_SCANNER (gss), GNOME_SCAN_STATUS_READY);
if (priv->changed) {
- gnome_scanner_settings_changed (GNOME_SCANNER (gss));
+ gnome_scanner_settings_changed (GNOME_SCAN_SCANNER (gss));
priv->changed = FALSE;
}
Modified: trunk/modules/gsane-scanner.h
==============================================================================
--- trunk/modules/gsane-scanner.h (original)
+++ trunk/modules/gsane-scanner.h Thu May 8 12:59:02 2008
@@ -25,7 +25,7 @@
#include <glib-object.h>
#include <sane/sane.h>
-#include <gnome-scanner.h>
+#include <gnome-scan-scanner.h>
G_BEGIN_DECLS
@@ -41,12 +41,12 @@
struct _GSaneScannerClass
{
- GnomeScannerClass parent_class;
+ GnomeScanScannerClass parent_class;
};
struct _GSaneScanner
{
- GnomeScanner parent_instance;
+ GnomeScanScanner parent_instance;
/* wether the ADF is selected */
gboolean adf;
@@ -54,7 +54,7 @@
GType gsane_scanner_get_type (void) G_GNUC_CONST;
void gsane_scanner_register_type (GTypeModule *module);
-GnomeScanner *gsane_scanner_new (const SANE_Device *device);
+GnomeScanScanner *gsane_scanner_new (const SANE_Device *device);
GValue* gsane_scanner_option_get_value (GSaneScanner *sane,
GParamSpec *spec);
Modified: trunk/modules/gsfile-backend.c
==============================================================================
--- trunk/modules/gsfile-backend.c (original)
+++ trunk/modules/gsfile-backend.c Thu May 8 12:59:02 2008
@@ -28,7 +28,7 @@
void gsfb_probe_scanners (GnomeScanBackend *backend);
-GS_DEFINE_MODULE_TYPE (GSFileBackend, gsfile_backend, GNOME_TYPE_SCAN_BACKEND);
+GS_DEFINE_MODULE_TYPE (GSFileBackend, gsfile_backend, GNOME_SCAN_TYPE_BACKEND);
static void
gsfile_backend_init (GSFileBackend *object)
@@ -59,7 +59,7 @@
void
gsfb_probe_scanners (GnomeScanBackend *backend)
{
- GnomeScanner *scanner;
+ GnomeScanScanner *scanner;
scanner = gsfile_scanner_new ();
gnome_scan_backend_add_scanner (backend, scanner);
g_object_unref (scanner);
Modified: trunk/modules/gsfile-scanner.c
==============================================================================
--- trunk/modules/gsfile-scanner.c (original)
+++ trunk/modules/gsfile-scanner.c Thu May 8 12:59:02 2008
@@ -38,7 +38,7 @@
GeglNode *load;
};
-static GnomeScannerClass* parent_class = NULL;
+static GnomeScanScannerClass* parent_class = NULL;
static void gsf_configure (GnomeScanPlugin *plugin,
GnomeScanSettings *settings);
@@ -48,7 +48,7 @@
static gboolean gsf_work (GnomeScanPlugin *plugin,
gdouble *progress);
-GS_DEFINE_MODULE_TYPE (GSFileScanner, gsfile_scanner, GNOME_TYPE_SCANNER);
+GS_DEFINE_MODULE_TYPE (GSFileScanner, gsfile_scanner, GNOME_SCAN_TYPE_SCANNER);
static void
gsfile_scanner_init (GSFileScanner *object)
@@ -98,7 +98,7 @@
gs_param_spec_set_domain (pspec, GETTEXT_PACKAGE);
gs_param_spec_set_unit (pspec, GNOME_SCAN_UNIT_NONE);
gnome_scan_plugin_params_add (GNOME_SCAN_PLUGIN (object), pspec);
- GNOME_SCANNER (object)->status = GNOME_SCANNER_READY;
+ GNOME_SCAN_SCANNER (object)->status = GNOME_SCAN_STATUS_READY;
}
static void
@@ -113,7 +113,7 @@
gsfile_scanner_class_init (GSFileScannerClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- parent_class = GNOME_SCANNER_CLASS (g_type_class_peek_parent (klass));
+ parent_class = GNOME_SCAN_SCANNER_CLASS (g_type_class_peek_parent (klass));
GnomeScanPluginClass* plugin_class = GNOME_SCAN_PLUGIN_CLASS (klass);
g_type_class_add_private (object_class, sizeof (GSFileScannerPrivate));
@@ -126,7 +126,7 @@
object_class->finalize = gsfile_scanner_finalize;
}
-GnomeScanner*
+GnomeScanScanner*
gsfile_scanner_new ()
{
GObject *object = g_object_new (GSFILE_TYPE_SCANNER,
Modified: trunk/modules/gsfile-scanner.h
==============================================================================
--- trunk/modules/gsfile-scanner.h (original)
+++ trunk/modules/gsfile-scanner.h Thu May 8 12:59:02 2008
@@ -24,7 +24,7 @@
#define _GSFILE_SCANNER_H_
#include <glib-object.h>
-#include <gnome-scanner.h>
+#include <gnome-scan-scanner.h>
G_BEGIN_DECLS
@@ -40,19 +40,19 @@
struct _GSFileScannerClass
{
- GnomeScannerClass parent_class;
+ GnomeScanScannerClass parent_class;
};
struct _GSFileScanner
{
- GnomeScanner parent_instance;
+ GnomeScanScanner parent_instance;
GSList* filenames;
GSList* current;
};
GType gsfile_scanner_get_type ();
void gsfile_scanner_register_type (GTypeModule *module);
-GnomeScanner *gsfile_scanner_new ();
+GnomeScanScanner *gsfile_scanner_new ();
G_END_DECLS
Modified: trunk/src/flegita-gimp-sink.c
==============================================================================
--- trunk/src/flegita-gimp-sink.c (original)
+++ trunk/src/flegita-gimp-sink.c Thu May 8 12:59:02 2008
@@ -63,7 +63,7 @@
gdouble *progress);
static void fgs_end_frame (GnomeScanPlugin *plugin);
-G_DEFINE_TYPE (FlegitaGimpSink, flegita_gimp_sink, GNOME_TYPE_SCAN_SINK);
+G_DEFINE_TYPE (FlegitaGimpSink, flegita_gimp_sink, GNOME_SCAN_TYPE_SINK);
#define PARAM_LAYER_NAME "layer-name"
Modified: trunk/src/flegita-sink.c
==============================================================================
--- trunk/src/flegita-sink.c (original)
+++ trunk/src/flegita-sink.c Thu May 8 12:59:02 2008
@@ -76,7 +76,7 @@
FlegitaSink *sink);
#endif
-G_DEFINE_TYPE (FlegitaSink, flegita_sink, GNOME_TYPE_SCAN_SINK)
+G_DEFINE_TYPE (FlegitaSink, flegita_sink, GNOME_SCAN_TYPE_SINK)
GS_DEFINE_QUARK(flegita_group_png_options, N_("PNG Options"))
#define FLEGITA_PARAM_GROUP_PNG_OPTIONS (flegita_group_png_options_quark())
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
