summaryrefslogtreecommitdiff
path: root/gtk/gtkimcontextsimple.c
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2020-07-24 20:40:36 +0200
committerBenjamin Otte <otte@redhat.com>2020-07-25 00:47:36 +0200
commitd375dce9f52fd9830069a6fd9287abde93d3f24b (patch)
treecd759ec130e07189ab7f19ebd03b8e89923aaa7f /gtk/gtkimcontextsimple.c
parentd7266b25ba5f2f21a5bd19d0fb88aca530e4d265 (diff)
downloadgtk+-d375dce9f52fd9830069a6fd9287abde93d3f24b.tar.gz
Replace "gchar" with "char"
Diffstat (limited to 'gtk/gtkimcontextsimple.c')
-rw-r--r--gtk/gtkimcontextsimple.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index c3681715ee..cf5669addd 100644
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -108,7 +108,7 @@ static gboolean gtk_im_context_simple_filter_keypress (GtkIMContext
GdkEvent *key);
static void gtk_im_context_simple_reset (GtkIMContext *context);
static void gtk_im_context_simple_get_preedit_string (GtkIMContext *context,
- gchar **str,
+ char **str,
PangoAttrList **attrs,
int *cursor_pos);
@@ -138,10 +138,10 @@ gtk_im_context_simple_class_init (GtkIMContextSimpleClass *class)
init_compose_table_async (NULL, NULL, NULL);
}
-static gchar*
+static char *
get_x11_compose_file_dir (void)
{
- gchar* compose_file_dir;
+ char * compose_file_dir;
#if defined (X11_DATA_PREFIX)
compose_file_dir = g_strdup (X11_DATA_PREFIX "/share/X11/locale");
@@ -155,14 +155,14 @@ get_x11_compose_file_dir (void)
static void
gtk_im_context_simple_init_compose_table (void)
{
- gchar *path = NULL;
- const gchar *home;
- const gchar *locale;
- gchar **langs = NULL;
- gchar **lang = NULL;
+ char *path = NULL;
+ const char *home;
+ const char *locale;
+ char **langs = NULL;
+ char **lang = NULL;
const char * const sys_langs[] = { "el_gr", "fi_fi", "pt_br", NULL };
const char * const *sys_lang = NULL;
- gchar *x11_compose_file_dir = get_x11_compose_file_dir ();
+ char *x11_compose_file_dir = get_x11_compose_file_dir ();
path = g_build_filename (g_get_user_config_dir (), "gtk-4.0", "Compose", NULL);
if (g_file_test (path, G_FILE_TEST_EXISTS))
@@ -300,7 +300,7 @@ gtk_im_context_simple_commit_char (GtkIMContext *context,
{
GtkIMContextSimple *context_simple = GTK_IM_CONTEXT_SIMPLE (context);
GtkIMContextSimplePrivate *priv = context_simple->priv;
- gchar buf[10];
+ char buf[10];
int len;
g_return_if_fail (g_unichar_validate (ch));
@@ -540,8 +540,8 @@ static gboolean
check_normalize_nfc (gunichar* combination_buffer, int n_compose)
{
gunichar combination_buffer_temp[GTK_MAX_COMPOSE_LEN];
- gchar *combination_utf8_temp = NULL;
- gchar *nfc_temp = NULL;
+ char *combination_utf8_temp = NULL;
+ char *nfc_temp = NULL;
int n_combinations;
gunichar temp_swap;
int i;
@@ -604,7 +604,7 @@ gtk_check_algorithmically (const guint16 *compose_buffer,
{
int i;
gunichar combination_buffer[GTK_MAX_COMPOSE_LEN];
- gchar *combination_utf8, *nfc;
+ char *combination_utf8, *nfc;
if (output_char)
*output_char = 0;
@@ -712,8 +712,8 @@ check_hex (GtkIMContextSimple *context_simple,
int i;
GString *str;
gulong n;
- gchar *nptr = NULL;
- gchar buf[7];
+ char *nptr = NULL;
+ char buf[7];
priv->tentative_match = 0;
priv->tentative_match_len = 0;
@@ -1214,7 +1214,7 @@ gtk_im_context_simple_reset (GtkIMContext *context)
static void
gtk_im_context_simple_get_preedit_string (GtkIMContext *context,
- gchar **str,
+ char **str,
PangoAttrList **attrs,
int *cursor_pos)
{
@@ -1307,7 +1307,7 @@ gtk_im_context_simple_add_table (GtkIMContextSimple *context_simple,
*/
void
gtk_im_context_simple_add_compose_file (GtkIMContextSimple *context_simple,
- const gchar *compose_file)
+ const char *compose_file)
{
g_return_if_fail (GTK_IS_IM_CONTEXT_SIMPLE (context_simple));