From c427a2b0f40838769d2ba32dc9816b44c05cf554 Mon Sep 17 00:00:00 2001
From: Alex Roitman <shura@gramps-project.org>
Date: Fri, 1 Apr 2005 05:09:59 +0000
Subject: [PATCH] * src/plugins/ScratchPad.py (ScratchPadWindow.__init__):
 Minor change.

svn: r4266
---
 ChangeLog                 |  2 ++
 src/plugins/ScratchPad.py | 13 ++-----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 06c858f6f..4917d2009 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
 	* src/SourceView.py (button_press): Proper selection on double-click.
 	* src/plugins/Check.py (check_for_broken_family_links): Typo.
 
+	* src/plugins/ScratchPad.py (ScratchPadWindow.__init__): Minor change.
+
 2005-03-31  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
 	* plugins/TestcaseGenerator.py: Added a dialog to specify what is to be generated
 	and a ProgressBar. Enhanced family tree generation and randomized names a little more.
diff --git a/src/plugins/ScratchPad.py b/src/plugins/ScratchPad.py
index c5c5f348d..bd714ee14 100644
--- a/src/plugins/ScratchPad.py
+++ b/src/plugins/ScratchPad.py
@@ -385,9 +385,7 @@ class ScratchPadListModel(gtk.ListStore):
                                object  # tooltip callback
                                )
 
-                               
 
-        
 #-------------------------------------------------------------------------
 #
 # ScratchPadListView class
@@ -548,8 +546,6 @@ class ScratchPadListView:
 
     def get_selection(self):
         return self._widget.get_selection()
-    
-    
         
 #-------------------------------------------------------------------------
 #
@@ -602,13 +598,11 @@ class ScratchPadWindow:
         
         self.object_list = ScratchPadListView(self.db,self.top.get_widget('objectlist'))
 
-        # This causes the window open to fail. I don't know why.
-        #if ScratchPadWindow.otree == None:
-        ScratchPadWindow.otree = ScratchPadListModel()
+        if not ScratchPadWindow.otree:
+            ScratchPadWindow.otree = ScratchPadListModel()
 
         self.object_list.set_model(ScratchPadWindow.otree)
         
-
         self.top.signal_autoconnect({
             "on_close_scratchpad" : self.on_close_scratchpad,
             "on_clear_clicked": self.on_clear_clicked,
@@ -692,7 +686,6 @@ def ScratchPad(database,person,callback,parent=None):
 #-------------------------------------------------------------------------
 from PluginMgr import register_tool
 
-
 register_tool(
     ScratchPad,
     _("Scratch Pad"),
@@ -700,5 +693,3 @@ register_tool(
     description=_("The Scratch Pad provides a temporary note pad to store "
                   "objects for easy reuse.")
     )
-
-