summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2002-11-19 16:44:33 +0000
committerAlexander Larsson <alexl@src.gnome.org>2002-11-19 16:44:33 +0000
commit614740540cd3bd0400293d4ad01ba58a051e8551 (patch)
treec6c58dc9915913a2c08f1e9e558672a055de21da
parent8eb8a6dddc40e89e914b38b585a969294e8fecd3 (diff)
downloadnautilus-614740540cd3bd0400293d4ad01ba58a051e8551.tar.gz
Don't reference wrong notebook pages
2002-11-19 Alexander Larsson <alexl@redhat.com> * src/file-manager/fm-properties-window.c: (clear_bonobo_pages) Don't reference wrong notebook pages (properties_window_file_changed_callback) correct strcmp comparison
-rw-r--r--ChangeLog6
-rw-r--r--src/file-manager/fm-properties-window.c6
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e52009d3f..69bbd8a01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-19 Alexander Larsson <alexl@redhat.com>
+
+ * src/file-manager/fm-properties-window.c:
+ (clear_bonobo_pages) Don't reference wrong notebook pages
+ (properties_window_file_changed_callback) correct strcmp comparison
+
2002-11-19 Padraig O'Briain <padraig.obriain@sun.com>
* components/text/Makefile.am:
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index d6ac2f854..2e5ed5f07 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -635,7 +635,7 @@ clear_bonobo_pages (FMPropertiesWindow *window)
num_pages = gtk_notebook_get_n_pages
(GTK_NOTEBOOK (window->details->notebook));
-
+
for (i=0; i < num_pages; i++) {
page = gtk_notebook_get_nth_page
(GTK_NOTEBOOK (window->details->notebook), i);
@@ -643,6 +643,8 @@ clear_bonobo_pages (FMPropertiesWindow *window)
if (g_object_get_data (G_OBJECT (page), "is-bonobo-page")) {
gtk_notebook_remove_page
(GTK_NOTEBOOK (window->details->notebook), i);
+ num_pages--;
+ i--;
}
}
}
@@ -677,7 +679,7 @@ properties_window_file_changed_callback (FMPropertiesWindow *window, NautilusFil
new_mime_type = nautilus_file_get_mime_type
(window->details->target_file);
- if (strcmp (orig_mime_type, new_mime_type) == 0) {
+ if (strcmp (orig_mime_type, new_mime_type) != 0) {
refresh_bonobo_pages (window);
}