From c808789e1df880046273c9de0a8e61b1b232ebd3 Mon Sep 17 00:00:00 2001
From: A Kelday <garagecoder@gmail.com>
Date: Thu, 24 Apr 2014 22:12:38 +0100
Subject: [PATCH] Bug 728911 - Fixes to libgimpwidgets for c++ plugins using
 gimpui

Add missing G_END_DECLS to libgimpwidgets headers.
Avoid use of c++ "private" keyword.
---
 libgimpwidgets/gimpcolorprofilechooserdialog.c | 10 +++++-----
 libgimpwidgets/gimpcolorprofilechooserdialog.h |  3 ++-
 libgimpwidgets/gimpcolorprofileview.c          |  8 ++++----
 libgimpwidgets/gimpcolorprofileview.h          |  3 ++-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/libgimpwidgets/gimpcolorprofilechooserdialog.c b/libgimpwidgets/gimpcolorprofilechooserdialog.c
index f1385bb679..f9f742a68c 100644
--- a/libgimpwidgets/gimpcolorprofilechooserdialog.c
+++ b/libgimpwidgets/gimpcolorprofilechooserdialog.c
@@ -68,7 +68,7 @@ gimp_color_profile_chooser_dialog_class_init (GimpColorProfileChooserDialogClass
 static void
 gimp_color_profile_chooser_dialog_init (GimpColorProfileChooserDialog *dialog)
 {
-  dialog->private =
+  dialog->priv =
     G_TYPE_INSTANCE_GET_PRIVATE (dialog,
                                  GIMP_TYPE_COLOR_PROFILE_CHOOSER_DIALOG,
                                  GimpColorProfileChooserDialogPrivate);
@@ -133,7 +133,7 @@ gimp_color_profile_chooser_dialog_constructed (GObject *object)
   gtk_container_add (GTK_CONTAINER (scrolled_window), profile_view);
   gtk_widget_show (profile_view);
 
-  dialog->private->profile_view = GIMP_COLOR_PROFILE_VIEW (profile_view);
+  dialog->priv->profile_view = GIMP_COLOR_PROFILE_VIEW (profile_view);
 
   gtk_file_chooser_set_preview_widget (GTK_FILE_CHOOSER (dialog), frame);
 
@@ -193,7 +193,7 @@ gimp_color_profile_chooser_dialog_update_preview (GimpColorProfileChooserDialog
 
   if (! filename)
     {
-      gimp_color_profile_view_set_profile (dialog->private->profile_view, NULL);
+      gimp_color_profile_view_set_profile (dialog->priv->profile_view, NULL);
       return;
     }
 
@@ -201,13 +201,13 @@ gimp_color_profile_chooser_dialog_update_preview (GimpColorProfileChooserDialog
 
   if (! profile)
     {
-      gimp_color_profile_view_set_error (dialog->private->profile_view,
+      gimp_color_profile_view_set_error (dialog->priv->profile_view,
                                          error->message);
       g_clear_error (&error);
     }
   else
     {
-      gimp_color_profile_view_set_profile (dialog->private->profile_view,
+      gimp_color_profile_view_set_profile (dialog->priv->profile_view,
                                            profile);
       cmsCloseProfile (profile);
     }
diff --git a/libgimpwidgets/gimpcolorprofilechooserdialog.h b/libgimpwidgets/gimpcolorprofilechooserdialog.h
index 5a229e39ba..cc82fa26f9 100644
--- a/libgimpwidgets/gimpcolorprofilechooserdialog.h
+++ b/libgimpwidgets/gimpcolorprofilechooserdialog.h
@@ -40,7 +40,7 @@ struct _GimpColorProfileChooserDialog
 {
   GtkFileChooserDialog                  parent_instance;
 
-  GimpColorProfileChooserDialogPrivate *private;
+  GimpColorProfileChooserDialogPrivate *priv;
 };
 
 struct _GimpColorProfileChooserDialogClass
@@ -59,5 +59,6 @@ GType       gimp_color_profile_chooser_dialog_get_type (void) G_GNUC_CONST;
 
 GtkWidget * gimp_color_profile_chooser_dialog_new      (const gchar *title);
 
+G_END_DECLS
 
 #endif /* __GIMP_COLOR_PROFILE_CHOOSER_DIALOG_H__ */
diff --git a/libgimpwidgets/gimpcolorprofileview.c b/libgimpwidgets/gimpcolorprofileview.c
index 49ef45e41f..eb14e66cc9 100644
--- a/libgimpwidgets/gimpcolorprofileview.c
+++ b/libgimpwidgets/gimpcolorprofileview.c
@@ -62,9 +62,9 @@ gimp_color_profile_view_class_init (GimpColorProfileViewClass *klass)
 static void
 gimp_color_profile_view_init (GimpColorProfileView *view)
 {
-  view->private = G_TYPE_INSTANCE_GET_PRIVATE (view,
-                                               GIMP_TYPE_COLOR_PROFILE_VIEW,
-                                               GimpColorProfileViewPrivate);
+  view->priv = G_TYPE_INSTANCE_GET_PRIVATE (view,
+                                            GIMP_TYPE_COLOR_PROFILE_VIEW,
+                                            GimpColorProfileViewPrivate);
 }
 
 static void
@@ -113,7 +113,7 @@ gimp_color_profile_view_set_profile (GimpColorProfileView *view,
 
   gtk_text_buffer_set_text (buffer, "", 0);
 
-  view->private->profile = profile;
+  view->priv->profile = profile;
 
   if (! profile)
     return;
diff --git a/libgimpwidgets/gimpcolorprofileview.h b/libgimpwidgets/gimpcolorprofileview.h
index f5b105aa6e..71a7724391 100644
--- a/libgimpwidgets/gimpcolorprofileview.h
+++ b/libgimpwidgets/gimpcolorprofileview.h
@@ -39,7 +39,7 @@ struct _GimpColorProfileView
 {
   GtkTextView                  parent_instance;
 
-  GimpColorProfileViewPrivate *private;
+  GimpColorProfileViewPrivate *priv;
 };
 
 struct _GimpColorProfileViewClass
@@ -63,5 +63,6 @@ void        gimp_color_profile_view_set_profile (GimpColorProfileView *view,
 void        gimp_color_profile_view_set_error   (GimpColorProfileView *view,
                                                  const gchar          *message);
 
+G_END_DECLS
 
 #endif /* __GIMP_COLOR_PROFILE_VIEW_H__ */