reviewed by: <robey@eazel.com>

	User-Agent Changes for PR3

		"Trilobite/" --> "Trilobite/0.2.0"
		"Nautilus/1.0" (in the Mozilla User-Agent) --> "Nautilus/1.0PR3"

	* components/mozilla/nautilus-mozilla-content-view.c:
	(mozilla_content_view_one_time_happenings):
	* components/services/install/lib/eazel-install-protocols.c:
	(http_fetch_remote_file),
	(eazel_install_fetch_definitive_package_info):
	* components/services/install/lib/eazel-softcat.c:
	(eazel_softcat_get_info):
	* components/services/inventory/eazel-inventory-service.c:
	(impl_Trilobite_Eazel_Inventory_upload):
	* components/services/trilobite/libtrilobite/Makefile.am:
	* components/services/trilobite/libtrilobite/trilobite-core-network
	-slim.c: (trilobite_fetch_uri):
	* components/services/trilobite/libtrilobite/trilobite-core-network
	.c: (trilobite_open_uri):
	* components/services/trilobite/libtrilobite/trilobite-core-utils.c
	: (trilobite_get_useragent_string):
	* components/services/trilobite/libtrilobite/trilobite-core-utils.h
	:

9 files changed, 11 insertions, 12 deletions

diff --git a/components/mozilla/nautilus-mozilla-content-view.c b/components/mozilla/nautilus-mozilla-content-view.c
index 086715ecb..2b4fa4987 100644
--- a/components/mozilla/nautilus-mozilla-content-view.c
+++ b/components/mozilla/nautilus-mozilla-content-view.c
@@ -1544,7 +1544,7 @@ mozilla_content_view_one_time_happenings (void)
 	mozilla_preference_set_boolean ("security.checkloaduri", FALSE);
 
 	/* Change http protocol user agent to include the string 'Nautilus' */
-	mozilla_preference_set ("general.useragent.misc", "Nautilus/1.0");
+	mozilla_preference_set ("general.useragent.misc", "Nautilus/1.0PR3");
 
 	/* We dont want to use the proxy for localhost */
 	mozilla_preference_set ("network.proxy.no_proxies_on", "localhost");
diff --git a/components/services/install/lib/eazel-install-protocols.c b/components/services/install/lib/eazel-install-protocols.c
index a007bd85c..7e5d2698f 100644
--- a/components/services/install/lib/eazel-install-protocols.c
+++ b/components/services/install/lib/eazel-install-protocols.c
@@ -148,7 +148,7 @@ http_fetch_remote_file (EazelInstall *service,
         }
 
         ghttp_set_header (request, http_hdr_Connection, "close");
-        ghttp_set_header (request, http_hdr_User_Agent, trilobite_get_useragent_string (FALSE, NULL));
+        ghttp_set_header (request, http_hdr_User_Agent, trilobite_get_useragent_string (NULL));
         if (ghttp_prepare (request) != 0) {
                 g_warning (_("Could not prepare http request !"));
                 get_failed = 1;
@@ -720,7 +720,7 @@ eazel_install_fetch_definitive_package_info (EazelInstall *service, PackageData
 	}
 
 	trilobite_debug ("Search URL: %s", search_url);
-	trilobite_setenv ("GNOME_VFS_HTTP_USER_AGENT", trilobite_get_useragent_string (FALSE, NULL), TRUE);
+	trilobite_setenv ("GNOME_VFS_HTTP_USER_AGENT", trilobite_get_useragent_string (NULL), TRUE);
 
 	if (! trilobite_fetch_uri (search_url, &body, &length)) {
 		g_free (search_url);
diff --git a/components/services/install/lib/eazel-softcat.c b/components/services/install/lib/eazel-softcat.c
index f6974bd64..30d615d47 100644
--- a/components/services/install/lib/eazel-softcat.c
+++ b/components/services/install/lib/eazel-softcat.c
@@ -562,7 +562,7 @@ eazel_softcat_get_info (EazelSoftCat *softcat, PackageData *package, int sense_f
 	}
 	trilobite_debug ("package search url: %s", search_url);
 
-	trilobite_setenv ("GNOME_VFS_HTTP_USER_AGENT", trilobite_get_useragent_string (FALSE, NULL), TRUE);
+	trilobite_setenv ("GNOME_VFS_HTTP_USER_AGENT", trilobite_get_useragent_string (NULL), TRUE);
 
 	for (got_happy = FALSE, tries_left = softcat->private->retries;
 	     !got_happy && (tries_left > 0);
diff --git a/components/services/inventory/eazel-inventory-service.c b/components/services/inventory/eazel-inventory-service.c
index 6eb49f8c4..7c7f01f0c 100644
--- a/components/services/inventory/eazel-inventory-service.c
+++ b/components/services/inventory/eazel-inventory-service.c
@@ -258,7 +258,7 @@ impl_Trilobite_Eazel_Inventory_upload (impl_POA_Trilobite_Eazel_Inventory *servi
 	}
 
         ghttp_set_header (request, http_hdr_Connection, "close");
-        ghttp_set_header (request, http_hdr_User_Agent, trilobite_get_useragent_string (FALSE, NULL));
+        ghttp_set_header (request, http_hdr_User_Agent, trilobite_get_useragent_string (NULL));
         ghttp_set_header (request, http_hdr_Content_Type, "application/x-www-form-urlencoded");
 	g_print("about to read file\n");
 
diff --git a/components/services/trilobite/libtrilobite/Makefile.am b/components/services/trilobite/libtrilobite/Makefile.am
index d35ed24f1..8d32046a8 100644
--- a/components/services/trilobite/libtrilobite/Makefile.am
+++ b/components/services/trilobite/libtrilobite/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = \
 	-DPREFIX=\"$(prefix)\" 	\
 	-DG_LOG_DOMAIN=\"libtrilobite\"	\
 	-DSTANDALONE		\
-	-DTRILOBITE_VERSION=\"0.1.0\" \
+	-DTRILOBITE_VERSION=\"0.2.0\" \
 	-I$(srcdir)		\
 	-I.			\
 	-I$(top_srcdir)		\
diff --git a/components/services/trilobite/libtrilobite/trilobite-core-network-slim.c b/components/services/trilobite/libtrilobite/trilobite-core-network-slim.c
index ba5531023..e94a59579 100644
--- a/components/services/trilobite/libtrilobite/trilobite-core-network-slim.c
+++ b/components/services/trilobite/libtrilobite/trilobite-core-network-slim.c
@@ -108,7 +108,7 @@ trilobite_fetch_uri (const char *uri_text, char **body, int *length)
 
 	if (result) {
 		ghttp_set_header (request, http_hdr_Connection, "close");
-		ghttp_set_header (request, http_hdr_User_Agent, trilobite_get_useragent_string (FALSE, NULL));
+		ghttp_set_header (request, http_hdr_User_Agent, trilobite_get_useragent_string (NULL));
 	}
 
         if (result && (ghttp_prepare (request) != 0)) {
diff --git a/components/services/trilobite/libtrilobite/trilobite-core-network.c b/components/services/trilobite/libtrilobite/trilobite-core-network.c
index bf500e7fc..c2d7cc070 100644
--- a/components/services/trilobite/libtrilobite/trilobite-core-network.c
+++ b/components/services/trilobite/libtrilobite/trilobite-core-network.c
@@ -76,7 +76,7 @@ trilobite_open_uri (const char *uri_text)
 	GnomeVFSHandle *handle = NULL;
 
 	if (! gnome_vfs_initialized ()) {
-		setenv ("GNOME_VFS_HTTP_USER_AGENT", trilobite_get_useragent_string (FALSE, NULL), 1);
+		setenv ("GNOME_VFS_HTTP_USER_AGENT", trilobite_get_useragent_string (NULL), 1);
 
 		if (! gnome_vfs_init ()) {
 			g_warning ("cannot initialize gnome-vfs!");
diff --git a/components/services/trilobite/libtrilobite/trilobite-core-utils.c b/components/services/trilobite/libtrilobite/trilobite-core-utils.c
index db85fe09f..dd5537424 100644
--- a/components/services/trilobite/libtrilobite/trilobite-core-utils.c
+++ b/components/services/trilobite/libtrilobite/trilobite-core-utils.c
@@ -254,13 +254,13 @@ trilobite_main_quit (void)
 #endif /* TRILOBITE_SLIM */
 
 const char *
-trilobite_get_useragent_string (gboolean version, char *suffix)
+trilobite_get_useragent_string (char *suffix)
 {
 	static char *result = NULL;
 
 	g_free (result);
 	result = g_strdup_printf ("Trilobite/%s%s%s", 
-				  version ? "/" TRILOBITE_VERSION : suffix ? "/" : "" , 
+				  TRILOBITE_VERSION, 
 				  suffix ? "/" : "", 
 				  suffix ? suffix : "");
 	return result;
diff --git a/components/services/trilobite/libtrilobite/trilobite-core-utils.h b/components/services/trilobite/libtrilobite/trilobite-core-utils.h
index d2fb2137e..ad0a5098d 100644
--- a/components/services/trilobite/libtrilobite/trilobite-core-utils.h
+++ b/components/services/trilobite/libtrilobite/trilobite-core-utils.h
@@ -61,8 +61,7 @@ void trilobite_main (void);
 void trilobite_main_quit (void);
 #endif /* TRILOBITE_SLIM  */
 
-const char *trilobite_get_useragent_string (gboolean version, 
-					    char *suffix);
+const char *trilobite_get_useragent_string (char *suffix);
 const char *trilobite_get_config_dir_string (void);
 gboolean trilobite_setenv (const char *name, const char *value, gboolean overwrite);