diff options
| author | Alexander Larsson <alexl@redhat.com> | 2003-04-16 08:31:37 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2003-04-16 08:31:37 +0000 |
| commit | 54e7a34dd61cc5df09174d5dfaf019c6601b4a8d (patch) | |
| tree | 00ed9cbef97c6b48f4860626a3cc098c7ebcf23f /src/nautilus-main.c | |
| parent | fb3fbedbfbd8c27d936b40b37dd92ab402919506 (diff) | |
| download | nautilus-54e7a34dd61cc5df09174d5dfaf019c6601b4a8d.tar.gz | |
Don't add .so to the server files. This makes it work on systems that
2003-04-16 Alexander Larsson <alexl@redhat.com>
* components/emblem/Nautilus_View_emblem.server.in.in:
* components/history/Nautilus_View_history.server.in.in:
* components/image_properties/Nautilus_View_image_properties.server.in.in:
* components/notes/Nautilus_View_notes.server.in.in:
* components/tree/Nautilus_View_tree.server.in.in:
Don't add .so to the server files. This makes it work on systems that
don't use .so as the library name.
* src/nautilus-main.c: (main):
* src/nautilus-server-connect.c: (browse):
Don't initialize array to a non-constant value.
Diffstat (limited to 'src/nautilus-main.c')
| -rw-r--r-- | src/nautilus-main.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/src/nautilus-main.c b/src/nautilus-main.c index 8895b1931..a752d9b61 100644 --- a/src/nautilus-main.c +++ b/src/nautilus-main.c @@ -141,25 +141,36 @@ main (int argc, char *argv[]) char **argv_copy; GnomeProgram *program; GValue context_as_value = { 0 }; + int i; struct poptOption options[] = { #ifndef NAUTILUS_OMIT_SELF_CHECK - { "check", 'c', POPT_ARG_NONE, &perform_self_check, 0, + { "check", 'c', POPT_ARG_NONE, NULL, 0, N_("Perform a quick set of self-check tests."), NULL }, #endif - { "geometry", 'g', POPT_ARG_STRING, &geometry, 0, + { "geometry", 'g', POPT_ARG_STRING, NULL, 0, N_("Create the initial window with the given geometry."), N_("GEOMETRY") }, - { "no-default-window", 'n', POPT_ARG_NONE, &no_default_window, 0, + { "no-default-window", 'n', POPT_ARG_NONE, NULL, 0, N_("Only create windows for explicitly specified URIs."), NULL }, - { "no-desktop", '\0', POPT_ARG_NONE, &no_desktop, 0, + { "no-desktop", '\0', POPT_ARG_NONE, NULL, 0, N_("Do not manage the desktop (ignore the preference set in the preferences dialog)."), NULL }, - { "quit", 'q', POPT_ARG_NONE, &kill_shell, 0, + { "quit", 'q', POPT_ARG_NONE, NULL, 0, N_("Quit Nautilus."), NULL }, - { "restart", '\0', POPT_ARG_NONE | POPT_ARGFLAG_DOC_HIDDEN, &restart_shell, 0, + { "restart", '\0', POPT_ARG_NONE | POPT_ARGFLAG_DOC_HIDDEN, NULL, 0, N_("Restart Nautilus."), NULL }, { NULL, '\0', 0, NULL, 0, NULL, NULL } }; + i = 0; +#ifndef NAUTILUS_OMIT_SELF_CHECK + options[i++].arg = &perform_self_check; +#endif + options[i++].arg = &geometry; + options[i++].arg = &no_default_window; + options[i++].arg = &no_desktop; + options[i++].arg = &kill_shell; + options[i++].arg = &restart_shell; + if (g_getenv ("NAUTILUS_DEBUG") != NULL) { eel_make_warnings_and_criticals_stop_in_debugger (); } |