From: Timm Bäder <mail@baedert.org>
Date: Mon, 18 Jun 2018 09:14:36 +0000 (+0200)
Subject: messagedialog: Remove priv pointer
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~22^2~144
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3756234708e471947f00d7594e7cba1094aba853;p=gtk4.git

messagedialog: Remove priv pointer
---

diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
index 08b72ee173..19ebd784ba 100644
--- a/gtk/gtkmessagedialog.c
+++ b/gtk/gtkmessagedialog.c
@@ -98,7 +98,7 @@
  * the message area as an internal child with the name “message_area”.
  */
 
-struct _GtkMessageDialogPrivate
+typedef struct
 {
   GtkWidget     *label;
   GtkWidget     *message_area; /* vbox for the primary and secondary labels, and any extra content from the caller */
@@ -107,7 +107,7 @@ struct _GtkMessageDialogPrivate
   guint          has_primary_markup : 1;
   guint          has_secondary_text : 1;
   guint          message_type       : 3;
-};
+} GtkMessageDialogPrivate;
 
 static void gtk_message_dialog_constructed  (GObject          *object);
 static void gtk_message_dialog_set_property (GObject          *object,
@@ -268,14 +268,11 @@ gtk_message_dialog_class_init (GtkMessageDialogClass *class)
 static void
 gtk_message_dialog_init (GtkMessageDialog *dialog)
 {
-  GtkMessageDialogPrivate *priv;
+  GtkMessageDialogPrivate *priv = gtk_message_dialog_get_instance_private (dialog);
   GtkWidget *action_area;
   GtkSettings *settings;
   gboolean use_caret;
 
-  dialog->priv = gtk_message_dialog_get_instance_private (dialog);
-  priv = dialog->priv;
-
   priv->has_primary_markup = FALSE;
   priv->has_secondary_text = FALSE;
   priv->has_primary_markup = FALSE;
@@ -295,7 +292,7 @@ gtk_message_dialog_init (GtkMessageDialog *dialog)
 static void
 setup_primary_label_font (GtkMessageDialog *dialog)
 {
-  GtkMessageDialogPrivate *priv = dialog->priv;
+  GtkMessageDialogPrivate *priv = gtk_message_dialog_get_instance_private (dialog);
 
   if (!priv->has_primary_markup)
     {
@@ -327,7 +324,7 @@ static void
 setup_type (GtkMessageDialog *dialog,
 	    GtkMessageType    type)
 {
-  GtkMessageDialogPrivate *priv = dialog->priv;
+  GtkMessageDialogPrivate *priv = gtk_message_dialog_get_instance_private (dialog);
   const gchar *name = NULL;
   AtkObject *atk_obj;
 
@@ -426,7 +423,7 @@ gtk_message_dialog_set_property (GObject      *object,
 				 GParamSpec   *pspec)
 {
   GtkMessageDialog *dialog = GTK_MESSAGE_DIALOG (object);
-  GtkMessageDialogPrivate *priv = dialog->priv;
+  GtkMessageDialogPrivate *priv = gtk_message_dialog_get_instance_private (dialog);
 
   switch (prop_id)
     {
@@ -496,7 +493,7 @@ gtk_message_dialog_get_property (GObject     *object,
 				 GParamSpec  *pspec)
 {
   GtkMessageDialog *dialog = GTK_MESSAGE_DIALOG (object);
-  GtkMessageDialogPrivate *priv = dialog->priv;
+  GtkMessageDialogPrivate *priv = gtk_message_dialog_get_instance_private (dialog);
 
   switch (prop_id)
     {
@@ -572,18 +569,19 @@ gtk_message_dialog_new (GtkWindow     *parent,
 
   if (message_format)
     {
+      GtkMessageDialogPrivate *priv = gtk_message_dialog_get_instance_private ((GtkMessageDialog*)dialog);
       va_start (args, message_format);
       msg = g_strdup_vprintf (message_format, args);
       va_end (args);
 
-      gtk_label_set_text (GTK_LABEL (GTK_MESSAGE_DIALOG (widget)->priv->label), msg);
+      gtk_label_set_text (GTK_LABEL (priv->label), msg);
 
       g_free (msg);
     }
 
   if (parent != NULL)
     gtk_window_set_transient_for (GTK_WINDOW (widget), GTK_WINDOW (parent));
-  
+
   if (flags & GTK_DIALOG_MODAL)
     gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
 
@@ -672,12 +670,10 @@ void
 gtk_message_dialog_set_markup (GtkMessageDialog *message_dialog,
                                const gchar      *str)
 {
-  GtkMessageDialogPrivate *priv;
+  GtkMessageDialogPrivate *priv = gtk_message_dialog_get_instance_private (message_dialog);
 
   g_return_if_fail (GTK_IS_MESSAGE_DIALOG (message_dialog));
 
-  priv = message_dialog->priv;
-
   priv->has_primary_markup = TRUE;
   gtk_label_set_markup (GTK_LABEL (priv->label), str);
 }
@@ -696,14 +692,12 @@ gtk_message_dialog_format_secondary_text (GtkMessageDialog *message_dialog,
                                           const gchar      *message_format,
                                           ...)
 {
+  GtkMessageDialogPrivate *priv = gtk_message_dialog_get_instance_private (message_dialog);
   va_list args;
   gchar *msg = NULL;
-  GtkMessageDialogPrivate *priv;
 
   g_return_if_fail (GTK_IS_MESSAGE_DIALOG (message_dialog));
 
-  priv = message_dialog->priv;
-
   if (message_format)
     {
       priv->has_secondary_text = TRUE;
@@ -756,14 +750,12 @@ gtk_message_dialog_format_secondary_markup (GtkMessageDialog *message_dialog,
                                             const gchar      *message_format,
                                             ...)
 {
+  GtkMessageDialogPrivate *priv = gtk_message_dialog_get_instance_private (message_dialog);
   va_list args;
   gchar *msg = NULL;
-  GtkMessageDialogPrivate *priv;
 
   g_return_if_fail (GTK_IS_MESSAGE_DIALOG (message_dialog));
 
-  priv = message_dialog->priv;
-
   if (message_format)
     {
       priv->has_secondary_text = TRUE;
@@ -802,9 +794,11 @@ gtk_message_dialog_format_secondary_markup (GtkMessageDialog *message_dialog,
 GtkWidget *
 gtk_message_dialog_get_message_area (GtkMessageDialog *message_dialog)
 {
+  GtkMessageDialogPrivate *priv = gtk_message_dialog_get_instance_private (message_dialog);
+
   g_return_val_if_fail (GTK_IS_MESSAGE_DIALOG (message_dialog), NULL);
 
-  return message_dialog->priv->message_area;
+  return priv->message_area;
 }
 
 static void
diff --git a/gtk/gtkmessagedialog.h b/gtk/gtkmessagedialog.h
index 7fa0d863d6..d39132faa3 100644
--- a/gtk/gtkmessagedialog.h
+++ b/gtk/gtkmessagedialog.h
@@ -43,15 +43,11 @@ G_BEGIN_DECLS
 #define GTK_MESSAGE_DIALOG_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MESSAGE_DIALOG, GtkMessageDialogClass))
 
 typedef struct _GtkMessageDialog              GtkMessageDialog;
-typedef struct _GtkMessageDialogPrivate       GtkMessageDialogPrivate;
 typedef struct _GtkMessageDialogClass         GtkMessageDialogClass;
 
 struct _GtkMessageDialog
 {
   GtkDialog parent_instance;
-
-  /*< private >*/
-  GtkMessageDialogPrivate *priv;
 };
 
 struct _GtkMessageDialogClass