[Pkg-bazaar-commits] ./bzr-gtk/unstable r131: Merge from integration branch.

[Szilveszter Farkas (Phanatic)]

------------------------------------------------------------
revno: 131
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: trunk
timestamp: Mon 2007-01-29 22:29:04 +0100
message:
  Merge from integration branch.
modified:
  olive/__init__.py
    ------------------------------------------------------------
    revno: 126.1.4
    committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
    branch nick: bzr-gtk
    timestamp: Mon 2007-01-29 22:27:40 +0100
    message:
      Set default drive letter (Fixed: #67924)
    modified:
      olive/__init__.py
-------------- next part --------------
=== modified file 'olive/__init__.py'
--- a/olive/__init__.py	2007-01-29 16:59:02 +0000
+++ b/olive/__init__.py	2007-01-29 21:27:40 +0000
@@ -157,6 +157,8 @@
         # Connect the signals to the handlers
         self.toplevel.signal_autoconnect(dic)
         
+        self._just_started = True
+        
         # Apply window size and position
         width = self.pref.get_preference('window_width', 'int')
         height = self.pref.get_preference('window_height', 'int')
@@ -189,6 +191,8 @@
 
         self.set_path(os.getcwd())
         self._load_right()
+        
+        self._just_started = False
 
     def set_path(self, path):
         self.path = path
@@ -878,8 +882,11 @@
         drives = self._harddisks()
         for drive in drives:
             self.combobox_drive.append_text(drive)
+        self.combobox_drive.set_active(drives.index(os.getcwd()[0:2]))
     
     def _refresh_drives(self, combobox):
+        if self._just_started:
+            return
         model = combobox.get_model()
         active = combobox.get_active()
         if active >= 0: