summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--src/msg.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index bc648daf..cae5fdc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-03-30 Lucas Rocha <lucasr@gnome.org>
+ * src/msg.c (zenity_msg_construct_question_dialog): fix memory leak on
+ custom labels (Fixes bug #526627). Patch by kraai@ftbfs.org.
+
+2008-03-30 Lucas Rocha <lucasr@gnome.org>
+
Allow question dialogs to use custom button label text (Fixes
bug #335763). Patch from Cosimo Cecchi <anarki@lilik.it> and
Thomas Thurman <tthurman@gnome.org>.
diff --git a/src/msg.c b/src/msg.c
index 90e51642..03642686 100644
--- a/src/msg.c
+++ b/src/msg.c
@@ -40,13 +40,13 @@ zenity_msg_construct_question_dialog (GtkWidget *dialog, ZenityMsgData *msg_data
gtk_widget_grab_focus (ok_button);
if (msg_data->cancel_label) {
- gtk_button_set_label (GTK_BUTTON (cancel_button), g_strdup (msg_data->cancel_label));
+ gtk_button_set_label (GTK_BUTTON (cancel_button), msg_data->cancel_label);
gtk_button_set_image (GTK_BUTTON (cancel_button),
gtk_image_new_from_stock (GTK_STOCK_CANCEL, GTK_ICON_SIZE_BUTTON));
}
if (msg_data->ok_label) {
- gtk_button_set_label (GTK_BUTTON (ok_button), g_strdup (msg_data->ok_label));
+ gtk_button_set_label (GTK_BUTTON (ok_button), msg_data->ok_label);
gtk_button_set_image (GTK_BUTTON (ok_button),
gtk_image_new_from_stock (GTK_STOCK_OK, GTK_ICON_SIZE_BUTTON));
}
bgstack15