[gimp/metadata-browser] app: pull virtual modifier replacement into gimp_get_mod_string()

[Roman Joost <romanofski src gnome org>]

commit 67941a39d63b15fba823bc925fe763b8857419b8
Author: Michael Natterer <mitch gimp org>
Date:   Thu Oct 6 22:26:43 2011 +0200

    app: pull virtual modifier replacement into gimp_get_mod_string()
    
    and remove it from all other places. We only want to have the virtual
    modifiers when displaying a modifier string (and in some other cases,
    but these are all handled internally by GTK+).

 app/actions/layers-actions.c     |    2 --
 app/tools/gimpselectionoptions.c |    2 +-
 app/widgets/gimpeditor.c         |    2 +-
 app/widgets/gimpwidgets-utils.c  |    2 ++
 4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/app/actions/layers-actions.c b/app/actions/layers-actions.c
index 8aed1cc..0a68fdc 100644
--- a/app/actions/layers-actions.c
+++ b/app/actions/layers-actions.c
@@ -432,8 +432,6 @@ layers_actions_fix_tooltip (GimpActionGroup *group,
   const gchar *old_hint;
   gchar       *new_hint;
 
-  modifiers = gimp_replace_virtual_modifiers (modifiers);
-
   old_hint = gimp_action_group_get_action_tooltip (group,
                                                    action);
   new_hint = g_strconcat (old_hint,
diff --git a/app/tools/gimpselectionoptions.c b/app/tools/gimpselectionoptions.c
index eafbbbd..78c145b 100644
--- a/app/tools/gimpselectionoptions.c
+++ b/app/tools/gimpselectionoptions.c
@@ -190,7 +190,7 @@ gimp_selection_options_get_modifiers (GimpChannelOps operation)
       break;
     }
 
-  return gimp_get_mod_string (gimp_replace_virtual_modifiers (modifiers));
+  return gimp_get_mod_string (modifiers);
 }
 
 GtkWidget *
diff --git a/app/widgets/gimpeditor.c b/app/widgets/gimpeditor.c
index 11ab3e3..46e3877 100644
--- a/app/widgets/gimpeditor.c
+++ b/app/widgets/gimpeditor.c
@@ -684,7 +684,7 @@ gimp_editor_add_action_button (GimpEditor  *editor,
         {
           ExtendedAction *ext = g_slice_new (ExtendedAction);
 
-          ext->mod_mask = gimp_replace_virtual_modifiers (mod_mask);
+          ext->mod_mask = mod_mask;
           ext->action   = action;
 
           extended = g_list_prepend (extended, ext);
diff --git a/app/widgets/gimpwidgets-utils.c b/app/widgets/gimpwidgets-utils.c
index b499c6a..9d668da 100644
--- a/app/widgets/gimpwidgets-utils.c
+++ b/app/widgets/gimpwidgets-utils.c
@@ -484,6 +484,8 @@ gimp_get_mod_string (GdkModifierType modifiers)
   if (G_UNLIKELY (! mod_labels))
     mod_labels = g_hash_table_new (g_int_hash, g_int_equal);
 
+  modifiers = gimp_replace_virtual_modifiers (modifiers);
+
   label = g_hash_table_lookup (mod_labels, &modifiers);
 
   if (! label)