[glib] Use g types for consistency



commit c2a539eff05f1afd43e1c3c0feb9c98ccfdd0a85
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Jun 7 17:48:09 2010 -0400

    Use g types for consistency

 gio/gapplication.c     |   26 +++++++++++++-------------
 gio/gapplication.h     |   26 +++++++++++++-------------
 gio/gdbusapplication.c |    8 ++++----
 gio/gnullapplication.c |    2 +-
 4 files changed, 31 insertions(+), 31 deletions(-)
---
diff --git a/gio/gapplication.c b/gio/gapplication.c
index d974ed9..c79bf3a 100644
--- a/gio/gapplication.c
+++ b/gio/gapplication.c
@@ -168,14 +168,14 @@ enum
 static guint application_signals[LAST_SIGNAL] = { 0 };
 
 typedef struct {
-  char *name;
-  char *description;
+  gchar *name;
+  gchar *description;
   guint enabled : 1;
 } GApplicationAction;
 
 struct _GApplicationPrivate
 {
-  char *appid;
+  gchar *appid;
   GHashTable *actions; /* name -> GApplicationAction */
   GMainLoop *mainloop;
 
@@ -185,7 +185,7 @@ struct _GApplicationPrivate
   guint actions_changed_id;
 
 #ifdef G_OS_UNIX
-  char *dbus_path;
+  gchar *dbus_path;
   GDBusConnection *session_bus;
 #endif
 };
@@ -197,7 +197,7 @@ static void     _g_application_platform_init                    (GApplication  *
 static gboolean _g_application_platform_acquire_single_instance (GApplication  *app,
                                                                  GError       **error);
 static void     _g_application_platform_remote_invoke_action    (GApplication  *app,
-                                                                 const char    *action,
+                                                                 const gchar   *action,
                                                                  guint          timestamp);
 static void     _g_application_platform_remote_quit             (GApplication  *app,
                                                                  guint          timestamp);
@@ -366,7 +366,7 @@ g_application_action_free (gpointer data)
  * Since: 2.26
  */
 GApplication *
-g_application_new (const char  *appid)
+g_application_new (const gchar *appid)
 {
   g_type_init ();
 
@@ -395,8 +395,8 @@ g_application_new (const char  *appid)
  */
 void
 g_application_register_with_data (GApplication  *application,
-                                  int            argc,
-                                  char         **argv,
+                                  gint           argc,
+                                  gchar        **argv,
                                   GVariant      *platform_data)
 {
   g_return_if_fail (application->priv->appid != NULL);
@@ -427,9 +427,9 @@ g_application_register_with_data (GApplication  *application,
  * with g_application_register_with_data().
  */
 GApplication *
-g_application_new_and_register (const char  *appid,
-                                int          argc,
-                                char       **argv)
+g_application_new_and_register (const gchar  *appid,
+                                gint          argc,
+                                gchar       **argv)
 {
   GApplication *app = g_application_new (appid);
   g_application_register_with_data (app, argc, argv, NULL);
@@ -534,7 +534,7 @@ g_application_remove_action (GApplication *application,
  */
 void
 g_application_invoke_action (GApplication *application,
-                             const char   *name,
+                             const gchar  *name,
                              guint         timestamp)
 {
   GApplicationPrivate *priv;
@@ -797,7 +797,7 @@ g_application_get_instance (void)
  *
  * Since: 2.26
  */
-G_CONST_RETURN char *
+G_CONST_RETURN gchar *
 g_application_get_id (GApplication *application)
 {
   g_return_val_if_fail (G_IS_APPLICATION (application), NULL);
diff --git a/gio/gapplication.h b/gio/gapplication.h
index bb70fe1..7a77199 100644
--- a/gio/gapplication.h
+++ b/gio/gapplication.h
@@ -105,35 +105,35 @@ struct _GApplicationClass
 };
 GType                   g_application_get_type                  (void) G_GNUC_CONST;
 
-GApplication *          g_application_new                       (const char               *appid);
+GApplication *          g_application_new                       (const gchar              *appid);
 
 void                    g_application_register_with_data        (GApplication      *application,
-                                                                 int                argc,
-                                                                 char             **argv,
+                                                                 gint               argc,
+                                                                 gchar            **argv,
                                                                  GVariant          *platform_data);
 
-GApplication *          g_application_new_and_register           (const char       *appid,
-                                                                  int               argc,
-                                                                  char            **argv);
+GApplication *          g_application_new_and_register           (const gchar      *appid,
+                                                                  gint              argc,
+                                                                  gchar           **argv);
 
 GApplication *          g_application_get_instance              (void);
 G_CONST_RETURN gchar *  g_application_get_id                    (GApplication      *application);
 
 void                    g_application_add_action                (GApplication      *application,
-                                                                 const char        *name,
-                                                                 const char        *description);
+                                                                 const gchar       *name,
+                                                                 const gchar       *description);
 void                    g_application_remove_action             (GApplication      *application,
-                                                                 const char        *name);
+                                                                 const gchar       *name);
 gchar **                g_application_list_actions              (GApplication      *application);
 void                    g_application_set_action_enabled        (GApplication      *application,
-                                                                 const char        *name,
+                                                                 const gchar       *name,
                                                                  gboolean           enabled);
 gboolean                g_application_get_action_enabled        (GApplication      *application,
-                                                                 const char        *name);
+                                                                 const gchar       *name);
 G_CONST_RETURN gchar *  g_application_get_action_description    (GApplication *application,
-                                                                 const char *name);
+                                                                 const gchar  *name);
 void                    g_application_invoke_action             (GApplication      *application,
-                                                                 const char        *name,
+                                                                 const gchar       *name,
                                                                  guint              timestamp);
 
 void                    g_application_run                       (GApplication      *application);
diff --git a/gio/gdbusapplication.c b/gio/gdbusapplication.c
index 012845d..436762a 100644
--- a/gio/gdbusapplication.c
+++ b/gio/gdbusapplication.c
@@ -256,10 +256,10 @@ static GDBusInterfaceVTable application_dbus_vtable =
   NULL
 };
 
-static char *
-application_path_from_appid (const char *appid)
+static gchar *
+application_path_from_appid (const gchar *appid)
 {
-  char *appid_path, *iter;
+  gchar *appid_path, *iter;
 
 
   appid_path = g_strconcat ("/", appid, NULL);
@@ -363,7 +363,7 @@ _g_application_platform_on_actions_changed (GApplication *app)
 
 static void
 _g_application_platform_remote_invoke_action (GApplication  *app,
-                                              const char    *action,
+                                              const gchar   *action,
                                               guint          timestamp)
 {
   GVariant *result;
diff --git a/gio/gnullapplication.c b/gio/gnullapplication.c
index 6d255e6..91a6578 100644
--- a/gio/gnullapplication.c
+++ b/gio/gnullapplication.c
@@ -44,7 +44,7 @@ _g_application_platform_on_actions_changed (GApplication *app)
 
 static void
 _g_application_platform_remote_invoke_action (GApplication  *app,
-                                              const char    *action,
+                                              const gchar   *action,
                                               guint          timestamp)
 {
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]