[gtksourceview] Override constructed instead of constructor.
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceview] Override constructed instead of constructor.
- Date: Wed, 12 Jan 2011 14:36:30 +0000 (UTC)
commit 3aecc5cb913433bdd23d389d5d5f1ed423a4150e
Author: Ignacio Casal Quinteiro <icq gnome org>
Date: Wed Jan 12 15:36:33 2011 +0100
Override constructed instead of constructor.
gtksourceview/gtksourcebuffer.c | 50 ++++++++++++----------------
gtksourceview/gtksourcecompletioncontext.c | 28 +++++++---------
gtksourceview/gtksourcegutter.c | 5 +++
gtksourceview/gtksourceview.c | 35 +++++++------------
4 files changed, 51 insertions(+), 67 deletions(-)
---
diff --git a/gtksourceview/gtksourcebuffer.c b/gtksourceview/gtksourcebuffer.c
index 384bc93..ab2711c 100644
--- a/gtksourceview/gtksourcebuffer.c
+++ b/gtksourceview/gtksourcebuffer.c
@@ -132,9 +132,6 @@ G_DEFINE_TYPE (GtkSourceBuffer, gtk_source_buffer, GTK_TYPE_TEXT_BUFFER)
static guint buffer_signals[LAST_SIGNAL];
-static GObject *gtk_source_buffer_constructor (GType type,
- guint n_construct_properties,
- GObjectConstructParam *construct_param);
static void gtk_source_buffer_finalize (GObject *object);
static void gtk_source_buffer_dispose (GObject *object);
static void gtk_source_buffer_set_property (GObject *object,
@@ -182,6 +179,26 @@ static void gtk_source_buffer_real_undo (GtkSourceBuffer *buffer);
static void gtk_source_buffer_real_redo (GtkSourceBuffer *buffer);
static void
+gtk_source_buffer_constructed (GObject *object)
+{
+ GtkSourceBuffer *buffer = GTK_SOURCE_BUFFER (object);
+
+ /* we need to know that the tag-table was set */
+ buffer->priv->constructed = TRUE;
+
+ if (buffer->priv->undo_manager == NULL)
+ {
+ /* This will install the default undo manager */
+ gtk_source_buffer_set_undo_manager (buffer, NULL);
+ }
+
+ if (G_OBJECT_CLASS (gtk_source_buffer_parent_class)->constructed)
+ {
+ G_OBJECT_CLASS (gtk_source_buffer_parent_class)->constructed (object);
+ }
+}
+
+static void
gtk_source_buffer_class_init (GtkSourceBufferClass *klass)
{
GObjectClass *object_class;
@@ -191,7 +208,7 @@ gtk_source_buffer_class_init (GtkSourceBufferClass *klass)
object_class = G_OBJECT_CLASS (klass);
tb_class = GTK_TEXT_BUFFER_CLASS (klass);
- object_class->constructor = gtk_source_buffer_constructor;
+ object_class->constructed = gtk_source_buffer_constructed;
object_class->finalize = gtk_source_buffer_finalize;
object_class->dispose = gtk_source_buffer_dispose;
object_class->get_property = gtk_source_buffer_get_property;
@@ -444,31 +461,6 @@ gtk_source_buffer_init (GtkSourceBuffer *buffer)
g_object_ref (priv->style_scheme);
}
-static GObject *
-gtk_source_buffer_constructor (GType type,
- guint n_construct_properties,
- GObjectConstructParam *construct_param)
-{
- GObject *object;
- GtkSourceBuffer *buffer;
-
- object = G_OBJECT_CLASS(gtk_source_buffer_parent_class)->constructor (type,
- n_construct_properties,
- construct_param);
-
- /* we need to know that the tag-table was set */
- buffer = GTK_SOURCE_BUFFER (object);
- buffer->priv->constructed = TRUE;
-
- if (buffer->priv->undo_manager == NULL)
- {
- /* This will install the default undo manager */
- gtk_source_buffer_set_undo_manager (buffer, NULL);
- }
-
- return object;
-}
-
static void
gtk_source_buffer_finalize (GObject *object)
{
diff --git a/gtksourceview/gtksourcecompletioncontext.c b/gtksourceview/gtksourcecompletioncontext.c
index f67c7bf..6a39c8a 100644
--- a/gtksourceview/gtksourcecompletioncontext.c
+++ b/gtksourceview/gtksourcecompletioncontext.c
@@ -181,38 +181,34 @@ buffer_mark_set_cb (GtkTextBuffer *buffer,
}
}
-static GObject *
-gtk_source_completion_context_constructor (GType type,
- guint n_construct_properties,
- GObjectConstructParam *construct_param)
+static void
+gtk_source_completion_context_constructed (GObject *object)
{
- GObject *object;
- GtkTextBuffer *buffer;
GtkSourceCompletionContext *context;
-
- object = G_OBJECT_CLASS (gtk_source_completion_context_parent_class)->constructor (type,
- n_construct_properties,
- construct_param);
+ GtkTextBuffer *buffer;
/* we need to connect after the completion property is set */
context = GTK_SOURCE_COMPLETION_CONTEXT (object);
buffer = get_buffer (context);
context->priv->mark_set_id = g_signal_connect (buffer,
- "mark-set",
- G_CALLBACK (buffer_mark_set_cb),
- context);
+ "mark-set",
+ G_CALLBACK (buffer_mark_set_cb),
+ context);
- return object;
+ if (G_OBJECT_CLASS (gtk_source_completion_context_parent_class)->constructed)
+ {
+ G_OBJECT_CLASS (gtk_source_completion_context_parent_class)->constructed (object);
+ }
}
static void
gtk_source_completion_context_class_init (GtkSourceCompletionContextClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
+
+ object_class->constructed = gtk_source_completion_context_constructed;
object_class->set_property = gtk_source_completion_context_set_property;
object_class->get_property = gtk_source_completion_context_get_property;
- object_class->constructor = gtk_source_completion_context_constructor;
object_class->dispose = gtk_source_completion_context_dispose;
/**
diff --git a/gtksourceview/gtksourcegutter.c b/gtksourceview/gtksourcegutter.c
index 8acb09e..2f19f12 100644
--- a/gtksourceview/gtksourcegutter.c
+++ b/gtksourceview/gtksourcegutter.c
@@ -493,6 +493,11 @@ gtk_source_gutter_constructed (GObject *object)
{
gutter->priv->orientation = GTK_ORIENTATION_VERTICAL;
}
+
+ if (G_OBJECT_CLASS (gtk_source_gutter_parent_class)->constructed)
+ {
+ G_OBJECT_CLASS (gtk_source_gutter_parent_class)->constructed (object);
+ }
}
static void
diff --git a/gtksourceview/gtksourceview.c b/gtksourceview/gtksourceview.c
index b7d4e14..b055d8e 100644
--- a/gtksourceview/gtksourceview.c
+++ b/gtksourceview/gtksourceview.c
@@ -194,9 +194,6 @@ typedef enum
} IconType;
/* Prototypes. */
-static GObject *gtk_source_view_constructor (GType type,
- guint n_construct_properties,
- GObjectConstructParam *construct_param);
static void gtk_source_view_dispose (GObject *object);
static void gtk_source_view_finalize (GObject *object);
static void gtk_source_view_undo (GtkSourceView *view);
@@ -255,6 +252,18 @@ static MarkCategory *mark_category_new (GtkSourceMarkAttributes
gint priority);
static void mark_category_free (MarkCategory *category);
+static void
+gtk_source_view_constructed (GObject *object)
+{
+ GtkSourceView *view = GTK_SOURCE_VIEW (object);
+
+ set_source_buffer (view, gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)));
+
+ if (G_OBJECT_CLASS (gtk_source_view_parent_class)->constructed)
+ {
+ G_OBJECT_CLASS (gtk_source_view_parent_class)->constructed (object);
+ }
+}
/* Private functions. */
static void
@@ -269,7 +278,7 @@ gtk_source_view_class_init (GtkSourceViewClass *klass)
textview_class = GTK_TEXT_VIEW_CLASS (klass);
widget_class = GTK_WIDGET_CLASS (klass);
- object_class->constructor = gtk_source_view_constructor;
+ object_class->constructed = gtk_source_view_constructed;
object_class->dispose = gtk_source_view_dispose;
object_class->finalize = gtk_source_view_finalize;
object_class->get_property = gtk_source_view_get_property;
@@ -1021,24 +1030,6 @@ gtk_source_view_init (GtkSourceView *view)
NULL);
}
-static GObject *
-gtk_source_view_constructor (GType type,
- guint n_construct_properties,
- GObjectConstructParam *construct_param)
-{
- GObject *object;
- GtkSourceView *view;
-
- object = G_OBJECT_CLASS(gtk_source_view_parent_class)->constructor (type,
- n_construct_properties,
- construct_param);
- view = GTK_SOURCE_VIEW (object);
-
- set_source_buffer (view, gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)));
-
- return object;
-}
-
static void
gtk_source_view_dispose (GObject *object)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]