Merge lp:~parnold-x/wingpanel-indicator-session/shutdown-dialog-transient into lp:~wingpanel-devs/wingpanel-indicator-session/trunk

[Djax]

set the shutdown dialog transient to the panel to not show the wingpanel icon in plank

This branch set the shutdown dialog transient to the panel to not show the wingpanel in plank.

[Danielle Foré (danrabbit)]

review: Approve

=== modified file 'src/Indicator.vala'
--- src/Indicator.vala	2015-07-17 19:37:15 +0000
+++ src/Indicator.vala	2015-07-23 17:44:58 +0000
@@ -232,12 +232,16 @@
 		});
 
 		log_out.clicked.connect (() => {
-			new Session.Widgets.EndSessionDialog (Session.Widgets.EndSessionDialogType.LOGOUT);
+			var dialog = new Session.Widgets.EndSessionDialog (Session.Widgets.EndSessionDialogType.LOGOUT);
+			dialog.set_transient_for (indicator_icon.get_toplevel () as Gtk.Window);
+			dialog.show_all ();
 			close ();
 		});
 
 		shutdown.clicked.connect (() => {
-			new Session.Widgets.EndSessionDialog (Session.Widgets.EndSessionDialogType.RESTART);
+			var dialog = new Session.Widgets.EndSessionDialog (Session.Widgets.EndSessionDialogType.RESTART);
+			dialog.set_transient_for (indicator_icon.get_toplevel () as Gtk.Window);
+			dialog.show_all ();
 			close ();
 		});
 

=== modified file 'src/Widgets/EndSessionDialog.vala'
--- src/Widgets/EndSessionDialog.vala	2015-06-20 15:59:22 +0000
+++ src/Widgets/EndSessionDialog.vala	2015-07-23 17:44:58 +0000
@@ -133,8 +133,6 @@
 		var action_area = get_action_area ();
 		action_area.margin_right = 6;
 		action_area.margin_bottom = 6;
-
-		this.show_all ();
 	}
 }