[nautilus/freedesktop-dbus] properties-window: parent_widget and startup_id are not mutual

[Cosimo Cecchi <cosimoc src gnome org>]

commit 6e02005986b78879f4d3e23342c90accfa241745
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Wed Dec 14 12:23:56 2011 +0100

    properties-window: parent_widget and startup_id are not mutual
    
    Even though we don't (yet) use the same code path when building a
    properties window for a parent widget and for a startup_id (i.e. there's
    no call that sets both), there's no reason to make them mutually
    exclusive in code when creating the window.

 src/nautilus-properties-window.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index 5267f3e..204b6ed 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -4779,11 +4779,14 @@ create_properties_window (StartupData *startup_data)
 
 	gtk_window_set_wmclass (GTK_WINDOW (window), "file_properties", "Nautilus");
 
-	if (startup_data->parent_widget)
+	if (startup_data->parent_widget) {
 		gtk_window_set_screen (GTK_WINDOW (window),
 				       gtk_widget_get_screen (startup_data->parent_widget));
-	else if (startup_data->startup_id)
+	}
+
+	if (startup_data->startup_id) {
 		gtk_window_set_startup_id (GTK_WINDOW (window), startup_data->startup_id);
+	}
 
 	gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_DIALOG);