summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Dreßler <verdre@v0yd.nl>2020-04-08 16:17:09 +0200
committerFlorian Müllner <florian.muellner@gmail.com>2020-05-21 23:10:23 +0000
commit70ba844c3c807efa67fc7180ad1c7a8ead1ed118 (patch)
tree43bb22412208c29f28560c2a233b78b802388ab5
parentbc0b9f76288b1904b68d053991415dcbab706d3b (diff)
downloadmutter-70ba844c3c807efa67fc7180ad1c7a8ead1ed118.tar.gz
window: Return pid_t in meta_window_get_pid()
Just as with the last commit, pid_t is compatible with all platforms and we should use that everywhere, so also make meta_window_get_pid() return a pid_t. https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1180
-rw-r--r--src/core/window.c8
-rw-r--r--src/meta/window.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/window.c b/src/core/window.c
index 326e51eb2..b2a7be5dd 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -898,13 +898,13 @@ meta_window_update_snap_id (MetaWindow *window,
static void
meta_window_update_sandboxed_app_id (MetaWindow *window)
{
- uint32_t pid;
+ pid_t pid;
g_clear_pointer (&window->sandboxed_app_id, g_free);
pid = meta_window_get_pid (window);
- if (pid == 0)
+ if (pid < 1)
return;
if (meta_window_update_flatpak_id (window, pid))
@@ -7590,12 +7590,12 @@ meta_window_get_transient_for (MetaWindow *window)
*
* Return value: the pid, or 0 if not known.
*/
-uint32_t
+pid_t
meta_window_get_pid (MetaWindow *window)
{
g_return_val_if_fail (META_IS_WINDOW (window), 0);
- return (uint32_t)META_WINDOW_GET_CLASS (window)->get_client_pid (window);
+ return META_WINDOW_GET_CLASS (window)->get_client_pid (window);
}
/**
diff --git a/src/meta/window.h b/src/meta/window.h
index 46bdab964..3157d44ee 100644
--- a/src/meta/window.h
+++ b/src/meta/window.h
@@ -328,7 +328,7 @@ META_EXPORT
guint32 meta_window_get_user_time (MetaWindow *window);
META_EXPORT
-uint32_t meta_window_get_pid (MetaWindow *window);
+pid_t meta_window_get_pid (MetaWindow *window);
META_EXPORT
const char *meta_window_get_client_machine (MetaWindow *window);