/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to olive/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2008-10-28 15:11:19 UTC
  • mfrom: (580.3.2 menesis-dev)
  • Revision ID: jelmer@samba.org-20081028151119-e7jpfpg8qf721q59
Merge symlinks patch from Gediminas.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/__init__.py
133
133
            self.combobox_drive.show()
134
134
            self.gen_hard_selector()
135
135
        
136
 
        # Acceptable errors when loading files/folders in the treeviews
137
 
        self.acceptable_errors = (errno.ENOENT, errno.ELOOP)
138
 
        
139
136
        self.refresh_left()
140
137
 
141
138
        # Apply menu state
876
873
        
877
874
        self.pref.write()
878
875
        self.window.destroy()
879
 
    
 
876
 
880
877
    def get_selected_fileid(self):
881
878
        """ Get the file_id of the selected file. """
882
879
        treeselection = self.window.treeview_right.get_selection()
967
964
            for item in os.listdir(path):
968
965
                if not dotted_files and item[0] == '.':
969
966
                    continue
970
 
                if os.path.isdir(path + os.sep + item):
 
967
                if os.path.isdir(os.path.join(path, item)):
971
968
                    dirs.append(item)
972
969
                else:
973
970
                    files.append(item)
1003
1000
                    if not ignored_files and status == 'ignored':
1004
1001
                        continue
1005
1002
                
1006
 
                try:
1007
 
                    statinfo = os.stat(self.path + os.sep + item)
1008
 
                except OSError, e:
1009
 
                    if e.errno in self.acceptable_errors:
1010
 
                        continue
1011
 
                    else:
1012
 
                        raise
 
1003
                statinfo = os.lstat(os.path.join(self.path, item))
1013
1004
                liststore.append([ gtk.STOCK_DIRECTORY,
1014
1005
                                   True,
1015
1006
                                   item,
1031
1022
                    if not ignored_files and status == 'ignored':
1032
1023
                        continue
1033
1024
                
1034
 
                try:
1035
 
                    statinfo = os.stat(self.path + os.sep + item)
1036
 
                except OSError, e:
1037
 
                    if e.errno in self.acceptable_errors:
1038
 
                        continue
1039
 
                    else:
1040
 
                        raise
 
1025
                statinfo = os.lstat(os.path.join(self.path, item))
1041
1026
                liststore.append([gtk.STOCK_FILE,
1042
1027
                                  False,
1043
1028
                                  item,