[gedit] The King is (partially) Dead

[Sébastien Wilmet <swilmet src gnome org>]

commit 365758fd239e92c6f276018ceb89be0e39c763fd
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sun Jul 28 15:46:18 2013 +0200

    The King is (partially) Dead
    
    Not all classes are converted. This fixes error messages.
    
    http://blogs.gnome.org/ebassi/2013/06/21/the-king-is-dead/

 gedit/gedit-status-menu-button.c |   11 ++++++-----
 gedit/gedit-view-frame.c         |    8 ++------
 2 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/gedit/gedit-status-menu-button.c b/gedit/gedit-status-menu-button.c
index 0e489e6..7d27adf 100644
--- a/gedit/gedit-status-menu-button.c
+++ b/gedit/gedit-status-menu-button.c
@@ -39,8 +39,11 @@ enum
        PROP_LABEL
 };
 
-G_DEFINE_TYPE_WITH_CODE (GeditStatusMenuButton, gedit_status_menu_button, GTK_TYPE_MENU_BUTTON,
-                         g_type_add_class_private (g_define_type_id, sizeof 
(GeditStatusMenuButtonClassPrivate)))
+G_DEFINE_TYPE_WITH_CODE (GeditStatusMenuButton,
+                        gedit_status_menu_button,
+                        GTK_TYPE_MENU_BUTTON,
+                        G_ADD_PRIVATE (GeditStatusMenuButton)
+                        g_type_add_class_private (g_define_type_id, sizeof 
(GeditStatusMenuButtonClassPrivate)))
 
 static void
 gedit_status_menu_button_get_property (GObject    *object,
@@ -105,8 +108,6 @@ gedit_status_menu_button_class_init (GeditStatusMenuButtonClass *klass)
                                                     "/org/gnome/gedit/ui/gedit-status-menu-button.ui");
        gtk_widget_class_bind_template_child_private (widget_class, GeditStatusMenuButton, label);
 
-       g_type_class_add_private (object_class, sizeof (GeditStatusMenuButtonPrivate));
-
        klass->priv = G_TYPE_CLASS_GET_PRIVATE (klass, GEDIT_TYPE_STATUS_MENU_BUTTON, 
GeditStatusMenuButtonClassPrivate);
 
        klass->priv->css = gtk_css_provider_new ();
@@ -118,7 +119,7 @@ gedit_status_menu_button_init (GeditStatusMenuButton *self)
 {
        GtkStyleContext *context;
 
-       self->priv = G_TYPE_INSTANCE_GET_PRIVATE(self, GEDIT_TYPE_STATUS_MENU_BUTTON, 
GeditStatusMenuButtonPrivate);
+       self->priv = gedit_status_menu_button_get_instance_private (self);
 
        gtk_widget_init_template (GTK_WIDGET (self));
 
diff --git a/gedit/gedit-view-frame.c b/gedit/gedit-view-frame.c
index 7b06037..0d6b476 100644
--- a/gedit/gedit-view-frame.c
+++ b/gedit/gedit-view-frame.c
@@ -39,8 +39,6 @@
 
 #define SEARCH_POPUP_MARGIN 12
 
-#define GEDIT_VIEW_FRAME_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GEDIT_TYPE_VIEW_FRAME, 
GeditViewFramePrivate))
-
 typedef enum
 {
        GOTO_LINE,
@@ -105,7 +103,7 @@ typedef enum
        GEDIT_SEARCH_ENTRY_NOT_FOUND
 } GeditSearchEntryBgColor;
 
-G_DEFINE_TYPE (GeditViewFrame, gedit_view_frame, GTK_TYPE_OVERLAY)
+G_DEFINE_TYPE_WITH_PRIVATE (GeditViewFrame, gedit_view_frame, GTK_TYPE_OVERLAY)
 
 static void
 gedit_view_frame_finalize (GObject *object)
@@ -1352,8 +1350,6 @@ gedit_view_frame_class_init (GeditViewFrameClass *klass)
        gtk_widget_class_bind_template_child_private (widget_class, GeditViewFrame, search_entry);
        gtk_widget_class_bind_template_child_private (widget_class, GeditViewFrame, go_up_button);
        gtk_widget_class_bind_template_child_private (widget_class, GeditViewFrame, go_down_button);
-
-       g_type_class_add_private (object_class, sizeof (GeditViewFramePrivate));
 }
 
 static GMountOperation *
@@ -1372,7 +1368,7 @@ gedit_view_frame_init (GeditViewFrame *frame)
        GeditDocument *doc;
        GdkRGBA transparent = {0, 0, 0, 0};
 
-       frame->priv = GEDIT_VIEW_FRAME_GET_PRIVATE (frame);
+       frame->priv = gedit_view_frame_get_instance_private (frame);
 
        frame->priv->typeselect_flush_timeout = 0;
        frame->priv->case_sensitive_search = FALSE;