From 4b602940e2c46d9f91acf91f67a6cd0b6ea05e13 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Tue, 28 Aug 2012 13:15:56 -0400 Subject: [PATCH] glib: don't quote quark names for G_DEFINE_QUARK --- glib/gbookmarkfile.c | 2 +- glib/gconvert.c | 2 +- glib/gfileutils.c | 2 +- glib/giochannel.c | 2 +- glib/gkeyfile.c | 2 +- glib/glib-unix.c | 2 +- glib/gmarkup.c | 2 +- glib/goption.c | 2 +- glib/gregex.c | 2 +- glib/gshell.c | 2 +- glib/gspawn-win32.c | 4 ++-- glib/gspawn.c | 4 ++-- glib/gthread.c | 2 +- glib/gvariant-parser.c | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/glib/gbookmarkfile.c b/glib/gbookmarkfile.c index 28eba21..2f50200 100644 --- a/glib/gbookmarkfile.c +++ b/glib/gbookmarkfile.c @@ -1585,7 +1585,7 @@ timestamp_from_iso8601 (const gchar *iso_date) return (time_t) stamp.tv_sec; } -G_DEFINE_QUARK ("g-bookmark-file-error-quark", g_bookmark_file_error) +G_DEFINE_QUARK (g-bookmark-file-error-quark, g_bookmark_file_error) /******************** * Public API * diff --git a/glib/gconvert.c b/glib/gconvert.c index 9f3bae3..bbc15bb 100644 --- a/glib/gconvert.c +++ b/glib/gconvert.c @@ -194,7 +194,7 @@ */ #define NUL_TERMINATOR_LENGTH 4 -G_DEFINE_QUARK ("g_convert_error", g_convert_error) +G_DEFINE_QUARK (g_convert_error, g_convert_error) static gboolean try_conversion (const char *to_codeset, diff --git a/glib/gfileutils.c b/glib/gfileutils.c index 0ac295c..b255a53 100644 --- a/glib/gfileutils.c +++ b/glib/gfileutils.c @@ -459,7 +459,7 @@ g_file_test (const gchar *filename, #endif } -G_DEFINE_QUARK ("g-file-error-quark", g_file_error) +G_DEFINE_QUARK (g-file-error-quark, g_file_error) /** * g_file_error_from_errno: diff --git a/glib/giochannel.c b/glib/giochannel.c index 8d19308..4cf205a 100644 --- a/glib/giochannel.c +++ b/glib/giochannel.c @@ -2581,4 +2581,4 @@ g_io_channel_write_unichar (GIOChannel *channel, * Error codes returned by #GIOChannel operations. **/ -G_DEFINE_QUARK ("g-io-channel-error-quark", g_io_channel_error) +G_DEFINE_QUARK (g-io-channel-error-quark, g_io_channel_error) diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c index 161370f..3fc965c 100644 --- a/glib/gkeyfile.c +++ b/glib/gkeyfile.c @@ -554,7 +554,7 @@ static void g_key_file_parse_data (GKeyFile static void g_key_file_flush_parse_buffer (GKeyFile *key_file, GError **error); -G_DEFINE_QUARK ("g-key-file-error-quark", g_key_file_error) +G_DEFINE_QUARK (g-key-file-error-quark, g_key_file_error) static void g_key_file_init (GKeyFile *key_file) diff --git a/glib/glib-unix.c b/glib/glib-unix.c index bf7e291..7d2f367 100644 --- a/glib/glib-unix.c +++ b/glib/glib-unix.c @@ -43,7 +43,7 @@ * "glib-unix.h" header. */ -G_DEFINE_QUARK ("g-unix-error-quark", g_unix_error) +G_DEFINE_QUARK (g-unix-error-quark, g_unix_error) static gboolean g_unix_set_error_from_errno (GError **error, diff --git a/glib/gmarkup.c b/glib/gmarkup.c index 8c7cf6c..6555545 100644 --- a/glib/gmarkup.c +++ b/glib/gmarkup.c @@ -83,7 +83,7 @@ * */ -G_DEFINE_QUARK ("g-markup-error-quark", g_markup_error) +G_DEFINE_QUARK (g-markup-error-quark, g_markup_error) typedef enum { diff --git a/glib/goption.c b/glib/goption.c index 1798288..fa8c951 100644 --- a/glib/goption.c +++ b/glib/goption.c @@ -272,7 +272,7 @@ _g_utf8_strwidth (const gchar *p) return len; } -G_DEFINE_QUARK ("g-option-context-error-quark", g_option_error) +G_DEFINE_QUARK (g-option-context-error-quark, g_option_error) /** * g_option_context_new: diff --git a/glib/gregex.c b/glib/gregex.c index 4df6d92..1ae8e0a 100644 --- a/glib/gregex.c +++ b/glib/gregex.c @@ -1229,7 +1229,7 @@ g_match_info_fetch_all (const GMatchInfo *match_info) /* GRegex */ -G_DEFINE_QUARK ("g-regex-error-quark", g_regex_error) +G_DEFINE_QUARK (g-regex-error-quark, g_regex_error) /** * g_regex_ref: diff --git a/glib/gshell.c b/glib/gshell.c index 509c444..32cb334 100644 --- a/glib/gshell.c +++ b/glib/gshell.c @@ -55,7 +55,7 @@ * * Error codes returned by shell functions. **/ -G_DEFINE_QUARK ("g-shell-error-quark", g_shell_error) +G_DEFINE_QUARK (g-shell-error-quark, g_shell_error) /* Single quotes preserve the literal string exactly. escape * sequences are not allowed; not even \' - if you want a ' diff --git a/glib/gspawn-win32.c b/glib/gspawn-win32.c index 5bf9126..40cb44a 100644 --- a/glib/gspawn-win32.c +++ b/glib/gspawn-win32.c @@ -206,8 +206,8 @@ protect_argv (gchar **argv, return argc; } -G_DEFINE_QUARK ("g-exec-error-quark", g_spawn_error) -G_DEFINE_QUARK ("g-spawn-exit-error-quark", g_spawn_exit_error) +G_DEFINE_QUARK (g-exec-error-quark, g_spawn_error) +G_DEFINE_QUARK (g-spawn-exit-error-quark, g_spawn_exit_error) gboolean g_spawn_async_utf8 (const gchar *working_directory, diff --git a/glib/gspawn.c b/glib/gspawn.c index aec0e18..14d1b4c 100644 --- a/glib/gspawn.c +++ b/glib/gspawn.c @@ -89,8 +89,8 @@ static gboolean fork_exec_with_pipes (gboolean intermediate_child, gint *standard_error, GError **error); -G_DEFINE_QUARK ("g-exec-error-quark", g_spawn_error) -G_DEFINE_QUARK ("g-spawn-exit-error-quark", g_spawn_exit_error) +G_DEFINE_QUARK (g-exec-error-quark, g_spawn_error) +G_DEFINE_QUARK (g-spawn-exit-error-quark, g_spawn_exit_error) /** * g_spawn_async: diff --git a/glib/gthread.c b/glib/gthread.c index d3533b2..ee87574 100644 --- a/glib/gthread.c +++ b/glib/gthread.c @@ -518,7 +518,7 @@ * * The error domain of the GLib thread subsystem. **/ -G_DEFINE_QUARK ("g_thread_error", g_thread_error) +G_DEFINE_QUARK (g_thread_error, g_thread_error) /* Local Data {{{1 -------------------------------------------------------- */ diff --git a/glib/gvariant-parser.c b/glib/gvariant-parser.c index 1277521..0662be3 100644 --- a/glib/gvariant-parser.c +++ b/glib/gvariant-parser.c @@ -71,7 +71,7 @@ * * Error codes returned by parsing text-format GVariants. **/ -G_DEFINE_QUARK ("g-variant-parse-error-quark", g_variant_parser_get_error) +G_DEFINE_QUARK (g-variant-parse-error-quark, g_variant_parser_get_error) typedef struct { -- 2.7.4