[Xfce4-commits] <libxfce4ui:master> Don't show escaped text in the shortcut conflict dialog (bug #5076).

[Jérôme Guelfucci]

Updating branch refs/heads/master
         to 19f4d73d341330297a13c13781be0fbb3603b864 (commit)
       from 1b66b0d24f3c789e579f06c11d2ee90ac6515285 (commit)

commit 19f4d73d341330297a13c13781be0fbb3603b864
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sun Feb 3 11:41:24 2013 +0100

    Don't show escaped text in the shortcut conflict dialog (bug #5076).

 libxfce4kbd-private/xfce-shortcuts.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libxfce4kbd-private/xfce-shortcuts.c b/libxfce4kbd-private/xfce-shortcuts.c
index ecdf185..be5dd8f 100644
--- a/libxfce4kbd-private/xfce-shortcuts.c
+++ b/libxfce4kbd-private/xfce-shortcuts.c
@@ -127,11 +127,11 @@ xfce_shortcut_conflict_dialog (GtkWindow   *parent,
 
             /* We need to get the human readable string of the action name */
             owner_action_name =
-              g_markup_escape_text (xfce_shortcuts_xfwm4_get_feature_name (owner_action), -1);
+              g_strdup (xfce_shortcuts_xfwm4_get_feature_name (owner_action));
 
           }
         else
-          owner_action_name = g_markup_escape_text (owner_action, -1);
+          owner_action_name = g_strdup(owner_action);
 
         DBG ("Owner action name: %s", owner_action_name);
 
@@ -142,16 +142,16 @@ xfce_shortcut_conflict_dialog (GtkWindow   *parent,
             /* We need to get the human readable string of the action name */
 
             other_action_name =
-              g_markup_escape_text (xfce_shortcuts_xfwm4_get_feature_name (other_action), -1);
+              g_strdup (xfce_shortcuts_xfwm4_get_feature_name (other_action));
 
           }
         else
-          other_action_name = g_markup_escape_text (other_action, -1);
+          other_action_name = g_strdup (other_action);
 
         secondary_text = g_strdup_printf (_(conflict_messages[i].message), other_action_name);
 
-        owner_button_text = g_markup_printf_escaped (_(conflict_messages[i].owner_button_text), owner_action_name);
-        other_button_text = g_markup_printf_escaped (_(conflict_messages[i].other_button_text), other_action_name);
+        owner_button_text = g_strdup_printf (_(conflict_messages[i].owner_button_text), owner_action_name);
+        other_button_text = g_strdup_printf (_(conflict_messages[i].other_button_text), other_action_name);
 
         response = xfce_message_dialog (parent, title, GTK_STOCK_DIALOG_QUESTION,
                                         title, secondary_text,