summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-10-08 19:48:58 +0200
committerhut <hut@lavabit.com>2010-10-08 19:48:58 +0200
commit1fb50effe36b4d051ecf2aa7891bd609d942f898 (patch)
tree8db54df7ee39fa8915193e2572bfa00966e1f88f
parent0ff9e377ec42c206631a3a14eb2b6beb6f7974d3 (diff)
downloadranger-1fb50effe36b4d051ecf2aa7891bd609d942f898.tar.gz
core.loader: fix bugs after merge
-rw-r--r--ranger/core/loader.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/ranger/core/loader.py b/ranger/core/loader.py
index 8272d0e0..42136011 100644
--- a/ranger/core/loader.py
+++ b/ranger/core/loader.py
@@ -17,7 +17,7 @@ from collections import deque
 from time import time, sleep
 from subprocess import Popen, PIPE
 from time import time
-from ranger.shared import FileManagerAware
+from ranger.core.shared import FileManagerAware
 import math
 import os
 import select
@@ -105,7 +105,6 @@ class Loader(FileManagerAware):
 		self.item = None
 		self.load_generator = None
 		self.throbber_status = 0
-		self.status_generator = status_generator()
 		self.rotate()
 		self.old_item = None
 
673e1e28bf221cef4'>dacf4030 ^
88663269 ^
1fad5eef ^

7cae95a9 ^
6d943605 ^
852936bf ^
6d943605 ^
01b2852b ^
6d943605 ^
88663269 ^
e45c1ce2 ^
5f128523 ^

56ce5577 ^



01b2852b ^
c8dd393c ^
793fcf5f ^

c8dd393c ^

56ce5577 ^
c8dd393c ^
75cbfa28 ^
88663269 ^
56ce5577 ^
01b2852b ^
75cbfa28 ^

88663269 ^
c2d49d81 ^

e53787f5 ^
4d1f4a66 ^


c2d49d81 ^
8abff870 ^
e53787f5 ^
201b2e6c ^
88663269 ^
6d943605 ^
01b2852b ^
5f128523 ^
fa3d7edc ^
7b8a2ff3 ^
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61