plugins: Clean up deprecated preprcessor commands

plugins/docinfo/xed-docinfo-plugin.c

@@ -69,7 +69,8 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (XedDocInfoPlugin,
                                 PEAS_TYPE_EXTENSION_BASE,
                                 0,
                                 G_IMPLEMENT_INTERFACE_DYNAMIC (XED_TYPE_WINDOW_ACTIVATABLE,
-                                                               xed_window_activatable_iface_init))
+                                                               xed_window_activatable_iface_init)
+                                G_ADD_PRIVATE_DYNAMIC (XedDocInfoPlugin))
 
 static void
 calculate_info (XedDocument *doc,
@@ -385,7 +386,7 @@ static void
 xed_docinfo_plugin_init (XedDocInfoPlugin *plugin)
 {
     xed_debug_message (DEBUG_PLUGINS, "XedDocInfoPlugin initializing");
-    plugin->priv = G_TYPE_INSTANCE_GET_PRIVATE (plugin, XED_TYPE_DOCINFO_PLUGIN, XedDocInfoPluginPrivate);
+    plugin->priv = xed_docinfo_plugin_get_instance_private (plugin);
 }
 
 static void
@@ -531,8 +532,6 @@ xed_docinfo_plugin_class_init (XedDocInfoPluginClass *klass)
     object_class->get_property = xed_docinfo_plugin_get_property;
 
     g_object_class_override_property (object_class, PROP_WINDOW, "window");
-
-    g_type_class_add_private (klass, sizeof (XedDocInfoPluginPrivate));
 }
 
 static void

plugins/filebrowser/xed-file-bookmarks-store.c

@@ -27,10 +27,6 @@
 #include "xed-file-bookmarks-store.h"
 #include "xed-file-browser-utils.h"
 
-#define XED_FILE_BOOKMARKS_STORE_GET_PRIVATE(object)( \
-        G_TYPE_INSTANCE_GET_PRIVATE((object), XED_TYPE_FILE_BOOKMARKS_STORE, \
-        XedFileBookmarksStorePrivate))
-
 struct _XedFileBookmarksStorePrivate
 {
     GVolumeMonitor * volume_monitor;
@@ -55,7 +51,11 @@ static gboolean find_with_flags       (GtkTreeModel * model,
                                        guint flags,
                                        guint notflags);
 
-G_DEFINE_DYNAMIC_TYPE (XedFileBookmarksStore, xed_file_bookmarks_store, GTK_TYPE_TREE_STORE)
+G_DEFINE_DYNAMIC_TYPE_EXTENDED (XedFileBookmarksStore,
+                                xed_file_bookmarks_store,
+                                GTK_TYPE_TREE_STORE,
+                                0,
+                                G_ADD_PRIVATE_DYNAMIC (XedFileBookmarksStore))
 
 static void
 xed_file_bookmarks_store_dispose (GObject * object)
@@ -92,8 +92,6 @@ xed_file_bookmarks_store_class_init (XedFileBookmarksStoreClass *klass)
 
     object_class->dispose = xed_file_bookmarks_store_dispose;
     object_class->finalize = xed_file_bookmarks_store_finalize;
-
-    g_type_class_add_private (object_class, sizeof (XedFileBookmarksStorePrivate));
 }
 
 static void
@@ -105,7 +103,7 @@ xed_file_bookmarks_store_class_finalize  (XedFileBookmarksStoreClass *klass)
 static void
 xed_file_bookmarks_store_init (XedFileBookmarksStore * obj)
 {
-    obj->priv = XED_FILE_BOOKMARKS_STORE_GET_PRIVATE (obj);
+    obj->priv = xed_file_bookmarks_store_get_instance_private (obj);
 }
 
 /* Private */

plugins/filebrowser/xed-file-browser-plugin.c

@@ -42,8 +42,6 @@
 #define FILE_BROWSER_SCHEMA         "org.x.editor.plugins.filebrowser"
 #define FILE_BROWSER_ONLOAD_SCHEMA  "org.x.editor.plugins.filebrowser.on-load"
 
-#define XED_FILE_BROWSER_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), XED_TYPE_FILE_BROWSER_PLUGIN, XedFileBrowserPluginPrivate))
-
 struct _XedFileBrowserPluginPrivate
 {
     XedWindow *window;
@@ -106,8 +104,8 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (XedFileBrowserPlugin,
                                 PEAS_TYPE_EXTENSION_BASE,
                                 0,
                                 G_IMPLEMENT_INTERFACE_DYNAMIC (XED_TYPE_WINDOW_ACTIVATABLE,
-                                                               xed_window_activatable_iface_init)    \
+                                                               xed_window_activatable_iface_init)
-                                                                                               \
+                                G_ADD_PRIVATE_DYNAMIC (XedFileBrowserPlugin)
                                 _xed_file_browser_store_register_type        (type_module);  \
                                 _xed_file_bookmarks_store_register_type      (type_module);  \
                                 _xed_file_browser_view_register_type         (type_module);  \
@@ -118,7 +116,7 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (XedFileBrowserPlugin,
 static void
 xed_file_browser_plugin_init (XedFileBrowserPlugin *plugin)
 {
-    plugin->priv = XED_FILE_BROWSER_PLUGIN_GET_PRIVATE (plugin);
+    plugin->priv = xed_file_browser_plugin_get_instance_private (plugin);
 }
 
 static void
@@ -620,8 +618,6 @@ xed_file_browser_plugin_class_init (XedFileBrowserPluginClass * klass)
     object_class->get_property = xed_file_browser_plugin_get_property;
 
     g_object_class_override_property (object_class, PROP_WINDOW, "window");
-
-    g_type_class_add_private (object_class, sizeof (XedFileBrowserPluginPrivate));
 }
 
 static void

plugins/filebrowser/xed-file-browser-store.c

@@ -31,10 +31,6 @@
 #include "xed-file-browser-error.h"
 #include "xed-file-browser-utils.h"
 
-#define XED_FILE_BROWSER_STORE_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), \
-                             XED_TYPE_FILE_BROWSER_STORE, \
-                             XedFileBrowserStorePrivate))
-
 #define NODE_IS_DIR(node)      (FILE_IS_DIR((node)->flags))
 #define NODE_IS_HIDDEN(node)   (FILE_IS_HIDDEN((node)->flags))
 #define NODE_IS_TEXT(node)     (FILE_IS_TEXT((node)->flags))
@@ -193,14 +189,6 @@ static void next_files_async (GFileEnumerator *enumerator,
 
 static void delete_files (AsyncData *data);
 
-G_DEFINE_DYNAMIC_TYPE_EXTENDED (XedFileBrowserStore, xed_file_browser_store,
-                                G_TYPE_OBJECT,
-                                0,
-                                G_IMPLEMENT_INTERFACE_DYNAMIC (GTK_TYPE_TREE_MODEL,
-                                                               xed_file_browser_store_iface_init)
-                                G_IMPLEMENT_INTERFACE_DYNAMIC (GTK_TYPE_TREE_DRAG_SOURCE,
-                                                               xed_file_browser_store_drag_source_init))
-
 /* Properties */
 enum {
     PROP_0,
@@ -224,6 +212,15 @@ enum
     NUM_SIGNALS
 };
 
+G_DEFINE_DYNAMIC_TYPE_EXTENDED (XedFileBrowserStore, xed_file_browser_store,
+                                G_TYPE_OBJECT,
+                                0,
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (GTK_TYPE_TREE_MODEL,
+                                                               xed_file_browser_store_iface_init)
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (GTK_TYPE_TREE_DRAG_SOURCE,
+                                                               xed_file_browser_store_drag_source_init)
+                                G_ADD_PRIVATE_DYNAMIC (XedFileBrowserStore))
+
 static guint model_signals[NUM_SIGNALS] = { 0 };
 
 static void
@@ -418,8 +415,6 @@ xed_file_browser_store_class_init (XedFileBrowserStoreClass * klass)
                       g_cclosure_marshal_VOID__OBJECT,
                       G_TYPE_NONE, 1,
                       G_TYPE_FILE);
-
-    g_type_class_add_private (object_class, sizeof (XedFileBrowserStorePrivate));
 }
 
 static void
@@ -457,7 +452,7 @@ xed_file_browser_store_drag_source_init (GtkTreeDragSourceIface * iface)
 static void
 xed_file_browser_store_init (XedFileBrowserStore * obj)
 {
-    obj->priv = XED_FILE_BROWSER_STORE_GET_PRIVATE (obj);
+    obj->priv = xed_file_browser_store_get_instance_private (obj);
 
     obj->priv->column_types[XED_FILE_BROWSER_STORE_COLUMN_LOCATION] = G_TYPE_FILE;
     obj->priv->column_types[XED_FILE_BROWSER_STORE_COLUMN_NAME] = G_TYPE_STRING;

plugins/filebrowser/xed-file-browser-view.c

@@ -31,10 +31,6 @@
 #include "xed-file-browser-marshal.h"
 #include "xed-file-browser-enum-types.h"
 
-#define XED_FILE_BROWSER_VIEW_GET_PRIVATE(object)( \
-        G_TYPE_INSTANCE_GET_PRIVATE((object), \
-        XED_TYPE_FILE_BROWSER_VIEW, XedFileBrowserViewPrivate))
-
 struct _XedFileBrowserViewPrivate
 {
     GtkTreeViewColumn *column;
@@ -81,7 +77,11 @@ static const GtkTargetEntry drag_source_targets[] = {
     { "text/uri-list", 0, 0 }
 };
 
-G_DEFINE_DYNAMIC_TYPE (XedFileBrowserView, xed_file_browser_view, GTK_TYPE_TREE_VIEW)
+G_DEFINE_DYNAMIC_TYPE_EXTENDED (XedFileBrowserView,
+                                xed_file_browser_view,
+                                GTK_TYPE_TREE_VIEW,
+                                0,
+                                G_ADD_PRIVATE_DYNAMIC (XedFileBrowserView))
 
 static void on_cell_edited (GtkCellRendererText *cell,
                             gchar               *path,
@@ -824,8 +824,6 @@ xed_file_browser_view_class_init (XedFileBrowserViewClass *klass)
                                bookmark_activated), NULL, NULL,
                       g_cclosure_marshal_VOID__BOXED,
                       G_TYPE_NONE, 1, GTK_TYPE_TREE_ITER);
-
-    g_type_class_add_private (object_class, sizeof (XedFileBrowserViewPrivate));
 }
 
 static void
@@ -864,7 +862,7 @@ cell_data_cb (GtkTreeViewColumn  *tree_column,
 static void
 xed_file_browser_view_init (XedFileBrowserView *obj)
 {
-    obj->priv = XED_FILE_BROWSER_VIEW_GET_PRIVATE (obj);
+    obj->priv = xed_file_browser_view_get_instance_private (obj);
 
     obj->priv->column = gtk_tree_view_column_new ();
 

plugins/filebrowser/xed-file-browser-widget.c

@@ -38,10 +38,6 @@
 #include "xed-file-browser-marshal.h"
 #include "xed-file-browser-enum-types.h"
 
-#define XED_FILE_BROWSER_WIDGET_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), \
-                                                    XED_TYPE_FILE_BROWSER_WIDGET, \
-                                                    XedFileBrowserWidgetPrivate))
-
 #define XML_UI_FILE "xed-file-browser-widget-ui.xml"
 #define LOCATION_DATA_KEY "xed-file-browser-widget-location"
 
@@ -225,7 +221,11 @@ static void on_action_filter_binary (GtkAction            *action,
 static void on_action_bookmark_open (GtkAction            *action,
                                      XedFileBrowserWidget *obj);
 
-G_DEFINE_DYNAMIC_TYPE (XedFileBrowserWidget, xed_file_browser_widget, GTK_TYPE_BOX)
+G_DEFINE_DYNAMIC_TYPE_EXTENDED (XedFileBrowserWidget,
+                                xed_file_browser_widget,
+                                GTK_TYPE_BOX,
+                                0,
+                                G_ADD_PRIVATE_DYNAMIC (XedFileBrowserWidget))
 
 static void
 free_name_icon (gpointer data)
@@ -483,8 +483,6 @@ xed_file_browser_widget_class_init (XedFileBrowserWidgetClass *klass)
                       G_TYPE_BOOLEAN,
                       1,
                       G_TYPE_POINTER);
-
-    g_type_class_add_private (object_class, sizeof (XedFileBrowserWidgetPrivate));
 }
 
 static void
@@ -1173,7 +1171,7 @@ create_filter (XedFileBrowserWidget *obj)
 static void
 xed_file_browser_widget_init (XedFileBrowserWidget *obj)
 {
-    obj->priv = XED_FILE_BROWSER_WIDGET_GET_PRIVATE (obj);
+    obj->priv = xed_file_browser_widget_get_instance_private (obj);
 
     obj->priv->bookmarks_hash = g_hash_table_new_full (g_file_hash,
                                                        (GEqualFunc)g_file_equal,

plugins/modelines/xed-modeline-plugin.c

@@ -50,7 +50,8 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (XedModelinePlugin,
                                 PEAS_TYPE_EXTENSION_BASE,
                                 0,
                                 G_IMPLEMENT_INTERFACE_DYNAMIC (XED_TYPE_VIEW_ACTIVATABLE,
-                                                               xed_view_activatable_iface_init))
+                                                               xed_view_activatable_iface_init)
+                                G_ADD_PRIVATE_DYNAMIC (XedModelinePlugin))
 
 static void
 xed_modeline_plugin_constructed (GObject *object)
@@ -71,9 +72,7 @@ xed_modeline_plugin_init (XedModelinePlugin *plugin)
 {
     xed_debug_message (DEBUG_PLUGINS, "XedModelinePlugin initializing");
 
-    plugin->priv = G_TYPE_INSTANCE_GET_PRIVATE (plugin,
+    plugin->priv = xed_modeline_plugin_get_instance_private (plugin);
-                                                XED_TYPE_MODELINE_PLUGIN,
-                                                XedModelinePluginPrivate);
 }
 
 static void
@@ -193,8 +192,6 @@ xed_modeline_plugin_class_init (XedModelinePluginClass *klass)
     object_class->get_property = xed_modeline_plugin_get_property;
 
     g_object_class_override_property (object_class, PROP_VIEW, "view");
-
-    g_type_class_add_private (klass, sizeof (XedModelinePluginPrivate));
 }
 
 static void

plugins/sort/xed-sort-plugin.c

@@ -33,19 +33,10 @@
 
 #include "xed-sort-plugin.h"
 
-#define XED_SORT_PLUGIN_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), XED_TYPE_SORT_PLUGIN, XedSortPluginPrivate))
-
 #define MENU_PATH "/MenuBar/EditMenu/EditOps_6"
 
 static void xed_window_activatable_iface_init (XedWindowActivatableInterface *iface);
 
-G_DEFINE_DYNAMIC_TYPE_EXTENDED (XedSortPlugin,
-                                xed_sort_plugin,
-                                PEAS_TYPE_EXTENSION_BASE,
-                                0,
-                                G_IMPLEMENT_INTERFACE_DYNAMIC (XED_TYPE_WINDOW_ACTIVATABLE,
-                                                               xed_window_activatable_iface_init))
-
 struct _XedSortPluginPrivate
 {
     XedWindow *window;
@@ -62,6 +53,14 @@ enum
     PROP_WINDOW
 };
 
+G_DEFINE_DYNAMIC_TYPE_EXTENDED (XedSortPlugin,
+                                xed_sort_plugin,
+                                PEAS_TYPE_EXTENSION_BASE,
+                                0,
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (XED_TYPE_WINDOW_ACTIVATABLE,
+                                                               xed_window_activatable_iface_init)
+                                G_ADD_PRIVATE_DYNAMIC (XedSortPlugin))
+
 static void sort_cb (GtkAction     *action,
                      XedSortPlugin *plugin);
 
@@ -310,7 +309,7 @@ xed_sort_plugin_init (XedSortPlugin *plugin)
 {
     xed_debug_message (DEBUG_PLUGINS, "XedSortPlugin initializing");
 
-    plugin->priv = G_TYPE_INSTANCE_GET_PRIVATE (plugin, XED_TYPE_SORT_PLUGIN, XedSortPluginPrivate);
+    plugin->priv = xed_sort_plugin_get_instance_private (plugin);
 }
 
 static void
@@ -383,8 +382,6 @@ xed_sort_plugin_class_init (XedSortPluginClass *klass)
     object_class->get_property = xed_sort_plugin_get_property;
 
     g_object_class_override_property (object_class, PROP_WINDOW, "window");
-
-    g_type_class_add_private (klass, sizeof (XedSortPluginPrivate));
 }
 
 static void

plugins/taglist/xed-taglist-plugin-panel.c

@@ -39,10 +39,6 @@
 #include "xed-taglist-plugin-panel.h"
 #include "xed-taglist-plugin-parser.h"
 
-#define XED_TAGLIST_PLUGIN_PANEL_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), \
-						       XED_TYPE_TAGLIST_PLUGIN_PANEL, \
-						       XedTaglistPluginPanelPrivate))
-
 enum
 {
 	COLUMN_TAG_NAME,
@@ -63,7 +59,11 @@ struct _XedTaglistPluginPanelPrivate
 	gchar *data_dir;
 };
 
-G_DEFINE_DYNAMIC_TYPE (XedTaglistPluginPanel, xed_taglist_plugin_panel, GTK_TYPE_BOX)
+G_DEFINE_DYNAMIC_TYPE_EXTENDED (XedTaglistPluginPanel,
+								xed_taglist_plugin_panel,
+								GTK_TYPE_BOX,
+								0,
+								G_ADD_PRIVATE_DYNAMIC (XedTaglistPluginPanel))
 
 enum
 {
@@ -114,8 +114,7 @@ xed_taglist_plugin_panel_get_property (GObject    *object,
 	switch (prop_id)
 	{
 		case PROP_WINDOW:
-			g_value_set_object (value,
+			g_value_set_object (value, panel->priv->window);
-					    XED_TAGLIST_PLUGIN_PANEL_GET_PRIVATE (panel)->window);
 			break;
 		default:
 			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -150,8 +149,6 @@ xed_taglist_plugin_panel_class_init (XedTaglistPluginPanelClass *klass)
 							 XED_TYPE_WINDOW,
 							 G_PARAM_READWRITE |
 							 G_PARAM_CONSTRUCT_ONLY));
-
-	g_type_class_add_private (object_class, sizeof(XedTaglistPluginPanelPrivate));
 }
 
 static void
@@ -668,7 +665,7 @@ xed_taglist_plugin_panel_init (XedTaglistPluginPanel *panel)
 
 	xed_debug (DEBUG_PLUGINS);
 
-	panel->priv = XED_TAGLIST_PLUGIN_PANEL_GET_PRIVATE (panel);
+	panel->priv = xed_taglist_plugin_panel_get_instance_private (panel);
 	panel->priv->data_dir = NULL;
 
 	gtk_orientable_set_orientation (GTK_ORIENTABLE (panel),

plugins/taglist/xed-taglist-plugin.c

@@ -37,8 +37,6 @@
 #include "xed-taglist-plugin-panel.h"
 #include "xed-taglist-plugin-parser.h"
 
-#define XED_TAGLIST_PLUGIN_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), XED_TYPE_TAGLIST_PLUGIN, XedTaglistPluginPrivate))
-
 struct _XedTaglistPluginPrivate
 {
     XedWindow *window;
@@ -48,26 +46,25 @@ struct _XedTaglistPluginPrivate
 
 static void xed_window_activatable_iface_init (XedWindowActivatableInterface *iface);
 
-G_DEFINE_DYNAMIC_TYPE_EXTENDED (XedTaglistPlugin,
-                                xed_taglist_plugin,
-                                PEAS_TYPE_EXTENSION_BASE,
-                                0,
-                                G_IMPLEMENT_INTERFACE_DYNAMIC (XED_TYPE_WINDOW_ACTIVATABLE,
-                                                               xed_window_activatable_iface_init) \
-                                                                                                  \
-                                _xed_taglist_plugin_panel_register_type (type_module);            \
-)
-
 enum
 {
     PROP_0,
     PROP_WINDOW
 };
 
+G_DEFINE_DYNAMIC_TYPE_EXTENDED (XedTaglistPlugin,
+                                xed_taglist_plugin,
+                                PEAS_TYPE_EXTENSION_BASE,
+                                0,
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (XED_TYPE_WINDOW_ACTIVATABLE,
+                                                               xed_window_activatable_iface_init)
+                                G_ADD_PRIVATE_DYNAMIC (XedTaglistPlugin)
+                                _xed_taglist_plugin_panel_register_type (type_module))
+
 static void
 xed_taglist_plugin_init (XedTaglistPlugin *plugin)
 {
-    plugin->priv = XED_TAGLIST_PLUGIN_GET_PRIVATE (plugin);
+    plugin->priv = xed_taglist_plugin_get_instance_private (plugin);
 
     xed_debug_message (DEBUG_PLUGINS, "XedTaglistPlugin initializing");
 }
@@ -192,8 +189,6 @@ xed_taglist_plugin_class_init (XedTaglistPluginClass *klass)
     object_class->get_property = xed_taglist_plugin_get_property;
 
     g_object_class_override_property (object_class, PROP_WINDOW, "window");
-
-    g_type_class_add_private (object_class, sizeof (XedTaglistPluginPrivate));
 }
 
 static void

plugins/time/xed-time-plugin.c

@@ -38,10 +38,6 @@
 
 #include "xed-time-plugin.h"
 
-#define XED_TIME_PLUGIN_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), \
-                                            XED_TYPE_TIME_PLUGIN, \
-                                            XedTimePluginPrivate))
-
 #define MENU_PATH "/MenuBar/EditMenu/EditOps_4"
 
 /* GSettings keys */
@@ -166,7 +162,8 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (XedTimePlugin,
                                 G_IMPLEMENT_INTERFACE_DYNAMIC (XED_TYPE_WINDOW_ACTIVATABLE,
                                                                xed_window_activatable_iface_init)
                                 G_IMPLEMENT_INTERFACE_DYNAMIC (PEAS_GTK_TYPE_CONFIGURABLE,
-                                                               peas_gtk_configurable_iface_init))
+                                                               peas_gtk_configurable_iface_init)
+                                G_ADD_PRIVATE_DYNAMIC (XedTimePlugin))
 
 static void time_cb (GtkAction     *action,
                      XedTimePlugin *plugin);
@@ -188,7 +185,7 @@ xed_time_plugin_init (XedTimePlugin *plugin)
 {
     xed_debug_message (DEBUG_PLUGINS, "XedTimePlugin initializing");
 
-    plugin->priv = XED_TIME_PLUGIN_GET_PRIVATE (plugin);
+    plugin->priv = xed_time_plugin_get_instance_private (plugin);
 
     plugin->priv->settings = g_settings_new (TIME_SCHEMA);
 }
@@ -1034,8 +1031,6 @@ xed_time_plugin_class_init (XedTimePluginClass *klass)
     object_class->get_property = xed_time_plugin_get_property;
 
     g_object_class_override_property (object_class, PROP_WINDOW, "window");
-
-    g_type_class_add_private (object_class, sizeof (XedTimePluginPrivate));
 }
 
 static void

plugins/trailsave/xed-trail-save-plugin.c

@@ -24,19 +24,8 @@
 
 #include "xed-trail-save-plugin.h"
 
-#define XED_TRAIL_SAVE_PLUGIN_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), \
-                                                  XED_TYPE_TRAIL_SAVE_PLUGIN, \
-                                                  XedTrailSavePluginPrivate))
-
 static void xed_window_activatable_iface_init (XedWindowActivatableInterface *iface);
 
-G_DEFINE_DYNAMIC_TYPE_EXTENDED (XedTrailSavePlugin,
-                                xed_trail_save_plugin,
-                                PEAS_TYPE_EXTENSION_BASE,
-                                0,
-                                G_IMPLEMENT_INTERFACE_DYNAMIC (XED_TYPE_WINDOW_ACTIVATABLE,
-                                                               xed_window_activatable_iface_init))
-
 struct _XedTrailSavePluginPrivate
 {
    XedWindow *window;
@@ -48,6 +37,14 @@ enum
    PROP_WINDOW
 };
 
+G_DEFINE_DYNAMIC_TYPE_EXTENDED (XedTrailSavePlugin,
+                                xed_trail_save_plugin,
+                                PEAS_TYPE_EXTENSION_BASE,
+                                0,
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (XED_TYPE_WINDOW_ACTIVATABLE,
+                                                               xed_window_activatable_iface_init)
+                                G_ADD_PRIVATE_DYNAMIC (XedTrailSavePlugin))
+
 static void
 strip_trailing_spaces (GtkTextBuffer *text_buffer)
 {
@@ -235,7 +232,7 @@ xed_trail_save_plugin_init (XedTrailSavePlugin *plugin)
 {
     xed_debug_message (DEBUG_PLUGINS, "XedTrailSavePlugin initializing");
 
-    plugin->priv = G_TYPE_INSTANCE_GET_PRIVATE (plugin, XED_TYPE_TRAIL_SAVE_PLUGIN, XedTrailSavePluginPrivate);
+    plugin->priv = xed_trail_save_plugin_get_instance_private (plugin);
 }
 
 static void
@@ -298,8 +295,6 @@ xed_trail_save_plugin_class_init (XedTrailSavePluginClass *klass)
     object_class->get_property = xed_trail_save_plugin_get_property;
 
     g_object_class_override_property (object_class, PROP_WINDOW, "window");
-
-    g_type_class_add_private (object_class, sizeof (XedTrailSavePluginPrivate));
 }
 
 static void

plugins/wordcompletion/xed-wordcompletion-plugin.c

@@ -45,17 +45,6 @@ static void xed_window_activatable_iface_init (XedWindowActivatableInterface *if
 static void xed_view_activatable_iface_init (XedViewActivatableInterface *iface);
 static void peas_gtk_configurable_iface_init (PeasGtkConfigurableInterface *iface);
 
-G_DEFINE_DYNAMIC_TYPE_EXTENDED (XedWordCompletionPlugin,
-                                xed_wordcompletion_plugin,
-                                PEAS_TYPE_EXTENSION_BASE,
-                                0,
-                                G_IMPLEMENT_INTERFACE_DYNAMIC (XED_TYPE_WINDOW_ACTIVATABLE,
-                                                               xed_window_activatable_iface_init)
-                                G_IMPLEMENT_INTERFACE_DYNAMIC (XED_TYPE_VIEW_ACTIVATABLE,
-                                                               xed_view_activatable_iface_init)
-                                G_IMPLEMENT_INTERFACE_DYNAMIC (PEAS_GTK_TYPE_CONFIGURABLE,
-                                                               peas_gtk_configurable_iface_init))
-
 struct _XedWordCompletionPluginPrivate
 {
     GtkWidget *window;
@@ -83,14 +72,24 @@ struct _WordCompletionConfigureWidget
     GSettings *settings;
 };
 
+G_DEFINE_DYNAMIC_TYPE_EXTENDED (XedWordCompletionPlugin,
+                                xed_wordcompletion_plugin,
+                                PEAS_TYPE_EXTENSION_BASE,
+                                0,
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (XED_TYPE_WINDOW_ACTIVATABLE,
+                                                               xed_window_activatable_iface_init)
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (XED_TYPE_VIEW_ACTIVATABLE,
+                                                               xed_view_activatable_iface_init)
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (PEAS_GTK_TYPE_CONFIGURABLE,
+                                                               peas_gtk_configurable_iface_init)
+                                G_ADD_PRIVATE_DYNAMIC (XedWordCompletionPlugin))
+
 static void
 xed_wordcompletion_plugin_init (XedWordCompletionPlugin *plugin)
 {
     xed_debug_message (DEBUG_PLUGINS, "XedWordCompletionPlugin initializing");
 
-    plugin->priv = G_TYPE_INSTANCE_GET_PRIVATE (plugin,
+    plugin->priv = xed_wordcompletion_plugin_get_instance_private (plugin);
-                                                XED_TYPE_WORDCOMPLETION_PLUGIN,
-                                                XedWordCompletionPluginPrivate);
 
     plugin->priv->settings = g_settings_new (WORDCOMPLETION_SETTINGS_BASE);
 }
@@ -417,8 +416,6 @@ xed_wordcompletion_plugin_class_init (XedWordCompletionPluginClass *klass)
 
     g_object_class_override_property (object_class, PROP_WINDOW, "window");
     g_object_class_override_property (object_class, PROP_VIEW, "view");
-
-    g_type_class_add_private (klass, sizeof (XedWordCompletionPluginPrivate));
 }
 
 static void