diff options
author | Miguel de Icaza <miguel@gnome.org> | 2006-10-31 01:39:02 +0300 |
---|---|---|
committer | Miguel de Icaza <miguel@gnome.org> | 2006-10-31 01:39:02 +0300 |
commit | 3316ee66122870ad3d449a2246268b55b9464cf2 (patch) | |
tree | a4fd4b2b1de9649e1ba48b45190ed22936f9a254 /eglib | |
parent | 3e56ffa9165b898a7a74e6c17a675131aada5306 (diff) |
A few prototypes, a few hacks to keep researching the failures
svn path=/trunk/mono/; revision=67155
Diffstat (limited to 'eglib')
-rw-r--r-- | eglib/src/glib.h | 6 | ||||
-rw-r--r-- | eglib/src/gshell.c | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/eglib/src/glib.h b/eglib/src/glib.h index 28c345ed423..51393b3cbfa 100644 --- a/eglib/src/glib.h +++ b/eglib/src/glib.h @@ -173,6 +173,7 @@ typedef struct { void g_error_free (GError *error); GError *g_error_new (gpointer domain, gint code, const char *format, ...); void g_set_error (GError **err, gpointer domain, gint code, const gchar *format, ...); +void g_propagate_error (GError **dest, GError *src); /* * Strings utility @@ -190,8 +191,11 @@ gboolean g_str_has_prefix (const gchar *str, const gchar *prefix); gboolean g_str_has_suffix (const gchar *str, const gchar *suffix); guint g_strv_length (gchar **str_array); gchar *g_strjoin (const gchar *separator, ...); +gchar *g_strjoinv (const gchar *separator, gchar **str_array); gchar *g_strchug (gchar *str); gchar *g_strchomp (gchar *str); +void g_strdown (gchar *string); + gchar *g_strdelimit (gchar *string, const gchar *delimiters, gchar new_delimiter); gchar *g_strescape (const gchar *source, const gchar *exceptions); @@ -679,7 +683,7 @@ gboolean g_markup_parse_context_end_parse (GMarkupParseContext *context, /* * Character set conversion */ -gboolean g_get_charset (char **charset); +gboolean g_get_charset (G_CONST_RETURN char **charset); gchar *g_locale_to_utf8 (const gchar *opsysstring, gssize len, gsize *bytes_read, gsize *bytes_written, GError **error); diff --git a/eglib/src/gshell.c b/eglib/src/gshell.c index f7cbe404ce4..00c5ecac3b0 100644 --- a/eglib/src/gshell.c +++ b/eglib/src/gshell.c @@ -136,13 +136,15 @@ g_shell_parse_argv (const gchar *command_line, gint *argcp, gchar ***argvp, GErr gchar * g_shell_quote (const gchar *unquoted_string) { - g_error ("Not implemented"); - return NULL; + //g_error ("Not implemented"); + return g_strdup (unquoted_string); +// return NULL; } gchar * g_shell_unquote (const gchar *quoted_string, GError **error) { - g_error ("Not implemented"); - return NULL; +// g_error ("Not implemented"); + return g_strdup (quoted_string); +// return NULL; } |