diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 4589252af..6f045146a 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,16 @@
+2006-12-22  Alex Roitman  <shura@phy.ucsf.edu>
+	* src/GrampsDb/_WriteGedcom.py (write_source_ref): Write PAGE as a
+	single line.
+	* src/Editors/_EditFamily.py (build_interface): Remove extra
+	show() call.
+	* src/Editors/_EditMedia.py (_local_init): Remove extra show() call.
+	* src/Editors/_EditEvent.py (_local_init): Remove extra show() call.
+	* src/Editors/_EditRepository.py (_local_init): Remove extra
+	show() call.
+	* src/Editors/_EditSecondary.py (_set_size): Remove extra show() call.
+	* src/Editors/_EditReference.py (_set_size): Remove extra show() call.
+	* src/Editors/_EditSource.py (_local_init): Remove extra show() call.
+
 2006-12-22  Don Allingham  <don@gramps-project.org>
 	* src/GrampsDb/_WriteXML.py: fix bookmark handling
 	* src/plugins/FindDupes.py (Merge.find_potentials): update internal
diff --git a/gramps2/src/Editors/_EditEvent.py b/gramps2/src/Editors/_EditEvent.py
index 59ae8cad4..41afc5508 100644
--- a/gramps2/src/Editors/_EditEvent.py
+++ b/gramps2/src/Editors/_EditEvent.py
@@ -100,7 +100,6 @@ class EditEvent(EditPrimary):
         width = Config.get(Config.EVENT_WIDTH)
         height = Config.get(Config.EVENT_HEIGHT)
         self.window.resize(width, height)
-        self.window.show()
 
     def _connect_signals(self):
         self.top.get_widget('button111').connect('clicked',self.close)
diff --git a/gramps2/src/Editors/_EditFamily.py b/gramps2/src/Editors/_EditFamily.py
index 34f1fc0a5..082aac458 100644
--- a/gramps2/src/Editors/_EditFamily.py
+++ b/gramps2/src/Editors/_EditFamily.py
@@ -468,7 +468,6 @@ class EditFamily(EditPrimary):
 
         self.mbox    = self.top.get_widget('mbox')
         self.fbox    = self.top.get_widget('fbox')
-        self.window.show()
 
     def _connect_signals(self):
         self.define_ok_button(self.top.get_widget('ok'), self.save)
diff --git a/gramps2/src/Editors/_EditMedia.py b/gramps2/src/Editors/_EditMedia.py
index 78632ff07..35c620e48 100644
--- a/gramps2/src/Editors/_EditMedia.py
+++ b/gramps2/src/Editors/_EditMedia.py
@@ -89,7 +89,6 @@ class EditMedia(EditPrimary):
         width = Config.get(Config.MEDIA_WIDTH)
         height = Config.get(Config.MEDIA_HEIGHT)
         self.window.resize(width, height)
-        self.window.show()
 
     def _connect_signals(self):
         self.define_cancel_button(self.glade.get_widget('button91'))
diff --git a/gramps2/src/Editors/_EditPlace.py b/gramps2/src/Editors/_EditPlace.py
index afa72b5e5..4bc024777 100644
--- a/gramps2/src/Editors/_EditPlace.py
+++ b/gramps2/src/Editors/_EditPlace.py
@@ -71,7 +71,6 @@ class EditPlace(EditPrimary):
         width = Config.get(Config.PLACE_WIDTH)
         height = Config.get(Config.PLACE_HEIGHT)
         self.window.resize(width, height)
-        self.window.show()
 
     def get_menu_title(self):
         if self.obj and self.obj.get_handle():
diff --git a/gramps2/src/Editors/_EditReference.py b/gramps2/src/Editors/_EditReference.py
index 6826a2959..9948c6f99 100644
--- a/gramps2/src/Editors/_EditReference.py
+++ b/gramps2/src/Editors/_EditReference.py
@@ -65,7 +65,6 @@ class EditReference(ManagedWindow.ManagedWindow):
             width = Config.get(self.WIDTH_KEY)
             height = Config.get(self.HEIGHT_KEY)
             self.window.resize(width, height)
-            self.window.show()
 
     def _local_init(self):
         """
diff --git a/gramps2/src/Editors/_EditRepository.py b/gramps2/src/Editors/_EditRepository.py
index 9c271e5d7..1b72f33dc 100644
--- a/gramps2/src/Editors/_EditRepository.py
+++ b/gramps2/src/Editors/_EditRepository.py
@@ -76,7 +76,6 @@ class EditRepository(EditPrimary):
         width = Config.get(Config.REPO_WIDTH)
         height = Config.get(Config.REPO_HEIGHT)
         self.window.resize(width, height)
-        self.window.show()
 
     def build_menu_names(self,source):
         return (_('Edit Repository'), self.get_menu_title())        
diff --git a/gramps2/src/Editors/_EditSecondary.py b/gramps2/src/Editors/_EditSecondary.py
index 51903eed9..12ae92319 100644
--- a/gramps2/src/Editors/_EditSecondary.py
+++ b/gramps2/src/Editors/_EditSecondary.py
@@ -55,7 +55,6 @@ class EditSecondary(ManagedWindow.ManagedWindow):
             width = Config.get(self.WIDTH_KEY)
             height = Config.get(self.HEIGHT_KEY)
             self.window.resize(width, height)
-            self.window.show()
 
     def _local_init(self):
         """
diff --git a/gramps2/src/Editors/_EditSource.py b/gramps2/src/Editors/_EditSource.py
index 36710a2d5..2bb29e5a2 100644
--- a/gramps2/src/Editors/_EditSource.py
+++ b/gramps2/src/Editors/_EditSource.py
@@ -83,7 +83,6 @@ class EditSource(EditPrimary):
         width = Config.get(Config.SOURCE_WIDTH)
         height = Config.get(Config.SOURCE_HEIGHT)
         self.window.resize(width, height)
-        self.window.show()
 
     def _connect_signals(self):
         self.define_ok_button(self.glade.get_widget('ok'),self.save)
diff --git a/gramps2/src/GrampsDb/_WriteGedcom.py b/gramps2/src/GrampsDb/_WriteGedcom.py
index 360af1da1..02217cd0c 100644
--- a/gramps2/src/GrampsDb/_WriteGedcom.py
+++ b/gramps2/src/GrampsDb/_WriteGedcom.py
@@ -1385,9 +1385,9 @@ class GedcomWriter(UpdateCallback):
             # Reference to the source
             self.writeln("%d SOUR @%s@" % (level,src.get_gramps_id()))
             if ref.get_page() != "":
-                self.write_long_text("PAGE",level+1,
-                                     self.cnvtxt(ref.get_page()))
-
+                page_text = self.cnvtxt(ref.get_page())
+                self.writeln('%d PAGE %s',
+                             (level+1,page_text))
             conf = ref.get_confidence_level()
             # Cap the maximum level
             conf = min(conf,RelLib.SourceRef.CONF_VERY_HIGH)