[gnome-commander] Replacing obsoleted g_strdown() with g_ascii_strdown()



commit 9666492bf7db472d04d3daad7e91e415abf95107
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Mon Jul 25 22:18:51 2011 +0200

    Replacing obsoleted g_strdown() with g_ascii_strdown()

 src/gnome-cmd-user-actions.cc |   10 +++++-----
 src/gnome-cmd-user-actions.h  |    4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/src/gnome-cmd-user-actions.cc b/src/gnome-cmd-user-actions.cc
index 1e489aa..9d88052 100644
--- a/src/gnome-cmd-user-actions.cc
+++ b/src/gnome-cmd-user-actions.cc
@@ -452,10 +452,9 @@ void GnomeCmdUserActions::load(const gchar *section)
             g_strstrip (++action_options);
         }
 
-        g_strstrip (action_name);
-        g_strdown (action_name);
+        gchar *action_name__lowercase = g_ascii_strdown (g_strstrip (action_name), -1);
 
-        if (action_func[action_name])
+        if (action_func[action_name__lowercase])
         {
             guint keyval;
             guint state;
@@ -463,15 +462,16 @@ void GnomeCmdUserActions::load(const gchar *section)
             str2key(key, state, keyval);
 
             if (keyval!=GDK_VoidSymbol)
-                register_action(state, keyval, action_name, action_options);
+                register_action(state, keyval, action_name__lowercase, action_options);
             else
                 g_warning ("[%s] invalid key name: '%s' - ignored", section, key);
         }
         else
-            g_warning ("[%s] unknown user action: '%s' - ignored", section, action_name);
+            g_warning ("[%s] unknown user action: '%s' - ignored", section, action_name__lowercase);
 
         g_free (key);
         g_free (action_name);
+        g_free (action_name__lowercase);
     }
 }
 
diff --git a/src/gnome-cmd-user-actions.h b/src/gnome-cmd-user-actions.h
index 479fbf4..f3ad4b9 100644
--- a/src/gnome-cmd-user-actions.h
+++ b/src/gnome-cmd-user-actions.h
@@ -88,7 +88,7 @@ inline std::string key2str(const GdkEventKey &event)
 
 inline GdkEventKey str2key(gchar *s, guint &state, guint &key_val)
 {
-    g_strdown (s);
+    s = g_ascii_strdown (s, -1);
 
     gchar *key = strrchr(s, '>');       // find last '>'
     key = key ? key+1 : s;
@@ -114,6 +114,8 @@ inline GdkEventKey str2key(gchar *s, guint &state, guint &key_val)
         break;
     }
 
+    g_free (s);
+
     GdkEventKey event;
 
     event.keyval = key_val;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]