[gimp] libgimpwidgets: more parameters for gimp_color_profile_chooser_dialog_new()

[Michael Natterer <mitch src gnome org>]

commit 83df7f410dd9245dc48303d1090e7e192474226d
Author: Michael Natterer <mitch gimp org>
Date:   Sat May 7 01:19:26 2016 +0200

    libgimpwidgets: more parameters for gimp_color_profile_chooser_dialog_new()
    
    Add "parent" and "action", contraidicting myself from two commits
    earlier.

 app/dialogs/color-profile-dialog.c             |    4 +++-
 app/dialogs/preferences-dialog.c               |    5 ++++-
 libgimpwidgets/gimpcolorprofilechooserdialog.c |   20 ++++++++++++++++----
 libgimpwidgets/gimpcolorprofilechooserdialog.h |    5 ++++-
 modules/display-filter-proof.c                 |    4 +++-
 5 files changed, 30 insertions(+), 8 deletions(-)
---
diff --git a/app/dialogs/color-profile-dialog.c b/app/dialogs/color-profile-dialog.c
index 2631859..cb9150f 100644
--- a/app/dialogs/color-profile-dialog.c
+++ b/app/dialogs/color-profile-dialog.c
@@ -331,7 +331,9 @@ color_profile_combo_box_new (ProfileDialog *dialog)
   GError           *error = NULL;
 
   chooser =
-    gimp_color_profile_chooser_dialog_new (_("Select destination profile"));
+    gimp_color_profile_chooser_dialog_new (_("Select Destination Profile"),
+                                           NULL,
+                                           GTK_FILE_CHOOSER_ACTION_OPEN);
 
   history = gimp_personal_rc_file ("profilerc");
   combo = gimp_color_profile_combo_box_new (chooser, history);
diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c
index baacd03..09600c9 100644
--- a/app/dialogs/preferences-dialog.c
+++ b/app/dialogs/preferences-dialog.c
@@ -887,12 +887,15 @@ prefs_profile_combo_box_new (GObject      *config,
                              const gchar  *label,
                              const gchar  *property_name)
 {
-  GtkWidget *dialog = gimp_color_profile_chooser_dialog_new (label);
+  GtkWidget *dialog;
   GtkWidget *combo;
   gchar     *path;
   gchar     *notify_name;
   GFile     *file = NULL;
 
+  dialog = gimp_color_profile_chooser_dialog_new (label, NULL,
+                                                  GTK_FILE_CHOOSER_ACTION_OPEN);
+
   g_object_get (config, property_name, &path, NULL);
 
   if (path)
diff --git a/libgimpwidgets/gimpcolorprofilechooserdialog.c b/libgimpwidgets/gimpcolorprofilechooserdialog.c
index d5cc4b4..09c5511 100644
--- a/libgimpwidgets/gimpcolorprofilechooserdialog.c
+++ b/libgimpwidgets/gimpcolorprofilechooserdialog.c
@@ -138,12 +138,24 @@ gimp_color_profile_chooser_dialog_constructed (GObject *object)
 }
 
 GtkWidget *
-gimp_color_profile_chooser_dialog_new (const gchar *title)
+gimp_color_profile_chooser_dialog_new (const gchar          *title,
+                                       GtkWindow            *parent,
+                                       GtkFileChooserAction  action)
 {
+  GtkWidget *dialog;
 
-  return g_object_new (GIMP_TYPE_COLOR_PROFILE_CHOOSER_DIALOG,
-                       "title", title,
-                       NULL);
+  g_return_val_if_fail (title != NULL, NULL);
+  g_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), NULL);
+
+  dialog = g_object_new (GIMP_TYPE_COLOR_PROFILE_CHOOSER_DIALOG,
+                         "title",  title,
+                         "action", action,
+                         NULL);
+
+  if (parent)
+    gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
+
+  return dialog;
 }
 
 /* Add shortcuts for default ICC profile locations */
diff --git a/libgimpwidgets/gimpcolorprofilechooserdialog.h b/libgimpwidgets/gimpcolorprofilechooserdialog.h
index cc82fa2..0fbb19e 100644
--- a/libgimpwidgets/gimpcolorprofilechooserdialog.h
+++ b/libgimpwidgets/gimpcolorprofilechooserdialog.h
@@ -57,7 +57,10 @@ struct _GimpColorProfileChooserDialogClass
 
 GType       gimp_color_profile_chooser_dialog_get_type (void) G_GNUC_CONST;
 
-GtkWidget * gimp_color_profile_chooser_dialog_new      (const gchar *title);
+GtkWidget * gimp_color_profile_chooser_dialog_new      (const gchar          *title,
+                                                        GtkWindow            *parent,
+                                                        GtkFileChooserAction  action);
+
 
 G_END_DECLS
 
diff --git a/modules/display-filter-proof.c b/modules/display-filter-proof.c
index 4f06263..ae08781 100644
--- a/modules/display-filter-proof.c
+++ b/modules/display-filter-proof.c
@@ -301,7 +301,9 @@ cdisplay_proof_configure (GimpColorDisplay *display)
   gtk_table_set_col_spacings (GTK_TABLE (table), 6);
   gtk_table_set_row_spacings (GTK_TABLE (table), 6);
 
-  dialog = gimp_color_profile_chooser_dialog_new (_("Choose an ICC Color Profile"));
+  dialog = gimp_color_profile_chooser_dialog_new (_("Choose an ICC Color Profile"),
+                                                  NULL,
+                                                  GTK_FILE_CHOOSER_ACTION_OPEN);
 
   history = gimp_personal_rc_file ("profilerc");
   combo = gimp_color_profile_combo_box_new (dialog, history);