Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset d5d83aaa82cc…

Parents b4f40f6011c7…

Parents c4fe5849059c…

by Yuki KODAMA

Changes to 2 files · Browse files at d5d83aaa82cc Showing diff from parent b4f40f6011c7 c4fe5849059c Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​backout.py Stacked
 
12
13
14
15
 
16
17
18
 
12
13
14
 
15
16
17
18
@@ -12,7 +12,7 @@
 from tortoisehg.util.i18n import _  from tortoisehg.util import hglib, i18n   -from tortoisehg.hgtk import csinfo, gdialog, textview +from tortoisehg.hgtk import csinfo, gdialog, textview, gtklib    keep = i18n.keepgettext()  
Change 1 of 2 Show Entire File tortoisehg/​hgtk/​gdialog.py Stacked
 
721
722
723
724
725
726
727
728
729
730
731
732
 
872
873
874
 
 
 
 
 
 
 
 
875
876
877
 
721
722
723
 
 
 
 
 
 
724
725
726
 
866
867
868
869
870
871
872
873
874
875
876
877
878
879
@@ -721,12 +721,6 @@
  name = self.get_setting_name()   if name:   self.settings = settings.Settings(name) - self.load_settings() - - # dialog size - defsize = self.get_defsize() - if defsize != (-1, -1): - self.set_default_size(*defsize)     # signal handler   self.connect('realize', self.realized) @@ -872,6 +866,14 @@
  gtklib.idle_add_single_call(self.destroy)   return   + # load persistent settings + self.load_settings() + + # dialog size + defsize = self.get_defsize() + if defsize != (-1, -1): + self.set_default_size(*defsize) +   # signal handler   self.connect('response', self.dialog_response)