From eb1a28d870924de2dc45124990bed69350633aff Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Wed, 19 Oct 2005 15:32:05 +0000
Subject: [PATCH] * src/Sources.py: fix typo on gladeif call

svn: r5338
---
 gramps2/ChangeLog        |  3 +++
 gramps2/src/AddrEdit.py  | 18 +++++++++++-------
 gramps2/src/Sources.py   |  4 ++--
 gramps2/src/gramps.glade |  5 -----
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 1211810e5..5313a5876 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,6 @@
+2005-10-19  Don Allingham  <don@gramps-project.org>
+	* src/Sources.py: fix typo on gladeif call
+
 2005-10-19  Stefan Bjork  <skalman@acc.umu.se>
 	* src/po/sv.po: Updates.
 
diff --git a/gramps2/src/AddrEdit.py b/gramps2/src/AddrEdit.py
index b2c40d807..42360ec18 100644
--- a/gramps2/src/AddrEdit.py
+++ b/gramps2/src/AddrEdit.py
@@ -54,6 +54,8 @@ import Sources
 import DateEdit
 import Spell
 
+from WindowUtils import GladeIf
+
 #-------------------------------------------------------------------------
 #
 # AddressEditor class
@@ -87,6 +89,8 @@ class AddressEditor:
 
         # Get the important widgets from the glade description
         self.top = gtk.glade.XML(const.dialogFile, "addr_edit","gramps")
+        self.gladeif = GladeIf(self.top)
+        
         self.window = self.top.get_widget("addr_edit")
         self.addr_start = self.top.get_widget("address_start")
         self.street = self.top.get_widget("street")
@@ -139,13 +143,11 @@ class AddressEditor:
         self.date_check = DateEdit.DateEdit(
             self.addr_date_obj, self.addr_start, date_stat, self.window)
 
-        self.top.signal_autoconnect({
-            "on_switch_page" : self.on_switch_page,
-            "on_help_addr_clicked" : self.on_help_clicked,
-            "on_ok_addr_clicked" : self.ok_clicked,
-            "on_cancel_addr_clicked" : self.close,
-            "on_addr_edit_delete_event" : self.on_delete_event,
-            })
+        self.gladeif.connect('addr_edit','delete_event',self.on_delete_event)
+        self.gladeif.connect('button122','clicked',self.close)
+        self.gladeif.connect('button121','clicked',self.ok_clicked)
+        self.gladeif.connect('button129','clicked',self.on_help_clicked)
+        self.gladeif.connect('notebook2','switch_page',self.on_switch_page)
 
         if parent_window:
             self.window.set_transient_for(parent_window)
@@ -155,11 +157,13 @@ class AddressEditor:
     def on_delete_event(self,obj,b):
         self.close_child_windows()
         self.remove_itself_from_menu()
+        self.gladeif.close()
         gc.collect()
 
     def close(self,obj):
         self.close_child_windows()
         self.remove_itself_from_menu()
+        self.gladeif.close()
         self.window.destroy()
         gc.collect()
 
diff --git a/gramps2/src/Sources.py b/gramps2/src/Sources.py
index 6e3ad9b19..7f323788a 100644
--- a/gramps2/src/Sources.py
+++ b/gramps2/src/Sources.py
@@ -94,8 +94,8 @@ class SourceSelector:
         self.gladeif.connect('ok', 'clicked', self.src_ok_clicked)
         self.gladeif.connect('button145', 'clicked', self.on_help_clicked)
         self.gladeif.connect('add', 'clicked', self.add_src_clicked)
-        self.gladeif.clicked('edit', 'clicked', self.edit_src_clicked)
-        self.gladeif.clicked('delete', 'clicked', self.del_src_clicked)
+        self.gladeif.connect('edit', 'clicked', self.edit_src_clicked)
+        self.gladeif.connect('delete', 'clicked', self.del_src_clicked)
         
         self.slist = self.top.get_widget("slist")
         self.edit = self.top.get_widget('edit')
diff --git a/gramps2/src/gramps.glade b/gramps2/src/gramps.glade
index 302a111f4..c09082b4a 100644
--- a/gramps2/src/gramps.glade
+++ b/gramps2/src/gramps.glade
@@ -27235,7 +27235,6 @@ Very High</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="has_separator">False</property>
-  <signal name="delete_event" handler="on_addr_edit_delete_event" last_modification_time="Fri, 20 Feb 2004 01:16:24 GMT"/>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="vbox34">
@@ -27258,7 +27257,6 @@ Very High</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-6</property>
-	      <signal name="clicked" handler="on_cancel_addr_clicked" object="addr_edit" last_modification_time="Fri, 20 Feb 2004 01:16:51 GMT"/>
 	    </widget>
 	  </child>
 
@@ -27274,7 +27272,6 @@ Very High</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-5</property>
-	      <signal name="clicked" handler="on_ok_addr_clicked" last_modification_time="Fri, 20 Feb 2004 01:17:10 GMT"/>
 	    </widget>
 	  </child>
 
@@ -27288,7 +27285,6 @@ Very High</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-11</property>
-	      <signal name="clicked" handler="on_help_addr_clicked" last_modification_time="Tue, 18 Nov 2003 04:04:45 GMT"/>
 	    </widget>
 	  </child>
 	</widget>
@@ -27336,7 +27332,6 @@ Very High</property>
 	      <property name="tab_pos">GTK_POS_TOP</property>
 	      <property name="scrollable">False</property>
 	      <property name="enable_popup">False</property>
-	      <signal name="switch_page" handler="on_switch_page" last_modification_time="Wed, 12 Nov 2003 18:09:04 GMT"/>
 
 	      <child>
 		<widget class="GtkTable" id="table26">