2.2.3.1 patches for IRIX and HP-UX

[Albert Chin <nautilus-list lists thewrittenword com>]

1. src/nautilus-server-connect.c
   src/nautilus-main.c
   Cannot initialize array to a non-constant value in C89.
2. components/history/Nautilus_View_history.server.in.in
   components/notes/Nautilus_View_notes.server.in.in
   components/tree/Nautilus_View_tree.server.in.in
   components/emblem/Nautilus_View_emblem.server.in.in
   Shared library extension on HP-UX is '.sl'. Rather than
   hard-coding the extension name, just load the libtool library.

-- 
albert chin (china thewrittenword com)

-- snip snip
--- src/nautilus-server-connect.c.orig	2003-04-12 09:51:21.000000000 -0500
+++ src/nautilus-server-connect.c	2003-04-12 09:51:36.000000000 -0500
@@ -122,7 +122,9 @@
 static void
 browse (char *uri)
 {
-	char *argv[3] = {"nautilus", uri, NULL};
+	char *argv[3] = {"nautilus", NULL, NULL};
+
+	argv[1] = uri;
 
 	D (("browse (%s)", uri));
 	if (gnome_execute_async (g_get_home_dir (), 2, argv) < 0)
--- src/nautilus-main.c.orig	Sat Apr 12 12:52:37 2003
+++ src/nautilus-main.c	Sat Apr 12 13:02:33 2003
@@ -144,21 +144,36 @@
 
 	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 }
 	};
+
+#ifndef NAUTILUS_OMIT_SELF_CHECK
+	options[0].arg = &perform_self_check;
+	options[1].arg = &geometry;
+	options[2].arg = &no_default_window;
+	options[3].arg = &no_desktop;
+	options[4].arg = &kill_shell;
+	options[5].arg = &restart_shell;
+#else
+	options[0].arg = &geometry;
+	options[1].arg = &no_default_window;
+	options[2].arg = &no_desktop;
+	options[3].arg = &kill_shell;
+	options[4].arg = &restart_shell;
+#endif
 
 	if (g_getenv ("NAUTILUS_DEBUG") != NULL) {
 		eel_make_warnings_and_criticals_stop_in_debugger ();
--- components/history/Nautilus_View_history.server.in.in.orig	Fri Apr 11 18:05:43 2003
+++ components/history/Nautilus_View_history.server.in.in	Fri Apr 11 18:05:47 2003
@@ -1,7 +1,7 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:Nautilus_History_View"
-	type="shlib" location="@BONOBODIR@/libnautilus-history-view.so">
+	type="shlib" location="@BONOBODIR@/libnautilus-history-view.la">
 	<oaf_attribute name="repo_ids" type="stringv">
  		<item value="IDL:Bonobo/Unknown:1.0"/>
 		<item value="IDL:Bonobo/Control:1.0"/>
--- components/notes/Nautilus_View_notes.server.in.in.orig	Sat Apr 12 13:38:40 2003
+++ components/notes/Nautilus_View_notes.server.in.in	Sat Apr 12 13:38:44 2003
@@ -1,7 +1,7 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:Nautilus_Notes_View"
-	type="shlib" location="@BONOBODIR@/libnautilus-notes-view.so">
+	type="shlib" location="@BONOBODIR@/libnautilus-notes-view.la">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 		<item value="IDL:Bonobo/Control:1.0"/>
--- components/tree/Nautilus_View_tree.server.in.in.orig	Fri Apr 11 18:10:28 2003
+++ components/tree/Nautilus_View_tree.server.in.in	Fri Apr 11 18:10:32 2003
@@ -1,7 +1,7 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:Nautilus_Tree_View"
-	type="shlib" location="@BONOBODIR@/libnautilus-tree-view.so">
+	type="shlib" location="@BONOBODIR@/libnautilus-tree-view.la">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 		<item value="IDL:Bonobo/Control:1.0"/>
--- components/emblem/Nautilus_View_emblem.server.in.in.orig	Sat Apr 12 13:35:23 2003
+++ components/emblem/Nautilus_View_emblem.server.in.in	Sat Apr 12 13:35:28 2003
@@ -1,7 +1,7 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:Nautilus_Emblem_View"
-	type="shlib" location="@BONOBODIR@/libnautilus-emblem-view.so">
+	type="shlib" location="@BONOBODIR@/libnautilus-emblem-view.la">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 		<item value="IDL:Bonobo/Control:1.0"/>