From 4dc1444c64357070f878c0525ef66bfca5893e4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 01/36] search: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- searchd/search-provider.c | 2 +- searchd/searchd.c | 10 +++++----- tests/services/testlib-search-provider-app.c | 4 ++-- tests/services/testlib-search-provider.c | 4 ++-- tests/test-search-provider.c | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/searchd/search-provider.c b/searchd/search-provider.c index afc750fd7..3f26ccea8 100644 --- a/searchd/search-provider.c +++ b/searchd/search-provider.c @@ -547,7 +547,7 @@ phosh_search_provider_get_result_meta (PhoshSearchProvider *self, g_task_set_source_tag (task, phosh_search_provider_get_result_meta); phosh_dbus_search_provider2_call_get_result_metas (PHOSH_DBUS_SEARCH_PROVIDER2 (priv->proxy), - (const gchar * const*) results, + (const char * const*) results, priv->cancellable, got_result_meta, task); diff --git a/searchd/searchd.c b/searchd/searchd.c index 77a0a5198..c170f8fd6 100644 --- a/searchd/searchd.c +++ b/searchd/searchd.c @@ -96,7 +96,7 @@ phosh_search_application_finalize (GObject *object) static gboolean phosh_search_application_dbus_register (GApplication *app, GDBusConnection *connection, - const gchar *object_path, + const char *object_path, GError **error) { PhoshSearchApplication *self = PHOSH_SEARCH_APPLICATION (app); @@ -120,7 +120,7 @@ phosh_search_application_dbus_register (GApplication *app, static void phosh_search_application_dbus_unregister (GApplication *app, GDBusConnection *connection, - const gchar *object_path) + const char *object_path) { PhoshSearchApplication *self = PHOSH_SEARCH_APPLICATION (app); PhoshSearchApplicationPrivate *priv = phosh_search_application_get_instance_private (self); @@ -153,7 +153,7 @@ phosh_search_application_class_init (PhoshSearchApplicationClass *klass) static gboolean launch_source (PhoshDBusSearch *interface, GDBusMethodInvocation *invocation, - const gchar *source_id, + const char *source_id, guint timestamp, gpointer user_data) { @@ -200,8 +200,8 @@ launch_source (PhoshDBusSearch *interface, static gboolean activate_result (PhoshDBusSearch *interface, GDBusMethodInvocation *invocation, - const gchar *source_id, - const gchar *result_id, + const char *source_id, + const char *result_id, guint timestamp, gpointer user_data) { diff --git a/tests/services/testlib-search-provider-app.c b/tests/services/testlib-search-provider-app.c index af97f406e..ccd9c4571 100644 --- a/tests/services/testlib-search-provider-app.c +++ b/tests/services/testlib-search-provider-app.c @@ -29,7 +29,7 @@ G_DEFINE_TYPE (PhoshSearchProviderMockApp, phosh_search_provider_mock_app, G_TYP static gboolean phosh_search_provider_mock_app_dbus_register (GApplication *application, GDBusConnection *connection, - const gchar *object_path, + const char *object_path, GError **error) { PhoshSearchProviderMockApp *self; @@ -52,7 +52,7 @@ phosh_search_provider_mock_app_dbus_register (GApplication *application, static void phosh_search_provider_mock_app_dbus_unregister (GApplication *application, GDBusConnection *connection, - const gchar *object_path) + const char *object_path) { PhoshSearchProviderMockApp *self = PHOSH_SEARCH_PROVIDER_MOCK_APP (application); diff --git a/tests/services/testlib-search-provider.c b/tests/services/testlib-search-provider.c index 192e3faa0..5ccef523b 100644 --- a/tests/services/testlib-search-provider.c +++ b/tests/services/testlib-search-provider.c @@ -169,7 +169,7 @@ phosh_search_provider_mock_init (PhoshSearchProviderMock *self) gboolean phosh_search_provider_mock_dbus_register (PhoshSearchProviderMock *self, GDBusConnection *connection, - const gchar *object_path, + const char *object_path, GError **error) { GDBusInterfaceSkeleton *skeleton = G_DBUS_INTERFACE_SKELETON (self->skeleton); @@ -181,7 +181,7 @@ phosh_search_provider_mock_dbus_register (PhoshSearchProviderMock *self, void phosh_search_provider_mock_dbus_unregister (PhoshSearchProviderMock *self, GDBusConnection *connection, - const gchar *object_path) + const char *object_path) { GDBusInterfaceSkeleton *skeleton = G_DBUS_INTERFACE_SKELETON (self->skeleton); diff --git a/tests/test-search-provider.c b/tests/test-search-provider.c index 85bafbbb6..cc78e9a31 100644 --- a/tests/test-search-provider.c +++ b/tests/test-search-provider.c @@ -208,10 +208,10 @@ test_phosh_search_provider_limit_results (TestFixture *fixture, gconstpointer un gint -main (gint argc, gchar *argv[]) +main (gint argc, char *argv[]) { g_autoptr(GTestDBus) dbus = NULL; - g_autofree gchar *relative = NULL, *servicesdir = NULL; + g_autofree char *relative = NULL, *servicesdir = NULL; const char *display; int ret = -1; -- GitLab From a57ed4a898385142104485000c519ada2682fff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 02/36] tests: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guido Günther Part-of: --- tests/test-take-screenshots.c | 2 +- tests/testlib-wait-for-shell-state.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test-take-screenshots.c b/tests/test-take-screenshots.c index f51373a49..d5bd5a23f 100644 --- a/tests/test-take-screenshots.c +++ b/tests/test-take-screenshots.c @@ -348,7 +348,7 @@ screenshot_end_session_dialog (GMainLoop *loop, 0, 0, 30, - (const gchar * const*)inhibitors->pdata, + (const char * const*)inhibitors->pdata, NULL, on_end_session_dialog_open_finish, NULL); diff --git a/tests/testlib-wait-for-shell-state.c b/tests/testlib-wait-for-shell-state.c index ece156eb6..0569ec03a 100644 --- a/tests/testlib-wait-for-shell-state.c +++ b/tests/testlib-wait-for-shell-state.c @@ -76,7 +76,7 @@ void phosh_test_wait_for_shell_state_wait (PhoshTestWaitForShellState *self, PhoshShellStateFlags state, gboolean enabled, guint64 timeout_ms) { - g_autofree gchar *str_state = NULL; + g_autofree char *str_state = NULL; self->state = state; self->state_enabled = enabled; -- GitLab From 279a2dab845dc74755b442deeeb01d78bab074a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 03/36] top-panel: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/top-panel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/top-panel.c b/src/top-panel.c index 6fb5552d2..1ccfb6ce5 100644 --- a/src/top-panel.c +++ b/src/top-panel.c @@ -413,7 +413,7 @@ add_keybindings (PhoshTopPanel *self) static void on_keybindings_changed (PhoshTopPanel *self, - gchar *key, + char *key, GSettings *settings) { /* For now just redo all keybindings */ -- GitLab From 808be0e81d1f6a06b21d22576c73e495064f3ddf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 04/36] util: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/util.c | 4 ++-- src/util.h | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/util.c b/src/util.c index 02f7dd37e..f154f941d 100644 --- a/src/util.c +++ b/src/util.c @@ -218,7 +218,7 @@ phosh_error_warnv (const char *log_domain, GError *err, GQuark domain, gint code, - const gchar *fmt, ...) + const char *fmt, ...) { g_autofree char *msg = NULL; gboolean matched = FALSE; @@ -456,7 +456,7 @@ phosh_util_gesture_is_touch (GtkGestureSingle *gesture) gboolean phosh_util_have_gnome_software (gboolean scan) { - g_autofree gchar *path = NULL; + g_autofree char *path = NULL; if (have_gnome_software >= 0 && !scan) return have_gnome_software; diff --git a/src/util.h b/src/util.h index 0e030cafe..4f52e32e4 100644 --- a/src/util.h +++ b/src/util.h @@ -19,14 +19,14 @@ void phosh_cp_widget_destroy (void *widget); GDesktopAppInfo *phosh_get_desktop_app_info_for_app_id (const char *app_id); -gchar *phosh_munge_app_id (const gchar *app_id); +char *phosh_munge_app_id (const char *app_id); char *phosh_strip_suffix_from_app_id (const char *app_id); gboolean phosh_find_systemd_session (char **session_id); -gboolean phosh_error_warnv (const char *log_domain, - GError *err, - GQuark domain, - int code, - const gchar *fmt, +gboolean phosh_error_warnv (const char *log_domain, + GError *err, + GQuark domain, + int code, + const char *fmt, ...) G_GNUC_PRINTF(5, 6); int phosh_create_shm_file (off_t size); char *phosh_util_escape_markup (const char *markup, gboolean allow_markup); -- GitLab From a37aa2a8c2bf279506b3ed64e998124728b93e6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 05/36] system-modal-dialog: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/system-modal-dialog.c | 6 +++--- src/system-modal-dialog.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/system-modal-dialog.c b/src/system-modal-dialog.c index 959eebffd..a795b5a3b 100644 --- a/src/system-modal-dialog.c +++ b/src/system-modal-dialog.c @@ -84,7 +84,7 @@ enum { static guint signals[N_SIGNALS] = { 0 }; typedef struct { - gchar *title; + char *title; GtkWidget *lbl_title; GtkWidget *box_dialog; @@ -230,7 +230,7 @@ static void phosh_system_modal_dialog_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { PhoshSystemModalDialog *self = PHOSH_SYSTEM_MODAL_DIALOG (buildable); @@ -415,7 +415,7 @@ phosh_system_modal_dialog_get_title (PhoshSystemModalDialog *self) } void -phosh_system_modal_dialog_set_title (PhoshSystemModalDialog *self, const gchar *title) +phosh_system_modal_dialog_set_title (PhoshSystemModalDialog *self, const char *title) { PhoshSystemModalDialogPrivate *priv; diff --git a/src/system-modal-dialog.h b/src/system-modal-dialog.h index a601a59a2..2a4faaadc 100644 --- a/src/system-modal-dialog.h +++ b/src/system-modal-dialog.h @@ -26,7 +26,7 @@ struct _PhoshSystemModalDialogClass { GtkWidget *phosh_system_modal_dialog_new (void); void phosh_system_modal_dialog_set_content (PhoshSystemModalDialog *self, GtkWidget *content); void phosh_system_modal_dialog_add_button (PhoshSystemModalDialog *self, GtkWidget *button, gint position); -void phosh_system_modal_dialog_set_title (PhoshSystemModalDialog *self, const gchar *title); +void phosh_system_modal_dialog_set_title (PhoshSystemModalDialog *self, const char *title); const char *phosh_system_modal_dialog_get_title (PhoshSystemModalDialog *self); void phosh_system_modal_dialog_remove_button (PhoshSystemModalDialog *self, GtkWidget *button); GList *phosh_system_modal_dialog_get_buttons (PhoshSystemModalDialog *self); -- GitLab From 1a2981dff1a0c4f79892e5bb9f3a9336295f15d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 06/36] splash-manager: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/splash-manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/splash-manager.c b/src/splash-manager.c index b390972a6..9233dc8c4 100644 --- a/src/splash-manager.c +++ b/src/splash-manager.c @@ -84,7 +84,7 @@ phosh_splash_manager_get_property (GObject *object, static void on_splash_closed (PhoshSplashManager *self, GtkWidget *splash) { - const gchar *key; + const char *key; g_return_if_fail (PHOSH_IS_SPLASH_MANAGER (self)); g_return_if_fail (PHOSH_IS_SPLASH (splash)); -- GitLab From 20644327710e3d2347fb8207374726f297c4d847 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 07/36] shell: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/shell.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/shell.c b/src/shell.c index 9cb2baeed..a40b95f39 100644 --- a/src/shell.c +++ b/src/shell.c @@ -1088,7 +1088,7 @@ phosh_shell_constructed (GObject *object) /* {{{ Action Map/Group */ -static gchar ** +static char ** phosh_shell_list_actions (GActionGroup *group) { PhoshShell *self = PHOSH_SHELL (group); @@ -1103,7 +1103,7 @@ phosh_shell_list_actions (GActionGroup *group) static gboolean phosh_shell_query_action (GActionGroup *group, - const gchar *action_name, + const char *action_name, gboolean *enabled, const GVariantType **parameter_type, const GVariantType **state_type, @@ -1128,7 +1128,7 @@ phosh_shell_query_action (GActionGroup *group, static void _phosh_shell_activate_action (GActionGroup *group, - const gchar *action_name, + const char *action_name, GVariant *parameter) { PhoshShell *self = PHOSH_SHELL (group); @@ -1143,7 +1143,7 @@ _phosh_shell_activate_action (GActionGroup *group, static void phosh_shell_change_action_state (GActionGroup *group, - const gchar *action_name, + const char *action_name, GVariant *state) { PhoshShell *self = PHOSH_SHELL (group); @@ -1167,7 +1167,7 @@ phosh_shell_action_group_iface_init (GActionGroupInterface *iface) static GAction * -phosh_shell_lookup_action (GActionMap *action_map, const gchar *action_name) +phosh_shell_lookup_action (GActionMap *action_map, const char *action_name) { PhoshShell *self = PHOSH_SHELL (action_map); PhoshShellPrivate *priv = phosh_shell_get_instance_private (self); @@ -1191,7 +1191,7 @@ phosh_shell_add_action (GActionMap *action_map, GAction *action) } static void -phosh_shell_remove_action (GActionMap *action_map, const gchar *action_name) +phosh_shell_remove_action (GActionMap *action_map, const char *action_name) { PhoshShell *self = PHOSH_SHELL (action_map); PhoshShellPrivate *priv = phosh_shell_get_instance_private (self); @@ -2396,8 +2396,8 @@ phosh_shell_set_state (PhoshShell *self, { PhoshShellPrivate *priv; PhoshShellStateFlags old_state; - g_autofree gchar *str_state = NULL; - g_autofree gchar *str_new_flags = NULL; + g_autofree char *str_state = NULL; + g_autofree char *str_new_flags = NULL; g_return_if_fail (PHOSH_IS_SHELL (self)); priv = phosh_shell_get_instance_private (self); -- GitLab From 60f61a91c785eceb9e8fbc56eaacc4ef494beb7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 08/36] audio-devices: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/settings/audio-devices.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings/audio-devices.c b/src/settings/audio-devices.c index 7f2546b63..2601f3a3a 100644 --- a/src/settings/audio-devices.c +++ b/src/settings/audio-devices.c @@ -136,7 +136,7 @@ static void on_device_added (PhoshAudioDevices *self, guint id) { GvcMixerUIDevice *device = NULL; - g_autofree gchar *description = NULL; + g_autofree char *description = NULL; const char *icon_name; const char *origin; g_autoptr (PhoshAudioDevice) audio_device = NULL; -- GitLab From abd92bc780f7b7135e1f445e4a5c06e82b8a3721 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 09/36] session-manager: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/session-manager.c | 8 ++++---- src/session-manager.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/session-manager.c b/src/session-manager.c index 6a2e5371a..3a300109b 100644 --- a/src/session-manager.c +++ b/src/session-manager.c @@ -112,7 +112,7 @@ handle_end_session_open (PhoshDBusEndSessionDialog *object, guint arg_type, guint arg_timestamp, guint arg_seconds_to_stay_open, - const gchar *const *arg_inhibitor_object_paths) + const char *const *arg_inhibitor_object_paths) { PhoshSessionManager *self = PHOSH_SESSION_MANAGER (object); @@ -283,7 +283,7 @@ on_client_registered (PhoshDBusSessionManager *proxy, GAsyncResult *res, PhoshSessionManager *self) { - g_autofree gchar *client_id = NULL; + g_autofree char *client_id = NULL; g_autoptr (GError) err = NULL; if (!phosh_dbus_session_manager_call_register_client_finish (proxy, &client_id, res, &err)) { @@ -441,8 +441,8 @@ phosh_session_manager_is_active (PhoshSessionManager *self) void phosh_session_manager_register (PhoshSessionManager *self, - const gchar *app_id, - const gchar *startup_id) + const char *app_id, + const char *startup_id) { g_return_if_fail (PHOSH_IS_SESSION_MANAGER (self)); g_return_if_fail (PHOSH_DBUS_IS_SESSION_MANAGER_PROXY (self->proxy)); diff --git a/src/session-manager.h b/src/session-manager.h index d3e1e9338..9468b64f0 100644 --- a/src/session-manager.h +++ b/src/session-manager.h @@ -28,7 +28,7 @@ G_DECLARE_FINAL_TYPE (PhoshSessionManager, phosh_session_manager, PhoshSessionManager *phosh_session_manager_new (void); gboolean phosh_session_manager_is_active (PhoshSessionManager *self); -void phosh_session_manager_register (PhoshSessionManager *self, const gchar *app_id, const gchar *startup_id); +void phosh_session_manager_register (PhoshSessionManager *self, const char *app_id, const char *startup_id); void phosh_session_manager_logout (PhoshSessionManager *self); void phosh_session_manager_shutdown (PhoshSessionManager *self); void phosh_session_manager_reboot (PhoshSessionManager *self); -- GitLab From 557d8a64ed7935341f8f9b8b8cf973bfa0eb502f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 10/36] run-command-dialog: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/run-command-dialog.c | 2 +- src/run-command-dialog.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/run-command-dialog.c b/src/run-command-dialog.c index 937e36891..033fac893 100644 --- a/src/run-command-dialog.c +++ b/src/run-command-dialog.c @@ -123,7 +123,7 @@ phosh_run_command_dialog_new (void) void phosh_run_command_dialog_set_message (PhoshRunCommandDialog *self, - const gchar *message) + const char *message) { if (message == NULL) message = _("Press ESC to close"); diff --git a/src/run-command-dialog.h b/src/run-command-dialog.h index 77361ba3a..512f1620a 100644 --- a/src/run-command-dialog.h +++ b/src/run-command-dialog.h @@ -19,6 +19,6 @@ G_DECLARE_FINAL_TYPE (PhoshRunCommandDialog, phosh_run_command_dialog, PHOSH, RU GtkWidget *phosh_run_command_dialog_new (void); void phosh_run_command_dialog_set_message (PhoshRunCommandDialog *self, - const gchar *message); + const char *message); G_END_DECLS -- GitLab From 7243f67365928fb9e88079c0840d46bd13e75ace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 11/36] rotation-manager: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/rotation-manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rotation-manager.c b/src/rotation-manager.c index e9863b489..fdd37d052 100644 --- a/src/rotation-manager.c +++ b/src/rotation-manager.c @@ -97,7 +97,7 @@ apply_transform (PhoshRotationManager *self, PhoshMonitorTransform transform) static gboolean match_orientation (PhoshRotationManager *self) { - const gchar *orient; + const char *orient; PhoshMonitorTransform transform; if (self->orientation_locked || !self->claimed || -- GitLab From d2b39d7f62248cb4b93347eaca9abc0504906838 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 12/36] quick-settings: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/quick-settings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/quick-settings.c b/src/quick-settings.c index 2f86e6a51..641dbf779 100644 --- a/src/quick-settings.c +++ b/src/quick-settings.c @@ -224,7 +224,7 @@ unload_custom_quick_setting (GtkWidget *quick_setting) static void -load_custom_quick_settings (PhoshQuickSettings *self, GSettings *settings, gchar *key) +load_custom_quick_settings (PhoshQuickSettings *self, GSettings *settings, char *key) { g_auto (GStrv) plugins = NULL; GtkWidget *widget; -- GitLab From 85e7d16a366c962e051d495cdac21bdcb7e5cf73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 13/36] notify-manager: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/notifications/notify-manager.c | 10 +++++----- src/notifications/notify-manager.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/notifications/notify-manager.c b/src/notifications/notify-manager.c index 73643e6ff..2581f78f9 100644 --- a/src/notifications/notify-manager.c +++ b/src/notifications/notify-manager.c @@ -176,7 +176,7 @@ forget_unlock_notify (PhoshNotifyManager *self) static void -invoke_action (PhoshNotifyManager *self, PhoshNotification *notification, const gchar *action) +invoke_action (PhoshNotifyManager *self, PhoshNotification *notification, const char *action) { guint id; @@ -379,11 +379,11 @@ phosh_notify_manager_add_application (PhoshNotifyManager *self, GAppInfo *info) g_autofree char *path = NULL; g_autoptr (GSettings) settings = NULL; g_autoptr(GPtrArray) new_apps = NULL; - const gchar *id; + const char *id; id = g_app_info_get_id(info); munged_id = phosh_munge_app_id (id); - if (g_strv_contains ((const gchar * const *)self->app_children, munged_id)) + if (g_strv_contains ((const char * const *)self->app_children, munged_id)) return; g_debug ("Adding new application: %s/%s", id, munged_id); @@ -398,7 +398,7 @@ phosh_notify_manager_add_application (PhoshNotifyManager *self, GAppInfo *info) settings = g_settings_new_with_path (NOTIFICATIONS_APP_SCHEMA_ID, path); g_settings_set_string (settings, NOTIFICATIONS_APP_KEY_APP_ID, id); g_settings_set_strv (self->settings, NOTIFICATIONS_KEY_APP_CHILDREN, - (const gchar * const *)new_apps->pdata); + (const char * const *)new_apps->pdata); } @@ -848,7 +848,7 @@ phosh_notify_manager_get_notification_id (PhoshNotifyManager *self) */ void phosh_notify_manager_add_notification (PhoshNotifyManager *self, - const gchar *source_id, + const char *source_id, int expire_timeout, PhoshNotification *notification) { diff --git a/src/notifications/notify-manager.h b/src/notifications/notify-manager.h index dfd4770ca..6b78d555e 100644 --- a/src/notifications/notify-manager.h +++ b/src/notifications/notify-manager.h @@ -26,7 +26,7 @@ PhoshNotificationList *phosh_notify_manager_get_list (PhoshNotifyManager gboolean phosh_notify_manager_get_show_banners (PhoshNotifyManager *self); guint phosh_notify_manager_get_notification_id (PhoshNotifyManager *self); void phosh_notify_manager_add_notification (PhoshNotifyManager *self, - const gchar *source_id, + const char *source_id, int expire_timeout, PhoshNotification *notification); gboolean phosh_notify_manager_close_notification_by_id (PhoshNotifyManager *self, -- GitLab From f753cf0c076b98250fa68291ce04ec0a32c8288e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 14/36] mount-notification: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/notifications/mount-notification.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/notifications/mount-notification.c b/src/notifications/mount-notification.c index 4c74bdeb4..af79f5e3b 100644 --- a/src/notifications/mount-notification.c +++ b/src/notifications/mount-notification.c @@ -110,15 +110,15 @@ phosh_mount_notification_init (PhoshMountNotification *self) PhoshMountNotification * phosh_mount_notification_new_from_mount (guint id, GMount *mount) { - g_autofree gchar *name = NULL; - g_autofree gchar *uri = NULL; + g_autofree char *name = NULL; + g_autofree char *uri = NULL; g_autoptr (GIcon) icon = NULL; g_autoptr (GIcon) app_icon = NULL; g_autoptr (GFile) root = NULL; g_autoptr (GAppInfo) info = NULL; g_autoptr (GAppInfo) handler_info = NULL; GDesktopAppInfo *desktop_info; - gchar *actions[] = { NULL, _("Open"), NULL }; + char *actions[] = { NULL, _("Open"), NULL }; name = g_mount_get_name (mount); g_debug ("Mount '%s' added", name); -- GitLab From 45a5be6df8ff5fdd9ba76fdca30fe82c5bf4570d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 15/36] network-auth-manager: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/network-auth-manager.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network-auth-manager.c b/src/network-auth-manager.c index 399514094..6b568e260 100644 --- a/src/network-auth-manager.c +++ b/src/network-auth-manager.c @@ -440,7 +440,7 @@ on_search_vpn_plugin_ready (GObject *source_object, g_autoptr (GPtrArray) auth_helper_argv = NULL; g_autoptr (NMVpnPluginInfo) plugin = NULL; g_autoptr (GError) err = NULL; - const gchar *service_type; + const char *service_type; GString * auth_helper_request; g_autofree char * auth_helper_request_str = NULL; @@ -565,7 +565,7 @@ vpn_secret_request (PhoshNetworkAuthManager *self, NMSecretAgentGetSecretsFlags flags) { NMSettingVpn *setting = nm_connection_get_setting_vpn (connection); - const gchar *service_type = nm_setting_vpn_get_service_type (setting); + const char *service_type = nm_setting_vpn_get_service_type (setting); VPNRequest *request = g_new0 (VPNRequest, 1); g_debug ("Handling VPN secrets for %s, flags: 0x%x", service_type, flags); -- GitLab From 96c82248865d0e5a6629b5654c7991620fc91754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 16/36] head: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/monitor/head-priv.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/monitor/head-priv.h b/src/monitor/head-priv.h index 33b45ccd0..f5131d591 100644 --- a/src/monitor/head-priv.h +++ b/src/monitor/head-priv.h @@ -36,9 +36,9 @@ typedef struct _PhoshHeadMode { struct _PhoshHead { GObject parent; - gchar *name; - gchar *description; - gchar *vendor, *product, *serial; + char *name; + char *description; + char *vendor, *product, *serial; gboolean enabled; struct PhoshPhysicalSize { -- GitLab From f6b04c2aa20c7b7593f4c4343ce3654a02f56e07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 17/36] mode-manager: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/mode-manager.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mode-manager.c b/src/mode-manager.c index 0501375e3..4248c35c8 100644 --- a/src/mode-manager.c +++ b/src/mode-manager.c @@ -47,7 +47,7 @@ struct _PhoshModeManager { PhoshDBusHostname1 *proxy; GCancellable *cancel; - gchar *chassis; + char *chassis; PhoshWaylandSeatCapabilities wl_caps; /* Tablet mode */ @@ -207,7 +207,7 @@ on_chassis_changed (PhoshModeManager *self, GParamSpec *pspec, PhoshDBusHostname1 *proxy) { - const gchar *chassis; + const char *chassis; g_return_if_fail (PHOSH_IS_MODE_MANAGER (self)); g_return_if_fail (PHOSH_DBUS_IS_HOSTNAME1 (proxy)); -- GitLab From 78b9933234f489ecb9f07da1b52a844d336370a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 18/36] log: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/log.c b/src/log.c index c2372e5a3..4b78ea6f9 100644 --- a/src/log.c +++ b/src/log.c @@ -59,7 +59,7 @@ phosh_log_writer_default (GLogLevelFlags log_level, /* Disable debug message output unless specified in _log_domains. */ if (!(log_level & DEFAULT_LEVELS) && !(log_level >> G_LOG_LEVEL_USER_SHIFT)) { - const gchar *log_domain = NULL; + const char *log_domain = NULL; gsize i; if ((log_level & INFO_LEVELS) == 0 || _log_domains == NULL) { -- GitLab From 6f700d318a6e91c645f8d60c70815c24170909dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 19/36] lockscreen: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/lockscreen.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lockscreen.c b/src/lockscreen.c index 40d0f8599..7b32d939a 100644 --- a/src/lockscreen.c +++ b/src/lockscreen.c @@ -526,7 +526,7 @@ carousel_page_changed_cb (PhoshLockscreen *self, static void -update_active_call (PhoshLockscreen *self, const gchar *path) +update_active_call (PhoshLockscreen *self, const char *path) { PhoshLockscreenPrivate *priv = phosh_lockscreen_get_instance_private (self); PhoshCall *call; @@ -545,7 +545,7 @@ update_active_call (PhoshLockscreen *self, const gchar *path) static void -on_calls_call_added (PhoshLockscreen *self, const gchar *path) +on_calls_call_added (PhoshLockscreen *self, const char *path) { PhoshLockscreenPrivate *priv; @@ -560,7 +560,7 @@ on_calls_call_added (PhoshLockscreen *self, const gchar *path) static void -on_calls_call_removed (PhoshLockscreen *self, const gchar *path) +on_calls_call_removed (PhoshLockscreen *self, const char *path) { PhoshLockscreenPrivate *priv; -- GitLab From 7c7a59e587034c64d015d08b32bc254dbd547e08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 20/36] location-manager: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/location-manager.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/location-manager.c b/src/location-manager.c index 6c39d80f2..81e881570 100644 --- a/src/location-manager.c +++ b/src/location-manager.c @@ -212,7 +212,7 @@ on_app_auth_prompt_closed (PhoshLocationManager *self, PhoshAppAuthPrompt *promp static gboolean handle_authorize_app (PhoshGeoClueDBusOrgFreedesktopGeoClue2Agent *object, GDBusMethodInvocation *invocation, - const gchar *arg_desktop_id, + const char *arg_desktop_id, guint arg_req_accuracy_level) { PhoshLocationManager *self = PHOSH_LOCATION_MANAGER (object); @@ -397,8 +397,8 @@ on_manager_proxy_ready (GObject *source_object, static void on_manager_name_appeared (GDBusConnection *connection, - const gchar *name, - const gchar *name_owner, + const char *name, + const char *name_owner, PhoshLocationManager *self) { g_return_if_fail (PHOSH_IS_LOCATION_MANAGER (self)); @@ -416,7 +416,7 @@ on_manager_name_appeared (GDBusConnection *connection, static void on_manager_name_vanished (GDBusConnection *connection, - const gchar *name, + const char *name, PhoshLocationManager *self) { g_return_if_fail (PHOSH_IS_LOCATION_MANAGER (self)); -- GitLab From 11ba7b16edaa73ea22517963e111c8232b77a8c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 21/36] keypad: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/keypad.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/keypad.c b/src/keypad.c index a22f56b6b..2d6f3747c 100644 --- a/src/keypad.c +++ b/src/keypad.c @@ -59,10 +59,9 @@ enum { static GParamSpec *props[PROP_LAST_PROP]; static void -symbol_clicked (PhoshKeypad *self, - gchar symbol) +symbol_clicked (PhoshKeypad *self, char symbol) { - g_autofree gchar *string = g_strdup_printf ("%c", symbol); + g_autofree char *string = g_strdup_printf ("%c", symbol); if (!self->entry) return; -- GitLab From 1b1c686dc318c5238472b67ef00f6e656e8e3ff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 22/36] keyboard-events: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/keyboard-events.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/keyboard-events.c b/src/keyboard-events.c index f2df4cb88..99b1ecff8 100644 --- a/src/keyboard-events.c +++ b/src/keyboard-events.c @@ -45,7 +45,7 @@ handle_accelerator_activated_event (void *data, uint32_t timestamp) { PhoshKeyboardEvents *self = PHOSH_KEYBOARD_EVENTS (data); - const gchar *action; + const char *action; GVariant *pressed = NULL; action = g_hash_table_lookup (self->accelerators, GUINT_TO_POINTER (action_id)); @@ -70,7 +70,7 @@ handle_accelerator_released_event (void *data, uint32_t timestamp) { PhoshKeyboardEvents *self = PHOSH_KEYBOARD_EVENTS (data); - const gchar *action; + const char *action; action = g_hash_table_lookup (self->accelerators, GUINT_TO_POINTER (action_id)); g_return_if_fail (action); @@ -156,7 +156,7 @@ static const struct phosh_private_keyboard_event_listener keyboard_event_listene static void on_action_added (PhoshKeyboardEvents *self, - gchar *action_name, + char *action_name, GActionGroup *action_group) { g_debug ("Grabbing accelerator %s", action_name); @@ -166,7 +166,7 @@ on_action_added (PhoshKeyboardEvents *self, static void on_action_removed (PhoshKeyboardEvents *self, - gchar *action_name, + char *action_name, GActionGroup *action_group) { GHashTableIter iter; -- GitLab From 996e58226b19adc7725c726c9f844c91e919114f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 23/36] home: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/home.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/home.c b/src/home.c index f77825e9f..a57c8026a 100644 --- a/src/home.c +++ b/src/home.c @@ -438,7 +438,7 @@ add_keybindings (PhoshHome *self) static void on_keybindings_changed (PhoshHome *self, - gchar *key, + char *key, GSettings *settings) { /* For now just redo all keybindings */ -- GitLab From 622b206bec9c389cc0c25101dd727ffffad8d865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 24/36] hks-manager: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/hks-manager.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hks-manager.c b/src/hks-manager.c index 0afb521b7..f7b9a52f1 100644 --- a/src/hks-manager.c +++ b/src/hks-manager.c @@ -63,8 +63,8 @@ enum { typedef struct { gboolean present; gboolean blocked; - gchar *blocked_icon_name; - gchar *unblocked_icon_name; + char *blocked_icon_name; + char *unblocked_icon_name; GHashTable *killswitches; } Hks; @@ -88,7 +88,7 @@ phosh_hks_manager_get_property (GObject *object, GParamSpec *pspec) { PhoshHksManager *self = PHOSH_HKS_MANAGER (object); - const gchar *icon_name; + const char *icon_name; switch (property_id) { case PROP_MIC_PRESENT: -- GitLab From f135b97ee6579ebce624805d57f4ca7cdf4ed044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 25/36] hks-info: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/hks-info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hks-info.c b/src/hks-info.c index 282f65fcf..c3e126fa6 100644 --- a/src/hks-info.c +++ b/src/hks-info.c @@ -96,7 +96,7 @@ phosh_hks_info_constructed (GObject *object) { PhoshHksInfo *self = PHOSH_HKS_INFO (object); PhoshShell *shell; - g_autofree gchar *propname = NULL; + g_autofree char *propname = NULL; G_OBJECT_CLASS (phosh_hks_info_parent_class)->constructed (object); -- GitLab From 5383c12a8fa7bafce10b44ea13e12905d683ecb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 26/36] gtk-mount-manager: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/gtk-mount-prompt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gtk-mount-prompt.h b/src/gtk-mount-prompt.h index db768a78c..3ccdd2ede 100644 --- a/src/gtk-mount-prompt.h +++ b/src/gtk-mount-prompt.h @@ -20,7 +20,7 @@ GtkWidget *phosh_gtk_mount_prompt_new (const char *message, GVariant *pids, const char *const *choices, GAskPasswordFlags ask_flags); -const gchar *phosh_gtk_mount_prompt_get_password (PhoshGtkMountPrompt *self); +const char *phosh_gtk_mount_prompt_get_password (PhoshGtkMountPrompt *self); GAskPasswordFlags phosh_gtk_mount_prompt_get_ask_flags (PhoshGtkMountPrompt *self); gboolean phosh_gtk_mount_prompt_get_cancelled (PhoshGtkMountPrompt *self); int phosh_gtk_mount_prompt_get_choice (PhoshGtkMountPrompt *self); -- GitLab From 5014c5b481cebdbbac8c96b28480622616a1299f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 27/36] gnome-shell-manager: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/gnome-shell-manager.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/gnome-shell-manager.c b/src/gnome-shell-manager.c index a792d610e..6e4c572f3 100644 --- a/src/gnome-shell-manager.c +++ b/src/gnome-shell-manager.c @@ -72,15 +72,15 @@ static void accelerator_activated_action (GSimpleAction *action, GVariant *param typedef struct _AcceleratorInfo { guint action_id; - gchar *accelerator; - gchar *sender; + char *accelerator; + char *sender; guint mode_flags; guint grab_flags; guint repeat_id; } AcceleratorInfo; static void -remove_action_entries (gchar *accelerator) +remove_action_entries (char *accelerator) { GStrv action_names = (char*[]){ accelerator, NULL }; @@ -217,10 +217,10 @@ handle_show_osd (PhoshDBusGnomeShell *skeleton, static guint grab_single_accelerator (PhoshGnomeShellManager *self, - const gchar *accelerator, + const char *accelerator, guint mode_flags, guint grab_flags, - const gchar *sender, + const char *sender, GError **error) { AcceleratorInfo *info; @@ -273,13 +273,13 @@ grab_single_accelerator (PhoshGnomeShellManager *self, static gboolean handle_grab_accelerator (PhoshDBusGnomeShell *skeleton, GDBusMethodInvocation *invocation, - const gchar *arg_accelerator, + const char *arg_accelerator, guint arg_modeFlags, guint arg_grabFlags) { PhoshGnomeShellManager *self = PHOSH_GNOME_SHELL_MANAGER (skeleton); g_autoptr (GError) error = NULL; - const gchar * sender; + const char *sender; guint action_id; g_return_val_if_fail (PHOSH_IS_GNOME_SHELL_MANAGER (self), FALSE); @@ -318,11 +318,11 @@ handle_grab_accelerators (PhoshDBusGnomeShell *skeleton, PhoshGnomeShellManager *self = PHOSH_GNOME_SHELL_MANAGER (skeleton); g_autoptr (GVariantBuilder) builder = NULL; g_autoptr (GVariantIter) arg_iter = NULL; - gchar *accelerator_name; + char *accelerator_name; guint accelerator_mode_flags; guint accelerator_grab_flags; g_autoptr (GError) error = NULL; - const gchar *sender; + const char *sender; gboolean conflict = FALSE; g_return_val_if_fail (PHOSH_IS_GNOME_SHELL_MANAGER (self), FALSE); @@ -386,7 +386,7 @@ handle_ungrab_accelerator (PhoshDBusGnomeShell *skeleton, PhoshGnomeShellManager *self = PHOSH_GNOME_SHELL_MANAGER (skeleton); AcceleratorInfo *info; gboolean success = FALSE; - const gchar *sender; + const char *sender; g_return_val_if_fail (PHOSH_IS_GNOME_SHELL_MANAGER (self), FALSE); g_debug ("DBus ungrab accelerator (id %u)", arg_action); @@ -420,7 +420,7 @@ handle_ungrab_accelerators (PhoshDBusGnomeShell *skeleton, PhoshGnomeShellManager *self = PHOSH_GNOME_SHELL_MANAGER (skeleton); AcceleratorInfo *info; gboolean success = TRUE; - const gchar *sender; + const char *sender; g_return_val_if_fail (PHOSH_IS_GNOME_SHELL_MANAGER (self), FALSE); sender = g_dbus_method_invocation_get_sender (invocation); @@ -541,10 +541,10 @@ do_activate_accelerator (AcceleratorInfo *info) g_assert (info); if ((info->mode_flags & self->action_mode) == 0) { - g_autofree gchar *str_shell_mode = g_flags_to_string (PHOSH_TYPE_SHELL_ACTION_MODE, - self->action_mode); - g_autofree gchar *str_grabbed_mode = g_flags_to_string (PHOSH_TYPE_SHELL_ACTION_MODE, - info->mode_flags); + g_autofree char *str_shell_mode = g_flags_to_string (PHOSH_TYPE_SHELL_ACTION_MODE, + self->action_mode); + g_autofree char *str_grabbed_mode = g_flags_to_string (PHOSH_TYPE_SHELL_ACTION_MODE, + info->mode_flags); g_debug ("Accelerator registered for mode %s, but shell is currently in %s", str_grabbed_mode, str_shell_mode); -- GitLab From 7dc96fe0df37a1798a32280ea3b90ad07714b48d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 28/36] emergency-menu: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/emergency-menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/emergency-menu.c b/src/emergency-menu.c index 40314938c..9dd32b62c 100644 --- a/src/emergency-menu.c +++ b/src/emergency-menu.c @@ -183,7 +183,7 @@ emergency_menu_dispose (GObject *object) } static void -on_dialpad_dialed (PhoshEmergencyMenu *self, const gchar *number) +on_dialpad_dialed (PhoshEmergencyMenu *self, const char *number) { phosh_emergency_calls_manager_call (self->manager, number); } -- GitLab From 1333492ffd8d52810a07681ee5620ec58aebdc84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 29/36] emergency-contact: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/emergency-calls-manager.h | 2 +- src/emergency-contact.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/emergency-calls-manager.h b/src/emergency-calls-manager.h index df59b8107..7063e52a9 100644 --- a/src/emergency-calls-manager.h +++ b/src/emergency-calls-manager.h @@ -22,6 +22,6 @@ G_DECLARE_FINAL_TYPE (PhoshEmergencyCallsManager, phosh_emergency_calls_manager, PhoshEmergencyCallsManager *phosh_emergency_calls_manager_new (void); GListStore *phosh_emergency_calls_manager_get_list_store (PhoshEmergencyCallsManager *self); -void phosh_emergency_calls_manager_call (PhoshEmergencyCallsManager *self, const gchar *id); +void phosh_emergency_calls_manager_call (PhoshEmergencyCallsManager *self, const char *id); G_END_DECLS diff --git a/src/emergency-contact.c b/src/emergency-contact.c index c590f910e..974711f90 100644 --- a/src/emergency-contact.c +++ b/src/emergency-contact.c @@ -39,8 +39,8 @@ static GParamSpec *props[LAST_PROP]; struct _PhoshEmergencyContact { GObject parent; - gchar *id; - gchar *name; + char *id; + char *name; gint32 source; GVariant *additional_properties; }; -- GitLab From fafefd74d57e48e170698623b79594df8422b1a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 30/36] docked-manager: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/docked-manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docked-manager.c b/src/docked-manager.c index 60ff8d793..35d97dfc1 100644 --- a/src/docked-manager.c +++ b/src/docked-manager.c @@ -283,7 +283,7 @@ phosh_docked_manager_get_can_dock (PhoshDockedManager *self) void phosh_docked_manager_set_enabled (PhoshDockedManager *self, gboolean enable) { - const gchar *icon_name; + const char *icon_name; g_return_if_fail (PHOSH_IS_DOCKED_MANAGER (self)); g_return_if_fail ((enable && self->can_dock) || !enable); -- GitLab From f7d2861219228ac4c6f86ba2eee22c0e99017925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 31/36] background-manager: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/background-manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/background-manager.c b/src/background-manager.c index 8c383af22..8f4b77423 100644 --- a/src/background-manager.c +++ b/src/background-manager.c @@ -537,7 +537,7 @@ phosh_background_manager_get_data (PhoshBackgroundManager *self, PhoshBackground if (self->slideshow) { gint width, height; gboolean fixed; - const gchar *file1; + const char *file1; width = phosh_layer_surface_get_configured_width (PHOSH_LAYER_SURFACE (background)); height = phosh_layer_surface_get_configured_height (PHOSH_LAYER_SURFACE (background)); -- GitLab From 1b0c7f27c403811d48284d1feaab607f14e082c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 32/36] app-tracker: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/app-tracker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app-tracker.c b/src/app-tracker.c index a23feb48b..d465655be 100644 --- a/src/app-tracker.c +++ b/src/app-tracker.c @@ -329,7 +329,7 @@ on_app_launched (PhoshAppTracker *self, GVariant *platform_data, GAppLaunchContext *context) { - g_autofree gchar *startup_id = NULL; + g_autofree char *startup_id = NULL; const char *app_id; PhoshAppState *state; gint32 pid; -- GitLab From 6db534a44603b90d1477f8f047e8db493394ad9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 33/36] app-grid-button: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/app-grid-button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app-grid-button.c b/src/app-grid-button.c index 6811c87ed..9c9ced2f5 100644 --- a/src/app-grid-button.c +++ b/src/app-grid-button.c @@ -358,7 +358,7 @@ favorite_add_activated (GSimpleAction *action, static void spawn_gnome_software (const char *action, const char *app_id) { - const gchar *argv[] = { "gnome-software", action, app_id, NULL }; + const char *argv[] = { "gnome-software", action, app_id, NULL }; g_autoptr (GError) err = NULL; if (!g_spawn_async (NULL, (char **)argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &err)) -- GitLab From 51c53bc131c2979f076d77fd2d335f0ca7a4b77a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 34/36] app-auth-prompt: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- src/app-auth-prompt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app-auth-prompt.c b/src/app-auth-prompt.c index 37f121433..19dadd320 100644 --- a/src/app-auth-prompt.c +++ b/src/app-auth-prompt.c @@ -174,9 +174,9 @@ on_dialog_canceled (PhoshAppAuthPrompt *self) static void add_switch_option ( PhoshAppAuthPrompt *self, - gchar *choice_id, - gchar *choice_label, - char *default_option_id) + char *choice_id, + char *choice_label, + char *default_option_id) { GtkWidget *action_row_choice; GtkWidget *switch_choice; -- GitLab From 33b362baa382189226354c600613ca22ca15a7e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 35/36] ticket-box-prefs: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- plugins/ticket-box/prefs/ticket-box-prefs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/ticket-box/prefs/ticket-box-prefs.c b/plugins/ticket-box/prefs/ticket-box-prefs.c index 10241d729..c95b2a38c 100644 --- a/plugins/ticket-box/prefs/ticket-box-prefs.c +++ b/plugins/ticket-box/prefs/ticket-box-prefs.c @@ -58,7 +58,7 @@ on_select_folder_ready (GObject *source_object, GAsyncResult *res, gpointer user PhoshTicketBoxPrefs *self = NULL; g_autoptr (GError) err = NULL; g_autoptr (GFile) file = NULL; - g_autofree gchar *filename = NULL; + g_autofree char *filename = NULL; file = gtk_file_dialog_select_folder_finish (GTK_FILE_DIALOG (source_object), res, -- GitLab From 38eff8d25e1c12cd286f36fc083bd4e35b878d0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 10 Aug 2025 19:33:43 +0200 Subject: [PATCH 36/36] dark-mode-quick-setting: Prefer char over gchar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's not clutter new code with old coding style Signed-off-by: Guido Günther Part-of: --- plugins/dark-mode-quick-setting/dark-mode-quick-setting.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/dark-mode-quick-setting/dark-mode-quick-setting.c b/plugins/dark-mode-quick-setting/dark-mode-quick-setting.c index 38fe78bd9..81e4af000 100644 --- a/plugins/dark-mode-quick-setting/dark-mode-quick-setting.c +++ b/plugins/dark-mode-quick-setting/dark-mode-quick-setting.c @@ -74,7 +74,7 @@ on_clicked (PhoshDarkModeQuickSetting *self) static void on_color_scheme_changed (PhoshDarkModeQuickSetting *self, - gchar *_key, + char *_key, GSettings *_settings) { gint color_scheme = g_settings_get_enum (self->settings, "color-scheme"); -- GitLab