← Back to branch summary

~ci-train-bot/unity-settings-daemon/unity-settings-daemon-ubuntu-disco-3643

« back to all changes in this revision

Viewing changes to debian/patches/git_revert_gsd-keygrab.patch

  • Committer: Robert Ancell
  • Date: 2013-11-13 01:33:12 UTC
  • Revision ID: robert.ancell@canonical.com-20131113013312-lqg7dhy39tvmjrda
Import packaging

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/git_revert_gsd-keygrab.patch
 
1
Description: Revert "common: Remove now unused key grab functions"
 
2
    
 
3
    This reverts commit b7f766de2a8f38b1e8cb76d8dfd9ff098c14c257.
 
4
 
 
5
https://bugzilla.gnome.org/show_bug.cgi?id=693016
 
6
 
 
7
Last-Update: <2013-04-25>
 
8
 
 
9
Index: gnome-settings-daemon-3.8.5/plugins/common/gsd-keygrab.h
 
10
===================================================================
 
11
--- gnome-settings-daemon-3.8.5.orig/plugins/common/gsd-keygrab.h       2013-11-12 16:32:41.374469465 +1300
 
12
+++ gnome-settings-daemon-3.8.5/plugins/common/gsd-keygrab.h    2013-11-12 16:32:41.370469465 +1300
 
13
@@ -42,12 +42,18 @@
 
14
                                 GsdKeygrabFlags flags,
 
15
                                 GSList  *screens);
 
16
 
 
17
+void            ungrab_key_unsafe (Key     *key,
 
18
+                                   GSList  *screens);
 
19
+
 
20
 gboolean        match_xi2_key   (Key           *key,
 
21
                                  XIDeviceEvent *event);
 
22
 
 
23
 gboolean        key_uses_keycode (const Key *key,
 
24
                                   guint keycode);
 
25
 
 
26
+Key *           parse_key        (const char    *str);
 
27
+void            free_key         (Key           *key);
 
28
+
 
29
 void            grab_button      (int      deviceid,
 
30
                                   gboolean grab,
 
31
                                   GSList  *screens);
 
32
Index: gnome-settings-daemon-3.8.5/plugins/common/gsd-keygrab.c
 
33
===================================================================
 
34
--- gnome-settings-daemon-3.8.5.orig/plugins/common/gsd-keygrab.c       2013-11-12 16:32:41.374469465 +1300
 
35
+++ gnome-settings-daemon-3.8.5/plugins/common/gsd-keygrab.c    2013-11-12 16:32:41.370469465 +1300
 
36
@@ -247,6 +247,13 @@
 
37
         grab_key_internal (key, TRUE, flags, screens);
 
38
 }
 
39
 
 
40
+void
 
41
+ungrab_key_unsafe (Key    *key,
 
42
+                   GSList *screens)
 
43
+{
 
44
+        grab_key_internal (key, FALSE, 0, screens);
 
45
+}
 
46
+
 
47
 static gboolean
 
48
 have_xkb (Display *dpy)
 
49
 {
 
50
@@ -361,6 +368,38 @@
 
51
                 && key_uses_keycode (key, keycode));
 
52
 }
 
53
 
 
54
+Key *
 
55
+parse_key (const char *str)
 
56
+{
 
57
+       Key *key;
 
58
+
 
59
+       if (str == NULL ||
 
60
+           *str == '\0' ||
 
61
+           g_str_equal (str, "disabled")) {
 
62
+               return NULL;
 
63
+       }
 
64
+
 
65
+       key = g_new0 (Key, 1);
 
66
+       gtk_accelerator_parse_with_keycode (str, &key->keysym, &key->keycodes, &key->state);
 
67
+       if (key->keysym == 0 &&
 
68
+           key->keycodes == NULL &&
 
69
+           key->state == 0) {
 
70
+               g_free (key);
 
71
+                return NULL;
 
72
+       }
 
73
+
 
74
+       return key;
 
75
+}
 
76
+
 
77
+void
 
78
+free_key (Key *key)
 
79
+{
 
80
+       if (key == NULL)
 
81
+               return;
 
82
+       g_free (key->keycodes);
 
83
+       g_free (key);
 
84
+}
 
85
+
 
86
 static void
 
87
 grab_button_real (int        deviceid,
 
88
                  gboolean   grab,