Fix profiler CFLAGS.

2002-04-20  Anders Carlsson  <andersca@gnu.org>

	* configure.in:
	Fix profiler CFLAGS.

	* libnautilus-private/nautilus-file-utilities.c:
	* libnautilus-private/nautilus-file-utilities.h:
	Remove time stamp and build message functions.
	* src/nautilus-profiler.c: (widget_set_busy_cursor),
	(dump_dialog_new):
	Remove deprecated functions.

	* src/nautilus-window-manage-views.c: (update_title):
	Remove time stamp in title.

	* src/nautilus-window-menus.c: (help_menu_about_nautilus_callback):
	Remove unused build_message variable.

	* src/nautilus-window.c: (nautilus_window_instance_init):
	Set initial title to "Nautilus". Fixes #74627.

12 files changed, 39 insertions, 102 deletions

diff --git a/ChangeLog b/ChangeLog
index 66d5a9dc1..779970efa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2002-04-20  Anders Carlsson  <andersca@gnu.org>
+
+	* configure.in:
+	Fix profiler CFLAGS.
+	
+	* libnautilus-private/nautilus-file-utilities.c:
+	* libnautilus-private/nautilus-file-utilities.h:
+	Remove time stamp and build message functions.
+	* src/nautilus-profiler.c: (widget_set_busy_cursor),
+	(dump_dialog_new):
+	Remove deprecated functions.
+	
+	* src/nautilus-window-manage-views.c: (update_title):
+	Remove time stamp in title.
+	
+	* src/nautilus-window-menus.c: (help_menu_about_nautilus_callback):
+	Remove unused build_message variable.
+	
+	* src/nautilus-window.c: (nautilus_window_instance_init):
+	Set initial title to "Nautilus". Fixes #74627.
+
 2002-04-19	Diego González  <diego@pemas.net>
 
 	* src/nautilus-window-menus.c (forget_history_if_confirmed):
diff --git a/configure.in b/configure.in
index 0434b67a0..9c5e5ac0e 100644
--- a/configure.in
+++ b/configure.in
@@ -84,8 +84,8 @@ AC_DEFINE(ENABLE_PROFILER))
 
 if test "x$ENABLE_PROFILER" = "x1"
 then
-	CFLAGS="-g -O -gdwarf-2 -finstrument-functions -D__NO_STRING_INLINES"
-	LDFLAGS="/gnome/GNOME2/lib/libprofiler.so -lpthread"
+	CFLAGS="-g -O -gdwarf-2 -finstrument-functions -D__NO_STRING_INLINES $CFLAGS"
+	LDFLAGS="/gnome/GNOME2/lib/libprofiler.so -lpthread $LDFLAGS"
 fi
 
 AC_SUBST(ENABLE_PROFILER)
diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c
index 357ddeca8..1efa0a190 100644
--- a/libnautilus-private/nautilus-file-utilities.c
+++ b/libnautilus-private/nautilus-file-utilities.c
@@ -241,26 +241,6 @@ nautilus_unique_temporary_file_name (void)
 	return file_name;
 }
 
-char *
-nautilus_get_build_time_stamp (void)
-{
-#ifdef EAZEL_BUILD_TIMESTAMP
-	return g_strdup (EAZEL_BUILD_TIMESTAMP);
-#else
-	return NULL;
-#endif
-}
-
-char *
-nautilus_get_build_message (void)
-{
-#ifdef NAUTILUS_BUILD_MESSAGE
-	return g_strdup (NAUTILUS_BUILD_MESSAGE);
-#else
-	return NULL;
-#endif
-}
-
 #if !defined (NAUTILUS_OMIT_SELF_CHECK)
 
 void
diff --git a/libnautilus-private/nautilus-file-utilities.h b/libnautilus-private/nautilus-file-utilities.h
index 669c42e0d..ecb03c30f 100644
--- a/libnautilus-private/nautilus-file-utilities.h
+++ b/libnautilus-private/nautilus-file-utilities.h
@@ -59,17 +59,6 @@ char *   nautilus_pixmap_file                        (const char *partial_path);
 /* Locate a file in either the uers directory or the datadir. */
 char *   nautilus_get_data_file_path                 (const char *partial_path);
 
-/* Returns the build time stamp the Nautilus binary.
- * This is useful to be able to tell builds apart.
- * A return value of NULL means unknown time stamp.
- */
-char *   nautilus_get_build_time_stamp               (void);
-
-/* Returns the "build message", which provides some information on build
- * context.  May return NULL.
- */
-char *   nautilus_get_build_message                  (void);
-
 /* Return an allocated file name that is guranteed to be unique. */
 char *   nautilus_unique_temporary_file_name         (void);
 char *   nautilus_find_file_in_gnome_path            (char       *file);
diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index 695299433..44a270536 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -547,7 +547,6 @@ help_menu_about_nautilus_callback (BonoboUIComponent *component,
 			           const char *verb)
 {
 	static GtkWidget *about = NULL;
-	char *build_message;
 	const char *authors[] = {
 		"Ali Abdin",
 		"Andy Hertzfeld",
@@ -583,18 +582,6 @@ help_menu_about_nautilus_callback (BonoboUIComponent *component,
 	const char *locale;
 
 	if (about == NULL) {
-		/* The time stamp overrides the build message, because
-		 * the time stamp should only be set on Tinderbox for
-		 * hourly builds.
-		 */
-		build_message = nautilus_get_build_time_stamp ();
-		if (build_message == NULL) {
-			build_message = nautilus_get_build_message ();
-			if (build_message == NULL) {
-				build_message = g_strdup ("");
-			}
-		}
-		
 		/* We could probably just put a translation in en_US
 		 * instead of doing this mess, but I got this working
 		 * and I don't feel like fiddling with it any more.
@@ -633,8 +620,6 @@ help_menu_about_nautilus_callback (BonoboUIComponent *component,
 					 NULL);
 		gtk_window_set_transient_for (GTK_WINDOW (about), GTK_WINDOW (user_data));
 		
-		g_free (build_message);
-
 		eel_add_weak_pointer (&about);
 	}
 	
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index cb3ab6ccf..5d70be9d5 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -181,6 +181,9 @@ nautilus_window_instance_init (NautilusWindow *window)
 	g_object_ref (G_OBJECT (window->details->tooltips));
 	gtk_object_sink (GTK_OBJECT (window->details->tooltips));
 
+	/* Set initial window title */
+	gtk_window_set_title (GTK_WINDOW (window), _("Nautilus"));
+
 	window->details->shell_ui = bonobo_ui_component_new ("Nautilus Shell");
 	bonobo_ui_component_set_container
 		(window->details->shell_ui,
diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c
index cb3ab6ccf..5d70be9d5 100644
--- a/src/nautilus-object-window.c
+++ b/src/nautilus-object-window.c
@@ -181,6 +181,9 @@ nautilus_window_instance_init (NautilusWindow *window)
 	g_object_ref (G_OBJECT (window->details->tooltips));
 	gtk_object_sink (GTK_OBJECT (window->details->tooltips));
 
+	/* Set initial window title */
+	gtk_window_set_title (GTK_WINDOW (window), _("Nautilus"));
+
 	window->details->shell_ui = bonobo_ui_component_new ("Nautilus Shell");
 	bonobo_ui_component_set_container
 		(window->details->shell_ui,
diff --git a/src/nautilus-profiler.c b/src/nautilus-profiler.c
index 3a242b1f4..852667437 100644
--- a/src/nautilus-profiler.c
+++ b/src/nautilus-profiler.c
@@ -93,7 +93,7 @@ widget_set_busy_cursor (GtkWidget *widget)
 
 	gdk_flush ();
 
-	gdk_cursor_destroy (cursor);
+	gdk_cursor_unref (cursor);
 }
 
 static void
@@ -200,7 +200,7 @@ dump_dialog_new (const char *title)
 	g_signal_connect (dump_dialog->window, "delete_event", 
 			  G_CALLBACK (window_delete_event), dump_dialog->window);
 
-	gtk_widget_set_usize (dump_dialog->window, 700, 700);
+	gtk_widget_set_size_request (dump_dialog->window, 700, 700);
 
 	main_box = gtk_vbox_new (FALSE, 0);
 	dump_dialog->scrolled_text = scrolled_text_new ();
diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c
index cb3ab6ccf..5d70be9d5 100644
--- a/src/nautilus-spatial-window.c
+++ b/src/nautilus-spatial-window.c
@@ -181,6 +181,9 @@ nautilus_window_instance_init (NautilusWindow *window)
 	g_object_ref (G_OBJECT (window->details->tooltips));
 	gtk_object_sink (GTK_OBJECT (window->details->tooltips));
 
+	/* Set initial window title */
+	gtk_window_set_title (GTK_WINDOW (window), _("Nautilus"));
+
 	window->details->shell_ui = bonobo_ui_component_new ("Nautilus Shell");
 	bonobo_ui_component_set_container
 		(window->details->shell_ui,
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index ec675085b..6f3b7d6aa 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -190,41 +190,6 @@ compute_title (NautilusWindow *window)
         return title;
 }
 
-/* window_set_title_with_time_stamp
- * 
- * Update the non-NautilusViewFrame objects that use the location's user-displayable
- * title in some way. Called when the location or title has changed.
- * @window: The NautilusWindow in question.
- * @title: The new user-displayable title.
- * 
- */
-static void
-window_set_title_with_time_stamp (NautilusWindow *window, const char *title)
-{
-        char *time_stamp;
-	char *title_with_time_stamp;
-	
-        g_return_if_fail (NAUTILUS_IS_WINDOW (window));
-        g_return_if_fail (title != NULL);
-
-	time_stamp = nautilus_get_build_time_stamp ();
-	
-	if (time_stamp != NULL) {
-		/* FIXME bugzilla.gnome.org 45037: The text Preview
-		 * Release is hardcoded here. Are all builds with
-		 * time stamps really best described as "preview
-		 * release"?.
-                 */
-		title_with_time_stamp = g_strdup_printf (_("Preview Release %s: %s"), time_stamp, title);
-		gtk_window_set_title (GTK_WINDOW (window), title_with_time_stamp);
-		g_free (title_with_time_stamp);
-	} else {
-		gtk_window_set_title (GTK_WINDOW (window), title);
-	}
-
-	g_free (time_stamp);
-}
-
 /* update_title:
  * 
  * Update the non-NautilusViewFrame objects that use the location's user-displayable
@@ -253,10 +218,10 @@ update_title (NautilusWindow *window)
         window->details->title = g_strdup (title);
 
         if (title[0] == '\0') {
-		window_set_title_with_time_stamp (window, _("Nautilus"));
+		gtk_window_set_title (GTK_WINDOW (window), _("Nautilus"));
         } else {
                 window_title = eel_str_middle_truncate (title, MAX_TITLE_LENGTH);
-		window_set_title_with_time_stamp (window, window_title);
+                gtk_window_set_title (GTK_WINDOW (window), window_title);
                 g_free (window_title);
         }
 
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index 695299433..44a270536 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -547,7 +547,6 @@ help_menu_about_nautilus_callback (BonoboUIComponent *component,
 			           const char *verb)
 {
 	static GtkWidget *about = NULL;
-	char *build_message;
 	const char *authors[] = {
 		"Ali Abdin",
 		"Andy Hertzfeld",
@@ -583,18 +582,6 @@ help_menu_about_nautilus_callback (BonoboUIComponent *component,
 	const char *locale;
 
 	if (about == NULL) {
-		/* The time stamp overrides the build message, because
-		 * the time stamp should only be set on Tinderbox for
-		 * hourly builds.
-		 */
-		build_message = nautilus_get_build_time_stamp ();
-		if (build_message == NULL) {
-			build_message = nautilus_get_build_message ();
-			if (build_message == NULL) {
-				build_message = g_strdup ("");
-			}
-		}
-		
 		/* We could probably just put a translation in en_US
 		 * instead of doing this mess, but I got this working
 		 * and I don't feel like fiddling with it any more.
@@ -633,8 +620,6 @@ help_menu_about_nautilus_callback (BonoboUIComponent *component,
 					 NULL);
 		gtk_window_set_transient_for (GTK_WINDOW (about), GTK_WINDOW (user_data));
 		
-		g_free (build_message);
-
 		eel_add_weak_pointer (&about);
 	}
 	
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index cb3ab6ccf..5d70be9d5 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -181,6 +181,9 @@ nautilus_window_instance_init (NautilusWindow *window)
 	g_object_ref (G_OBJECT (window->details->tooltips));
 	gtk_object_sink (GTK_OBJECT (window->details->tooltips));
 
+	/* Set initial window title */
+	gtk_window_set_title (GTK_WINDOW (window), _("Nautilus"));
+
 	window->details->shell_ui = bonobo_ui_component_new ("Nautilus Shell");
 	bonobo_ui_component_set_container
 		(window->details->shell_ui,