[Xfce4-commits] <xfwm4:master> Fix crash when handling conflict involving xfwm4 actions.

[Jérôme Guelfucci]

Updating branch refs/heads/master
         to 17d3d97874eb9c764669f5499ad5b4468506ade4 (commit)
       from 7d933f37584a08775607d9c93e713de02f48a45b (commit)

commit 17d3d97874eb9c764669f5499ad5b4468506ade4
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Thu Dec 20 23:22:08 2012 +0100

    Fix crash when handling conflict involving xfwm4 actions.
    
    xfce_shortcut_dialog_get_action_name seems to return garbage which made
    the application segfault.

 settings-dialogs/xfwm4-settings.c |   22 ++--------------------
 1 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/settings-dialogs/xfwm4-settings.c b/settings-dialogs/xfwm4-settings.c
index 64dea66..1b5b7e9 100644
--- a/settings-dialogs/xfwm4-settings.c
+++ b/settings-dialogs/xfwm4-settings.c
@@ -1844,24 +1844,6 @@ xfwm_settings_shortcut_reset_clicked (GtkButton    *button,
 
 
 
-static const gchar *
-xfwm_settings_shortcut_feature_name (const gchar *feature)
-{
-  const gchar *result = feature;
-  gint         i;
-
-  for (i = 0; xfwm4_shortcut_values[i].name != NULL; ++i)
-    if (G_UNLIKELY (g_str_equal (xfwm4_shortcut_values[i].feature, feature)))
-      {
-        result = xfwm4_shortcut_values[i].name;
-        break;
-      }
-
-  return result;
-}
-
-
-
 static gboolean
 xfwm_settings_validate_shortcut (XfceShortcutDialog  *dialog,
                                  const gchar         *shortcut,
@@ -1913,8 +1895,8 @@ xfwm_settings_validate_shortcut (XfceShortcutDialog  *dialog,
                                                     xfce_shortcuts_provider_get_name (settings->priv->provider),
                                                     xfce_shortcuts_provider_get_name (other_provider),
                                                     shortcut,
-                                                    xfce_shortcut_dialog_get_action_name (dialog),
-                                                    xfwm_settings_shortcut_feature_name (other_shortcut->command),
+                                                    xfce_shortcut_dialog_get_action (dialog),
+                                                    other_shortcut->command,
                                                     FALSE);
 
           if (G_UNLIKELY (response == GTK_RESPONSE_ACCEPT))