]> Pileus Git - ~andy/gtk/commitdiff
gtkpagesetupunixdialog: unseal private pointer
authorJavier Jardón <jjardon@gnome.org>
Mon, 5 Jul 2010 03:24:59 +0000 (05:24 +0200)
committerJavier Jardón <jjardon@gnome.org>
Tue, 13 Jul 2010 17:40:49 +0000 (19:40 +0200)
gtk/gtkpagesetupunixdialog.c
gtk/gtkpagesetupunixdialog.h

index ff0ed19d4e5352953cc1e526504ce76b3f37c300..49a24d3dbd46fec027b434df5a91598bfdb3b820 100644 (file)
@@ -70,7 +70,7 @@
  */
 
 
-struct GtkPageSetupUnixDialogPrivate
+struct _GtkPageSetupUnixDialogPrivate
 {
   GtkListStore *printer_list;
   GtkListStore *page_setup_list;
@@ -112,9 +112,6 @@ enum {
 
 G_DEFINE_TYPE (GtkPageSetupUnixDialog, gtk_page_setup_unix_dialog, GTK_TYPE_DIALOG)
 
-#define GTK_PAGE_SETUP_UNIX_DIALOG_GET_PRIVATE(o)  \
-   (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_PAGE_SETUP_UNIX_DIALOG, GtkPageSetupUnixDialogPrivate))
-
 static void gtk_page_setup_unix_dialog_finalize  (GObject                *object);
 static void populate_dialog                      (GtkPageSetupUnixDialog *dialog);
 static void fill_paper_sizes_from_printer        (GtkPageSetupUnixDialog *dialog,
@@ -168,7 +165,9 @@ gtk_page_setup_unix_dialog_init (GtkPageSetupUnixDialog *dialog)
   GtkTreeIter iter;
   gchar *tmp;
 
-  priv = dialog->priv = GTK_PAGE_SETUP_UNIX_DIALOG_GET_PRIVATE (dialog);
+  priv = dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (dialog,
+                                                     GTK_TYPE_PAGE_SETUP_UNIX_DIALOG,
+                                                     GtkPageSetupUnixDialogPrivate);
 
   priv->print_backends = NULL;
 
index 58d7b611f80fe68c2b20e11f07ae1a33fb03c074..eb74ecaa286539fd19b81aae17df3c62424ed0e3 100644 (file)
@@ -38,13 +38,13 @@ G_BEGIN_DECLS
 
 typedef struct _GtkPageSetupUnixDialog         GtkPageSetupUnixDialog;
 typedef struct _GtkPageSetupUnixDialogClass    GtkPageSetupUnixDialogClass;
-typedef struct GtkPageSetupUnixDialogPrivate   GtkPageSetupUnixDialogPrivate;
+typedef struct _GtkPageSetupUnixDialogPrivate  GtkPageSetupUnixDialogPrivate;
 
 struct _GtkPageSetupUnixDialog
 {
   GtkDialog parent_instance;
 
-  GtkPageSetupUnixDialogPrivate *GSEAL (priv);
+  GtkPageSetupUnixDialogPrivate *priv;
 };
 
 struct _GtkPageSetupUnixDialogClass