[gnome-control-center] wacom: Show hard-coded action names on OLED too

[Bastien Nocera <hadess src gnome org>]

commit 3708eab09d9d321fdec4770450f1a4317064d624
Author: Przemo Firszt <przemo firszt eu>
Date:   Fri May 17 19:42:56 2013 +0100

    wacom: Show hard-coded action names on OLED too
    
    Show hard-coded action names on OLED as well, not just
    for custom actions.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=700498

 panels/wacom/cc-wacom-page.c |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/panels/wacom/cc-wacom-page.c b/panels/wacom/cc-wacom-page.c
index 90dc8fc..1ccfddf 100644
--- a/panels/wacom/cc-wacom-page.c
+++ b/panels/wacom/cc-wacom-page.c
@@ -445,6 +445,10 @@ accel_set_func (GtkTreeViewColumn *tree_column,
                      "accel-mods", mask,
                      "style", PANGO_STYLE_NORMAL,
                      NULL);
+
+       str = gtk_accelerator_get_label (keyval, mask);
+       g_settings_set_string (button->settings, OLED_LABEL, str);
+       g_free (str);
 }
 
 static gboolean
@@ -586,9 +590,6 @@ accel_edited_callback (GtkCellRendererText   *cell,
            g_strfreev (strv);
   } else {
     g_settings_set_string (button->settings, CUSTOM_ACTION_KEY, str);
-    g_free (str);
-    str = gtk_accelerator_get_label (keyval, mask);
-    g_settings_set_string (button->settings, OLED_LABEL, str);
   }
   g_settings_set_enum (button->settings, ACTION_TYPE_KEY, GSD_WACOM_ACTION_TYPE_CUSTOM);
   g_free (str);
@@ -776,6 +777,13 @@ combo_action_cell_changed (GtkCellRendererCombo *cell,
                return;
        g_settings_set_enum (button->settings, ACTION_TYPE_KEY, type);
 
+       if ((type == GSD_WACOM_ACTION_TYPE_SWITCH_MONITOR) || 
+          (type == GSD_WACOM_ACTION_TYPE_HELP))
+               g_settings_set_string (button->settings, OLED_LABEL, WACOM_C(action_table[type].action_name));
+
+       if (type == GSD_WACOM_ACTION_TYPE_NONE)
+               g_settings_set_string (button->settings, OLED_LABEL, "");
+
        gtk_widget_grab_focus (GTK_WIDGET (tree_view));
 }