Re: 2.2.3.1 patches for IRIX and HP-UX

[Alexander Larsson <alexl redhat com>]

On Sun, 13 Apr 2003, Albert Chin wrote:

> 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.

I checked in this, similar change:

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/nautilus/ChangeLog,v
retrieving revision 1.5780
diff -u -p -r1.5780 ChangeLog
--- ChangeLog	7 Apr 2003 15:29:10 -0000	1.5780
+++ ChangeLog	16 Apr 2003 08:29:55 -0000
@@ -1,3 +1,17 @@
+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.
+	   
 2003-04-07  Alexander Larsson  <alexl redhat com>
 
 	* src/file-manager/fm-directory-view.c (unschedule_timeout_display_of_pending_files) 
Index: components/emblem/Nautilus_View_emblem.server.in.in
===================================================================
RCS file: /cvs/gnome/nautilus/components/emblem/Nautilus_View_emblem.server.in.in,v
retrieving revision 1.1
diff -u -p -r1.1 Nautilus_View_emblem.server.in.in
--- components/emblem/Nautilus_View_emblem.server.in.in	4 Oct 2002 10:42:01 -0000	1.1
+++ components/emblem/Nautilus_View_emblem.server.in.in	16 Apr 2003 08:29:55 -0000
@@ -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">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 		<item value="IDL:Bonobo/Control:1.0"/>
Index: components/history/Nautilus_View_history.server.in.in
===================================================================
RCS file: /cvs/gnome/nautilus/components/history/Nautilus_View_history.server.in.in,v
retrieving revision 1.11
diff -u -p -r1.11 Nautilus_View_history.server.in.in
--- components/history/Nautilus_View_history.server.in.in	22 Jul 2002 15:52:40 -0000	1.11
+++ components/history/Nautilus_View_history.server.in.in	16 Apr 2003 08:29:55 -0000
@@ -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">
 	<oaf_attribute name="repo_ids" type="stringv">
  		<item value="IDL:Bonobo/Unknown:1.0"/>
 		<item value="IDL:Bonobo/Control:1.0"/>
Index: components/image_properties/Nautilus_View_image_properties.server.in.in
===================================================================
RCS file: /cvs/gnome/nautilus/components/image_properties/Nautilus_View_image_properties.server.in.in,v
retrieving revision 1.2
diff -u -p -r1.2 Nautilus_View_image_properties.server.in.in
--- components/image_properties/Nautilus_View_image_properties.server.in.in	8 Feb 2003 23:59:17 -0000	1.2
+++ components/image_properties/Nautilus_View_image_properties.server.in.in	16 Apr 2003 08:29:55 -0000
@@ -1,7 +1,7 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:Nautilus_Image_Properties_View" 
-	type="shlib" location="@BONOBODIR@/libnautilus-image-properties-view.so">
+	type="shlib" location="@BONOBODIR@/libnautilus-image-properties-view">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 		<item value="IDL:Bonobo/Control:1.0"/>
Index: components/notes/Nautilus_View_notes.server.in.in
===================================================================
RCS file: /cvs/gnome/nautilus/components/notes/Nautilus_View_notes.server.in.in,v
retrieving revision 1.15
diff -u -p -r1.15 Nautilus_View_notes.server.in.in
--- components/notes/Nautilus_View_notes.server.in.in	8 Feb 2003 23:59:17 -0000	1.15
+++ components/notes/Nautilus_View_notes.server.in.in	16 Apr 2003 08:29:55 -0000
@@ -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">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 		<item value="IDL:Bonobo/Control:1.0"/>
Index: components/tree/Nautilus_View_tree.server.in.in
===================================================================
RCS file: /cvs/gnome/nautilus/components/tree/Nautilus_View_tree.server.in.in,v
retrieving revision 1.5
diff -u -p -r1.5 Nautilus_View_tree.server.in.in
--- components/tree/Nautilus_View_tree.server.in.in	16 Jul 2002 22:17:47 -0000	1.5
+++ components/tree/Nautilus_View_tree.server.in.in	16 Apr 2003 08:29:55 -0000
@@ -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">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/Unknown:1.0"/>
 		<item value="IDL:Bonobo/Control:1.0"/>
Index: src/nautilus-main.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-main.c,v
retrieving revision 1.131
diff -u -p -r1.131 nautilus-main.c
--- src/nautilus-main.c	14 Mar 2003 15:34:55 -0000	1.131
+++ src/nautilus-main.c	16 Apr 2003 08:29:55 -0000
@@ -141,24 +141,35 @@ 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 ();
Index: src/nautilus-server-connect.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-server-connect.c,v
retrieving revision 1.5
diff -u -p -r1.5 nautilus-server-connect.c
--- src/nautilus-server-connect.c	20 Feb 2003 14:13:22 -0000	1.5
+++ src/nautilus-server-connect.c	16 Apr 2003 08:29:55 -0000
@@ -122,7 +122,9 @@ gnome_vfs_make_directory_with_parents (c
 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)
 

-- 
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 Alexander Larsson                                            Red Hat, Inc 
                   alexl redhat com    alla lysator liu se 
He's an uncontrollable one-eyed barbarian on the wrong side of the law. She's 
a warm-hearted mute barmaid with a flame-thrower. They fight crime!