[gimp] libgimpwidgets: fix code duplication in gimp_prop_enum_combo_box_new()
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] libgimpwidgets: fix code duplication in gimp_prop_enum_combo_box_new()
- Date: Tue, 9 May 2017 17:08:42 +0000 (UTC)
commit db4e120b8b216686472928a82c7f133aac74b7e4
Author: Michael Natterer <mitch gimp org>
Date: Tue May 9 19:07:39 2017 +0200
libgimpwidgets: fix code duplication in gimp_prop_enum_combo_box_new()
libgimpwidgets/gimppropwidgets.c | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
---
diff --git a/libgimpwidgets/gimppropwidgets.c b/libgimpwidgets/gimppropwidgets.c
index fb36e67..dfb1282 100644
--- a/libgimpwidgets/gimppropwidgets.c
+++ b/libgimpwidgets/gimppropwidgets.c
@@ -502,9 +502,10 @@ gimp_prop_enum_combo_box_new (GObject *config,
gint minimum,
gint maximum)
{
- GParamSpec *param_spec;
- GtkWidget *combo_box;
- gint value;
+ GParamSpec *param_spec;
+ GtkListStore *store = NULL;
+ GtkWidget *combo_box;
+ gint value;
g_return_val_if_fail (G_IS_OBJECT (config), NULL);
g_return_val_if_fail (property_name != NULL, NULL);
@@ -520,23 +521,14 @@ gimp_prop_enum_combo_box_new (GObject *config,
if (minimum != maximum)
{
- GtkListStore *store;
-
store = gimp_enum_store_new_with_range (param_spec->value_type,
minimum, maximum);
-
- combo_box = g_object_new (GIMP_TYPE_ENUM_COMBO_BOX,
- "model", store,
- NULL);
- g_object_unref (store);
}
else if (param_spec->value_type == GIMP_TYPE_DESATURATE_MODE)
{
/* this is a bad hack, if we get more of those, we should probably
* think of something less ugly
*/
- GtkListStore *store;
-
store = gimp_enum_store_new_with_values (param_spec->value_type,
5,
GIMP_DESATURATE_LUMINANCE,
@@ -544,7 +536,10 @@ gimp_prop_enum_combo_box_new (GObject *config,
GIMP_DESATURATE_LIGHTNESS,
GIMP_DESATURATE_AVERAGE,
GIMP_DESATURATE_VALUE);
+ }
+ if (store)
+ {
combo_box = g_object_new (GIMP_TYPE_ENUM_COMBO_BOX,
"model", store,
NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]