From abab07a2f2288496acbeccdc92c7feb84b73122b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Wed, 21 Apr 2021 18:18:23 +0200
Subject: [PATCH] event: Remove 'g' prefix from common C types

This matchs phosh's style.
---
 src/fbd-event.c | 12 ++++++------
 src/fbd-event.h | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/fbd-event.c b/src/fbd-event.c
index bd004b3..73f37c2 100644
--- a/src/fbd-event.c
+++ b/src/fbd-event.c
@@ -36,7 +36,7 @@ typedef struct _FbdEvent {
   char *app_id;
   char *event;
 
-  gint timeout;
+  int  timeout;
   gboolean expired;
   guint timeout_id;
 
@@ -267,7 +267,7 @@ fbd_event_init (FbdEvent *self)
 }
 
 FbdEvent *
-fbd_event_new (gint id, const gchar *app_id, const gchar *event, gint timeout)
+fbd_event_new (int id, const char *app_id, const char *event, int timeout)
 {
   return FBD_EVENT (g_object_new (FBD_TYPE_EVENT,
                                   "id", id,
@@ -277,7 +277,7 @@ fbd_event_new (gint id, const gchar *app_id, const gchar *event, gint timeout)
                                   NULL));
 }
 
-const gchar *
+const char *
 fbd_event_get_event (FbdEvent *self)
 {
   g_return_val_if_fail (FBD_IS_EVENT (self), NULL);
@@ -285,7 +285,7 @@ fbd_event_get_event (FbdEvent *self)
   return self->event;
 }
 
-const gchar *
+const char *
 fbd_event_get_app_id (FbdEvent *self)
 {
   g_return_val_if_fail (FBD_IS_EVENT (self), NULL);
@@ -301,7 +301,7 @@ fbd_event_get_id (FbdEvent *self)
   return self->id;
 }
 
-gint
+int
 fbd_event_get_timeout (FbdEvent *self)
 {
   g_return_val_if_fail (FBD_IS_EVENT (self), -1);
@@ -334,7 +334,7 @@ fbd_event_get_feedbacks (FbdEvent *self)
   return self->feedbacks;
 }
 
-gint
+int
 fbd_event_remove_feedback (FbdEvent *self, FbdFeedbackBase *feedback)
 {
   g_return_val_if_fail (FBD_IS_EVENT (self), 0);
diff --git a/src/fbd-event.h b/src/fbd-event.h
index 6562d2b..b497613 100644
--- a/src/fbd-event.h
+++ b/src/fbd-event.h
@@ -33,17 +33,17 @@ typedef enum _FbdEventTimeout {
 
 G_DECLARE_FINAL_TYPE (FbdEvent, fbd_event, FBD, EVENT, GObject);
 
-FbdEvent    *fbd_event_new (gint id, const gchar *app_id, const gchar *event, gint timeout);
-const gchar *fbd_event_get_event (FbdEvent *event);
-const gchar *fbd_event_get_app_id (FbdEvent *event);
+FbdEvent    *fbd_event_new (gint id, const char *app_id, const char *event, int timeout);
+const char  *fbd_event_get_event (FbdEvent *event);
+const char  *fbd_event_get_app_id (FbdEvent *event);
 guint        fbd_event_get_id (FbdEvent *event);
-gint         fbd_event_get_timeout (FbdEvent *self);
+int          fbd_event_get_timeout (FbdEvent *self);
 void         fbd_event_set_end_reason (FbdEvent *self, FbdEventEndReason reason);
 FbdEventEndReason fbd_event_get_end_reason (FbdEvent *self);
 GSList *     fbd_event_get_feedbacks (FbdEvent *self);
 void         fbd_event_add_feedback (FbdEvent *self,
                                      FbdFeedbackBase *feedback);
-gint         fbd_event_remove_feedback (FbdEvent *self,
+int          fbd_event_remove_feedback (FbdEvent *self,
                                         FbdFeedbackBase *feedback);
 void         fbd_event_run_feedbacks (FbdEvent *self);
 void         fbd_event_end_feedbacks (FbdEvent *self);