summaryrefslogtreecommitdiff
path: root/gdk/x11
diff options
context:
space:
mode:
Diffstat (limited to 'gdk/x11')
-rw-r--r--gdk/x11/gdkapplaunchcontext-x11.c6
-rw-r--r--gdk/x11/gdkclipboard-x11.c2
-rw-r--r--gdk/x11/gdkclipboard-x11.h2
-rw-r--r--gdk/x11/gdkcursor-x11.c10
-rw-r--r--gdk/x11/gdkdevicemanager-xi2.c12
-rw-r--r--gdk/x11/gdkdisplay-x11.c32
-rw-r--r--gdk/x11/gdkdisplay-x11.h2
-rw-r--r--gdk/x11/gdkdrag-x11.c4
-rw-r--r--gdk/x11/gdkdrop-x11.c4
-rw-r--r--gdk/x11/gdkkeys-x11.c2
-rw-r--r--gdk/x11/gdkprivate-x11.h6
-rw-r--r--gdk/x11/gdkproperty-x11.c8
-rw-r--r--gdk/x11/gdkscreen-x11.c6
-rw-r--r--gdk/x11/gdkselection-x11.c36
-rw-r--r--gdk/x11/gdksurface-x11.c22
-rw-r--r--gdk/x11/gdktextlistconverter-x11.c4
-rw-r--r--gdk/x11/gdkvisual-x11.c2
-rw-r--r--gdk/x11/gdkx11display.h8
-rw-r--r--gdk/x11/gdkx11property.h4
-rw-r--r--gdk/x11/gdkx11selection.h4
-rw-r--r--gdk/x11/gdkx11surface.h4
-rw-r--r--gdk/x11/gdkxftdefaults.c14
22 files changed, 97 insertions, 97 deletions
diff --git a/gdk/x11/gdkapplaunchcontext-x11.c b/gdk/x11/gdkapplaunchcontext-x11.c
index adc11bf4ec..b0a8985640 100644
--- a/gdk/x11/gdkapplaunchcontext-x11.c
+++ b/gdk/x11/gdkapplaunchcontext-x11.c
@@ -293,7 +293,7 @@ gdk_x11_app_launch_context_get_startup_notify_id (GAppLaunchContext *context,
}
else if (files_count == 1)
{
- gchar *display_name;
+ char *display_name;
if (g_file_is_native (files->data))
fileinfo = g_file_query_info (files->data,
@@ -389,7 +389,7 @@ gdk_x11_app_launch_context_get_startup_notify_id (GAppLaunchContext *context,
static void
gdk_x11_app_launch_context_launch_failed (GAppLaunchContext *context,
- const gchar *startup_notify_id)
+ const char *startup_notify_id)
{
GdkAppLaunchContext *ctx;
GdkX11Screen *screen;
@@ -457,7 +457,7 @@ GdkAppLaunchContext *
_gdk_x11_display_get_app_launch_context (GdkDisplay *display)
{
GdkAppLaunchContext *ctx;
- const gchar *display_name;
+ const char *display_name;
ctx = g_object_new (GDK_TYPE_X11_APP_LAUNCH_CONTEXT,
"display", display,
diff --git a/gdk/x11/gdkclipboard-x11.c b/gdk/x11/gdkclipboard-x11.c
index af2434fbf4..404c8c7cd6 100644
--- a/gdk/x11/gdkclipboard-x11.c
+++ b/gdk/x11/gdkclipboard-x11.c
@@ -823,7 +823,7 @@ gdk_x11_clipboard_init (GdkX11Clipboard *cb)
GdkClipboard *
gdk_x11_clipboard_new (GdkDisplay *display,
- const gchar *selection)
+ const char *selection)
{
GdkX11Clipboard *cb;
diff --git a/gdk/x11/gdkclipboard-x11.h b/gdk/x11/gdkclipboard-x11.h
index e4b82ee622..9eeea4a0c6 100644
--- a/gdk/x11/gdkclipboard-x11.h
+++ b/gdk/x11/gdkclipboard-x11.h
@@ -34,7 +34,7 @@ typedef struct _GdkX11Clipboard GdkX11Clipboard;
GType gdk_x11_clipboard_get_type (void) G_GNUC_CONST;
GdkClipboard * gdk_x11_clipboard_new (GdkDisplay *display,
- const gchar *selection);
+ const char *selection);
GSList * gdk_x11_clipboard_formats_to_targets (GdkContentFormats *formats);
Atom * gdk_x11_clipboard_formats_to_atoms (GdkDisplay *display,
diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
index bb05c01baf..3e99403954 100644
--- a/gdk/x11/gdkcursor-x11.c
+++ b/gdk/x11/gdkcursor-x11.c
@@ -184,8 +184,8 @@ gdk_x11_cursor_create_for_texture (GdkDisplay *display,
return xcursor;
}
-static const gchar *
-name_fallback (const gchar *name)
+static const char *
+name_fallback (const char *name)
{
int i;
@@ -239,7 +239,7 @@ gdk_x11_cursor_create_for_texture (GdkDisplay *display,
static Cursor
gdk_x11_cursor_create_for_name (GdkDisplay *display,
- const gchar *name)
+ const char *name)
{
int i;
@@ -279,12 +279,12 @@ gdk_x11_cursor_create_for_name (GdkDisplay *display,
*/
void
gdk_x11_display_set_cursor_theme (GdkDisplay *display,
- const gchar *theme,
+ const char *theme,
const int size)
{
#if defined(HAVE_XCURSOR) && defined(HAVE_XFIXES) && XFIXES_MAJOR >= 2
Display *xdisplay;
- gchar *old_theme;
+ char *old_theme;
int old_size;
gpointer cursor, xcursor;
GHashTableIter iter;
diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
index ef63fb5c4d..51cd98a2a5 100644
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/gdk/x11/gdkdevicemanager-xi2.c
@@ -384,8 +384,8 @@ has_abs_axes (GdkDisplay *display,
static gboolean
get_device_ids (GdkDisplay *display,
XIDeviceInfo *info,
- gchar **vendor_id,
- gchar **product_id)
+ char **vendor_id,
+ char **product_id)
{
gulong nitems, bytes_after;
guint32 *data;
@@ -474,7 +474,7 @@ create_device (GdkX11DeviceManagerXI2 *device_manager,
GdkDeviceType type;
GdkDevice *device;
int num_touches = 0;
- gchar *vendor_id = NULL, *product_id = NULL;
+ char *vendor_id = NULL, *product_id = NULL;
if (dev->use == XIMasterKeyboard || dev->use == XISlaveKeyboard)
input_source = GDK_SOURCE_KEYBOARD;
@@ -485,7 +485,7 @@ create_device (GdkX11DeviceManagerXI2 *device_manager,
input_source = touch_source;
else
{
- gchar *tmp_name;
+ char *tmp_name;
tmp_name = g_ascii_strdown (dev->name, -1);
@@ -531,8 +531,8 @@ create_device (GdkX11DeviceManagerXI2 *device_manager,
GDK_DISPLAY_NOTE (display, INPUT,
({
- const gchar *type_names[] = { "logical", "physical", "floating" };
- const gchar *source_names[] = { "mouse", "pen", "eraser", "cursor", "keyboard", "direct touch", "indirect touch", "trackpoint", "pad" };
+ const char *type_names[] = { "logical", "physical", "floating" };
+ const char *source_names[] = { "mouse", "pen", "eraser", "cursor", "keyboard", "direct touch", "indirect touch", "trackpoint", "pad" };
g_message ("input device:\n\tname: %s\n\ttype: %s\n\tsource: %s\n\thas cursor: %d\n\ttouches: %d",
dev->name,
type_names[type],
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index ab9a1ee949..8be698fa6e 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -1331,7 +1331,7 @@ gdk_event_init (GdkDisplay *display)
static void
set_sm_client_id (GdkDisplay *display,
- const gchar *sm_client_id)
+ const char *sm_client_id)
{
GdkX11Display *display_x11 = GDK_X11_DISPLAY (display);
@@ -1377,13 +1377,13 @@ gdk_display_setup_window_visual (GdkDisplay *display,
* %NULL on error.
**/
GdkDisplay *
-gdk_x11_display_open (const gchar *display_name)
+gdk_x11_display_open (const char *display_name)
{
Display *xdisplay;
GdkDisplay *display;
GdkX11Display *display_x11;
int argc;
- gchar *argv[1];
+ char *argv[1];
XClassHint *class_hint;
int ignore;
int maj, min;
@@ -1733,10 +1733,10 @@ gdk_internal_connection_watch (Display *display,
gdk_remove_connection_handler ((GdkInternalConnection *)*watch_data);
}
-static const gchar *
+static const char *
gdk_x11_display_get_name (GdkDisplay *display)
{
- return (gchar *) DisplayString (GDK_X11_DISPLAY (display)->xdisplay);
+ return (char *) DisplayString (GDK_X11_DISPLAY (display)->xdisplay);
}
gboolean
@@ -2093,7 +2093,7 @@ static void
gdk_x11_display_make_default (GdkDisplay *display)
{
GdkX11Display *display_x11 = GDK_X11_DISPLAY (display);
- const gchar *startup_id;
+ const char *startup_id;
g_free (display_x11->startup_notification_id);
display_x11->startup_notification_id = NULL;
@@ -2257,9 +2257,9 @@ gdk_x11_display_broadcast_startup_message (GdkDisplay *display,
static void
gdk_x11_display_notify_startup_complete (GdkDisplay *display,
- const gchar *startup_id)
+ const char *startup_id)
{
- gchar *free_this = NULL;
+ char *free_this = NULL;
if (startup_id == NULL)
{
@@ -2329,7 +2329,7 @@ gdk_x11_display_get_user_time (GdkDisplay *display)
*
* Returns: the startup notification ID for @display
*/
-const gchar *
+const char *
gdk_x11_display_get_startup_notification_id (GdkDisplay *display)
{
return GDK_X11_DISPLAY (display)->startup_notification_id;
@@ -2357,10 +2357,10 @@ gdk_x11_display_get_startup_notification_id (GdkDisplay *display)
**/
void
gdk_x11_display_set_startup_notification_id (GdkDisplay *display,
- const gchar *startup_id)
+ const char *startup_id)
{
GdkX11Display *display_x11;
- gchar *time_str;
+ char *time_str;
display_x11 = GDK_X11_DISPLAY (display);
@@ -2376,7 +2376,7 @@ gdk_x11_display_set_startup_notification_id (GdkDisplay *display,
if (time_str != NULL)
{
gulong retval;
- gchar *end;
+ char *end;
errno = 0;
/* Skip past the "_TIME" part */
@@ -2463,8 +2463,8 @@ _gdk_x11_display_error_event (GdkDisplay *display,
if (!ignore)
{
- gchar buf[64];
- gchar *msg;
+ char buf[64];
+ char *msg;
XGetErrorText (display_x11->xdisplay, error->error_code, buf, 63);
@@ -2735,7 +2735,7 @@ gdk_x11_display_error_trap_pop_ignored (GdkDisplay *display)
* session management and the Inter-Client Communication Conventions Manual
*/
void
-gdk_x11_set_sm_client_id (const gchar *sm_client_id)
+gdk_x11_set_sm_client_id (const char *sm_client_id)
{
GSList *displays, *l;
@@ -2893,7 +2893,7 @@ gdk_x11_display_get_window_colormap (GdkX11Display *display)
static gboolean
gdk_x11_display_get_setting (GdkDisplay *display,
- const gchar *name,
+ const char *name,
GValue *value)
{
return gdk_x11_screen_get_setting (GDK_X11_DISPLAY (display)->screen, name, value);
diff --git a/gdk/x11/gdkdisplay-x11.h b/gdk/x11/gdkdisplay-x11.h
index c3719e9ac5..58eafeca61 100644
--- a/gdk/x11/gdkdisplay-x11.h
+++ b/gdk/x11/gdkdisplay-x11.h
@@ -110,7 +110,7 @@ struct _GdkX11Display
int primary_monitor;
/* Startup notification */
- gchar *startup_notification_id;
+ char *startup_notification_id;
/* Time of most recent user interaction. */
gulong user_time;
diff --git a/gdk/x11/gdkdrag-x11.c b/gdk/x11/gdkdrag-x11.c
index 5e8e03fccb..291a892156 100644
--- a/gdk/x11/gdkdrag-x11.c
+++ b/gdk/x11/gdkdrag-x11.c
@@ -302,7 +302,7 @@ precache_target_list (GdkDrag *drag)
atoms = gdk_content_formats_get_mime_types (formats, &n_atoms);
_gdk_x11_precache_atoms (gdk_drag_get_display (drag),
- (const gchar **) atoms,
+ (const char **) atoms,
n_atoms);
}
@@ -805,7 +805,7 @@ get_client_window_at_coords (GdkSurfaceCache *cache,
/* Utility functions */
static struct {
- const gchar *name;
+ const char *name;
GdkDragAction action;
} xdnd_actions_table[] = {
{ "XdndActionCopy", GDK_ACTION_COPY },
diff --git a/gdk/x11/gdkdrop-x11.c b/gdk/x11/gdkdrop-x11.c
index 628ac33d0e..7bbb6cc78f 100644
--- a/gdk/x11/gdkdrop-x11.c
+++ b/gdk/x11/gdkdrop-x11.c
@@ -257,7 +257,7 @@ gdk_x11_drop_finalize (GObject *object)
static void
print_target_list (GdkContentFormats *formats)
{
- gchar *name = gdk_content_formats_to_string (formats);
+ char *name = gdk_content_formats_to_string (formats);
g_message ("DND formats: %s", name);
g_free (name);
}
@@ -270,7 +270,7 @@ print_target_list (GdkContentFormats *formats)
/* Utility functions */
static struct {
- const gchar *name;
+ const char *name;
GdkDragAction action;
} xdnd_actions_table[] = {
{ "XdndActionCopy", GDK_ACTION_COPY },
diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index dc4cd45e3c..689c6b330e 100644
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@@ -166,7 +166,7 @@ update_modmap (Display *display,
GdkX11Keymap *keymap_x11)
{
static struct {
- const gchar *name;
+ const char *name;
Atom atom;
GdkModifierType mask;
} vmods[] = {
diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h
index eca7e4fcbd..eeae4abbe5 100644
--- a/gdk/x11/gdkprivate-x11.h
+++ b/gdk/x11/gdkprivate-x11.h
@@ -129,7 +129,7 @@ int _gdk_x11_display_text_property_to_utf8_list (GdkDisplay *display
int format,
const guchar *text,
int length,
- gchar ***list);
+ char ***list);
char * gdk_x11_utf8_to_string_target (const char *utf8_str,
gboolean return_latin1);
@@ -186,11 +186,11 @@ GdkSurface * _gdk_x11_display_create_surface (GdkDisplay *display,
GList * gdk_x11_display_get_toplevel_windows (GdkDisplay *display);
void _gdk_x11_precache_atoms (GdkDisplay *display,
- const gchar * const *atom_names,
+ const char * const *atom_names,
int n_atoms);
Atom _gdk_x11_get_xatom_for_display_printf (GdkDisplay *display,
- const gchar *format,
+ const char *format,
...) G_GNUC_PRINTF (2, 3);
GdkDrag *gdk_x11_drag_find (GdkDisplay *display,
diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index fd6ddca2fb..bbe916d5cc 100644
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -77,7 +77,7 @@ lookup_cached_xatom (GdkDisplay *display,
**/
Atom
gdk_x11_get_xatom_by_name_for_display (GdkDisplay *display,
- const gchar *atom_name)
+ const char *atom_name)
{
Atom xatom = None;
@@ -102,7 +102,7 @@ gdk_x11_get_xatom_by_name_for_display (GdkDisplay *display,
void
_gdk_x11_precache_atoms (GdkDisplay *display,
- const gchar * const *atom_names,
+ const char * const *atom_names,
int n_atoms)
{
Atom *xatoms;
@@ -147,7 +147,7 @@ _gdk_x11_precache_atoms (GdkDisplay *display,
* Returns: name of the X atom; this string is owned by GDK,
* so it shouldn’t be modified or freed.
**/
-const gchar *
+const char *
gdk_x11_get_xatom_name_for_display (GdkDisplay *display,
Atom xatom)
@@ -197,7 +197,7 @@ gdk_x11_get_xatom_name_for_display (GdkDisplay *display,
Atom
_gdk_x11_get_xatom_for_display_printf (GdkDisplay *display,
- const gchar *format,
+ const char *format,
...)
{
va_list args;
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index 8b875dfc58..6a96389040 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -1061,7 +1061,7 @@ _gdk_x11_screen_window_manager_changed (GdkX11Screen *screen)
gboolean
gdk_x11_screen_get_setting (GdkX11Screen *x11_screen,
- const gchar *name,
+ const char *name,
GValue *value)
{
const GValue *setting;
@@ -1305,7 +1305,7 @@ gdk_x11_screen_get_window_manager_name (GdkX11Screen *x11_screen)
int format;
gulong n_items;
gulong bytes_after;
- gchar *name;
+ char *name;
name = NULL;
@@ -1357,7 +1357,7 @@ gdk_x11_screen_class_init (GdkX11ScreenClass *klass)
static guint32
get_netwm_cardinal_property (GdkX11Screen *x11_screen,
- const gchar *name)
+ const char *name)
{
guint32 prop = 0;
Atom type;
diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c
index 83cdd8c37a..26e1b589b5 100644
--- a/gdk/x11/gdkselection-x11.c
+++ b/gdk/x11/gdkselection-x11.c
@@ -59,12 +59,12 @@ gdk_x11_display_text_property_to_text_list (GdkDisplay *display,
int format,
const guchar *text,
int length,
- gchar ***list)
+ char ***list)
{
XTextProperty property;
int count = 0;
int res;
- gchar **local_list;
+ char **local_list;
g_return_val_if_fail (GDK_IS_DISPLAY (display), 0);
if (list)
@@ -101,7 +101,7 @@ gdk_x11_display_text_property_to_text_list (GdkDisplay *display,
* gdk_x11_display_text_property_to_text_list().
*/
void
-gdk_x11_free_text_list (gchar **list)
+gdk_x11_free_text_list (char **list)
{
g_return_if_fail (list != NULL);
@@ -109,22 +109,22 @@ gdk_x11_free_text_list (gchar **list)
}
static int
-make_list (const gchar *text,
+make_list (const char *text,
int length,
gboolean latin1,
- gchar ***list)
+ char ***list)
{
GSList *strings = NULL;
int n_strings = 0;
int i;
- const gchar *p = text;
- const gchar *q;
+ const char *p = text;
+ const char *q;
GSList *tmp_list;
GError *error = NULL;
while (p < text + length)
{
- gchar *str;
+ char *str;
q = p;
while (*q && q < text + length)
@@ -165,7 +165,7 @@ make_list (const gchar *text,
if (list)
{
- *list = g_new (gchar *, n_strings + 1);
+ *list = g_new (char *, n_strings + 1);
(*list)[n_strings] = NULL;
}
@@ -192,22 +192,22 @@ _gdk_x11_display_text_property_to_utf8_list (GdkDisplay *display,
int format,
const guchar *text,
int length,
- gchar ***list)
+ char ***list)
{
if (g_str_equal (encoding, "STRING"))
{
- return make_list ((gchar *)text, length, TRUE, list);
+ return make_list ((char *)text, length, TRUE, list);
}
else if (g_str_equal (encoding, "UTF8_STRING"))
{
- return make_list ((gchar *)text, length, FALSE, list);
+ return make_list ((char *)text, length, FALSE, list);
}
else
{
- gchar **local_list;
+ char **local_list;
int local_count;
int i;
- const gchar *charset = NULL;
+ const char *charset = NULL;
gboolean need_conversion = !g_get_charset (&charset);
int count = 0;
GError *error = NULL;
@@ -221,7 +221,7 @@ _gdk_x11_display_text_property_to_utf8_list (GdkDisplay *display,
length,
&local_list);
if (list)
- *list = g_new (gchar *, local_count + 1);
+ *list = g_new (char *, local_count + 1);
for (i=0; i<local_count; i++)
{
@@ -229,7 +229,7 @@ _gdk_x11_display_text_property_to_utf8_list (GdkDisplay *display,
*/
if (need_conversion)
{
- gchar *utf = g_convert (local_list[i], -1,
+ char *utf = g_convert (local_list[i], -1,
"UTF-8", charset,
NULL, NULL, &error);
if (utf)
@@ -348,8 +348,8 @@ gdk_x11_display_utf8_to_compound_text (GdkDisplay *display,
int *length)
{
gboolean need_conversion;
- const gchar *charset;
- gchar *locale_str, *tmp_str;
+ const char *charset;
+ char *locale_str, *tmp_str;
GError *error = NULL;
gboolean result;
diff --git a/gdk/x11/gdksurface-x11.c b/gdk/x11/gdksurface-x11.c
index ec0c6d582a..261b123940 100644
--- a/gdk/x11/gdksurface-x11.c
+++ b/gdk/x11/gdksurface-x11.c
@@ -103,7 +103,7 @@ static void gdk_x11_surface_apply_fullscreen_mode (GdkSurface *surface);
static gboolean gdk_surface_icon_name_set (GdkSurface *surface);
static void set_wm_name (GdkDisplay *display,
Window xwindow,
- const gchar *name);
+ const char *name);
static void move_to_current_desktop (GdkSurface *surface);
static void gdk_x11_toplevel_state_callback (GdkSurface *surface);
static gboolean gdk_x11_toplevel_event_callback (GdkSurface *surface,
@@ -652,7 +652,7 @@ set_wm_protocols (GdkSurface *surface)
XSetWMProtocols (GDK_DISPLAY_XDISPLAY (display), GDK_SURFACE_XID (surface), protocols, n);
}
-static const gchar *
+static const char *
get_default_title (void)
{
const char *title;
@@ -1799,7 +1799,7 @@ move_to_current_desktop (GdkSurface *surface)
static guint32
get_netwm_cardinal_property (GdkSurface *surface,
- const gchar *name)
+ const char *name)
{
GdkX11Screen *x11_screen = GDK_SURFACE_SCREEN (surface);
guint32 prop = 0;
@@ -2306,7 +2306,7 @@ gdk_surface_get_geometry_hints (GdkSurface *surface,
}
static gboolean
-utf8_is_latin1 (const gchar *str)
+utf8_is_latin1 (const char *str)
{
const char *p = str;
@@ -2330,9 +2330,9 @@ static void
set_text_property (GdkDisplay *display,
Window xwindow,
Atom property,
- const gchar *utf8_str)
+ const char *utf8_str)
{
- gchar *prop_text = NULL;
+ char *prop_text = NULL;
Atom prop_type;
int prop_length;
int prop_format;
@@ -2378,7 +2378,7 @@ set_text_property (GdkDisplay *display,
static void
set_wm_name (GdkDisplay *display,
Window xwindow,
- const gchar *name)
+ const char *name)
{
XChangeProperty (GDK_DISPLAY_XDISPLAY (display), xwindow,
gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_NAME"),
@@ -2392,7 +2392,7 @@ set_wm_name (GdkDisplay *display,
static void
gdk_x11_surface_set_title (GdkSurface *surface,
- const gchar *title)
+ const char *title)
{
GdkDisplay *display;
Display *xdisplay;
@@ -2424,7 +2424,7 @@ gdk_x11_surface_set_title (GdkSurface *surface,
static void
gdk_x11_surface_set_startup_id (GdkSurface *surface,
- const gchar *startup_id)
+ const char *startup_id)
{
GdkDisplay *display;
@@ -2846,8 +2846,8 @@ gdk_x11_surface_set_user_time (GdkSurface *surface,
*/
void
gdk_x11_surface_set_utf8_property (GdkSurface *surface,
- const gchar *name,
- const gchar *value)
+ const char *name,
+ const char *value)
{
GdkDisplay *display;
diff --git a/gdk/x11/gdktextlistconverter-x11.c b/gdk/x11/gdktextlistconverter-x11.c
index fdd4228ad2..c8f7a0276f 100644
--- a/gdk/x11/gdktextlistconverter-x11.c
+++ b/gdk/x11/gdktextlistconverter-x11.c
@@ -134,7 +134,7 @@ gdk_x11_utf8_to_string_target (const char *utf8_str,
{
int len = strlen (utf8_str);
GString *result = g_string_sized_new (len);
- const gchar *p = utf8_str;
+ const char *p = utf8_str;
while (*p)
{
@@ -200,7 +200,7 @@ gdk_x11_text_list_converter_encode (GdkX11TextListConverter *conv,
g_str_equal (conv->encoding, "TEXT"))
{
GConverterResult result;
- gchar *tmp, *latin1;
+ char *tmp, *latin1;
tmp = g_strndup (inbuf, inbuf_size);
latin1 = gdk_x11_utf8_to_string_target (tmp, TRUE);
diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c
index ecb9ea6b6f..6d18060a9e 100644
--- a/gdk/x11/gdkvisual-x11.c
+++ b/gdk/x11/gdkvisual-x11.c
@@ -198,7 +198,7 @@ _gdk_x11_screen_init_visuals (GdkX11Screen *x11_screen,
#ifdef G_ENABLE_DEBUG
if (GDK_DISPLAY_DEBUG_CHECK (GDK_SCREEN_DISPLAY (x11_screen), MISC))
{
- static const gchar *const visual_names[] =
+ static const char *const visual_names[] =
{
"static gray",
"grayscale",
diff --git a/gdk/x11/gdkx11display.h b/gdk/x11/gdkx11display.h
index 0eb84a8025..a84247fd00 100644
--- a/gdk/x11/gdkx11display.h
+++ b/gdk/x11/gdkx11display.h
@@ -81,17 +81,17 @@ GDK_AVAILABLE_IN_ALL
guint32 gdk_x11_display_get_user_time (GdkDisplay *display);
GDK_AVAILABLE_IN_ALL
-const gchar * gdk_x11_display_get_startup_notification_id (GdkDisplay *display);
+const char * gdk_x11_display_get_startup_notification_id (GdkDisplay *display);
GDK_AVAILABLE_IN_ALL
void gdk_x11_display_set_startup_notification_id (GdkDisplay *display,
- const gchar *startup_id);
+ const char *startup_id);
GDK_AVAILABLE_IN_ALL
void gdk_x11_display_set_program_class (GdkDisplay *display,
const char *program_class);
GDK_AVAILABLE_IN_ALL
void gdk_x11_display_set_cursor_theme (GdkDisplay *display,
- const gchar *theme,
+ const char *theme,
const int size);
GDK_AVAILABLE_IN_ALL
@@ -126,7 +126,7 @@ GDK_AVAILABLE_IN_ALL
void gdk_x11_display_error_trap_pop_ignored (GdkDisplay *display);
GDK_AVAILABLE_IN_ALL
-void gdk_x11_set_sm_client_id (const gchar *sm_client_id);
+void gdk_x11_set_sm_client_id (const char *sm_client_id);
G_END_DECLS
diff --git a/gdk/x11/gdkx11property.h b/gdk/x11/gdkx11property.h
index 5275c61214..905711cb76 100644
--- a/gdk/x11/gdkx11property.h
+++ b/gdk/x11/gdkx11property.h
@@ -38,9 +38,9 @@ G_BEGIN_DECLS
GDK_AVAILABLE_IN_ALL
Atom gdk_x11_get_xatom_by_name_for_display (GdkDisplay *display,
- const gchar *atom_name);
+ const char *atom_name);
GDK_AVAILABLE_IN_ALL
-const gchar * gdk_x11_get_xatom_name_for_display (GdkDisplay *display,
+const char * gdk_x11_get_xatom_name_for_display (GdkDisplay *display,
Atom xatom);
G_END_DECLS
diff --git a/gdk/x11/gdkx11selection.h b/gdk/x11/gdkx11selection.h
index 7fd9f73892..2b012e0685 100644
--- a/gdk/x11/gdkx11selection.h
+++ b/gdk/x11/gdkx11selection.h
@@ -42,9 +42,9 @@ int gdk_x11_display_text_property_to_text_list (GdkDisplay *display,
int format,
const guchar *text,
int length,
- gchar ***list);
+ char ***list);
GDK_AVAILABLE_IN_ALL
-void gdk_x11_free_text_list (gchar **list);
+void gdk_x11_free_text_list (char **list);
GDK_AVAILABLE_IN_ALL
int gdk_x11_display_string_to_compound_text (GdkDisplay *display,
const char *str,
diff --git a/gdk/x11/gdkx11surface.h b/gdk/x11/gdkx11surface.h
index f2be036d38..63b11ecf04 100644
--- a/gdk/x11/gdkx11surface.h
+++ b/gdk/x11/gdkx11surface.h
@@ -60,8 +60,8 @@ void gdk_x11_surface_set_user_time (GdkSurface *surface,
guint32 timestamp);
GDK_AVAILABLE_IN_ALL
void gdk_x11_surface_set_utf8_property (GdkSurface *surface,
- const gchar *name,
- const gchar *value);
+ const char *name,
+ const char *value);
GDK_AVAILABLE_IN_ALL
void gdk_x11_surface_set_theme_variant (GdkSurface *surface,
const char *variant);
diff --git a/gdk/x11/gdkxftdefaults.c b/gdk/x11/gdkxftdefaults.c
index 2d3709c97c..226bbcd985 100644
--- a/gdk/x11/gdkxftdefaults.c
+++ b/gdk/x11/gdkxftdefaults.c
@@ -57,7 +57,7 @@
static int
parse_boolean (char *v)
{
- gchar c0, c1;
+ char c0, c1;
c0 = *v;
if (g_ascii_isupper ((int)c0))
@@ -82,11 +82,11 @@ parse_boolean (char *v)
static gboolean
get_boolean_default (GdkX11Screen *x11_screen,
- const gchar *option,
+ const char *option,
gboolean *value)
{
Display *dpy = GDK_SCREEN_XDISPLAY (x11_screen);
- gchar *v;
+ char *v;
int i;
if (GDK_DISPLAY_DEBUG_CHECK (GDK_SCREEN_DISPLAY (x11_screen), DEFAULT_SETTINGS))
@@ -108,11 +108,11 @@ get_boolean_default (GdkX11Screen *x11_screen,
static gboolean
get_double_default (GdkX11Screen *x11_screen,
- const gchar *option,
+ const char *option,
gdouble *value)
{
Display *dpy = GDK_SCREEN_XDISPLAY (x11_screen);
- gchar *v, *e;
+ char *v, *e;
if (GDK_DISPLAY_DEBUG_CHECK (GDK_SCREEN_DISPLAY (x11_screen), DEFAULT_SETTINGS))
return FALSE;
@@ -135,11 +135,11 @@ get_double_default (GdkX11Screen *x11_screen,
static gboolean
get_integer_default (GdkX11Screen *x11_screen,
- const gchar *option,
+ const char *option,
int *value)
{
Display *dpy = GDK_SCREEN_XDISPLAY (x11_screen);
- gchar *v, *e;
+ char *v, *e;
if (GDK_DISPLAY_DEBUG_CHECK (GDK_SCREEN_DISPLAY (x11_screen), DEFAULT_SETTINGS))
return FALSE;
View Lorry Controller Status