[gedit] snippets: use new private definition for gobject templates

[Ignacio Casal Quinteiro <icq src gnome org>]

commit e939e7a23f0b96f808296c4ed355a5d7a340f6c0
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Mon Jun 16 08:49:42 2014 +0200

    snippets: use new private definition for gobject templates

 plugins/snippets/data/c.xml    |   11 +++--------
 plugins/snippets/data/chdr.xml |    3 ---
 2 files changed, 3 insertions(+), 11 deletions(-)
---
diff --git a/plugins/snippets/data/c.xml b/plugins/snippets/data/c.xml
index 9cd474c..f46ceed 100644
--- a/plugins/snippets/data/c.xml
+++ b/plugins/snippets/data/c.xml
@@ -165,13 +165,11 @@ for t in components:
   camel_str += t.capitalize()
>
 
-#define $<[1]: return up_str >_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), $<[1]: return 
type_str >, $<[1]: return camel_str >Private))
-
-struct _$<[1]: return camel_str >Private
+typedef struct _$<[1]: return camel_str >Private
 {
-};
+} $<[1]: return camel_str >Private;
 
-G_DEFINE_TYPE ($<[1]: return camel_str >, $<[1]: return low_str >, ${2:G_TYPE_OBJECT})
+G_DEFINE_TYPE_WITH_PRIVATE ($<[1]: return camel_str >, $<[1]: return low_str >, ${2:G_TYPE_OBJECT})
 
 static void
 $<[1]: return low_str>_finalize (GObject *object)
@@ -185,14 +183,11 @@ $<[1]: return low_str >_class_init ($<[1]: return camel_str >Class *klass)
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
        object_class->finalize = $<[1]: return low_str >_finalize;
-
-       g_type_class_add_private (object_class, sizeof ($<[1]: return camel_str >Private));
 }
 
 static void
 $<[1]: return low_str >_init ($<[1]: return camel_str> *self)
 {
-       self->priv = $<[1]: return up_str >_GET_PRIVATE (self);
 }
 
 $<[1]: return camel_str > *
diff --git a/plugins/snippets/data/chdr.xml b/plugins/snippets/data/chdr.xml
index cdff112..3baf13b 100644
--- a/plugins/snippets/data/chdr.xml
+++ b/plugins/snippets/data/chdr.xml
@@ -158,7 +158,6 @@ $<[1]:
 items = [ \
 ['typedef struct _' + camel_str, camel_str + ';'], \
 ['typedef struct _' + camel_str + 'Class', camel_str + 'Class;'], \
-['typedef struct _' + camel_str + 'Private', camel_str + 'Private;'] \
 ]
 
 return align(items) >
@@ -166,8 +165,6 @@ return align(items) >
 struct _$<[1]: return camel_str >
 {
        ${7:GObject} parent;
-
-       $<[1]: return camel_str >Private *priv;
 };
 
 struct _$<[1]: return camel_str >Class