From 40d318c9aa9cf7027ebc8b8ad6266c7e27ac358d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Mon, 11 Jan 2021 10:28:51 +0100 Subject: [PATCH] feedback-manager: Fix formatting It was off in several places. Now that there's no outstanding MRs clean it up via uncrustify --replace -c phosh.cfg src/fbd-feedback-manager.c --- src/fbd-feedback-manager.c | 79 +++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/src/fbd-feedback-manager.c b/src/fbd-feedback-manager.c index 3804f89..3401b81 100644 --- a/src/fbd-feedback-manager.c +++ b/src/fbd-feedback-manager.c @@ -42,18 +42,18 @@ typedef struct _FbdFeedbackManager { LfbGdbusFeedbackSkeleton parent; - GSettings *settings; - FbdFeedbackProfileLevel level; - FbdFeedbackTheme *theme; - guint next_id; + GSettings *settings; + FbdFeedbackProfileLevel level; + FbdFeedbackTheme *theme; + guint next_id; - GHashTable *events; + GHashTable *events; /* Hardware interaction */ - GUdevClient *client; - FbdDevVibra *vibra; - FbdDevSound *sound; - FbdDevLeds *leds; + GUdevClient *client; + FbdDevVibra *vibra; + FbdDevSound *sound; + FbdDevLeds *leds; } FbdFeedbackManager; static void fbd_feedback_manager_feedback_iface_init (LfbGdbusFeedbackIface *iface); @@ -177,7 +177,7 @@ on_event_feedbacks_ended (FbdFeedbackManager *self, FbdEvent *event) g_return_if_fail (fbd_event_get_feedbacks_ended (event)); - lfb_gdbus_feedback_emit_feedback_ended (LFB_GDBUS_FEEDBACK(self), event_id, + lfb_gdbus_feedback_emit_feedback_ended (LFB_GDBUS_FEEDBACK (self), event_id, fbd_event_get_end_reason (event)); g_debug ("All feedbacks for event %d finished", event_id); @@ -243,12 +243,12 @@ parse_hints (GVariant *hints, FbdFeedbackProfileLevel *level) } static gboolean -fbd_feedback_manager_handle_trigger_feedback (LfbGdbusFeedback *object, +fbd_feedback_manager_handle_trigger_feedback (LfbGdbusFeedback *object, GDBusMethodInvocation *invocation, - const gchar *arg_app_id, - const gchar *arg_event, - GVariant *arg_hints, - gint arg_timeout) + const gchar *arg_app_id, + const gchar *arg_event, + GVariant *arg_hints, + gint arg_timeout) { FbdFeedbackManager *self; FbdEvent *event; @@ -302,8 +302,8 @@ fbd_feedback_manager_handle_trigger_feedback (LfbGdbusFeedback *object, FbdFeedbackBase *fb = l->data; if (fbd_feedback_is_available (FBD_FEEDBACK_BASE (fb))) { - fbd_event_add_feedback (event, fb); - found_fb = TRUE; + fbd_event_add_feedback (event, fb); + found_fb = TRUE; } } g_slist_free_full (feedbacks, g_object_unref); @@ -320,7 +320,7 @@ fbd_feedback_manager_handle_trigger_feedback (LfbGdbusFeedback *object, fbd_event_run_feedbacks (event); } else { g_hash_table_remove (self->events, GUINT_TO_POINTER (event_id)); - lfb_gdbus_feedback_emit_feedback_ended (LFB_GDBUS_FEEDBACK(self), event_id, + lfb_gdbus_feedback_emit_feedback_ended (LFB_GDBUS_FEEDBACK (self), event_id, FBD_EVENT_END_REASON_NOT_FOUND); } @@ -329,9 +329,9 @@ fbd_feedback_manager_handle_trigger_feedback (LfbGdbusFeedback *object, } static gboolean -fbd_feedback_manager_handle_end_feedback (LfbGdbusFeedback *object, +fbd_feedback_manager_handle_end_feedback (LfbGdbusFeedback *object, GDBusMethodInvocation *invocation, - guint event_id) + guint event_id) { FbdFeedbackManager *self; FbdEvent *event; @@ -357,45 +357,46 @@ fbd_feedback_manager_handle_end_feedback (LfbGdbusFeedback *object, } static const gchar * -find_themefile (void) { +find_themefile (void) +{ gint i = 0; gsize len; const gchar *comp; - g_autoptr(GError) err = NULL; - gchar **xdg_data_dirs = (gchar **) g_get_system_data_dirs(); + + g_autoptr (GError) err = NULL; + gchar **xdg_data_dirs = (gchar **) g_get_system_data_dirs (); g_autofree gchar *config_path = NULL; g_autofree gchar *compatibles = NULL; // Try to read the device name - if (g_file_test(DEVICE_TREE_PATH, (G_FILE_TEST_EXISTS))) { - g_debug("Found device tree device compatible at %s", DEVICE_TREE_PATH); + if (g_file_test (DEVICE_TREE_PATH, (G_FILE_TEST_EXISTS))) { + g_debug ("Found device tree device compatible at %s", DEVICE_TREE_PATH); // Check if feedbackd has a proper config available this device - if(!g_file_get_contents(DEVICE_TREE_PATH, &compatibles, &len, &err)) + if (!g_file_get_contents (DEVICE_TREE_PATH, &compatibles, &len, &err)) g_warning ("Unable to read: %s", err->message); comp = compatibles; - while(comp - compatibles < len) { + while (comp - compatibles < len) { // Iterate over $XDG_DATA_DIRS - for (i = 0; i < g_strv_length(xdg_data_dirs); i++) { - config_path = g_strconcat(xdg_data_dirs[i], "feedbackd/themes/", comp, ".json", NULL); - g_debug("Searching for device specific themefile in %s", config_path); + for (i = 0; i < g_strv_length (xdg_data_dirs); i++) { + config_path = g_strconcat (xdg_data_dirs[i], "feedbackd/themes/", comp, ".json", NULL); + g_debug ("Searching for device specific themefile in %s", config_path); // Check if file exist - if (g_file_test(config_path, (G_FILE_TEST_EXISTS))) { - g_debug("Found themefile for this device at: %s", config_path); - return g_strdup(config_path); + if (g_file_test (config_path, (G_FILE_TEST_EXISTS))) { + g_debug ("Found themefile for this device at: %s", config_path); + return g_strdup (config_path); } } // Next compatible - comp = strchr(comp, 0); + comp = strchr (comp, 0); comp++; } - } - else { - g_debug("Device tree path does not exist: %s", DEVICE_TREE_PATH); + }else { + g_debug ("Device tree path does not exist: %s", DEVICE_TREE_PATH); } return NULL; @@ -411,7 +412,7 @@ fbd_feedback_manager_constructed (GObject *object) G_OBJECT_CLASS (fbd_feedback_manager_parent_class)->constructed (object); // Overide themefile with environment variable if requested - themefile = g_getenv(FEEDBACKD_THEME_VAR); + themefile = g_getenv (FEEDBACKD_THEME_VAR); // Search for device-specific configuration if (!themefile) @@ -420,7 +421,7 @@ fbd_feedback_manager_constructed (GObject *object) // Fallback to default configuration if needed if (!themefile) themefile = FEEDBACKD_THEME_DIR "/default.json"; - g_info("Using themefile: %s", themefile); + g_info ("Using themefile: %s", themefile); self->theme = fbd_feedback_theme_new_from_file (themefile, &err); if (!self->theme) {