From a537c2b50f0bef9e8f0a89540fcba24bfbc9b6da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Mon, 29 Jan 2024 16:52:44 -0800
Subject: [PATCH] Session: Fix dialog, gresource suspend icon (#17)

---
 data/icons/system-suspend.svg     | 13 +++++++++++++
 data/quick-settings.gresource.xml |  1 +
 src/PopoverWidget.vala            |  5 +++++
 src/Widgets/EndSessionDialog.vala |  1 +
 4 files changed, 20 insertions(+)
 create mode 100644 data/icons/system-suspend.svg

diff --git a/data/icons/system-suspend.svg b/data/icons/system-suspend.svg
new file mode 100644
index 0000000..c9a260f
--- /dev/null
+++ b/data/icons/system-suspend.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="16"
+   width="16"
+   version="1.1"
+   id="svg228"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs232" /><path
+     id="path301"
+     style="fill:#555761;stroke-width:4;font-variation-settings:normal;opacity:1;vector-effect:none;fill-opacity:1;stroke:none;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
+     d="M 8 1 A 7 7 0 0 0 1 8 A 7 7 0 0 0 8 15 A 7 7 0 0 0 15 8 A 7 7 0 0 0 8 1 z M 8 3 A 5 5 0 0 1 12.896484 7 L 3.1113281 7 A 5 5 0 0 1 8 3 z M 3.1113281 9 L 12.888672 9 A 5 5 0 0 1 8 13 A 5 5 0 0 1 3.1113281 9 z " /></svg>
diff --git a/data/quick-settings.gresource.xml b/data/quick-settings.gresource.xml
index 7dc2368..8ed165f 100644
--- a/data/quick-settings.gresource.xml
+++ b/data/quick-settings.gresource.xml
@@ -7,6 +7,7 @@
 <gresources>
   <gresource prefix="org/elementary/wingpanel/icons">
     <file alias="scalable/status/dark-mode-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/dark-mode.svg</file>
+    <file alias="scalable/status/system-suspend-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/system-suspend.svg</file>
     <file alias="scalable/status/quick-settings-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/quick-settings.svg</file>
     <file alias="scalable/status/quick-settings-rotation-allowed-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/rotation-allowed.svg</file>
     <file alias="scalable/status/quick-settings-rotation-locked-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/rotation-locked.svg</file>
diff --git a/src/PopoverWidget.vala b/src/PopoverWidget.vala
index 7988721..11f9a47 100644
--- a/src/PopoverWidget.vala
+++ b/src/PopoverWidget.vala
@@ -243,6 +243,11 @@ public class QuickSettings.PopoverWidget : Gtk.Box {
                 keybinding_settings.get_strv ("screensaver"), _("Lock")
             );
         });
+
+        EndSessionDialogServer.init ();
+        EndSessionDialogServer.get_default ().show_dialog.connect (
+            (type, timestamp) => show_dialog ((EndSessionDialogType) type, timestamp)
+        );
     }
 
     private void update_navigation () {
diff --git a/src/Widgets/EndSessionDialog.vala b/src/Widgets/EndSessionDialog.vala
index 32f2ff9..52f6bf3 100644
--- a/src/Widgets/EndSessionDialog.vala
+++ b/src/Widgets/EndSessionDialog.vala
@@ -106,6 +106,7 @@ public class QuickSettings.EndSessionDialog : Hdy.Window {
         grid.attach (primary_label, 1, 0);
         grid.attach (secondary_label, 1, 1);
         grid.attach (action_area, 0, 2, 2, 1);
+        grid.show_all ();
 
         deletable = false;
         resizable = false;