summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@gnome.org>2011-12-13 17:58:41 -0600
committerFederico Mena Quintero <federico@gnome.org>2011-12-13 18:13:42 -0600
commit9868b796ec9d4761512d0a948bf0d6438be6702c (patch)
tree69fdd9a560262c52406a7bc3fd2dfdb2b50a15fe
parentebc2d0728553cded8dcb5f65d0075e2e7c9d277e (diff)
downloadnautilus-9868b796ec9d4761512d0a948bf0d6438be6702c.tar.gz
Don't use nested if()s when a single one will do
-rw-r--r--src/nautilus-properties-window.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index b715567d7..5d952fbd4 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -4969,11 +4969,10 @@ remove_pending (StartupData *startup_data,
eel_timed_wait_stop
(cancel_create_properties_window_callback, startup_data);
}
- if (cancel_destroy_handler) {
- if (startup_data->parent_widget)
- g_signal_handlers_disconnect_by_func (startup_data->parent_widget,
- G_CALLBACK (parent_widget_destroyed_callback),
- startup_data);
+ if (cancel_destroy_handler && startup_data->parent_widget) {
+ g_signal_handlers_disconnect_by_func (startup_data->parent_widget,
+ G_CALLBACK (parent_widget_destroyed_callback),
+ startup_data);
}
g_hash_table_remove (pending_lists, startup_data->pending_key);