[gedit] encodings-dialog: use G_DECLARE macros



commit 7aa3c9660d258ac2e4cc23d2a4fde62cd88c774e
Author: Paolo Borelli <pborelli gnome org>
Date:   Sun Apr 19 18:09:23 2015 +0200

    encodings-dialog: use G_DECLARE macros

 gedit/gedit-encodings-dialog.c |  189 +++++++++++++++++++---------------------
 gedit/gedit-encodings-dialog.h |   26 +-----
 2 files changed, 90 insertions(+), 125 deletions(-)
---
diff --git a/gedit/gedit-encodings-dialog.c b/gedit/gedit-encodings-dialog.c
index 1dc939c..c27c24c 100644
--- a/gedit/gedit-encodings-dialog.c
+++ b/gedit/gedit-encodings-dialog.c
@@ -38,8 +38,10 @@ typedef enum _State
        STATE_RESET
 } State;
 
-struct _GeditEncodingsDialogPrivate
+struct _GeditEncodingsDialog
 {
+       GtkDialog parent_instance;
+
        GSettings *enc_settings;
 
        /* Available encodings */
@@ -67,13 +69,13 @@ enum
        N_COLUMNS
 };
 
-G_DEFINE_TYPE_WITH_PRIVATE (GeditEncodingsDialog, gedit_encodings_dialog, GTK_TYPE_DIALOG)
+G_DEFINE_TYPE (GeditEncodingsDialog, gedit_encodings_dialog, GTK_TYPE_DIALOG)
 
 static void
 set_modified (GeditEncodingsDialog *dialog)
 {
-       dialog->priv->state = STATE_MODIFIED;
-       gtk_widget_set_sensitive (dialog->priv->reset_button, TRUE);
+       dialog->state = STATE_MODIFIED;
+       gtk_widget_set_sensitive (dialog->reset_button, TRUE);
 }
 
 static void
@@ -128,12 +130,12 @@ init_liststores (GeditEncodingsDialog *dialog,
                chosen_encodings = gedit_settings_get_candidate_encodings (&default_candidates);
        }
 
-       gtk_widget_set_sensitive (dialog->priv->reset_button, !default_candidates);
+       gtk_widget_set_sensitive (dialog->reset_button, !default_candidates);
 
        for (l = chosen_encodings; l != NULL; l = l->next)
        {
                const GtkSourceEncoding *cur_encoding = l->data;
-               append_encoding (dialog->priv->liststore_chosen, cur_encoding);
+               append_encoding (dialog->liststore_chosen, cur_encoding);
        }
 
        /* Available encodings */
@@ -149,7 +151,7 @@ init_liststores (GeditEncodingsDialog *dialog,
        for (l = all_encodings; l != NULL; l = l->next)
        {
                const GtkSourceEncoding *cur_encoding = l->data;
-               append_encoding (dialog->priv->liststore_available, cur_encoding);
+               append_encoding (dialog->liststore_available, cur_encoding);
        }
 
        g_slist_free (chosen_encodings);
@@ -181,11 +183,11 @@ reset_button_clicked_cb (GtkWidget            *button,
 
        if (response == GTK_RESPONSE_ACCEPT)
        {
-               gtk_list_store_clear (dialog->priv->liststore_available);
-               gtk_list_store_clear (dialog->priv->liststore_chosen);
+               gtk_list_store_clear (dialog->liststore_available);
+               gtk_list_store_clear (dialog->liststore_chosen);
 
                init_liststores (dialog, TRUE);
-               dialog->priv->state = STATE_RESET;
+               dialog->state = STATE_RESET;
        }
 
        gtk_widget_destroy (GTK_WIDGET (msg_dialog));
@@ -194,7 +196,7 @@ reset_button_clicked_cb (GtkWidget            *button,
 static GSList *
 get_chosen_encodings_list (GeditEncodingsDialog *dialog)
 {
-       GtkTreeModel *model = GTK_TREE_MODEL (dialog->priv->liststore_chosen);
+       GtkTreeModel *model = GTK_TREE_MODEL (dialog->liststore_chosen);
        GtkTreeIter iter;
        gboolean iter_set;
        GSList *ret = NULL;
@@ -243,7 +245,7 @@ encoding_list_to_strv (const GSList *enc_list)
 static void
 apply_settings (GeditEncodingsDialog *dialog)
 {
-       switch (dialog->priv->state)
+       switch (dialog->state)
        {
                case STATE_MODIFIED:
                {
@@ -253,7 +255,7 @@ apply_settings (GeditEncodingsDialog *dialog)
                        enc_list = get_chosen_encodings_list (dialog);
                        enc_strv = encoding_list_to_strv (enc_list);
 
-                       g_settings_set_strv (dialog->priv->enc_settings,
+                       g_settings_set_strv (dialog->enc_settings,
                                             GEDIT_SETTINGS_CANDIDATE_ENCODINGS,
                                             (const gchar * const *)enc_strv);
 
@@ -263,7 +265,7 @@ apply_settings (GeditEncodingsDialog *dialog)
                }
 
                case STATE_RESET:
-                       g_settings_reset (dialog->priv->enc_settings,
+                       g_settings_reset (dialog->enc_settings,
                                          GEDIT_SETTINGS_CANDIDATE_ENCODINGS);
                        break;
 
@@ -299,14 +301,14 @@ gedit_encodings_dialog_response (GtkDialog *gtk_dialog,
 static void
 gedit_encodings_dialog_dispose (GObject *object)
 {
-       GeditEncodingsDialogPrivate *priv = GEDIT_ENCODINGS_DIALOG (object)->priv;
+       GeditEncodingsDialog *dialog = GEDIT_ENCODINGS_DIALOG (object);
 
-       g_clear_object (&priv->enc_settings);
-       g_clear_object (&priv->add_button);
-       g_clear_object (&priv->remove_button);
-       g_clear_object (&priv->up_button);
-       g_clear_object (&priv->down_button);
-       g_clear_object (&priv->reset_button);
+       g_clear_object (&dialog->enc_settings);
+       g_clear_object (&dialog->add_button);
+       g_clear_object (&dialog->remove_button);
+       g_clear_object (&dialog->up_button);
+       g_clear_object (&dialog->down_button);
+       g_clear_object (&dialog->reset_button);
 
        G_OBJECT_CLASS (gedit_encodings_dialog_parent_class)->dispose (object);
 }
@@ -325,11 +327,11 @@ gedit_encodings_dialog_class_init (GeditEncodingsDialogClass *klass)
        /* Bind class to template */
        gtk_widget_class_set_template_from_resource (widget_class,
                                                     "/org/gnome/gedit/ui/gedit-encodings-dialog.ui");
-       gtk_widget_class_bind_template_child_private (widget_class, GeditEncodingsDialog, 
liststore_available);
-       gtk_widget_class_bind_template_child_private (widget_class, GeditEncodingsDialog, liststore_chosen);
-       gtk_widget_class_bind_template_child_private (widget_class, GeditEncodingsDialog, sort_available);
-       gtk_widget_class_bind_template_child_private (widget_class, GeditEncodingsDialog, treeview_available);
-       gtk_widget_class_bind_template_child_private (widget_class, GeditEncodingsDialog, treeview_chosen);
+       gtk_widget_class_bind_template_child (widget_class, GeditEncodingsDialog, liststore_available);
+       gtk_widget_class_bind_template_child (widget_class, GeditEncodingsDialog, liststore_chosen);
+       gtk_widget_class_bind_template_child (widget_class, GeditEncodingsDialog, sort_available);
+       gtk_widget_class_bind_template_child (widget_class, GeditEncodingsDialog, treeview_available);
+       gtk_widget_class_bind_template_child (widget_class, GeditEncodingsDialog, treeview_chosen);
        gtk_widget_class_bind_template_child_full (widget_class, "scrolledwindow_available", FALSE, 0);
        gtk_widget_class_bind_template_child_full (widget_class, "scrolledwindow_chosen", FALSE, 0);
        gtk_widget_class_bind_template_child_full (widget_class, "toolbar_available", FALSE, 0);
@@ -342,9 +344,9 @@ update_add_button_sensitivity (GeditEncodingsDialog *dialog)
        GtkTreeSelection *selection;
        gint count;
 
-       selection = gtk_tree_view_get_selection (dialog->priv->treeview_available);
+       selection = gtk_tree_view_get_selection (dialog->treeview_available);
        count = gtk_tree_selection_count_selected_rows (selection);
-       gtk_widget_set_sensitive (dialog->priv->add_button, count > 0);
+       gtk_widget_set_sensitive (dialog->add_button, count > 0);
 }
 
 static void
@@ -361,10 +363,10 @@ update_remove_button_sensitivity (GeditEncodingsDialog *dialog)
        utf8_encoding = gtk_source_encoding_get_utf8 ();
        current_encoding = gtk_source_encoding_get_current ();
 
-       selection = gtk_tree_view_get_selection (dialog->priv->treeview_chosen);
+       selection = gtk_tree_view_get_selection (dialog->treeview_chosen);
 
        selected_rows = gtk_tree_selection_get_selected_rows (selection, &model);
-       g_return_if_fail (model == GTK_TREE_MODEL (dialog->priv->liststore_chosen));
+       g_return_if_fail (model == GTK_TREE_MODEL (dialog->liststore_chosen));
 
        sensitive = FALSE;
        for (l = selected_rows; l != NULL; l = l->next)
@@ -396,7 +398,7 @@ update_remove_button_sensitivity (GeditEncodingsDialog *dialog)
                }
        }
 
-       gtk_widget_set_sensitive (dialog->priv->remove_button, sensitive);
+       gtk_widget_set_sensitive (dialog->remove_button, sensitive);
 
        g_list_free_full (selected_rows, (GDestroyNotify) gtk_tree_path_free);
 }
@@ -415,13 +417,13 @@ update_up_down_buttons_sensitivity (GeditEncodingsDialog *dialog)
        gboolean first_item_selected;
        gboolean last_item_selected;
 
-       selection = gtk_tree_view_get_selection (dialog->priv->treeview_chosen);
+       selection = gtk_tree_view_get_selection (dialog->treeview_chosen);
        count = gtk_tree_selection_count_selected_rows (selection);
 
        if (count != 1)
        {
-               gtk_widget_set_sensitive (dialog->priv->up_button, FALSE);
-               gtk_widget_set_sensitive (dialog->priv->down_button, FALSE);
+               gtk_widget_set_sensitive (dialog->up_button, FALSE);
+               gtk_widget_set_sensitive (dialog->down_button, FALSE);
                return;
        }
 
@@ -437,8 +439,8 @@ update_up_down_buttons_sensitivity (GeditEncodingsDialog *dialog)
        first_item_selected = indices[0] == 0;
        last_item_selected = indices[0] == (items_count - 1);
 
-       gtk_widget_set_sensitive (dialog->priv->up_button, !first_item_selected);
-       gtk_widget_set_sensitive (dialog->priv->down_button, !last_item_selected);
+       gtk_widget_set_sensitive (dialog->up_button, !first_item_selected);
+       gtk_widget_set_sensitive (dialog->down_button, !last_item_selected);
 
        g_list_free_full (selected_rows, (GDestroyNotify) gtk_tree_path_free);
 }
@@ -511,18 +513,18 @@ add_button_clicked_cb (GtkWidget            *button,
        GList *children_paths = NULL;
        GList *l;
 
-       selection = gtk_tree_view_get_selection (dialog->priv->treeview_available);
+       selection = gtk_tree_view_get_selection (dialog->treeview_available);
        filter_paths = gtk_tree_selection_get_selected_rows (selection, &model);
 
-       g_return_if_fail (model == GTK_TREE_MODEL (dialog->priv->sort_available));
+       g_return_if_fail (model == GTK_TREE_MODEL (dialog->sort_available));
 
        for (l = filter_paths; l != NULL; l = l->next)
        {
                GtkTreePath *filter_path = l->data;
                GtkTreePath *child_path;
 
-               child_path = gtk_tree_model_sort_convert_path_to_child_path (dialog->priv->sort_available,
-                                                                            filter_path);
+               child_path = gtk_tree_model_sort_convert_path_to_child_path (dialog->sort_available,
+                                                                            filter_path);
 
                children_paths = g_list_prepend (children_paths, child_path);
        }
@@ -530,8 +532,8 @@ add_button_clicked_cb (GtkWidget            *button,
        children_paths = g_list_reverse (children_paths);
 
        transfer_encodings (children_paths,
-                           dialog->priv->liststore_available,
-                           dialog->priv->liststore_chosen);
+                           dialog->liststore_available,
+                           dialog->liststore_chosen);
 
        set_modified (dialog);
 
@@ -563,10 +565,10 @@ remove_button_clicked_cb (GtkWidget            *button,
        utf8_encoding = gtk_source_encoding_get_utf8 ();
        current_encoding = gtk_source_encoding_get_current ();
 
-       selection = gtk_tree_view_get_selection (dialog->priv->treeview_chosen);
+       selection = gtk_tree_view_get_selection (dialog->treeview_chosen);
        selected_rows = gtk_tree_selection_get_selected_rows (selection, &model);
 
-       g_return_if_fail (model == GTK_TREE_MODEL (dialog->priv->liststore_chosen));
+       g_return_if_fail (model == GTK_TREE_MODEL (dialog->liststore_chosen));
 
        /* Ensure that UTF-8 and the current locale encodings cannot be removed. */
        for (l = selected_rows; l != NULL; l = l->next)
@@ -600,8 +602,8 @@ remove_button_clicked_cb (GtkWidget            *button,
        to_remove = g_list_reverse (to_remove);
 
        transfer_encodings (to_remove,
-                           dialog->priv->liststore_chosen,
-                           dialog->priv->liststore_available);
+                           dialog->liststore_chosen,
+                           dialog->liststore_available);
 
        set_modified (dialog);
 
@@ -620,10 +622,10 @@ up_button_clicked_cb (GtkWidget            *button,
        GtkTreeIter iter;
        GtkTreeIter prev_iter;
 
-       selection = gtk_tree_view_get_selection (dialog->priv->treeview_chosen);
+       selection = gtk_tree_view_get_selection (dialog->treeview_chosen);
        selected_rows = gtk_tree_selection_get_selected_rows (selection, &model);
 
-       g_return_if_fail (model == GTK_TREE_MODEL (dialog->priv->liststore_chosen));
+       g_return_if_fail (model == GTK_TREE_MODEL (dialog->liststore_chosen));
        g_return_if_fail (g_list_length (selected_rows) == 1);
 
        path = selected_rows->data;
@@ -638,9 +640,9 @@ up_button_clicked_cb (GtkWidget            *button,
                g_return_if_reached ();
        }
 
-       gtk_list_store_move_before (dialog->priv->liststore_chosen,
-                                   &iter,
-                                   &prev_iter);
+       gtk_list_store_move_before (dialog->liststore_chosen,
+                                   &iter,
+                                   &prev_iter);
 
        set_modified (dialog);
 
@@ -660,10 +662,10 @@ down_button_clicked_cb (GtkWidget            *button,
        GtkTreeIter iter;
        GtkTreeIter next_iter;
 
-       selection = gtk_tree_view_get_selection (dialog->priv->treeview_chosen);
+       selection = gtk_tree_view_get_selection (dialog->treeview_chosen);
        selected_rows = gtk_tree_selection_get_selected_rows (selection, &model);
 
-       g_return_if_fail (model == GTK_TREE_MODEL (dialog->priv->liststore_chosen));
+       g_return_if_fail (model == GTK_TREE_MODEL (dialog->liststore_chosen));
        g_return_if_fail (g_list_length (selected_rows) == 1);
 
        path = selected_rows->data;
@@ -678,9 +680,9 @@ down_button_clicked_cb (GtkWidget            *button,
                g_return_if_reached ();
        }
 
-       gtk_list_store_move_after (dialog->priv->liststore_chosen,
-                                  &iter,
-                                  &next_iter);
+       gtk_list_store_move_after (dialog->liststore_chosen,
+                                  &iter,
+                                  &next_iter);
 
        set_modified (dialog);
 
@@ -712,20 +714,15 @@ init_toolbar_available (GeditEncodingsDialog *dialog)
        gtk_style_context_add_class (context, GTK_STYLE_CLASS_INLINE_TOOLBAR);
 
        /* Add button */
-       dialog->priv->add_button = GTK_WIDGET (gtk_tool_button_new (NULL, NULL));
-       g_object_ref_sink (dialog->priv->add_button);
-
-       gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (dialog->priv->add_button),
-                                      "list-add-symbolic");
+       dialog->add_button = GTK_WIDGET (gtk_tool_button_new (NULL, NULL));
+       g_object_ref_sink (dialog->add_button);
 
-       gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (dialog->priv->add_button),
-                                       _("Add"));
+       gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (dialog->add_button), "list-add-symbolic");
+       gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (dialog->add_button), _("Add"));
 
-       gtk_toolbar_insert (toolbar,
-                           GTK_TOOL_ITEM (dialog->priv->add_button),
-                           -1);
+       gtk_toolbar_insert (toolbar, GTK_TOOL_ITEM (dialog->add_button), -1);
 
-       g_signal_connect_object (dialog->priv->add_button,
+       g_signal_connect_object (dialog->add_button,
                                 "clicked",
                                 G_CALLBACK (add_button_clicked_cb),
                                 dialog,
@@ -762,41 +759,33 @@ init_toolbar_chosen (GeditEncodingsDialog *dialog)
        gtk_style_context_add_class (context, GTK_STYLE_CLASS_INLINE_TOOLBAR);
 
        /* Remove button */
-       dialog->priv->remove_button = gtk_button_new_from_icon_name ("list-remove-symbolic",
-                                                                    GTK_ICON_SIZE_SMALL_TOOLBAR);
-       g_object_ref_sink (dialog->priv->remove_button);
-
-       gtk_widget_set_tooltip_text (dialog->priv->remove_button, _("Remove"));
+       dialog->remove_button = gtk_button_new_from_icon_name ("list-remove-symbolic", 
GTK_ICON_SIZE_SMALL_TOOLBAR);
+       g_object_ref_sink (dialog->remove_button);
+       gtk_widget_set_tooltip_text (dialog->remove_button, _("Remove"));
 
-       g_signal_connect_object (dialog->priv->remove_button,
+       g_signal_connect_object (dialog->remove_button,
                                 "clicked",
                                 G_CALLBACK (remove_button_clicked_cb),
                                 dialog,
                                 0);
 
        /* Up button */
-       dialog->priv->up_button = gtk_button_new_from_icon_name ("go-up-symbolic",
-                                                                GTK_ICON_SIZE_SMALL_TOOLBAR);
-       g_object_ref_sink (dialog->priv->up_button);
+       dialog->up_button = gtk_button_new_from_icon_name ("go-up-symbolic", GTK_ICON_SIZE_SMALL_TOOLBAR);
+       g_object_ref_sink (dialog->up_button);
+       gtk_widget_set_tooltip_text (dialog->up_button, _("Move to a higher priority"));
 
-       gtk_widget_set_tooltip_text (dialog->priv->up_button,
-                                    _("Move to a higher priority"));
-
-       g_signal_connect_object (dialog->priv->up_button,
+       g_signal_connect_object (dialog->up_button,
                                 "clicked",
                                 G_CALLBACK (up_button_clicked_cb),
                                 dialog,
                                 0);
 
        /* Down button */
-       dialog->priv->down_button = gtk_button_new_from_icon_name ("go-down-symbolic",
-                                                                  GTK_ICON_SIZE_SMALL_TOOLBAR);
-       g_object_ref_sink (dialog->priv->down_button);
-
-       gtk_widget_set_tooltip_text (dialog->priv->down_button,
-                                    _("Move to a lower priority"));
+       dialog->down_button = gtk_button_new_from_icon_name ("go-down-symbolic", GTK_ICON_SIZE_SMALL_TOOLBAR);
+       g_object_ref_sink (dialog->down_button);
+       gtk_widget_set_tooltip_text (dialog->down_button, _("Move to a lower priority"));
 
-       g_signal_connect_object (dialog->priv->down_button,
+       g_signal_connect_object (dialog->down_button,
                                 "clicked",
                                 G_CALLBACK (down_button_clicked_cb),
                                 dialog,
@@ -805,9 +794,9 @@ init_toolbar_chosen (GeditEncodingsDialog *dialog)
        /* Left group (with a trick for rounded borders) */
        left_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
        left_group = gtk_tool_item_new ();
-       gtk_box_pack_start (GTK_BOX (left_box), dialog->priv->remove_button, FALSE, FALSE, 0);
-       gtk_box_pack_start (GTK_BOX (left_box), dialog->priv->up_button, FALSE, FALSE, 0);
-       gtk_box_pack_start (GTK_BOX (left_box), dialog->priv->down_button, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (left_box), dialog->remove_button, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (left_box), dialog->up_button, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (left_box), dialog->down_button, FALSE, FALSE, 0);
        gtk_container_add (GTK_CONTAINER (left_group), left_box);
        gtk_toolbar_insert (toolbar, left_group, -1);
 
@@ -818,10 +807,10 @@ init_toolbar_chosen (GeditEncodingsDialog *dialog)
        gtk_toolbar_insert (toolbar, separator, -1);
 
        /* Reset button */
-       dialog->priv->reset_button = gtk_button_new_with_mnemonic (_("_Reset"));
-       g_object_ref_sink (dialog->priv->reset_button);
+       dialog->reset_button = gtk_button_new_with_mnemonic (_("_Reset"));
+       g_object_ref_sink (dialog->reset_button);
 
-       g_signal_connect_object (dialog->priv->reset_button,
+       g_signal_connect_object (dialog->reset_button,
                                 "clicked",
                                 G_CALLBACK (reset_button_clicked_cb),
                                 dialog,
@@ -830,7 +819,7 @@ init_toolbar_chosen (GeditEncodingsDialog *dialog)
        /* Right group */
        right_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
        right_group = gtk_tool_item_new ();
-       gtk_box_pack_start (GTK_BOX (right_box), dialog->priv->reset_button, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (right_box), dialog->reset_button, FALSE, FALSE, 0);
        gtk_container_add (GTK_CONTAINER (right_group), right_box);
        gtk_toolbar_insert (toolbar, right_group, -1);
 
@@ -842,23 +831,21 @@ gedit_encodings_dialog_init (GeditEncodingsDialog *dialog)
 {
        GtkTreeSelection *selection;
 
-       dialog->priv = gedit_encodings_dialog_get_instance_private (dialog);
-
-       dialog->priv->enc_settings = g_settings_new ("org.gnome.gedit.preferences.encodings");
+       dialog->enc_settings = g_settings_new ("org.gnome.gedit.preferences.encodings");
 
        gtk_widget_init_template (GTK_WIDGET (dialog));
 
        init_toolbar_available (dialog);
        init_toolbar_chosen (dialog);
        init_liststores (dialog, FALSE);
-       dialog->priv->state = STATE_UNMODIFIED;
+       dialog->state = STATE_UNMODIFIED;
 
        /* Available encodings */
-       gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (dialog->priv->sort_available),
+       gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (dialog->sort_available),
                                              COLUMN_NAME,
                                              GTK_SORT_ASCENDING);
 
-       selection = gtk_tree_view_get_selection (dialog->priv->treeview_available);
+       selection = gtk_tree_view_get_selection (dialog->treeview_available);
 
        g_signal_connect_swapped (selection,
                                  "changed",
@@ -868,7 +855,7 @@ gedit_encodings_dialog_init (GeditEncodingsDialog *dialog)
        update_add_button_sensitivity (dialog);
 
        /* Chosen encodings */
-       selection = gtk_tree_view_get_selection (dialog->priv->treeview_chosen);
+       selection = gtk_tree_view_get_selection (dialog->treeview_chosen);
 
        g_signal_connect_swapped (selection,
                                  "changed",
diff --git a/gedit/gedit-encodings-dialog.h b/gedit/gedit-encodings-dialog.h
index 59b2211..1c800df 100644
--- a/gedit/gedit-encodings-dialog.h
+++ b/gedit/gedit-encodings-dialog.h
@@ -25,35 +25,13 @@
 
 G_BEGIN_DECLS
 
-#define GEDIT_TYPE_ENCODINGS_DIALOG              (gedit_encodings_dialog_get_type())
-#define GEDIT_ENCODINGS_DIALOG(obj)              (G_TYPE_CHECK_INSTANCE_CAST((obj), 
GEDIT_TYPE_ENCODINGS_DIALOG, GeditEncodingsDialog))
-#define GEDIT_ENCODINGS_DIALOG_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST((klass), 
GEDIT_TYPE_ENCODINGS_DIALOG, GeditEncodingsDialogClass))
-#define GEDIT_IS_ENCODINGS_DIALOG(obj)           (G_TYPE_CHECK_INSTANCE_TYPE((obj), 
GEDIT_TYPE_ENCODINGS_DIALOG))
-#define GEDIT_IS_ENCODINGS_DIALOG_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), 
GEDIT_TYPE_ENCODINGS_DIALOG))
-#define GEDIT_ENCODINGS_DIALOG_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS((obj), 
GEDIT_TYPE_ENCODINGS_DIALOG, GeditEncodingsDialogClass))
+#define GEDIT_TYPE_ENCODINGS_DIALOG (gedit_encodings_dialog_get_type())
 
-typedef struct _GeditEncodingsDialog           GeditEncodingsDialog;
-typedef struct _GeditEncodingsDialogClass      GeditEncodingsDialogClass;
-typedef struct _GeditEncodingsDialogPrivate    GeditEncodingsDialogPrivate;
-
-struct _GeditEncodingsDialog
-{
-       GtkDialog dialog;
-
-       GeditEncodingsDialogPrivate *priv;
-};
-
-struct _GeditEncodingsDialogClass
-{
-       GtkDialogClass parent_class;
-};
-
-GType           gedit_encodings_dialog_get_type        (void) G_GNUC_CONST;
+G_DECLARE_FINAL_TYPE (GeditEncodingsDialog, gedit_encodings_dialog, GEDIT, ENCODINGS_DIALOG, GtkDialog)
 
 GtkWidget      *gedit_encodings_dialog_new             (void);
 
 G_END_DECLS
 
 #endif /* __GEDIT_ENCODINGS_DIALOG_H__ */
-
 /* ex:set ts=8 noet: */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]