diff options
author | Jerzi Kaminsky <JerziKaminsky@users.noreply.github.com> | 2017-04-15 17:13:28 +0300 |
---|---|---|
committer | Jerzi Kaminsky <JerziKaminsky@users.noreply.github.com> | 2017-04-16 17:09:53 +0300 |
commit | cf5e764c7f69bdce8dd76cb0d6c464b7f245ef94 (patch) | |
tree | 6431853157a586443d0a0a8a9a3190db44e09659 /sway/extensions.c | |
parent | Merge pull request #1175 from JerziKaminsky/fix_sway_assert_variadic (diff) | |
download | sway-cf5e764c7f69bdce8dd76cb0d6c464b7f245ef94.tar.gz sway-cf5e764c7f69bdce8dd76cb0d6c464b7f245ef94.tar.zst sway-cf5e764c7f69bdce8dd76cb0d6c464b7f245ef94.zip |
Disambiguate get_*_policy() and get_*_policy_mask()
Diffstat (limited to 'sway/extensions.c')
-rw-r--r-- | sway/extensions.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/extensions.c b/sway/extensions.c index 15d2f971..96957dbf 100644 --- a/sway/extensions.c +++ b/sway/extensions.c | |||
@@ -86,7 +86,7 @@ static void set_background(struct wl_client *client, struct wl_resource *resourc | |||
86 | struct wl_resource *_output, struct wl_resource *surface) { | 86 | struct wl_resource *_output, struct wl_resource *surface) { |
87 | pid_t pid; | 87 | pid_t pid; |
88 | wl_client_get_credentials(client, &pid, NULL, NULL); | 88 | wl_client_get_credentials(client, &pid, NULL, NULL); |
89 | if (!(get_feature_policy(pid) & FEATURE_BACKGROUND)) { | 89 | if (!(get_feature_policy_mask(pid) & FEATURE_BACKGROUND)) { |
90 | sway_log(L_INFO, "Denying background feature to %d", pid); | 90 | sway_log(L_INFO, "Denying background feature to %d", pid); |
91 | return; | 91 | return; |
92 | } | 92 | } |
@@ -114,7 +114,7 @@ static void set_panel(struct wl_client *client, struct wl_resource *resource, | |||
114 | struct wl_resource *_output, struct wl_resource *surface) { | 114 | struct wl_resource *_output, struct wl_resource *surface) { |
115 | pid_t pid; | 115 | pid_t pid; |
116 | wl_client_get_credentials(client, &pid, NULL, NULL); | 116 | wl_client_get_credentials(client, &pid, NULL, NULL); |
117 | if (!(get_feature_policy(pid) & FEATURE_PANEL)) { | 117 | if (!(get_feature_policy_mask(pid) & FEATURE_PANEL)) { |
118 | sway_log(L_INFO, "Denying panel feature to %d", pid); | 118 | sway_log(L_INFO, "Denying panel feature to %d", pid); |
119 | return; | 119 | return; |
120 | } | 120 | } |
@@ -152,7 +152,7 @@ static void desktop_ready(struct wl_client *client, struct wl_resource *resource | |||
152 | static void set_panel_position(struct wl_client *client, struct wl_resource *resource, uint32_t position) { | 152 | static void set_panel_position(struct wl_client *client, struct wl_resource *resource, uint32_t position) { |
153 | pid_t pid; | 153 | pid_t pid; |
154 | wl_client_get_credentials(client, &pid, NULL, NULL); | 154 | wl_client_get_credentials(client, &pid, NULL, NULL); |
155 | if (!(get_feature_policy(pid) & FEATURE_PANEL)) { | 155 | if (!(get_feature_policy_mask(pid) & FEATURE_PANEL)) { |
156 | sway_log(L_INFO, "Denying panel feature to %d", pid); | 156 | sway_log(L_INFO, "Denying panel feature to %d", pid); |
157 | return; | 157 | return; |
158 | } | 158 | } |
@@ -191,7 +191,7 @@ static void set_lock_surface(struct wl_client *client, struct wl_resource *resou | |||
191 | struct wl_resource *_output, struct wl_resource *surface) { | 191 | struct wl_resource *_output, struct wl_resource *surface) { |
192 | pid_t pid; | 192 | pid_t pid; |
193 | wl_client_get_credentials(client, &pid, NULL, NULL); | 193 | wl_client_get_credentials(client, &pid, NULL, NULL); |
194 | if (!(get_feature_policy(pid) & FEATURE_LOCK)) { | 194 | if (!(get_feature_policy_mask(pid) & FEATURE_LOCK)) { |
195 | sway_log(L_INFO, "Denying lock feature to %d", pid); | 195 | sway_log(L_INFO, "Denying lock feature to %d", pid); |
196 | return; | 196 | return; |
197 | } | 197 | } |