[GTK] Fix error in setting active button

The comparison for system_state was incorrect and raised unhandled error when system_state was None.
cas-- · Sep 12, 2018 · 6e81305 · 6e81305
1 parent d9d378b
commit 6e81305
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/autoshutdown/data/config.glade b/autoshutdown/data/config.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glade-interface>
-  <!-- interface-requires gtk+ 2.16 -->
+  <!-- interface-requires gtk+ 2.24 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <widget class="GtkWindow" id="window1">
     <property name="can_focus">False</property>
@@ -26,6 +26,7 @@
                     <property name="receives_default">False</property>
                     <property name="border_width">10</property>
                     <property name="use_underline">True</property>
+                    <property name="active">True</property>
                     <property name="draw_indicator">True</property>
                     <property name="group">button_shutdown</property>
                   </widget>
@@ -43,7 +44,6 @@
                     <property name="receives_default">False</property>
                     <property name="border_width">10</property>
                     <property name="use_underline">True</property>
-                    <property name="active">True</property>
                     <property name="draw_indicator">True</property>
                   </widget>
                   <packing>

diff --git a/autoshutdown/gtkui.py b/autoshutdown/gtkui.py
@@ -82,10 +82,17 @@ def on_show_prefs(self):
     def cb_get_config(self, config):
         "callback for on show_prefs"
         log.debug("callback for on show_prefs")
-        self.glade.get_widget("button_shutdown").set_active("shutdown" in config["system_state"])
-        self.glade.get_widget("button_hibernate").set_active("hibernate" in config["system_state"])
-        self.glade.get_widget("button_suspend").set_active("suspend" in config["system_state"])
+
+        self.glade.get_widget("button_shutdown").set_active(
+            "shutdown" == config["system_state"])
+        self.glade.get_widget("button_hibernate").set_active(
+            "hibernate" == config["system_state"])
+        self.glade.get_widget("button_suspend").set_active(
+            "suspend" == config["system_state"])
         self.glade.get_widget("once_check").set_active(config["once"])
-        self.glade.get_widget("button_disable").set_active(not config["enabled"])
-        self.glade.get_widget("button_hibernate").set_sensitive(config["can_hibernate"])
-        self.glade.get_widget("button_suspend").set_sensitive(config["can_suspend"])
+        self.glade.get_widget("button_disable").set_active(
+            not config["enabled"] or not config["system_state"])
+        self.glade.get_widget("button_hibernate").set_sensitive(
+            config["can_hibernate"])
+        self.glade.get_widget("button_suspend").set_sensitive(
+            config["can_suspend"])