Updating branch refs/heads/kelnos/new-sm-client to 60f00295a82746cdf69267be10bab27b5441807c (commit) from e1456828dcc17c7d05ac3d202a3f0540e9ac2d6b (commit)
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. libxfce4kbd-private/xfce-shortcuts.c | 4 ++-- 1 files changed, 2 insertions(+), 2 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); _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits