[gimp] Revert "libgimpwidgets: remove gimp_color_profile_chooser_dialog_new()"



commit f7f9174a9c57b358f619911980e44be332ede912
Author: Michael Natterer <mitch gimp org>
Date:   Sat May 7 00:57:40 2016 +0200

    Revert "libgimpwidgets: remove gimp_color_profile_chooser_dialog_new()"
    
    This reverts commit 2bfd0711e8ea42acf63f1424e4b585e51f83925c.
    
    Don't ask...

 app/dialogs/color-profile-dialog.c                 |    5 ++---
 app/dialogs/preferences-dialog.c                   |    8 ++------
 .../libgimpwidgets/libgimpwidgets-sections.txt     |    1 +
 libgimpwidgets/gimpcolorprofilechooserdialog.c     |    9 +++++++++
 libgimpwidgets/gimpcolorprofilechooserdialog.h     |    3 ++-
 libgimpwidgets/gimpwidgets.def                     |    1 +
 modules/display-filter-proof.c                     |    4 +---
 7 files changed, 18 insertions(+), 13 deletions(-)
---
diff --git a/app/dialogs/color-profile-dialog.c b/app/dialogs/color-profile-dialog.c
index 89e94f1..2631859 100644
--- a/app/dialogs/color-profile-dialog.c
+++ b/app/dialogs/color-profile-dialog.c
@@ -330,9 +330,8 @@ color_profile_combo_box_new (ProfileDialog *dialog)
   gchar            *label;
   GError           *error = NULL;
 
-  chooser = g_object_new (GIMP_TYPE_COLOR_PROFILE_CHOOSER_DIALOG,
-                          "title", _("Select Destination Profile"),
-                          NULL);
+  chooser =
+    gimp_color_profile_chooser_dialog_new (_("Select destination profile"));
 
   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 d838e3c..baacd03 100644
--- a/app/dialogs/preferences-dialog.c
+++ b/app/dialogs/preferences-dialog.c
@@ -802,7 +802,7 @@ static void   prefs_profile_combo_notify (GObject                  *config,
                                           const GParamSpec         *param_spec,
                                           GimpColorProfileComboBox *combo);
 
-static void
+  static void
 prefs_profile_combo_changed (GimpColorProfileComboBox *combo,
                              GObject                  *config)
 {
@@ -887,16 +887,12 @@ prefs_profile_combo_box_new (GObject      *config,
                              const gchar  *label,
                              const gchar  *property_name)
 {
-  GtkWidget *dialog;
+  GtkWidget *dialog = gimp_color_profile_chooser_dialog_new (label);
   GtkWidget *combo;
   gchar     *path;
   gchar     *notify_name;
   GFile     *file = NULL;
 
-  dialog = g_object_new (GIMP_TYPE_COLOR_PROFILE_CHOOSER_DIALOG,
-                         "title", label,
-                         NULL);
-
   g_object_get (config, property_name, &path, NULL);
 
   if (path)
diff --git a/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt 
b/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt
index 009dbef..ba9c1a0 100644
--- a/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt
+++ b/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt
@@ -205,6 +205,7 @@ GIMP_COLOR_SELECTION_GET_CLASS
 <SECTION>
 <FILE>gimpcolorprofilechooserdialog</FILE>
 <TITLE>GimpColorProfileChooserDialog</TITLE>
+gimp_color_profile_chooser_dialog_new
 <SUBSECTION Standard>
 GIMP_COLOR_PROFILE_CHOOSER_DIALOG
 GIMP_COLOR_PROFILE_CHOOSER_DIALOG_CLASS
diff --git a/libgimpwidgets/gimpcolorprofilechooserdialog.c b/libgimpwidgets/gimpcolorprofilechooserdialog.c
index 107df25..d5cc4b4 100644
--- a/libgimpwidgets/gimpcolorprofilechooserdialog.c
+++ b/libgimpwidgets/gimpcolorprofilechooserdialog.c
@@ -137,6 +137,15 @@ gimp_color_profile_chooser_dialog_constructed (GObject *object)
                     NULL);
 }
 
+GtkWidget *
+gimp_color_profile_chooser_dialog_new (const gchar *title)
+{
+
+  return g_object_new (GIMP_TYPE_COLOR_PROFILE_CHOOSER_DIALOG,
+                       "title", title,
+                       NULL);
+}
+
 /* Add shortcuts for default ICC profile locations */
 static gboolean
 add_shortcut (GimpColorProfileChooserDialog *dialog,
diff --git a/libgimpwidgets/gimpcolorprofilechooserdialog.h b/libgimpwidgets/gimpcolorprofilechooserdialog.h
index 42c9711..cc82fa2 100644
--- a/libgimpwidgets/gimpcolorprofilechooserdialog.h
+++ b/libgimpwidgets/gimpcolorprofilechooserdialog.h
@@ -55,8 +55,9 @@ struct _GimpColorProfileChooserDialogClass
 };
 
 
-GType   gimp_color_profile_chooser_dialog_get_type (void) G_GNUC_CONST;
+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
 
diff --git a/libgimpwidgets/gimpwidgets.def b/libgimpwidgets/gimpwidgets.def
index 6a07515..50cdae4 100644
--- a/libgimpwidgets/gimpwidgets.def
+++ b/libgimpwidgets/gimpwidgets.def
@@ -74,6 +74,7 @@ EXPORTS
        gimp_color_notebook_set_has_page
        gimp_color_picker_cursors_get_resource
        gimp_color_profile_chooser_dialog_get_type
+       gimp_color_profile_chooser_dialog_new
        gimp_color_profile_combo_box_add
        gimp_color_profile_combo_box_add_file
        gimp_color_profile_combo_box_get_active
diff --git a/modules/display-filter-proof.c b/modules/display-filter-proof.c
index 0f918b3..4f06263 100644
--- a/modules/display-filter-proof.c
+++ b/modules/display-filter-proof.c
@@ -301,9 +301,7 @@ cdisplay_proof_configure (GimpColorDisplay *display)
   gtk_table_set_col_spacings (GTK_TABLE (table), 6);
   gtk_table_set_row_spacings (GTK_TABLE (table), 6);
 
-  dialog = g_object_new (GIMP_TYPE_COLOR_PROFILE_CHOOSER_DIALOG,
-                         "title", _("Choose an ICC Color Profile"),
-                         NULL);
+  dialog = gimp_color_profile_chooser_dialog_new (_("Choose an ICC Color Profile"));
 
   history = gimp_personal_rc_file ("profilerc");
   combo = gimp_color_profile_combo_box_new (dialog, history);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]