diff --git a/ChangeLog b/ChangeLog index a10d364717..8a1fce9af3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-02-09 Sven Neumann + + * app/display/gimpscalecombobox.[ch] + * app/display/gimpstatusbar.c: pass an action label to + gimp_scale_combo_box_add_action(). + 2005-02-09 Sven Neumann * app/display/gimpscalecombobox.c: fixed brokeness introduced by diff --git a/app/display/gimpscalecombobox.c b/app/display/gimpscalecombobox.c index a0a51865b7..35fa305303 100644 --- a/app/display/gimpscalecombobox.c +++ b/app/display/gimpscalecombobox.c @@ -315,13 +315,12 @@ gimp_scale_combo_box_new (void) void gimp_scale_combo_box_add_action (GimpScaleComboBox *combo_box, - GtkAction *action) + GtkAction *action, + const gchar *label) { GtkTreeModel *model; GtkListStore *store; GtkTreeIter iter; - gchar *label; - gchar *stripped_label; g_return_if_fail (GIMP_IS_SCALE_COMBO_BOX (combo_box)); g_return_if_fail (GTK_IS_ACTION (action)); @@ -340,19 +339,13 @@ gimp_scale_combo_box_add_action (GimpScaleComboBox *combo_box, combo_box->actions_added = TRUE; } - g_object_get (action, "label", &label, NULL); - stripped_label = gimp_strip_uline (label); - g_free (label); - gtk_list_store_append (store, &iter); gtk_list_store_set (store, &iter, - LABEL, stripped_label, + LABEL, label, LABEL_ALIGN, 0.0, PERSISTENT, TRUE, ACTION, action, -1); - - g_free (stripped_label); } void diff --git a/app/display/gimpscalecombobox.h b/app/display/gimpscalecombobox.h index 95af3852a5..354c69061f 100644 --- a/app/display/gimpscalecombobox.h +++ b/app/display/gimpscalecombobox.h @@ -54,7 +54,8 @@ GType gimp_scale_combo_box_get_type (void) G_GNUC_CONST; GtkWidget * gimp_scale_combo_box_new (void); void gimp_scale_combo_box_add_action (GimpScaleComboBox *combo_box, - GtkAction *action); + GtkAction *action, + const gchar *label); void gimp_scale_combo_box_set_scale (GimpScaleComboBox *combo_box, gdouble scale); gdouble gimp_scale_combo_box_get_scale (GimpScaleComboBox *combo_box); diff --git a/app/display/gimpstatusbar.c b/app/display/gimpstatusbar.c index e8716cda99..37c8769967 100644 --- a/app/display/gimpstatusbar.c +++ b/app/display/gimpstatusbar.c @@ -422,7 +422,7 @@ gimp_statusbar_new (GimpDisplayShell *shell) { GimpScaleComboBox *combo = GIMP_SCALE_COMBO_BOX (statusbar->scale_combo); - gimp_scale_combo_box_add_action (combo, action); + gimp_scale_combo_box_add_action (combo, action, _("Other...")); } g_signal_connect_object (shell, "scaled",