aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/menus
diff options
context:
space:
mode:
Diffstat (limited to 'widgets/menus')
-rw-r--r--widgets/menus/gal-define-views-dialog.c12
-rw-r--r--widgets/menus/gal-define-views-model.c20
-rw-r--r--widgets/menus/gal-view-collection.c17
-rw-r--r--widgets/menus/gal-view-etable.c12
-rw-r--r--widgets/menus/gal-view-factory-etable.c11
-rw-r--r--widgets/menus/gal-view-factory.c10
-rw-r--r--widgets/menus/gal-view-instance-save-as-dialog.c14
-rw-r--r--widgets/menus/gal-view-instance.c17
-rw-r--r--widgets/menus/gal-view-new-dialog.c14
-rw-r--r--widgets/menus/gal-view.c12
10 files changed, 42 insertions, 97 deletions
diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c
index 8f7aec365f..9518d22143 100644
--- a/widgets/menus/gal-define-views-dialog.c
+++ b/widgets/menus/gal-define-views-dialog.c
@@ -40,9 +40,6 @@ static void gal_define_views_dialog_set_property (GObject *object, guint prop_id
static void gal_define_views_dialog_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
static void gal_define_views_dialog_dispose (GObject *object);
-static GtkDialogClass *parent_class = NULL;
-#define PARENT_TYPE GTK_TYPE_DIALOG
-
/* The properties we support */
enum {
PROP_0,
@@ -63,8 +60,7 @@ typedef struct {
GalDefineViewsDialog *names;
} GalDefineViewsDialogChild;
-
-E_MAKE_TYPE(gal_define_views_dialog, "GalDefineViewsDialog", GalDefineViewsDialog, gal_define_views_dialog_class_init, gal_define_views_dialog_init, PARENT_TYPE)
+G_DEFINE_TYPE (GalDefineViewsDialog, gal_define_views_dialog, GTK_TYPE_DIALOG)
static void
gal_define_views_dialog_class_init (GalDefineViewsDialogClass *klass)
@@ -73,8 +69,6 @@ gal_define_views_dialog_class_init (GalDefineViewsDialogClass *klass)
object_class = (GObjectClass*) klass;
- parent_class = g_type_class_ref (PARENT_TYPE);
-
object_class->set_property = gal_define_views_dialog_set_property;
object_class->get_property = gal_define_views_dialog_get_property;
object_class->dispose = gal_define_views_dialog_dispose;
@@ -305,8 +299,8 @@ gal_define_views_dialog_dispose (GObject *object)
g_object_unref(gal_define_views_dialog->gui);
gal_define_views_dialog->gui = NULL;
- if (G_OBJECT_CLASS (parent_class)->dispose)
- (* G_OBJECT_CLASS (parent_class)->dispose) (object);
+ if (G_OBJECT_CLASS (gal_define_views_dialog_parent_class)->dispose)
+ (* G_OBJECT_CLASS (gal_define_views_dialog_parent_class)->dispose) (object);
}
static void
diff --git a/widgets/menus/gal-define-views-model.c b/widgets/menus/gal-define-views-model.c
index b38dbbc4b2..912012935b 100644
--- a/widgets/menus/gal-define-views-model.c
+++ b/widgets/menus/gal-define-views-model.c
@@ -32,8 +32,7 @@
#include "gal-define-views-model.h"
-#define PARENT_TYPE E_TABLE_MODEL_TYPE
-static ETableModelClass *parent_class;
+G_DEFINE_TYPE (GalDefineViewsModel, gal_define_views_model, E_TABLE_MODEL_TYPE)
/*
* GalDefineViewsModel callbacks
@@ -57,8 +56,8 @@ gdvm_dispose(GObject *object)
g_object_unref(model->collection);
model->collection = NULL;
- if (G_OBJECT_CLASS (parent_class)->dispose)
- (* G_OBJECT_CLASS (parent_class)->dispose) (object);
+ if (G_OBJECT_CLASS (gal_define_views_model_parent_class)->dispose)
+ (* G_OBJECT_CLASS (gal_define_views_model_parent_class)->dispose) (object);
}
/* This function returns the number of columns in our ETableModel. */
@@ -166,11 +165,10 @@ gal_define_views_model_append (GalDefineViewsModel *model,
}
static void
-gal_define_views_model_class_init (GObjectClass *object_class)
+gal_define_views_model_class_init (GalDefineViewsModelClass *klass)
{
- ETableModelClass *model_class = (ETableModelClass *) object_class;
-
- parent_class = g_type_class_ref (PARENT_TYPE);
+ ETableModelClass *model_class = E_TABLE_MODEL_CLASS (klass);
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->dispose = gdvm_dispose;
object_class->set_property = gal_define_views_model_set_property;
@@ -204,10 +202,8 @@ gal_define_views_model_class_init (GObjectClass *object_class)
}
static void
-gal_define_views_model_init (GObject *object)
+gal_define_views_model_init (GalDefineViewsModel *model)
{
- GalDefineViewsModel *model = GAL_DEFINE_VIEWS_MODEL(object);
-
model->collection = NULL;
}
@@ -255,8 +251,6 @@ gal_define_views_model_get_property (GObject *object, guint prop_id, GValue *val
}
}
-E_MAKE_TYPE(gal_define_views_model, "GalDefineViewsModel", GalDefineViewsModel, gal_define_views_model_class_init, gal_define_views_model_init, PARENT_TYPE)
-
/**
* gal_define_views_model_new
*
diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c
index b94fb02f5f..6d86b91c76 100644
--- a/widgets/menus/gal-view-collection.c
+++ b/widgets/menus/gal-view-collection.c
@@ -39,9 +39,7 @@
#include "gal-view-collection.h"
-#define PARENT_TYPE G_TYPE_OBJECT
-
-static GObjectClass *gal_view_collection_parent_class;
+G_DEFINE_TYPE (GalViewCollection, gal_view_collection, G_TYPE_OBJECT)
#define d(x)
@@ -191,16 +189,15 @@ gal_view_collection_dispose (GObject *object)
g_free (collection->title);
collection->title = NULL;
- if (gal_view_collection_parent_class->dispose)
- (*gal_view_collection_parent_class->dispose)(object);
+ if (G_OBJECT_CLASS (gal_view_collection_parent_class)->dispose)
+ (* G_OBJECT_CLASS (gal_view_collection_parent_class)->dispose)(object);
}
static void
-gal_view_collection_class_init (GObjectClass *object_class)
+gal_view_collection_class_init (GalViewCollectionClass *klass)
{
- GalViewCollectionClass *klass = GAL_VIEW_COLLECTION_CLASS(object_class);
- gal_view_collection_parent_class = g_type_class_ref (PARENT_TYPE);
-
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
object_class->dispose = gal_view_collection_dispose;
gal_view_collection_signals [DISPLAY_VIEW] =
@@ -245,8 +242,6 @@ gal_view_collection_init (GalViewCollection *collection)
collection->title = NULL;
}
-E_MAKE_TYPE(gal_view_collection, "GalViewCollection", GalViewCollection, gal_view_collection_class_init, gal_view_collection_init, PARENT_TYPE)
-
/**
* gal_view_collection_new:
*
diff --git a/widgets/menus/gal-view-etable.c b/widgets/menus/gal-view-etable.c
index f35d94e5db..6a7576c311 100644
--- a/widgets/menus/gal-view-etable.c
+++ b/widgets/menus/gal-view-etable.c
@@ -27,9 +27,7 @@
#include "gal-view-etable.h"
-#define PARENT_TYPE GAL_VIEW_TYPE
-
-static GalViewClass *gal_view_etable_parent_class;
+G_DEFINE_TYPE (GalViewEtable, gal_view_etable, GAL_VIEW_TYPE)
static void
detach_table (GalViewEtable *view)
@@ -163,10 +161,10 @@ gal_view_etable_dispose (GObject *object)
}
static void
-gal_view_etable_class_init (GObjectClass *object_class)
+gal_view_etable_class_init (GalViewEtableClass *klass)
{
- GalViewClass *gal_view_class = GAL_VIEW_CLASS(object_class);
- gal_view_etable_parent_class = g_type_class_ref (PARENT_TYPE);
+ GalViewClass *gal_view_class = GAL_VIEW_CLASS (klass);
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
gal_view_class->edit = gal_view_etable_edit ;
gal_view_class->load = gal_view_etable_load ;
@@ -187,8 +185,6 @@ gal_view_etable_init (GalViewEtable *gve)
gve->title = NULL;
}
-E_MAKE_TYPE(gal_view_etable, "GalViewEtable", GalViewEtable, gal_view_etable_class_init, gal_view_etable_init, PARENT_TYPE)
-
/**
* gal_view_etable_new
* @spec: The ETableSpecification that this view will be based upon.
diff --git a/widgets/menus/gal-view-factory-etable.c b/widgets/menus/gal-view-factory-etable.c
index 309cf2d5cb..655740f5ec 100644
--- a/widgets/menus/gal-view-factory-etable.c
+++ b/widgets/menus/gal-view-factory-etable.c
@@ -29,9 +29,7 @@
#include "gal-view-etable.h"
#include "gal-view-factory-etable.h"
-#define PARENT_TYPE GAL_VIEW_FACTORY_TYPE
-
-static GalViewFactoryClass *gal_view_factory_etable_parent_class;
+G_DEFINE_TYPE (GalViewFactoryEtable, gal_view_factory_etable, GAL_VIEW_FACTORY_TYPE)
static const char *
gal_view_factory_etable_get_title (GalViewFactory *factory)
@@ -66,10 +64,10 @@ gal_view_factory_etable_dispose (GObject *object)
}
static void
-gal_view_factory_etable_class_init (GObjectClass *object_class)
+gal_view_factory_etable_class_init (GalViewFactoryEtableClass *klass)
{
- GalViewFactoryClass *view_factory_class = GAL_VIEW_FACTORY_CLASS(object_class);
- gal_view_factory_etable_parent_class = g_type_class_ref (PARENT_TYPE);
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GalViewFactoryClass *view_factory_class = GAL_VIEW_FACTORY_CLASS (klass);
view_factory_class->get_title = gal_view_factory_etable_get_title;
view_factory_class->new_view = gal_view_factory_etable_new_view;
@@ -119,4 +117,3 @@ gal_view_factory_etable_construct (GalViewFactoryEtable *factory,
return GAL_VIEW_FACTORY(factory);
}
-E_MAKE_TYPE(gal_view_factory_etable, "GalViewFactoryEtable", GalViewFactoryEtable, gal_view_factory_etable_class_init, gal_view_factory_etable_init, PARENT_TYPE)
diff --git a/widgets/menus/gal-view-factory.c b/widgets/menus/gal-view-factory.c
index 6441d9ee24..f9f832d767 100644
--- a/widgets/menus/gal-view-factory.c
+++ b/widgets/menus/gal-view-factory.c
@@ -27,14 +27,12 @@
#include "gal-view-factory.h"
-#define PARENT_TYPE G_TYPE_OBJECT
+G_DEFINE_TYPE (GalViewFactory, gal_view_factory, G_TYPE_OBJECT)
#define d(x)
d(static gint depth = 0;)
-static GObjectClass *gal_view_factory_parent_class;
-
/**
* gal_view_factory_get_title:
* @factory: The factory to query.
@@ -92,11 +90,8 @@ gal_view_factory_get_type_code (GalViewFactory *factory)
}
static void
-gal_view_factory_class_init (GObjectClass *object_class)
+gal_view_factory_class_init (GalViewFactoryClass *klass)
{
- GalViewFactoryClass *klass = GAL_VIEW_FACTORY_CLASS(object_class);
- gal_view_factory_parent_class = g_type_class_ref (PARENT_TYPE);
-
klass->get_title = NULL;
klass->new_view = NULL;
}
@@ -106,4 +101,3 @@ gal_view_factory_init (GalViewFactory *factory)
{
}
-E_MAKE_TYPE(gal_view_factory, "GalViewFactory", GalViewFactory, gal_view_factory_class_init, gal_view_factory_init, PARENT_TYPE)
diff --git a/widgets/menus/gal-view-instance-save-as-dialog.c b/widgets/menus/gal-view-instance-save-as-dialog.c
index 622b99a049..ba322563dc 100644
--- a/widgets/menus/gal-view-instance-save-as-dialog.c
+++ b/widgets/menus/gal-view-instance-save-as-dialog.c
@@ -33,8 +33,7 @@
#include "gal-view-instance-save-as-dialog.h"
#include "gal-view-new-dialog.h"
-static GtkDialogClass *parent_class = NULL;
-#define PARENT_TYPE GTK_TYPE_DIALOG
+G_DEFINE_TYPE (GalViewInstanceSaveAsDialog, gal_view_instance_save_as_dialog, GTK_TYPE_DIALOG)
/* The arguments we take */
enum {
@@ -159,8 +158,8 @@ gal_view_instance_save_as_dialog_dispose (GObject *object)
g_object_unref(gal_view_instance_save_as_dialog->gui);
gal_view_instance_save_as_dialog->gui = NULL;
- if (G_OBJECT_CLASS (parent_class)->dispose)
- (* G_OBJECT_CLASS (parent_class)->dispose) (object);
+ if (G_OBJECT_CLASS (gal_view_instance_save_as_dialog_parent_class)->dispose)
+ (* G_OBJECT_CLASS (gal_view_instance_save_as_dialog_parent_class)->dispose) (object);
}
/* Init functions */
@@ -171,8 +170,6 @@ gal_view_instance_save_as_dialog_class_init (GalViewInstanceSaveAsDialogClass *k
object_class = (GObjectClass*) klass;
- parent_class = g_type_class_ref (PARENT_TYPE);
-
object_class->set_property = gal_view_instance_save_as_dialog_set_property;
object_class->get_property = gal_view_instance_save_as_dialog_get_property;
object_class->dispose = gal_view_instance_save_as_dialog_dispose;
@@ -270,11 +267,6 @@ gal_view_instance_save_as_dialog_new (GalViewInstance *instance)
return widget;
}
-E_MAKE_TYPE(gal_view_instance_save_as_dialog, "GalViewInstanceSaveAsDialog",
- GalViewInstanceSaveAsDialog,
- gal_view_instance_save_as_dialog_class_init,
- gal_view_instance_save_as_dialog_init, PARENT_TYPE)
-
void
gal_view_instance_save_as_dialog_save (GalViewInstanceSaveAsDialog *dialog)
{
diff --git a/widgets/menus/gal-view-instance.c b/widgets/menus/gal-view-instance.c
index 521da6a6b3..c2fb24af20 100644
--- a/widgets/menus/gal-view-instance.c
+++ b/widgets/menus/gal-view-instance.c
@@ -45,9 +45,7 @@
#include "gal-view-instance.h"
#include "gal-view-instance-save-as-dialog.h"
-#define PARENT_TYPE G_TYPE_OBJECT
-
-static GObjectClass *gal_view_instance_parent_class;
+G_DEFINE_TYPE (GalViewInstance, gal_view_instance, G_TYPE_OBJECT)
static const EPopupMenu separator = E_POPUP_SEPARATOR;
static const EPopupMenu terminator = E_POPUP_TERMINATOR;
@@ -174,16 +172,15 @@ gal_view_instance_dispose (GObject *object)
g_free (instance->default_view);
- if (gal_view_instance_parent_class->dispose)
- (*gal_view_instance_parent_class->dispose)(object);
+ if (G_OBJECT_CLASS (gal_view_instance_parent_class)->dispose)
+ (* G_OBJECT_CLASS (gal_view_instance_parent_class)->dispose)(object);
}
static void
-gal_view_instance_class_init (GObjectClass *object_class)
+gal_view_instance_class_init (GalViewInstanceClass *klass)
{
- GalViewInstanceClass *klass = GAL_VIEW_INSTANCE_CLASS(object_class);
- gal_view_instance_parent_class = g_type_class_ref (PARENT_TYPE);
-
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
object_class->dispose = gal_view_instance_dispose;
gal_view_instance_signals [DISPLAY_VIEW] =
@@ -229,8 +226,6 @@ gal_view_instance_init (GalViewInstance *instance)
instance->default_view = NULL;
}
-E_MAKE_TYPE(gal_view_instance, "GalViewInstance", GalViewInstance, gal_view_instance_class_init, gal_view_instance_init, PARENT_TYPE)
-
static void
collection_changed (GalView *view, GalViewInstance *instance)
{
diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c
index c41ce03123..49c96d4c2c 100644
--- a/widgets/menus/gal-view-new-dialog.c
+++ b/widgets/menus/gal-view-new-dialog.c
@@ -40,9 +40,6 @@ static void gal_view_new_dialog_set_property (GObject *object, guint prop_id, co
static void gal_view_new_dialog_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
static void gal_view_new_dialog_dispose (GObject *object);
-static GtkDialogClass *parent_class = NULL;
-#define PARENT_TYPE GTK_TYPE_DIALOG
-
/* The arguments we take */
enum {
PROP_0,
@@ -50,10 +47,7 @@ enum {
PROP_FACTORY
};
-E_MAKE_TYPE(gal_view_new_dialog, "GalViewNewDialog",
- GalViewNewDialog,
- gal_view_new_dialog_class_init,
- gal_view_new_dialog_init, PARENT_TYPE)
+G_DEFINE_TYPE (GalViewNewDialog, gal_view_new_dialog, GTK_TYPE_DIALOG)
static void
gal_view_new_dialog_class_init (GalViewNewDialogClass *klass)
@@ -62,8 +56,6 @@ gal_view_new_dialog_class_init (GalViewNewDialogClass *klass)
object_class = (GObjectClass*) klass;
- parent_class = g_type_class_ref (PARENT_TYPE);
-
object_class->set_property = gal_view_new_dialog_set_property;
object_class->get_property = gal_view_new_dialog_get_property;
object_class->dispose = gal_view_new_dialog_dispose;
@@ -127,8 +119,8 @@ gal_view_new_dialog_dispose (GObject *object)
g_object_unref(gal_view_new_dialog->gui);
gal_view_new_dialog->gui = NULL;
- if (G_OBJECT_CLASS (parent_class)->dispose)
- (* G_OBJECT_CLASS (parent_class)->dispose) (object);
+ if (G_OBJECT_CLASS (gal_view_new_dialog_parent_class)->dispose)
+ (* G_OBJECT_CLASS (gal_view_new_dialog_parent_class)->dispose) (object);
}
GtkWidget*
diff --git a/widgets/menus/gal-view.c b/widgets/menus/gal-view.c
index 36c325aefd..30b9a683f3 100644
--- a/widgets/menus/gal-view.c
+++ b/widgets/menus/gal-view.c
@@ -27,15 +27,13 @@
#include "gal-view.h"
-#define PARENT_TYPE G_TYPE_OBJECT
+G_DEFINE_TYPE (GalView, gal_view, G_TYPE_OBJECT)
#define d(x)
d(static gint depth = 0;)
-static GObjectClass *gal_view_parent_class;
-
enum {
CHANGED,
LAST_SIGNAL
@@ -177,11 +175,10 @@ gal_view_changed (GalView *view)
}
static void
-gal_view_class_init (GObjectClass *object_class)
+gal_view_class_init (GalViewClass *klass)
{
- GalViewClass *klass = GAL_VIEW_CLASS(object_class);
- gal_view_parent_class = g_type_class_ref (PARENT_TYPE);
-
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
klass->edit = NULL;
klass->load = NULL;
klass->save = NULL;
@@ -205,4 +202,3 @@ gal_view_init (GalView *view)
{
}
-E_MAKE_TYPE(gal_view, "GalView", GalView, gal_view_class_init, gal_view_init, PARENT_TYPE)
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-24 16:30:27 +0800