From 533f7c24e5490b5958165ce5815db495e0bd202c Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Wed, 29 Jan 2014 17:53:26 -0600
Subject: don't load the alarm icon until we need it, which in the case of the
 desktop greeter is never.

---
 src/menu.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/menu.cpp b/src/menu.cpp
index 44da7b7..4ed0a03 100644
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -51,9 +51,6 @@ protected:
         m_actions(actions),
         m_formatter(formatter)
     {
-        // preload the alarm icon from click
-        m_serialized_alarm_icon = create_alarm_icon();
-
         // initialize the menu
         create_gmenu();
         for (int i=0; i<NUM_SECTIONS; i++)
@@ -114,7 +111,13 @@ protected:
     std::shared_ptr<Formatter> m_formatter;
     GMenu* m_submenu = nullptr;
 
-    GVariant* get_serialized_alarm_icon() { return m_serialized_alarm_icon; }
+    GVariant* get_serialized_alarm_icon()
+    {
+        if (G_UNLIKELY(m_serialized_alarm_icon == nullptr))
+            m_serialized_alarm_icon = create_alarm_icon();
+
+        return m_serialized_alarm_icon;
+    }
 
 private:
 
-- 
cgit v1.2.3