Updating branch refs/heads/kelnos/new-sm-client
to 5894435111041ed57f2f8fe4068e71e0f08e9807 (commit)
from 0ebc70fb21ac75c2902e1285d2ecee16803d8da8 (commit)
commit 5894435111041ed57f2f8fe4068e71e0f08e9807
Merge: 0ebc70fb21ac75c2902e1285d2ecee16803d8da8
60f00295a82746cdf69267be10bab27b5441807c
Author: Olivier Fourdan <four...@xfce.org>
Date: Wed Sep 9 20:47:35 2009 +0200
Merge branch 'master' of ssh://oliv...@git.xfce.org/git/xfce/libxfce4ui
commit 60f00295a82746cdf69267be10bab27b5441807c
Author: Jannis Pohlmann <jan...@xfce.org>
Date: Mon Sep 7 22:41:02 2009 +0200
Fix conflict dialog segfault due to wrong use of xfce_message_dialog().
When creating the shortcut conflict dialog, add a NULL parameter for the
stock IDs of the mixed buttons.
commit e1456828dcc17c7d05ac3d202a3f0540e9ac2d6b
Author: Jannis Pohlmann <jan...@xfce.org>
Date: Mon Sep 7 22:38:28 2009 +0200
Rename first_button_type to first_button_text to comply with the docs.
I personally think first_button_text is confusing so I'd rather use
first_button_type myself.
libxfce4kbd-private/xfce-shortcuts.c | 4 ++--
libxfce4ui/xfce-dialogs.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libxfce4kbd-private/xfce-shortcuts.c
b/libxfce4kbd-private/xfce-shortcuts.c
index 8e11325..7ebc078 100644
--- a/libxfce4kbd-private/xfce-shortcuts.c
+++ b/libxfce4kbd-private/xfce-shortcuts.c
@@ -108,8 +108,8 @@ xfce_shortcut_conflict_dialog (const gchar *owner,
response = xfce_message_dialog (NULL, title, GTK_STOCK_DIALOG_QUESTION,
title, secondary_text,
- XFCE_BUTTON_TYPE_MIXED,
owner_button_text, GTK_RESPONSE_ACCEPT,
- XFCE_BUTTON_TYPE_MIXED,
other_button_text, GTK_RESPONSE_REJECT,
+ XFCE_BUTTON_TYPE_MIXED, NULL,
owner_button_text, GTK_RESPONSE_ACCEPT,
+ XFCE_BUTTON_TYPE_MIXED, NULL,
other_button_text, GTK_RESPONSE_REJECT,
NULL);
g_free (other_button_text);
diff --git a/libxfce4ui/xfce-dialogs.c b/libxfce4ui/xfce-dialogs.c
index 34949f6..a0c76e2 100644
--- a/libxfce4ui/xfce-dialogs.c
+++ b/libxfce4ui/xfce-dialogs.c
@@ -230,13 +230,13 @@ xfce_message_dialog_new_valist (GtkWindow *parent,
const gchar *icon_stock_id,
const gchar *primary_text,
const gchar *secondary_text,
- const gchar *first_button_type,
+ const gchar *first_button_text,
va_list args)
{
GtkWidget *dialog;
GtkWidget *image;
GtkWidget *button;
- const gchar *text = first_button_type;
+ const gchar *text = first_button_text;
const gchar *label;
const gchar *stock_id;
gint response;
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
