Return a gboolean saying whether or not the shortcut changed. Use strcmp

	* e-shortcuts.c (shortcut_item_update): Return a gboolean saying
	whether or not the shortcut changed. Use strcmp rather than
	pointer comparisons to determine this.
	(update_shortcut_and_emit_signal): propagate the gboolean from
	shortcut_item_update (and only emit the signal if it's TRUE).
	(update_shortcuts_by_path): Only call make_dirty if something
	changed.
	(storage_set_new_folder_callback,
	storage_set_updated_folder_callback): Don't call make_dirty:
	update_shortcuts_by_path will have called it if necessary.

	* e-shell-view.c (updated_folder_cb): Don't call
	update_for_current_uri if the folder that was updated isn't the
	one being displayed.

svn path=/trunk/; revision=10912

1 files changed, 5 insertions, 0 deletions

diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 03906a20d3..c8385ebbc4 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -1122,6 +1122,7 @@ updated_folder_cb (EStorageSet *storage_set,
 {
 	EShellView *shell_view;
 	EShellViewPrivate *priv;
+	const char *view_path;
 
 	shell_view = E_SHELL_VIEW (data);
 	priv = shell_view->priv;
@@ -1134,6 +1135,10 @@ updated_folder_cb (EStorageSet *storage_set,
 	g_free (uri);
 #endif
 
+	view_path = get_storage_set_path_from_uri (priv->uri);
+	if (strcmp (path, view_path) != 0)
+		return;
+
 	/* Update the folder title bar and the window title bar */
 	update_for_current_uri (shell_view);
 }