[gitg] Use G_DEFINE_BOXED_TYPE
- From: Garrett Regier <gregier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gitg] Use G_DEFINE_BOXED_TYPE
- Date: Tue, 4 Jan 2011 17:12:09 +0000 (UTC)
commit d526a900ee87bbaef52e51dd925fa9265c756c34
Author: Garrett Regier <alias301 gmail com>
Date: Sun Jan 2 21:01:50 2011 -0800
Use G_DEFINE_BOXED_TYPE
gitg/gitg-diff-line-renderer.c | 8 +-------
gitg/gitg-revision-changes-panel.c | 17 +++--------------
libgitg/gitg-ref.c | 15 +--------------
libgitg/gitg-revision.c | 17 ++---------------
4 files changed, 7 insertions(+), 50 deletions(-)
---
diff --git a/gitg/gitg-diff-line-renderer.c b/gitg/gitg-diff-line-renderer.c
index c77fa46..4ceaaf9 100644
--- a/gitg/gitg-diff-line-renderer.c
+++ b/gitg/gitg-diff-line-renderer.c
@@ -49,13 +49,7 @@ struct _GitgDiffLineRendererPrivate
gchar *label;
};
-G_DEFINE_TYPE (GitgDiffLineRenderer, gitg_diff_line_renderer, GTK_TYPE_CELL_RENDERER)
-
-static void
-gitg_diff_line_renderer_finalize (GObject *object)
-{
- G_OBJECT_CLASS (gitg_diff_line_renderer_parent_class)->finalize (object);
-}
+G_DEFINE_TYPE (GitgDiffLineRenderer, gitg_diff_line_renderer, GTK_TYPE_SOURCE_GUTTER_RENDERER)
static void
gitg_diff_line_renderer_set_property (GObject *object,
diff --git a/gitg/gitg-revision-changes-panel.c b/gitg/gitg-revision-changes-panel.c
index 02bbdd8..ed0c403 100644
--- a/gitg/gitg-revision-changes-panel.c
+++ b/gitg/gitg-revision-changes-panel.c
@@ -71,6 +71,8 @@ static void gitg_activatable_iface_init (GitgActivatableInterface *iface);
static void on_header_added (GitgDiffView *view, GitgDiffIter *iter, GitgRevisionChangesPanel *self);
static void on_diff_files_selection_changed (GtkTreeSelection *selection, GitgRevisionChangesPanel *self);
+static GType diff_file_get_type (void) G_GNUC_CONST;
+
G_DEFINE_TYPE_EXTENDED (GitgRevisionChangesPanel,
gitg_revision_changes_panel,
G_TYPE_OBJECT,
@@ -140,20 +142,7 @@ diff_file_unref (DiffFile *f)
g_slice_free (DiffFile, f);
}
-static GType
-diff_file_get_type ()
-{
- static GType gtype = 0;
-
- if (!G_UNLIKELY(gtype))
- {
- gtype = g_boxed_type_register_static ("DiffFile",
- (GBoxedCopyFunc)diff_file_copy,
- (GBoxedFreeFunc)diff_file_unref);
- }
-
- return gtype;
-}
+G_DEFINE_BOXED_TYPE (DiffFile, diff_file, diff_file_copy, diff_file_unref)
static void
revision_files_icon (GtkTreeViewColumn *column,
diff --git a/libgitg/gitg-ref.c b/libgitg/gitg-ref.c
index 0ee8b27..bc99c0f 100644
--- a/libgitg/gitg-ref.c
+++ b/libgitg/gitg-ref.c
@@ -44,20 +44,7 @@ struct _GitgRef
gboolean working;
};
-GType
-gitg_ref_get_type (void)
-{
- static GType our_type = 0;
-
- if (!our_type)
- {
- our_type = g_boxed_type_register_static ("GitGRef",
- (GBoxedCopyFunc)gitg_ref_copy,
- (GBoxedFreeFunc)gitg_ref_free);
- }
-
- return our_type;
-}
+G_DEFINE_BOXED_TYPE (GitgRef, gitg_ref, gitg_ref_copy, gitg_ref_free)
GitgRef *
gitg_ref_new (gchar const *hash, gchar const *name)
diff --git a/libgitg/gitg-revision.c b/libgitg/gitg-revision.c
index d4bbbae..4083515 100644
--- a/libgitg/gitg-revision.c
+++ b/libgitg/gitg-revision.c
@@ -48,6 +48,8 @@ struct _GitgRevision
gint8 mylane;
};
+G_DEFINE_BOXED_TYPE (GitgRevision, gitg_revision, gitg_revision_ref, gitg_revision_unref)
+
static void
free_lanes (GitgRevision *rv)
{
@@ -344,21 +346,6 @@ gitg_revision_get_sign (GitgRevision *revision)
return revision->sign;
}
-GType
-gitg_revision_get_type (void)
-{
- static GType our_type = 0;
-
- if (!our_type)
- {
- our_type = g_boxed_type_register_static ("GitgRevision",
- (GBoxedCopyFunc)gitg_revision_ref,
- (GBoxedFreeFunc)gitg_revision_unref);
- }
-
- return our_type;
-}
-
GitgLane *
gitg_revision_get_lane (GitgRevision *revision)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]