brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

launcher: Use native char type and fix formatting

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4130>
This commit is contained in:
Sebastian Wick 2024-11-12 15:28:26 +01:00
parent 8e2e986eeb
commit 15ca9a09b5
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/backends/native/meta-launcher.c
View File

@ -60,15 +60,15 @@ meta_launcher_get_seat_id (MetaLauncher *launcher)
} }
static gboolean static gboolean
find_systemd_session (gchar **session_id, find_systemd_session (char **session_id,
GError **error) GError **error)
{ {
const gchar * const graphical_session_types[] = { "wayland", "x11", "mir", NULL }; const char * const graphical_session_types[] = { "wayland", "x11", "mir", NULL };
const gchar * const active_states[] = { "active", "online", NULL }; const char * const active_states[] = { "active", "online", NULL };
g_autofree gchar *class = NULL; g_autofree char *class = NULL;
g_autofree gchar *local_session_id = NULL; g_autofree char *local_session_id = NULL;
g_autofree gchar *type = NULL; g_autofree char *type = NULL;
g_autofree gchar *state = NULL; g_autofree char *state = NULL;
g_auto (GStrv) sessions = NULL; g_auto (GStrv) sessions = NULL;
int n_sessions; int n_sessions;
int saved_errno; int saved_errno;
@ -285,7 +285,7 @@ get_session_proxy (const char *fallback_session_id,
} }
static MetaDBusLogin1Seat * static MetaDBusLogin1Seat *
get_seat_proxy (gchar *seat_id, get_seat_proxy (char *seat_id,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
@ -335,7 +335,7 @@ on_active_changed (MetaDBusLogin1Session *session,
sync_active (self); sync_active (self);
} }
static gchar * static char *
get_seat_id (GError **error) get_seat_id (GError **error)
{ {
g_autoptr (GError) local_error = NULL; g_autoptr (GError) local_error = NULL;

1
src/backends/native/meta-launcher.h
View File

@ -28,6 +28,7 @@ MetaLauncher *meta_launcher_new (MetaBackend *backend,
const char *session_id, const char *session_id,
const char *custom_seat_id, const char *custom_seat_id,
GError **error); GError **error);
void meta_launcher_free (MetaLauncher *self); void meta_launcher_free (MetaLauncher *self);
gboolean meta_launcher_activate_vt (MetaLauncher *self, gboolean meta_launcher_activate_vt (MetaLauncher *self,