diff options
| author | Alexander Larsson <alexl@redhat.com> | 2003-02-13 14:11:25 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2003-02-13 14:11:25 +0000 |
| commit | f604f8498a2becf7840a393e541a46e8480fb6ff (patch) | |
| tree | b5c6f05c7e0f223e3367e80fb62d1386edb9d2e7 | |
| parent | d3a466f60024ab004ca293966d4e35aaad93a57d (diff) | |
| download | nautilus-f604f8498a2becf7840a393e541a46e8480fb6ff.tar.gz | |
Set DISPLAY activation env variable to canonical display name, since that
2003-02-13 Alexander Larsson <alexl@redhat.com>
* src/nautilus-main.c (main):
Set DISPLAY activation env variable to canonical display name, since that is what
we register for. Without this, do *not* run e.g. "DISPLAY=:0 nautilus".
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/nautilus-main.c | 7 |
2 files changed, 12 insertions, 1 deletions
@@ -1,5 +1,11 @@ 2003-02-13 Alexander Larsson <alexl@redhat.com> + * src/nautilus-main.c (main): + Set DISPLAY activation env variable to canonical display name, since that is what + we register for. Without this, do *not* run e.g. "DISPLAY=:0 nautilus". + +2003-02-13 Alexander Larsson <alexl@redhat.com> + * src/nautilus-server-connect.c: Include locale.h. (#105756) diff --git a/src/nautilus-main.c b/src/nautilus-main.c index acda7d647..6c7194dc1 100644 --- a/src/nautilus-main.c +++ b/src/nautilus-main.c @@ -183,7 +183,12 @@ main (int argc, char *argv[]) GNOME_PARAM_POPT_TABLE, options, GNOME_PARAM_HUMAN_READABLE_NAME, _("Nautilus"), NULL); - + + /* Need to set this to the canonical DISPLAY value, since + thats where we're registering per-display components */ + bonobo_activation_set_activation_env_value ("DISPLAY", + gdk_display_get_name (gdk_display_get_default())); + g_object_get_property (G_OBJECT (program), GNOME_PARAM_POPT_CONTEXT, g_value_init (&context_as_value, G_TYPE_POINTER)); |