From 398338bda8fe793531c8aba50d3e54beaab0245c Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Mon, 25 Apr 2005 02:30:28 +0000
Subject: [PATCH] update

svn: r4421
---
 gramps2/NEWS               |  8 ++++++++
 gramps2/src/gramps_main.py | 17 +++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/gramps2/NEWS b/gramps2/NEWS
index 60c989a7a..e66e1128b 100644
--- a/gramps2/NEWS
+++ b/gramps2/NEWS
@@ -1,3 +1,11 @@
+Version 1.1.99 -- the "What... is your favourite colour?" release
+* Bug fixes
+* GEDCOM import fixes with parent/child relationships
+* Improved signaling interface to keep all displays in sync
+* Handle multiple selections in the Source View
+* Handle runtime errors from gnomevfs
+* translation improvements
+
 Version 1.1.95 -- the "When danger reared its ugly head, he bravely
                        turned his tail and fled" release
 * Explicit format selection in Save As, Open, and Import dialogs.
diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py
index bf7f9a520..f78d7c2fa 100755
--- a/gramps2/src/gramps_main.py
+++ b/gramps2/src/gramps_main.py
@@ -305,7 +305,7 @@ class Gramps(GrampsDBCallback.GrampsDBCallback):
         self.spouse_combo= self.gtop.get_widget("spouse_combo")
         self.spouse_tab  = self.gtop.get_widget("spouse_tab")
         self.undolabel   = self.gtop.get_widget('undolabel')
-        self.redolabel   = self.gtop.get_widget('redolabel')
+        #self.redolabel   = self.gtop.get_widget('redolabel')
         self.open_recent = self.gtop.get_widget('open_recent1')
 
         self.child_model = gtk.ListStore(
@@ -494,13 +494,14 @@ class Gramps(GrampsDBCallback.GrampsDBCallback):
         label.set_use_underline(1)
 
     def redo_callback(self,text):
-        self.redolabel.set_sensitive(bool(text))
-        label = self.redolabel.get_children()[0]
-        if text:
-            label.set_text(text)
-        else:
-            label.set_text(_("_Redo"))
-        label.set_use_underline(1)
+	return
+        #self.redolabel.set_sensitive(bool(text))
+        #label = self.redolabel.get_children()[0]
+        #if text:
+        #    label.set_text(text)
+        #else:
+        #    label.set_text(_("_Redo"))
+        #label.set_use_underline(1)
 
     def undo(self,*args):
         """