From 2f07a2d1f8e7d3fc14a1fd44681612ef9c3491d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Wed, 13 Sep 2017 00:03:57 +0300
Subject: [PATCH 1/2] Load only needed dialog objects from builder

Avoids "Handler %s not found" errors, fixes #31.
---
 gnomegmail.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gnomegmail.py b/gnomegmail.py
index d07b451..a340203 100755
--- a/gnomegmail.py
+++ b/gnomegmail.py
@@ -645,10 +645,12 @@ def getFromAddress(last_address, config, gladefile):
     if last_address and suppress_account_selection:
         return last_address
 
+    dlgid = "user_select_dialog"
+
     builder = Gtk.Builder()
-    builder.add_from_file(gladefile)
+    builder.add_objects_from_file(gladefile, (dlgid, ))
 
-    dlg = builder.get_object("user_select_dialog")
+    dlg = builder.get_object(dlgid)
 
     hdlr = Handler(last_address, dlg)
     builder.connect_signals(hdlr)
@@ -800,13 +802,15 @@ def do_preferred(glade_file, config):
         def onCancelClicked(self, button):
             Gtk.main_quit()
 
+    dlgid = "preferred_app_dialog"
+
     builder = Gtk.Builder()
-    builder.add_from_file(glade_file)
+    builder.add_objects_from_file(glade_file, (dlgid, ))
 
     hdlr = Handler()
     builder.connect_signals(hdlr)
 
-    response = builder.get_object("preferred_app_dialog").run()
+    response = builder.get_object(dlgid).run()
 
     preferred_setting = builder.get_object("check_dont_ask_again").get_active()
     config.set_bool('suppress_preferred', preferred_setting)
-- 
2.9.5