summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Wehner <martin.wehner@gmail.com>2005-05-02 20:50:06 +0000
committerMartin Wehner <mwehner@src.gnome.org>2005-05-02 20:50:06 +0000
commitbd4ce86740db9652dc3afdb079fa51a5afea5203 (patch)
tree45d45f6126960347881bb7970a6234ad9d2d1904
parent091b6fcdd8e03797eee60711ba3c0fa330b11f27 (diff)
downloadnautilus-bd4ce86740db9652dc3afdb079fa51a5afea5203.tar.gz
Prevent nautilus from crashing on press of Ctrl+Space in an empty
2005-05-02 Martin Wehner <martin.wehner@gmail.com> * libnautilus-private/nautilus-icon-container.c: (keyboard_space): Prevent nautilus from crashing on press of Ctrl+Space in an empty directory. Fixes bug #302018. Patch from Vinay M R <vinay.mandyakoppal@wipro.com>
-rw-r--r--ChangeLog8
-rw-r--r--libnautilus-private/nautilus-icon-container.c4
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ef9ea3183..c7dc0f939 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-05-02 Martin Wehner <martin.wehner@gmail.com>
+
+ * libnautilus-private/nautilus-icon-container.c:
+ (keyboard_space): Prevent nautilus from crashing on press of
+ Ctrl+Space in an empty directory. Fixes bug #302018.
+
+ Patch from Vinay M R <vinay.mandyakoppal@wipro.com>
+
2005-05-02 Frederic Crozat <fcrozat@mandriva.com>
* libnautilus-private/nautilus-program-choosing.c:
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index 18dd7a1ad..9bdc55a19 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -2838,7 +2838,9 @@ keyboard_space (NautilusIconContainer *container,
leftmost_in_top_row,
NULL);
}
- set_keyboard_focus (container, icon);
+ if (icon != NULL) {
+ set_keyboard_focus (container, icon);
+ }
}
} else if ((event->state & GDK_SHIFT_MASK) != 0) {
activate_selected_items_alternate (container, NULL);