~ubuntu-branches/ubuntu/gutsy/xfce-mcs-plugins/gutsy

« back to all changes in this revision

Viewing changes to debian/patches/02_keysym_svn_backport.patch

  • Committer: Bazaar Package Importer
  • Author(s): Gauvain Pocentek
  • Date: 2007-03-11 11:46:43 UTC
  • Revision ID: james.westby@ubuntu.com-20070311114643-p3jknn4i5a75l4p5
Tags: 4.4.0-0ubuntu4
* 02_keysym_svn_backport.patch: backport the entire patch 
  (Thanks to Alan Tam)
* LP: #85009

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
diff -Nur xfce-mcs-plugins-4.4.0/plugins/keyboard_plugin/keys_management.c xfce-mcs-plugins-4.4.0.new/plugins/keyboard_plugin/keys_management.c
2
2
--- xfce-mcs-plugins-4.4.0/plugins/keyboard_plugin/keys_management.c    2007-01-20 16:45:31.000000000 +0100
3
 
+++ xfce-mcs-plugins-4.4.0.new/plugins/keyboard_plugin/keys_management.c        2007-02-24 19:02:16.000000000 +0100
 
3
+++ xfce-mcs-plugins-4.4.0.new/plugins/keyboard_plugin/keys_management.c        2007-03-11 11:56:34.000000000 +0100
4
4
@@ -44,6 +44,29 @@
5
5
 unsigned int SuperMask = 0;
6
6
 unsigned int HyperMask = 0;
49
49
         my_key->modifier = 0;
50
50
     }
51
51
 
 
52
diff -Nur xfce-mcs-plugins-4.4.0/plugins/keyboard_plugin/shortcuts_plugin.c xfce-mcs-plugins-4.4.0.new/plugins/keyboard_plugin/shortcuts_plugin.c
 
53
--- xfce-mcs-plugins-4.4.0/plugins/keyboard_plugin/shortcuts_plugin.c   2007-01-20 16:45:31.000000000 +0100
 
54
+++ xfce-mcs-plugins-4.4.0.new/plugins/keyboard_plugin/shortcuts_plugin.c       2007-03-11 11:56:34.000000000 +0100
 
55
@@ -1003,6 +1003,12 @@
 
56
     g_free (accelerator);
 
57
     g_strfreev (shortcuts);
 
58
 
 
59
+    /* Use keycode if unknown keysym */
 
60
+    if (!strlen (shortcut_string))
 
61
+    {
 
62
+        g_snprintf (shortcut_string, sizeof (shortcut_string), "0x%X", (guint) event->hardware_keycode);
 
63
+    }
 
64
+
 
65
     /* check if shorcut already exists */
 
66
     selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->treeview_shortcuts));
 
67
     gtk_tree_selection_get_selected (selection, &model, &iter);