[gtk+/gtk-2-90: 113/127] Unseal GtkAboutDialog's private_data member, convert from gpointer to GtkAboutDialogPrivate

From: Javier Jardón <jjardon src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [gtk+/gtk-2-90: 113/127] Unseal GtkAboutDialog's private_data member, convert from gpointer to GtkAboutDialogPrivate
Date: Tue, 17 Nov 2009 19:34:17 +0000 (UTC)
commit 3754cb31f1dd96c24bbc090783602baf05719eb4
Author: Cody Russell <bratsche gnome org>
Date:   Thu Oct 22 14:28:35 2009 -0500

    Unseal GtkAboutDialog's private_data member, convert from gpointer to GtkAboutDialogPrivate

 gtk/gtkaboutdialog.c |   83 ++++++++++++++++++++++++-------------------------
 gtk/gtkaboutdialog.h |    3 +-
 2 files changed, 43 insertions(+), 43 deletions(-)
---
diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index ace3713..d3d4c78 100644
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -121,7 +121,6 @@
 static GdkColor default_link_color = { 0, 0, 0, 0xeeee };
 static GdkColor default_visited_link_color = { 0, 0x5555, 0x1a1a, 0x8b8b };
 
-typedef struct _GtkAboutDialogPrivate GtkAboutDialogPrivate;
 struct _GtkAboutDialogPrivate 
 {
   gchar *name;
@@ -528,7 +527,7 @@ gtk_about_dialog_init (GtkAboutDialog *about)
 
   /* Data */
   priv = GTK_ABOUT_DIALOG_GET_PRIVATE (about);
-  about->private_data = priv;
+  about->priv = priv;
 
   priv->name = NULL;
   priv->version = NULL;
@@ -642,7 +641,7 @@ static void
 gtk_about_dialog_finalize (GObject *object)
 {
   GtkAboutDialog *about = GTK_ABOUT_DIALOG (object);
-  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->private_data;
+  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->priv;
 
   g_free (priv->name);
   g_free (priv->version);
@@ -673,7 +672,7 @@ gtk_about_dialog_set_property (GObject      *object,
 			       GParamSpec   *pspec)
 {
   GtkAboutDialog *about = GTK_ABOUT_DIALOG (object);
-  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->private_data;
+  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->priv;
 
   switch (prop_id) 
     {
@@ -732,7 +731,7 @@ gtk_about_dialog_get_property (GObject    *object,
 			       GParamSpec *pspec)
 {
   GtkAboutDialog *about = GTK_ABOUT_DIALOG (object);
-  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->private_data;
+  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->priv;
 	
   switch (prop_id) 
     {
@@ -798,7 +797,7 @@ gtk_about_dialog_get_property (GObject    *object,
 static void
 update_website (GtkAboutDialog *about)
 {
-  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->private_data;
+  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->priv;
 
   if (priv->website_url && (!activate_url_hook_set || activate_url_hook != NULL))
     {
@@ -851,7 +850,7 @@ gtk_about_dialog_get_program_name (GtkAboutDialog *about)
   
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = (GtkAboutDialogPrivate *)about->priv;
 
   return priv->name;
 }
@@ -862,7 +861,7 @@ update_name_version (GtkAboutDialog *about)
   GtkAboutDialogPrivate *priv;
   gchar *title_string, *name_string;
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = (GtkAboutDialogPrivate *)about->priv;
 
   title_string = g_strdup_printf (_("About %s"), priv->name);
   gtk_window_set_title (GTK_WINDOW (about), title_string);
@@ -899,7 +898,7 @@ gtk_about_dialog_set_program_name (GtkAboutDialog *about,
 
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
 	
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = (GtkAboutDialogPrivate *)about->priv;
   tmp = priv->name;
   priv->name = g_strdup (name ? name : g_get_application_name ());
   g_free (tmp);
@@ -928,7 +927,7 @@ gtk_about_dialog_get_version (GtkAboutDialog *about)
   
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = (GtkAboutDialogPrivate *)about->priv;
 
   return priv->version;
 }
@@ -951,7 +950,7 @@ gtk_about_dialog_set_version (GtkAboutDialog *about,
 
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = (GtkAboutDialogPrivate *)about->priv;
   
   tmp = priv->version;
   priv->version = g_strdup (version);
@@ -980,7 +979,7 @@ gtk_about_dialog_get_copyright (GtkAboutDialog *about)
   
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = (GtkAboutDialogPrivate *)about->priv;
 
   return priv->copyright;
 }
@@ -1004,7 +1003,7 @@ gtk_about_dialog_set_copyright (GtkAboutDialog *about,
 
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = (GtkAboutDialogPrivate *)about->priv;
 	
   tmp = priv->copyright;
   priv->copyright = g_strdup (copyright);
@@ -1043,7 +1042,7 @@ gtk_about_dialog_get_comments (GtkAboutDialog *about)
   
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = (GtkAboutDialogPrivate *)about->priv;
 
   return priv->comments;
 }
@@ -1068,7 +1067,7 @@ gtk_about_dialog_set_comments (GtkAboutDialog *about,
 
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = (GtkAboutDialogPrivate *)about->priv;
   
   tmp = priv->comments;
   if (comments) 
@@ -1105,7 +1104,7 @@ gtk_about_dialog_get_license (GtkAboutDialog *about)
   
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = (GtkAboutDialogPrivate *)about->priv;
 
   return priv->license;
 }
@@ -1130,7 +1129,7 @@ gtk_about_dialog_set_license (GtkAboutDialog *about,
 
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = (GtkAboutDialogPrivate *)about->priv;
 
   tmp = priv->license;
   if (license) 
@@ -1166,7 +1165,7 @@ gtk_about_dialog_get_wrap_license (GtkAboutDialog *about)
 
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), FALSE);
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = (GtkAboutDialogPrivate *)about->priv;
 
   return priv->wrap_license;
 }
@@ -1189,7 +1188,7 @@ gtk_about_dialog_set_wrap_license (GtkAboutDialog *about,
 
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = (GtkAboutDialogPrivate *)about->priv;
 
   wrap_license = wrap_license != FALSE;
   
@@ -1219,7 +1218,7 @@ gtk_about_dialog_get_website (GtkAboutDialog *about)
   
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = (GtkAboutDialogPrivate *)about->priv;
 
   return priv->website_url;
 }
@@ -1245,7 +1244,7 @@ gtk_about_dialog_set_website (GtkAboutDialog *about,
 
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = (GtkAboutDialogPrivate *)about->priv;
   
   tmp = priv->website_url;
   priv->website_url = g_strdup (website);
@@ -1274,7 +1273,7 @@ gtk_about_dialog_get_website_label (GtkAboutDialog *about)
   
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = (GtkAboutDialogPrivate *)about->priv;
 
   return priv->website_text;
 }
@@ -1298,7 +1297,7 @@ gtk_about_dialog_set_website_label (GtkAboutDialog *about,
 
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = (GtkAboutDialogPrivate *)about->priv;
 
   tmp = priv->website_text;
   priv->website_text = g_strdup (website_label);
@@ -1329,7 +1328,7 @@ gtk_about_dialog_get_authors (GtkAboutDialog *about)
   
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = (GtkAboutDialogPrivate *)about->priv;
 
   return (const gchar * const *) priv->authors;
 }
@@ -1337,7 +1336,7 @@ gtk_about_dialog_get_authors (GtkAboutDialog *about)
 static void
 update_credits_button_visibility (GtkAboutDialog *about)
 {
-  GtkAboutDialogPrivate *priv = about->private_data;
+  GtkAboutDialogPrivate *priv = about->priv;
   gboolean show;
 
   show = priv->authors != NULL ||
@@ -1371,7 +1370,7 @@ gtk_about_dialog_set_authors (GtkAboutDialog  *about,
 
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = (GtkAboutDialogPrivate *)about->priv;
 
   tmp = priv->authors;
   priv->authors = g_strdupv ((gchar **)authors);
@@ -1402,7 +1401,7 @@ gtk_about_dialog_get_documenters (GtkAboutDialog *about)
   
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = (GtkAboutDialogPrivate *)about->priv;
 
   return (const gchar * const *)priv->documenters;
 }
@@ -1426,7 +1425,7 @@ gtk_about_dialog_set_documenters (GtkAboutDialog *about,
 
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = (GtkAboutDialogPrivate *)about->priv;
   
   tmp = priv->documenters;
   priv->documenters = g_strdupv ((gchar **)documenters);
@@ -1457,7 +1456,7 @@ gtk_about_dialog_get_artists (GtkAboutDialog *about)
   
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = (GtkAboutDialogPrivate *)about->priv;
 
   return (const gchar * const *)priv->artists;
 }
@@ -1481,7 +1480,7 @@ gtk_about_dialog_set_artists (GtkAboutDialog *about,
 
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = (GtkAboutDialogPrivate *)about->priv;
   
   tmp = priv->artists;
   priv->artists = g_strdupv ((gchar **)artists);
@@ -1511,7 +1510,7 @@ gtk_about_dialog_get_translator_credits (GtkAboutDialog *about)
   
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = (GtkAboutDialogPrivate *)about->priv;
 
   return priv->translator_credits;
 }
@@ -1547,7 +1546,7 @@ gtk_about_dialog_set_translator_credits (GtkAboutDialog *about,
 
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = (GtkAboutDialogPrivate *)about->priv;
 
   tmp = priv->translator_credits;
   priv->translator_credits = g_strdup (translator_credits);
@@ -1577,7 +1576,7 @@ gtk_about_dialog_get_logo (GtkAboutDialog *about)
   
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = (GtkAboutDialogPrivate *)about->priv;
 
   if (gtk_image_get_storage_type (GTK_IMAGE (priv->logo_image)) == GTK_IMAGE_PIXBUF)
     return gtk_image_get_pixbuf (GTK_IMAGE (priv->logo_image));
@@ -1623,7 +1622,7 @@ gtk_about_dialog_set_logo (GtkAboutDialog *about,
 
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = (GtkAboutDialogPrivate *)about->priv;
 
   g_object_freeze_notify (G_OBJECT (about));
 
@@ -1673,7 +1672,7 @@ gtk_about_dialog_get_logo_icon_name (GtkAboutDialog *about)
   
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = (GtkAboutDialogPrivate *)about->priv;
 
   if (gtk_image_get_storage_type (GTK_IMAGE (priv->logo_image)) == GTK_IMAGE_ICON_NAME)
     gtk_image_get_icon_name (GTK_IMAGE (priv->logo_image), &icon_name, NULL);
@@ -1701,7 +1700,7 @@ gtk_about_dialog_set_logo_icon_name (GtkAboutDialog *about,
 
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about));
 
-  priv = (GtkAboutDialogPrivate *)about->private_data;
+  priv = (GtkAboutDialogPrivate *)about->priv;
 
   g_object_freeze_notify (G_OBJECT (about));
 
@@ -1721,7 +1720,7 @@ follow_if_link (GtkAboutDialog *about,
 		GtkTextIter    *iter)
 {
   GSList *tags = NULL, *tagp = NULL;
-  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->private_data;
+  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->priv;
   gchar *url = NULL;
   GtkAboutDialogActivateLinkFunc email_hook, url_hook;
   gpointer email_hook_data, url_hook_data;
@@ -1862,7 +1861,7 @@ set_cursor_if_appropriate (GtkAboutDialog *about,
 			   gint            x,
 			   gint            y)
 {
-  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->private_data;
+  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->priv;
   GSList *tags = NULL, *tagp = NULL;
   GtkTextIter iter;
   gboolean hovering_over_link = FALSE;
@@ -1951,7 +1950,7 @@ text_view_new (GtkAboutDialog  *about,
   GdkColor color;
   GdkColor link_color;
   GdkColor visited_link_color;
-  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->private_data;
+  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->priv;
   
   linkify_email = (!activate_email_hook_set || activate_email_hook != NULL);
   linkify_urls = (!activate_url_hook_set || activate_url_hook != NULL);
@@ -2107,7 +2106,7 @@ display_credits_dialog (GtkWidget *button,
 			gpointer   data)
 {
   GtkAboutDialog *about = (GtkAboutDialog *)data;
-  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->private_data;
+  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->priv;
   GtkWidget *dialog, *notebook;
   GtkDialog *credits_dialog;
 
@@ -2183,7 +2182,7 @@ display_license_dialog (GtkWidget *button,
 			gpointer   data)
 {
   GtkAboutDialog *about = (GtkAboutDialog *)data;
-  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->private_data;
+  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->priv;
   GtkWidget *dialog, *view, *sw;
   GtkDialog *licence_dialog;
   gchar *strings[2];
@@ -2330,7 +2329,7 @@ gtk_about_dialog_set_url_hook (GtkAboutDialogActivateLinkFunc func,
 static void 
 close_cb (GtkAboutDialog *about)
 {
-  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->private_data;
+  GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->priv;
 
   if (priv->license_dialog != NULL)
     {
diff --git a/gtk/gtkaboutdialog.h b/gtk/gtkaboutdialog.h
index 59120c1..5bcd67c 100644
--- a/gtk/gtkaboutdialog.h
+++ b/gtk/gtkaboutdialog.h
@@ -42,6 +42,7 @@ G_BEGIN_DECLS
 
 typedef struct _GtkAboutDialog        GtkAboutDialog;
 typedef struct _GtkAboutDialogClass   GtkAboutDialogClass;
+typedef struct _GtkAboutDialogPrivate GtkAboutDialogPrivate;
 
 /**
  * GtkAboutDialog:
@@ -54,7 +55,7 @@ struct _GtkAboutDialog
   GtkDialog parent_instance;
 
   /*< private >*/
-  gpointer GSEAL (private_data);
+  GtkAboutDialogPrivate *priv;
 };
 
 struct _GtkAboutDialogClass
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]