luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-09 19:06:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Retrieve cwd and environ in local GApplicationCommandLine

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=669689
This commit is contained in:
Jesse van den Kieboom 2012-02-08 17:13:34 +01:00
parent 90dbaca924
commit 1370804f2b
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
gio/gapplicationcommandline.c
View File

@ -139,9 +139,9 @@ struct _GApplicationCommandLinePrivate
{
GVariant *platform_data;
GVariant *arguments;
GVariant *cwd;
gchar *cwd;
const gchar **environ;
gchar **environ;
gint exit_status;
};
@ -162,14 +162,14 @@ grok_platform_data (GApplicationCommandLine *cmdline)
if (strcmp (key, "cwd") == 0)
{
if (!cmdline->priv->cwd)
cmdline->priv->cwd = g_variant_ref (value);
cmdline->priv->cwd = g_variant_dup_bytestring (value, NULL);
}
else if (strcmp (key, "environ") == 0)
{
if (!cmdline->priv->environ)
cmdline->priv->environ =
g_variant_get_bytestring_array (value, NULL);
g_variant_dup_bytestring_array (value, NULL);
}
}
@ -250,8 +250,9 @@ g_application_command_line_finalize (GObject *object)
g_variant_unref (cmdline->priv->platform_data);
if (cmdline->priv->arguments)
g_variant_unref (cmdline->priv->arguments);
if (cmdline->priv->cwd)
g_variant_unref (cmdline->priv->cwd);
g_free (cmdline->priv->cwd);
g_strfreev (cmdline->priv->environ);
G_OBJECT_CLASS (g_application_command_line_parent_class)
->finalize (object);
@ -266,6 +267,22 @@ g_application_command_line_init (GApplicationCommandLine *cmdline)
GApplicationCommandLinePrivate);
}
static void
g_application_command_line_constructed (GObject *object)
{
GApplicationCommandLine *cmdline = G_APPLICATION_COMMAND_LINE (object);
if (IS_REMOTE (cmdline))
return;
/* In the local case, set cmd and environ */
if (!cmdline->priv->cwd)
cmdline->priv->cwd = g_get_current_dir ();
if (!cmdline->priv->environ)
cmdline->priv->environ = g_get_environ ();
}
static void
g_application_command_line_class_init (GApplicationCommandLineClass *class)
{
@ -274,6 +291,8 @@ g_application_command_line_class_init (GApplicationCommandLineClass *class)
object_class->get_property = g_application_command_line_get_property;
object_class->set_property = g_application_command_line_set_property;
object_class->finalize = g_application_command_line_finalize;
object_class->constructed = g_application_command_line_constructed;
class->printerr_literal = g_application_command_line_real_printerr_literal;
class->print_literal = g_application_command_line_real_print_literal;
@ -358,10 +377,7 @@ g_application_command_line_get_arguments (GApplicationCommandLine *cmdline,
const gchar *
g_application_command_line_get_cwd (GApplicationCommandLine *cmdline)
{
if (cmdline->priv->cwd)
return g_variant_get_bytestring (cmdline->priv->cwd);
else
return NULL;
return cmdline->priv->cwd;
}
/**
@ -392,7 +408,7 @@ g_application_command_line_get_cwd (GApplicationCommandLine *cmdline)
const gchar * const *
g_application_command_line_get_environ (GApplicationCommandLine *cmdline)
{
return cmdline->priv->environ;
return (const gchar **)cmdline->priv->environ;
}
/**