meld r1091 - trunk

[kaiw svn gnome org]

Author: kaiw
Date: Tue Dec  2 07:59:37 2008
New Revision: 1091
URL: http://svn.gnome.org/viewvc/meld?rev=1091&view=rev

Log:
Don't destroy HistoryFileEntry's file dialog, and note the bug # that requires us to manually show custom widgets

Modified:
   trunk/historyentry.py
   trunk/vcview.py

Modified: trunk/historyentry.py
==============================================================================
--- trunk/historyentry.py	(original)
+++ trunk/historyentry.py	Tue Dec  2 07:59:37 2008
@@ -344,13 +344,13 @@
         self.gtk_entry.set_text(locale_filename)
         self.gtk_entry.emit("changed")
         self.gtk_entry.activate()
-        filewidget.destroy()
+        filewidget.hide()
 
     def __browse_dialog_response(self, widget, response):
         if response == gtk.RESPONSE_ACCEPT:
             self.__browse_dialog_ok(widget)
         else:
-            widget.destroy()
+            widget.hide()
 
     def __setup_filter(self, filechooser, *args):
         filefilter = gtk.FileFilter()

Modified: trunk/vcview.py
==============================================================================
--- trunk/vcview.py	(original)
+++ trunk/vcview.py	Tue Dec  2 07:59:37 2008
@@ -197,7 +197,7 @@
         self.consolestream = ConsoleStream(self.consoleview)
         self.location = None
         self.treeview_column_location.set_visible(self.actiongroup.get_action("VcFlatten").get_active())
-        self.fileentry.show() #TODO: remove
+        self.fileentry.show() #TODO: remove once bug 97503 is fixed
         size = self.fileentry.size_request()[1]
         self.button_jump.set_size_request(size, size)
         self.button_jump.hide()