[gtk+/refactor: 32/106] gtkcustompaperunixdialog: unseal private pointer
- From: Javier Jardón <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/refactor: 32/106] gtkcustompaperunixdialog: unseal private pointer
- Date: Tue, 13 Jul 2010 17:32:42 +0000 (UTC)
commit c57958922d85757508500cf4d8f2b937e3cf17d5
Author: Javier Jardón <jjardon gnome org>
Date: Wed Jun 2 05:31:23 2010 +0200
gtkcustompaperunixdialog: unseal private pointer
gtk/gtkcustompaperunixdialog.c | 10 ++++++----
gtk/gtkcustompaperunixdialog.h | 4 ++--
2 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtkcustompaperunixdialog.c b/gtk/gtkcustompaperunixdialog.c
index 28120b1..cc95bec 100644
--- a/gtk/gtkcustompaperunixdialog.c
+++ b/gtk/gtkcustompaperunixdialog.c
@@ -49,7 +49,7 @@ typedef struct
GtkWidget *spin_button;
} UnitWidget;
-struct GtkCustomPaperUnixDialogPrivate
+struct _GtkCustomPaperUnixDialogPrivate
{
GtkWidget *treeview;
@@ -86,10 +86,9 @@ enum {
PRINTER_LIST_N_COLS
};
+
G_DEFINE_TYPE (GtkCustomPaperUnixDialog, gtk_custom_paper_unix_dialog, GTK_TYPE_DIALOG)
-#define GTK_CUSTOM_PAPER_UNIX_DIALOG_GET_PRIVATE(o) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_CUSTOM_PAPER_UNIX_DIALOG, GtkCustomPaperUnixDialogPrivate))
static void gtk_custom_paper_unix_dialog_finalize (GObject *object);
static void populate_dialog (GtkCustomPaperUnixDialog *dialog);
@@ -272,7 +271,10 @@ gtk_custom_paper_unix_dialog_init (GtkCustomPaperUnixDialog *dialog)
GtkCustomPaperUnixDialogPrivate *priv;
GtkTreeIter iter;
- priv = dialog->priv = GTK_CUSTOM_PAPER_UNIX_DIALOG_GET_PRIVATE (dialog);
+ dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (dialog,
+ GTK_TYPE_CUSTOM_PAPER_UNIX_DIALOG,
+ GtkCustomPaperUnixDialogPrivate);
+ priv = dialog->priv;
priv->print_backends = NULL;
diff --git a/gtk/gtkcustompaperunixdialog.h b/gtk/gtkcustompaperunixdialog.h
index 0ff3af1..acb3163 100644
--- a/gtk/gtkcustompaperunixdialog.h
+++ b/gtk/gtkcustompaperunixdialog.h
@@ -34,13 +34,13 @@ G_BEGIN_DECLS
typedef struct _GtkCustomPaperUnixDialog GtkCustomPaperUnixDialog;
typedef struct _GtkCustomPaperUnixDialogClass GtkCustomPaperUnixDialogClass;
-typedef struct GtkCustomPaperUnixDialogPrivate GtkCustomPaperUnixDialogPrivate;
+typedef struct _GtkCustomPaperUnixDialogPrivate GtkCustomPaperUnixDialogPrivate;
struct _GtkCustomPaperUnixDialog
{
GtkDialog parent_instance;
- GtkCustomPaperUnixDialogPrivate *GSEAL (priv);
+ GtkCustomPaperUnixDialogPrivate *priv;
};
struct _GtkCustomPaperUnixDialogClass
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]