[nautilus] Minor whitespace cleanups
- From: Alexander Larsson <alexl src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [nautilus] Minor whitespace cleanups
- Date: Thu, 17 Dec 2009 12:09:46 +0000 (UTC)
commit aecc6b6abf1e1c313d2d4473902a2b9eb0e11827
Author: Alexander Larsson <alexl redhat com>
Date: Thu Dec 17 10:31:26 2009 +0100
Minor whitespace cleanups
src/nautilus-window.c | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 87a0e2c..b1cf33e 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -832,8 +832,7 @@ nautilus_window_set_active_pane (NautilusWindow *window,
g_assert (NAUTILUS_IS_WINDOW_PANE (new_pane));
if (new_pane->active_slot) {
nautilus_window_set_active_slot (window, new_pane->active_slot);
- }
- else if (new_pane != window->details->active_pane) {
+ } else if (new_pane != window->details->active_pane) {
real_set_active_pane (window, new_pane);
}
}
@@ -855,10 +854,9 @@ nautilus_window_set_active_slot (NautilusWindow *window, NautilusWindowSlot *new
g_assert (g_list_find (new_slot->pane->slots, new_slot) != NULL);
}
- if (NAUTILUS_IS_WINDOW_PANE (window->details->active_pane)) {
+ if (window->details->active_pane != NULL) {
old_slot = window->details->active_pane->active_slot;
- }
- else {
+ } else {
old_slot = NULL;
}
@@ -878,11 +876,11 @@ nautilus_window_set_active_slot (NautilusWindow *window, NautilusWindowSlot *new
}
/* deal with panes */
- if (new_slot && (new_slot->pane != new_slot->pane->window->details->active_pane)) {
+ if (new_slot &&
+ new_slot->pane != window->details->active_pane) {
real_set_active_pane (window, new_slot->pane);
}
-
window->details->active_pane->active_slot = new_slot;
/* make new slot active, if it exists */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]