Rename old stop_monitoring_directory function.

	* components/tree/nautilus-tree-model.h:
	* components/tree/nautilus-tree-model.c:
	(stop_monitoring_directory_without_reporting): Rename old
	stop_monitoring_directory function.
	(stop_monitoring_directory): New function that handles changes
	caused by stopping monitoring.
	(destroy_children_by_function): New.
	(destroy_by_function): New.
	(should_show_file): New.
	(update_node): Call should_show_file instead of
	nautilus_file_is_gone to decide whether a given file should show
	up.
	(process_file_change): Ditto.
	(start_monitoring_directory): Pass through flags for whether to
	monitor invisible or backup files, rather than just TRUE, TRUE.
	(nautilus_tree_model_get_value): Use PANGO_STYLE_ITALIC instead of
	PANGO_STYLE_OBLIQUE. Both will fall back to the other if not
	available, but if we have both, we'd prefer italic.
	(stop_monitoring_directory_and_children): New.
	(stop_monitoring): New.
	(nautilus_tree_model_set_show_hidden_files): New.
	(nautilus_tree_model_set_show_backup_files): New.
	(file_is_not_directory): New.
	(nautilus_tree_model_set_show_only_directories): New.

	* components/tree/nautilus-tree-view.c:
	(update_filtering_from_preferences): Call functions to change
	settings on model rather than storing these settings here.
	(tree_activate_callback),
	(filtering_changed_callback): Call
	update_filtering_from_preferences to set filtering for the newly
	created tree.
	(nautilus_tree_view_instance_init): Don't call
	update_filtering_from_preferences here, because we don't have a
	tree model yet.

	* libnautilus-private/nautilus-theme.c: Formatting tweaks.
	* libnautilus/nautilus-view-standard-main.c: Formatting tweak.
	* src/nautilus-window-toolbars.c: Formatting tweaks, and remove
	some unnecessary localized strings.

	* src/nautilus-zoom-control.h: Remove extern "C" stuff. If we need
	this, we'll do G_BEGIN_DECLS, and it's silly to use it for private
	headers that are never going to be used from C++.

	* libnautilus-private/nautilus-bonobo-extensions.c:
	(nautilus_bonobo_activation_register_for_display): Temporarily
	re-disable per-display registration since it doesn't work at all
	on my machine. I'll turn it back on after talking to Michael
	Meeks.

1 files changed, 7 insertions, 8 deletions

diff --git a/libnautilus-private/nautilus-theme.c b/libnautilus-private/nautilus-theme.c
index 12f0fdb45..078233788 100644
--- a/libnautilus-private/nautilus-theme.c
+++ b/libnautilus-private/nautilus-theme.c
@@ -143,7 +143,7 @@ free_last_theme (void)
 /* Fetch data from the specified theme.  Cache the last theme file as a parsed xml document
  */
 char *
-nautilus_theme_get_theme_data_from_theme (const char *resource_name, const char *property_name, const char* theme_name)
+nautilus_theme_get_theme_data_from_theme (const char *resource_name, const char *property_name, const char *theme_name)
 {
 	char *temp_str;
 	char *theme_data;
@@ -172,9 +172,9 @@ nautilus_theme_get_theme_data_from_theme (const char *resource_name, const char
 	if (theme_document != NULL) {
 		/* fetch the resource node */			
 		resource_node = eel_xml_get_child_by_name (xmlDocGetRootElement (theme_document), resource_name);
-		if (resource_node) {
-			temp_str = xmlGetProp(resource_node, property_name);
-			if (temp_str) {
+		if (resource_node != NULL) {
+			temp_str = xmlGetProp (resource_node, property_name);
+			if (temp_str != NULL) {
 				theme_data = g_strdup (temp_str);
 				xmlFree (temp_str);
 			}
@@ -232,7 +232,7 @@ nautilus_theme_get_image_path_from_theme (const char *image_name, const char* th
 	image_path = nautilus_pixmap_file_may_be_local (temp_str);
 	
 	/* see if a theme-specific image exists; if so, return it */
-	if (image_path) {
+	if (image_path != NULL) {
 		g_free (temp_str);	
 		return image_path;
 	}
@@ -247,14 +247,13 @@ nautilus_theme_get_image_path_from_theme (const char *image_name, const char* th
 			g_free (temp_str);	
 			return image_path;
 		}
-	}		
+	}
 	g_free (temp_str);
 
 
 	/* we couldn't find a theme specific one, so look for a general image */
 	image_path = nautilus_pixmap_file (image_name);
-	
-	if (image_path) {
+	if (image_path != NULL) {
 		return image_path;
 	}