From dc88ab3621c7fdd4c562187ee584adf8975b866b Mon Sep 17 00:00:00 2001 From: Martin Wehner Date: Sat, 28 Jul 2007 02:20:18 +0000 Subject: Don't crash if the active group combobox entry is removed or the group 2007-07-28 Martin Wehner * src/file-manager/fm-properties-window.c: (changed_group_callback): Don't crash if the active group combobox entry is removed or the group information becomes unreadable. Fixes #355018. svn path=/trunk/; revision=13030 --- ChangeLog | 7 +++++++ src/file-manager/fm-properties-window.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7eb71bdcf..052857720 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-07-28 Martin Wehner + + * src/file-manager/fm-properties-window.c: + (changed_group_callback): Don't crash if the active group + combobox entry is removed or the group information becomes + unreadable. Fixes #355018. + 2007-07-24 Christian Persch * libnautilus-private/nautilus-bookmark.c: diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c index 1850c9264..aa4340cd1 100644 --- a/src/file-manager/fm-properties-window.c +++ b/src/file-manager/fm-properties-window.c @@ -1677,7 +1677,7 @@ changed_group_callback (GtkComboBox *combo_box, NautilusFile *file) group = gtk_combo_box_get_active_text (combo_box); cur_group = nautilus_file_get_group_name (file); - if (strcmp (group, cur_group) != 0) { + if (group != NULL && strcmp (group, cur_group) != 0) { /* Try to change file group. If this fails, complain to user. */ window = FM_PROPERTIES_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (combo_box), GTK_TYPE_WINDOW)); -- cgit v1.2.1