Say "Close" instead of "Done".

	* src/nautilus-bookmarks-window.c: (create_bookmarks_window):
	Say "Close" instead of "Done".

	* src/nautilus-property-browser.c:
	(nautilus_property_browser_init): Say "Close" instead of "Done".

	* src/nautilus-sidebar-title.c: (nautilus_sidebar_title_init): Use
	g_signal_connect_object instead of g_signal_connect_swapped.  This
	will probably fix the theme-switching problem people have been
	complaining about.

	* src/nautilus-preferences-dialog.c: Tweak formatting.
	* src/file-manager/fm-properties-window.c: Tweak formatting.

	* src/nautilus-application.c: Fix bug # in a comment.

7 files changed, 69 insertions, 78 deletions

diff --git a/ChangeLog b/ChangeLog
index cf87bc3ec..bf29c8cb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
 2002-03-06  Darin Adler  <darin@bentspoon.com>
 
+	* src/nautilus-bookmarks-window.c: (create_bookmarks_window):
+	Say "Close" instead of "Done".
+	
+	* src/nautilus-property-browser.c:
+	(nautilus_property_browser_init): Say "Close" instead of "Done".
+	
+	* src/nautilus-sidebar-title.c: (nautilus_sidebar_title_init): Use
+	g_signal_connect_object instead of g_signal_connect_swapped.  This
+	will probably fix the theme-switching problem people have been
+	complaining about.
+
+	* src/nautilus-preferences-dialog.c: Tweak formatting.
+	* src/file-manager/fm-properties-window.c: Tweak formatting.
+
+	* src/nautilus-application.c: Fix bug # in a comment.
+	
+2002-03-06  Darin Adler  <darin@bentspoon.com>
+
 	* components/tree/nautilus-tree-model.c: (update_monitoring): New
 	name for destroy_unneeded_children, which now starts monitoring
 	for nodes that need it as well as stopping monitoring and
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index dea142327..46cdcd2cb 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -307,29 +307,29 @@ fm_properties_window_drag_data_received (GtkWidget *widget, GdkDragContext *cont
 
 
 	if (!exactly_one) {
-		eel_show_error_dialog (
-				       _("You can't assign more than one custom icon at a time! "
-					 "Please drag just one image to set a custom icon."), 
-				       _("More Than One Image"),
-				       window);
+		eel_show_error_dialog
+			(_("You can't assign more than one custom icon at a time! "
+			   "Please drag just one image to set a custom icon."), 
+			 _("More Than One Image"),
+			 window);
 	} else {		
 		if (uri_is_local_image (uris[0])) {			
 			set_icon_callback (gnome_vfs_get_local_path_from_uri (uris[0]), 
 					   FM_PROPERTIES_WINDOW (window));
 		} else {	
 			if (eel_is_remote_uri (uris[0])) {
-				eel_show_error_dialog (
-						       _("The file that you dropped is not local.  "
-							 "You can only use local images as custom icons."), 
-						       _("Local Images Only"),
-						       window);
+				eel_show_error_dialog
+					(_("The file that you dropped is not local.  "
+					   "You can only use local images as custom icons."), 
+					 _("Local Images Only"),
+					 window);
 				
 			} else {
-				eel_show_error_dialog (
-						       _("The file that you dropped is not an image.  "
-							 "You can only use local images as custom icons."),
-						       _("Images Only"),
-						       window);
+				eel_show_error_dialog
+					(_("The file that you dropped is not an image.  "
+					   "You can only use local images as custom icons."),
+					 _("Images Only"),
+					 window);
 			}
 		}		
 	}
@@ -352,8 +352,8 @@ create_image_widget_for_file (NautilusFile *file)
 			   target_table, G_N_ELEMENTS (target_table),
 			   GDK_ACTION_COPY | GDK_ACTION_MOVE);
 
-	g_signal_connect(image, "drag_data_received",
-			 G_CALLBACK (fm_properties_window_drag_data_received), NULL);
+	g_signal_connect (image, "drag_data_received",
+			  G_CALLBACK (fm_properties_window_drag_data_received), NULL);
 
 
 	gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
@@ -373,8 +373,7 @@ create_image_widget_for_file (NautilusFile *file)
 				 image, G_CONNECT_SWAPPED);
 
 	/* Name changes can also change icon (since name is determined by MIME type) */
-	g_signal_connect_object (file,
-				 "changed",
+	g_signal_connect_object (file, "changed",
 				 G_CALLBACK (update_properties_window_icon),
 				 image, G_CONNECT_SWAPPED);
 	return image;
@@ -734,10 +733,8 @@ attach_value_field_internal (GtkTable *table,
 	}
 
 	/* Stash a copy of the file attribute name in this field for the callback's sake. */
-	g_object_set_data_full (G_OBJECT (value_field),
-				"file_attribute",
-				g_strdup (file_attribute_name),
-				g_free);
+	g_object_set_data_full (G_OBJECT (value_field), "file_attribute",
+				g_strdup (file_attribute_name), g_free);
 
 	/* Fill in the value. */
 	if (ellipsize_text) {
@@ -747,8 +744,7 @@ attach_value_field_internal (GtkTable *table,
 	}
 
 	/* Connect to signal to update value when file changes. */
-	g_signal_connect_object (file,
-				 "changed",
+	g_signal_connect_object (file, "changed",
 				 ellipsize_text
 				 ? G_CALLBACK (ellipsizing_value_field_update)
 				 : G_CALLBACK (value_field_update),
@@ -928,8 +924,7 @@ attach_group_menu (GtkTable *table,
 	synch_groups_menu (option_menu, file);
 
 	/* Connect to signal to update menu when file changes. */
-	g_signal_connect_object (file,
-				 "changed",
+	g_signal_connect_object (file, "changed",
 				 G_CALLBACK (synch_groups_menu),
 				 option_menu, G_CONNECT_SWAPPED);	
 }	
@@ -1075,8 +1070,7 @@ attach_owner_menu (GtkTable *table,
 	synch_user_menu (option_menu, file);
 
 	/* Connect to signal to update menu when file changes. */
-	g_signal_connect_object (file,
-				 "changed",
+	g_signal_connect_object (file, "changed",
 				 G_CALLBACK (synch_user_menu),
 				 option_menu, G_CONNECT_SWAPPED);	
 }
@@ -1703,10 +1697,8 @@ create_emblems_page (FMPropertiesWindow *window)
 	 * This must be done after the widget is realized, due to
 	 * an apparent bug in gtk_viewport_set_shadow_type.
 	 */
-	g_signal_connect (GTK_BIN (scroller)->child, 
-			  "realize", 
-			  G_CALLBACK (remove_default_viewport_shadow),
-			  NULL);
+	g_signal_connect (GTK_BIN (scroller)->child, "realize", 
+			  G_CALLBACK (remove_default_viewport_shadow), NULL);
 
 	gtk_notebook_append_page (window->details->notebook, 
 				  scroller, gtk_label_new (_("Emblems")));
@@ -1742,30 +1734,23 @@ create_emblems_page (FMPropertiesWindow *window)
 		g_object_unref (pixbuf);
 
 		/* Attach parameters and signal handler. */
-		g_object_set_data_full (G_OBJECT (button),
-					"nautilus_property_name",
-					emblem_name,
-					g_free);
+		g_object_set_data_full (G_OBJECT (button), "nautilus_property_name",
+					emblem_name, g_free);
 				     
 		nautilus_file_ref (file);
-		g_object_set_data_full (G_OBJECT (button),
-					"nautilus_file",
-					file,
-					(GtkDestroyNotify) nautilus_file_unref);
+		g_object_set_data_full (G_OBJECT (button), "nautilus_file",
+					file, (GtkDestroyNotify) nautilus_file_unref);
 		
-		g_signal_connect (button,
-				    "toggled",
-				    G_CALLBACK (property_button_toggled),
-				    NULL);
+		g_signal_connect (button, "toggled",
+				  G_CALLBACK (property_button_toggled), NULL);
 
 		/* Set initial state of button. */
 		property_button_update (GTK_TOGGLE_BUTTON (button));
 
 		/* Update button when file changes in future. */
-		g_signal_connect_object (file,
-					 "changed",
-					 G_CALLBACK (property_button_update),
-					 button, G_CONNECT_SWAPPED);
+		g_signal_connect_object (file, "changed",
+					 G_CALLBACK (property_button_update), button,
+					 G_CONNECT_SWAPPED);
 
 		gtk_container_add (GTK_CONTAINER (emblems_table), button);
 	}
@@ -1810,9 +1795,9 @@ update_permissions_check_button_state (GtkWidget *check_button, NautilusFile *fi
 	g_assert (nautilus_file_can_get_permissions (file));
 
 	toggled_signal_id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (check_button),
-						 		  "toggled_signal_id"));
+								"toggled_signal_id"));
 	permission = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (check_button),
-							   "permission"));
+							 "permission"));
 	g_assert (toggled_signal_id > 0);
 	g_assert (permission != 0);
 
@@ -2539,5 +2524,3 @@ remove_image_button_callback (GtkWidget *widget, FMPropertiesWindow *properties_
 	
 	gtk_widget_set_sensitive (widget, FALSE);
 }
-
-
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 22abdb1bd..d83d4d126 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -693,7 +693,7 @@ desktop_changed_callback (gpointer user_data)
  * presented is: ~/.nautilus/first-time-flag.
  *
  * Another alternative could be to use preferences to store this flag
- * However, there because of bug 1229 this is not yet possible.
+ * However, there because of bug 41229 this is not yet possible.
  *
  * Also, for debugging purposes, it is convenient to have just one file
  * to kill in order to test the startup druid:
diff --git a/src/nautilus-bookmarks-window.c b/src/nautilus-bookmarks-window.c
index fd5c5c424..68fe6f690 100644
--- a/src/nautilus-bookmarks-window.c
+++ b/src/nautilus-bookmarks-window.c
@@ -136,7 +136,7 @@ create_bookmarks_window (NautilusBookmarkList *list, GObject *undo_manager_sourc
 	bookmarks = list;
 
 	window = gtk_dialog_new_with_buttons (_("Bookmarks"), NULL, 0,
-					      _("Done"), GTK_RESPONSE_OK,
+					      GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
 					      NULL);
 	
 	set_up_close_accelerator (window);
diff --git a/src/nautilus-preferences-dialog.c b/src/nautilus-preferences-dialog.c
index a1d7bbf3f..b107ac197 100644
--- a/src/nautilus-preferences-dialog.c
+++ b/src/nautilus-preferences-dialog.c
@@ -427,14 +427,10 @@ preferences_dialog_create (void)
 
 	gtk_window_set_wmclass (GTK_WINDOW (dialog), "nautilus_preferences", "Nautilus");
 
-	g_signal_connect (dialog,
-			  "delete_event",
-			  G_CALLBACK (dialog_delete_event_callback),
-			  dialog);
-	g_signal_connect (dialog,
-			  "response",
-			  G_CALLBACK (dialog_button_response_callback),
-			  dialog);
+	g_signal_connect (dialog, "delete_event",
+			  G_CALLBACK (dialog_delete_event_callback), dialog);
+	g_signal_connect (dialog, "response",
+			  G_CALLBACK (dialog_button_response_callback), dialog);
 
 	return dialog;
 }
@@ -533,18 +529,14 @@ preferences_dialog_populate_themes_group (EelPreferencesGroup *group)
 						      "theme_changed",
 						      0);
 	/* Keep track of theme chooser changes */
-	g_signal_connect (child,
-			    "theme_changed",
-			    G_CALLBACK (theme_changed_callback),
-			    NULL);
+	g_signal_connect (child, "theme_changed",
+			  G_CALLBACK (theme_changed_callback), NULL);
 
 	/* Have the custom preferences item tell us when its time to update the displayed
 	 * with with the one stored in preferences
 	 */
-	g_signal_connect (item,
-			    "custom_update_displayed_value",
-			    G_CALLBACK (update_theme_selector_displayed_value_callback),
-			    child);
+	g_signal_connect (item, "custom_update_displayed_value",
+			  G_CALLBACK (update_theme_selector_displayed_value_callback), child);
 	update_theme_selector_displayed_value_callback (EEL_PREFERENCES_ITEM (item), child);
 }
 
diff --git a/src/nautilus-property-browser.c b/src/nautilus-property-browser.c
index 306b3f931..e88bb2537 100644
--- a/src/nautilus-property-browser.c
+++ b/src/nautilus-property-browser.c
@@ -350,7 +350,7 @@ nautilus_property_browser_init (GtkObject *object)
   	gtk_container_add (GTK_CONTAINER (temp_frame), property_browser->details->bottom_box);
   	
   	/* create the "done" button */
- 	temp_button = gtk_button_new_with_mnemonic (_("_Done"));
+ 	temp_button = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
 	eel_gtk_button_set_padding (GTK_BUTTON (temp_button), GNOME_PAD_SMALL);
 
 	gtk_widget_show(temp_button);
diff --git a/src/nautilus-sidebar-title.c b/src/nautilus-sidebar-title.c
index 663dbf3fe..a7d924847 100644
--- a/src/nautilus-sidebar-title.c
+++ b/src/nautilus-sidebar-title.c
@@ -165,12 +165,10 @@ nautilus_sidebar_title_init (NautilusSidebarTitle *sidebar_title)
 	sidebar_title->details = g_new0 (NautilusSidebarTitleDetails, 1);
 
 	/* Register to find out about icon theme changes */
-	g_signal_connect_swapped (nautilus_icon_factory_get (),
-				  "icons_changed",
-				  G_CALLBACK (update_icon),
-				  sidebar_title);
+	g_signal_connect_object (nautilus_icon_factory_get (), "icons_changed",
+				 G_CALLBACK (update_icon), G_OBJECT (sidebar_title), G_CONNECT_SWAPPED);
 	g_signal_connect (sidebar_title, "realize",
-			    G_CALLBACK (realize_callback), NULL);
+			  G_CALLBACK (realize_callback), NULL);
 
 	/* Create the icon */
 	sidebar_title->details->icon = gtk_image_new ();
@@ -448,7 +446,7 @@ update_icon (NautilusSidebarTitle *sidebar_title)
 	icon_name = get_property_from_component (sidebar_title, "icon_name");
 
 	pixbuf = NULL;
-	if (icon_name != NULL && strlen (icon_name) > 0) {
+	if (icon_name != NULL && icon_name[0] != '\0') {
 		pixbuf = nautilus_icon_factory_get_pixbuf_from_name (icon_name, NULL, NAUTILUS_ICON_SIZE_LARGE);
 	} else if (nautilus_icon_factory_is_icon_ready_for_file (sidebar_title->details->file)) {
 		pixbuf = nautilus_icon_factory_get_pixbuf_for_file (sidebar_title->details->file,