diff options
| author | Arx Cruz <arxcruz@gnome.org> | 2011-07-26 14:00:28 -0300 |
|---|---|---|
| committer | Arx Cruz <arxcruz@gnome.org> | 2011-07-26 14:02:45 -0300 |
| commit | 6768a40e997697d05008aecdb41815e1dbae61c6 (patch) | |
| tree | 787c080cb8b3a81af70d2bb7d9c3847529e9a5f1 /src/color.c | |
| parent | Bug #592195. This fix made the --list mode return as soon as receive an ok or... (diff) | |
| download | zenity-6768a40e997697d05008aecdb41815e1dbae61c6.tar.gz zenity-6768a40e997697d05008aecdb41815e1dbae61c6.tar.bz2 zenity-6768a40e997697d05008aecdb41815e1dbae61c6.zip | |
Fix for bug #611297 Now Zenity have --ok-label and --cancel-label in all dialogs. This patch doesn't break old zenity scripts.
Diffstat (limited to 'src/color.c')
| -rw-r--r-- | src/color.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/color.c b/src/color.c index ca8debde..5e24e3dc 100644 --- a/src/color.c +++ b/src/color.c @@ -35,6 +35,7 @@ void zenity_colorselection (ZenityData *data, ZenityColorData *color_data) { GtkWidget *dialog; GtkWidget *colorsel; + GtkWidget *button; GdkColor color; zen_data = data; @@ -56,6 +57,22 @@ void zenity_colorselection (ZenityData *data, ZenityColorData *color_data) &color); } + if (data->ok_label) { + g_object_get (G_OBJECT (dialog), "ok-button", &button); + gtk_button_set_label (GTK_BUTTON (button), data->ok_label); + gtk_button_set_image (GTK_BUTTON (button), + gtk_image_new_from_stock (GTK_STOCK_OK, GTK_ICON_SIZE_BUTTON)); + g_object_unref (G_OBJECT (button)); + } + + if (data->cancel_label) { + g_object_get (G_OBJECT (dialog), "cancel-button", &button); + gtk_button_set_label (GTK_BUTTON (button), data->cancel_label); + gtk_button_set_image (GTK_BUTTON (button), + gtk_image_new_from_stock (GTK_STOCK_CANCEL, GTK_ICON_SIZE_BUTTON)); + g_object_unref (G_OBJECT (button)); + } + gtk_color_selection_set_has_palette (GTK_COLOR_SELECTION (colorsel), color_data->show_palette); |