Issue CLIENT-241 Depends-On: Ie1b3277bb1c667ee99a1b203c2ff1094616ceaff Change-Id: If0fd1c74a19c488cb7853d69deae9f75bab43d41 Reviewed-on: http://gerrit.dmdirc.com/1923 Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com> Reviewed-by: Chris Smith <chris@dmdirc.com>tags/0.7rc1
|
|
||
23 |
|
23 |
|
24 |
|
24 |
|
25 |
|
25 |
|
26 |
|
|
|
|
26 |
|
|
27 |
|
27 |
|
28 |
|
28 |
|
29 |
|
29 |
|
30 |
|
|
|
31 |
|
|
|
32 |
|
30 |
|
33 |
|
|
|
|
31 |
|
|
34 |
|
32 |
|
35 |
|
33 |
|
36 |
|
34 |
|
37 |
|
|
|
38 |
|
35 |
|
39 |
|
36 |
|
40 |
|
37 |
|
41 |
|
|
|
42 |
|
|
|
43 |
|
|
|
44 |
|
|
|
45 |
|
|
|
46 |
|
|
|
47 |
|
|
|
48 |
|
38 |
|
49 |
|
39 |
|
50 |
|
40 |
|
|
|
||
23 |
|
23 |
|
24 |
|
24 |
|
25 |
|
25 |
|
26 |
|
|
|
|
26 |
|
|
27 |
|
27 |
|
28 |
|
28 |
|
29 |
|
29 |
|
30 |
|
30 |
|
31 |
|
31 |
|
32 |
|
32 |
|
33 |
|
|
|
|
33 |
|
|
34 |
|
34 |
|
35 |
|
35 |
|
36 |
|
36 |
|
|
|
||
46 |
|
46 |
|
47 |
|
47 |
|
48 |
|
48 |
|
49 |
|
|
|
|
49 |
|
|
50 |
|
50 |
|
51 |
|
51 |
|
52 |
|
52 |
|
|
|
||
61 |
|
61 |
|
62 |
|
62 |
|
63 |
|
63 |
|
64 |
|
|
|
|
64 |
|
|
65 |
|
65 |
|
66 |
|
66 |
|
67 |
|
67 |
|
|
|
||
23 |
|
23 |
|
24 |
|
24 |
|
25 |
|
25 |
|
26 |
|
|
|
|
26 |
|
|
27 |
|
27 |
|
28 |
|
28 |
|
29 |
|
29 |
|
|
|
||
36 |
|
36 |
|
37 |
|
37 |
|
38 |
|
38 |
|
39 |
|
|
|
|
39 |
|
|
40 |
|
40 |
|
41 |
|
41 |
|
42 |
|
42 |
|
|
|
||
26 |
|
26 |
|
27 |
|
27 |
|
28 |
|
28 |
|
29 |
|
|
|
|
29 |
|
|
30 |
|
30 |
|
31 |
|
31 |
|
32 |
|
32 |
|
|
|
||
36 |
|
36 |
|
37 |
|
37 |
|
38 |
|
38 |
|
39 |
|
|
|
|
39 |
|
|
40 |
|
40 |
|
41 |
|
41 |
|
42 |
|
42 |
|
|
|
||
23 |
|
23 |
|
24 |
|
24 |
|
25 |
|
25 |
|
26 |
|
|
|
|
26 |
|
|
27 |
|
27 |
|
28 |
|
28 |
|
29 |
|
29 |
|
|
|
||
34 |
|
34 |
|
35 |
|
35 |
|
36 |
|
36 |
|
37 |
|
|
|
|
37 |
|
|
38 |
|
38 |
|
39 |
|
39 |
|
40 |
|
40 |
|
|
|
||
24 |
|
24 |
|
25 |
|
25 |
|
26 |
|
26 |
|
27 |
|
|
|
|
27 |
|
|
28 |
|
28 |
|
29 |
|
29 |
|
30 |
|
30 |
|
31 |
|
31 |
|
32 |
|
|
|
|
32 |
|
|
33 |
|
33 |
|
34 |
|
34 |
|
35 |
|
35 |
|
|
|
||
33 |
|
33 |
|
34 |
|
34 |
|
35 |
|
35 |
|
36 |
|
|
|
|
36 |
|
|
37 |
|
37 |
|
38 |
|
38 |
|
39 |
|
39 |
|
|
|
||
47 |
|
47 |
|
48 |
|
48 |
|
49 |
|
49 |
|
50 |
|
|
|
|
50 |
|
|
51 |
|
51 |
|
52 |
|
52 |
|
53 |
|
53 |
|
|
|
||
34 |
|
34 |
|
35 |
|
35 |
|
36 |
|
36 |
|
37 |
|
|
|
|
37 |
|
|
38 |
|
38 |
|
39 |
|
39 |
|
40 |
|
40 |
|
|
|
||
42 |
|
42 |
|
43 |
|
43 |
|
44 |
|
44 |
|
45 |
|
|
|
|
45 |
|
|
46 |
|
46 |
|
47 |
|
47 |
|
48 |
|
48 |
|
|
|
||
38 |
|
38 |
|
39 |
|
39 |
|
40 |
|
40 |
|
41 |
|
|
|
|
41 |
|
|
42 |
|
42 |
|
43 |
|
43 |
|
44 |
|
44 |
|
|
|
||
50 |
|
50 |
|
51 |
|
51 |
|
52 |
|
52 |
|
53 |
|
|
|
54 |
|
53 |
|
55 |
|
|
|
|
54 |
|
|
|
55 |
|
|
56 |
|
56 |
|
57 |
|
57 |
|
58 |
|
58 |
|
59 |
|
|
|
60 |
|
59 |
|
61 |
|
60 |
|
62 |
|
|
|
63 |
|
61 |
|
64 |
|
62 |
|
65 |
|
63 |
|
66 |
|
|
|
67 |
|
64 |
|
68 |
|
65 |
|
69 |
|
|
|
70 |
|
66 |
|
71 |
|
67 |
|
72 |
|
|
|
73 |
|
68 |
|
74 |
|
69 |
|
75 |
|
70 |
|
76 |
|
|
|
77 |
|
|
|
78 |
|
|
|
79 |
|
|
|
80 |
|
|
|
81 |
|
71 |
|
82 |
|
72 |
|
83 |
|
73 |
|
|
|
||
36 |
|
36 |
|
37 |
|
37 |
|
38 |
|
38 |
|
39 |
|
|
|
40 |
|
|
|
41 |
|
39 |
|
42 |
|
40 |
|
43 |
|
41 |
|
44 |
|
42 |
|
45 |
|
|
|
46 |
|
|
|
47 |
|
|
|
48 |
|
|
|
49 |
|
|
|
50 |
|
|
|
51 |
|
|
|
52 |
|
43 |
|
53 |
|
44 |
|
54 |
|
45 |
|
|
|
||
45 |
|
45 |
|
46 |
|
46 |
|
47 |
|
47 |
|
48 |
|
|
|
|
48 |
|
|
49 |
|
49 |
|
50 |
|
50 |
|
51 |
|
51 |
|
|
|
||
75 |
|
75 |
|
76 |
|
76 |
|
77 |
|
77 |
|
78 |
|
|
|
|
78 |
|
|
79 |
|
79 |
|
80 |
|
80 |
|
81 |
|
81 |
|
|
|
||
26 |
|
26 |
|
27 |
|
27 |
|
28 |
|
28 |
|
29 |
|
|
|
|
29 |
|
|
30 |
|
30 |
|
31 |
|
31 |
|
32 |
|
32 |
|
|
|
||
41 |
|
41 |
|
42 |
|
42 |
|
43 |
|
43 |
|
44 |
|
|
|
|
44 |
|
|
45 |
|
45 |
|
46 |
|
46 |
|
47 |
|
47 |
|
|
|
||
25 |
|
25 |
|
26 |
|
26 |
|
27 |
|
27 |
|
28 |
|
|
|
|
28 |
|
|
29 |
|
29 |
|
30 |
|
30 |
|
31 |
|
31 |
|
|
|
||
34 |
|
34 |
|
35 |
|
35 |
|
36 |
|
36 |
|
37 |
|
|
|
|
37 |
|
|
38 |
|
38 |
|
39 |
|
39 |
|
40 |
|
40 |
|
|
|
||
24 |
|
24 |
|
25 |
|
25 |
|
26 |
|
26 |
|
27 |
|
|
|
|
27 |
|
|
28 |
|
28 |
|
29 |
|
29 |
|
30 |
|
30 |
|
|
|
||
35 |
|
35 |
|
36 |
|
36 |
|
37 |
|
37 |
|
38 |
|
|
|
|
38 |
|
|
39 |
|
39 |
|
40 |
|
40 |
|
41 |
|
41 |
|
|
|
||
24 |
|
24 |
|
25 |
|
25 |
|
26 |
|
26 |
|
27 |
|
|
|
|
27 |
|
|
28 |
|
28 |
|
29 |
|
29 |
|
30 |
|
30 |
|
|
|
||
38 |
|
38 |
|
39 |
|
39 |
|
40 |
|
40 |
|
41 |
|
|
|
|
41 |
|
|
42 |
|
42 |
|
43 |
|
43 |
|
44 |
|
44 |
|
|
|
||
30 |
|
30 |
|
31 |
|
31 |
|
32 |
|
32 |
|
33 |
|
|
|
|
33 |
|
|
34 |
|
34 |
|
35 |
|
35 |
|
36 |
|
36 |
|
|
|
||
45 |
|
45 |
|
46 |
|
46 |
|
47 |
|
47 |
|
48 |
|
|
|
|
48 |
|
|
49 |
|
49 |
|
50 |
|
50 |
|
51 |
|
51 |
|
|
|
||
27 |
|
27 |
|
28 |
|
28 |
|
29 |
|
29 |
|
30 |
|
|
|
|
30 |
|
|
31 |
|
31 |
|
32 |
|
32 |
|
33 |
|
33 |
|
|
|
||
39 |
|
39 |
|
40 |
|
40 |
|
41 |
|
41 |
|
42 |
|
|
|
|
42 |
|
|
43 |
|
43 |
|
44 |
|
44 |
|
45 |
|
45 |
|
|
|
||
40 |
|
40 |
|
41 |
|
41 |
|
42 |
|
42 |
|
43 |
|
|
|
|
43 |
|
|
44 |
|
44 |
|
45 |
|
45 |
|
46 |
|
46 |
|
|
|
||
55 |
|
55 |
|
56 |
|
56 |
|
57 |
|
57 |
|
58 |
|
|
|
|
58 |
|
|
59 |
|
59 |
|
60 |
|
60 |
|
61 |
|
61 |
|
|
|
||
31 |
|
31 |
|
32 |
|
32 |
|
33 |
|
33 |
|
34 |
|
|
|
|
34 |
|
|
35 |
|
35 |
|
36 |
|
36 |
|
37 |
|
37 |
|
|
|
||
43 |
|
43 |
|
44 |
|
44 |
|
45 |
|
45 |
|
46 |
|
|
|
|
46 |
|
|
47 |
|
47 |
|
48 |
|
48 |
|
49 |
|
49 |
|
|
|
||
32 |
|
32 |
|
33 |
|
33 |
|
34 |
|
34 |
|
|
35 |
|
|
35 |
|
36 |
|
36 |
|
37 |
|
37 |
|
38 |
|
|
|
||
44 |
|
45 |
|
45 |
|
46 |
|
46 |
|
47 |
|
47 |
|
|
|
48 |
|
|
|
49 |
|
48 |
|
50 |
|
|
|
|
49 |
|
|
51 |
|
50 |
|
52 |
|
51 |
|
53 |
|
52 |
|
54 |
|
|
|
55 |
|
53 |
|
56 |
|
54 |
|
57 |
|
|
|
58 |
|
55 |
|
59 |
|
56 |
|
60 |
|
|
|
61 |
|
57 |
|
62 |
|
58 |
|
63 |
|
59 |
|
64 |
|
|
|
65 |
|
|
|
66 |
|
|
|
67 |
|
|
|
68 |
|
|
|
69 |
|
|
|
70 |
|
|
|
71 |
|
60 |
|
72 |
|
61 |
|
73 |
|
62 |
|
|
|
||
318 |
|
307 |
|
319 |
|
308 |
|
320 |
|
309 |
|
321 |
|
|
|
|
310 |
|
|
|
||
34 |
|
34 |
|
35 |
|
35 |
|
36 |
|
36 |
|
37 |
|
|
|
|
37 |
|
|
38 |
|
38 |
|
39 |
|
39 |
|
40 |
|
40 |
|
|
|
||
42 |
|
42 |
|
43 |
|
43 |
|
44 |
|
44 |
|
45 |
|
|
|
|
45 |
|
|
46 |
|
46 |
|
47 |
|
47 |
|
48 |
|
48 |
|
|
|
||
27 |
|
27 |
|
28 |
|
28 |
|
29 |
|
29 |
|
30 |
|
|
|
|
30 |
|
|
31 |
|
31 |
|
32 |
|
32 |
|
33 |
|
33 |
|
|
|
||
37 |
|
37 |
|
38 |
|
38 |
|
39 |
|
39 |
|
40 |
|
|
|
|
40 |
|
|
41 |
|
41 |
|
42 |
|
42 |
|
43 |
|
43 |
|
|
|
||
75 |
|
75 |
|
76 |
|
76 |
|
77 |
|
77 |
|
78 |
|
|
|
|
78 |
|
|
|
79 |
|
|
79 |
|
80 |
|
80 |
|
81 |
|
81 |
|
82 |
|
|
|
||
32 |
|
32 |
|
33 |
|
33 |
|
34 |
|
34 |
|
35 |
|
|
|
|
35 |
|
|
36 |
|
36 |
|
37 |
|
37 |
|
38 |
|
38 |
|
|
|
||
42 |
|
42 |
|
43 |
|
43 |
|
44 |
|
44 |
|
45 |
|
|
|
|
45 |
|
|
46 |
|
46 |
|
47 |
|
47 |
|
48 |
|
48 |
|
|
|
||
25 |
|
25 |
|
26 |
|
26 |
|
27 |
|
27 |
|
28 |
|
|
|
|
28 |
|
|
29 |
|
29 |
|
30 |
|
30 |
|
31 |
|
31 |
|
32 |
|
32 |
|
33 |
|
33 |
|
34 |
|
|
|
|
34 |
|
|
35 |
|
35 |
|
36 |
|
36 |
|
37 |
|
37 |
|
|
|
||
30 |
|
30 |
|
31 |
|
31 |
|
32 |
|
32 |
|
33 |
|
|
|
|
33 |
|
|
34 |
|
34 |
|
35 |
|
35 |
|
36 |
|
36 |
|
|
|
||
42 |
|
42 |
|
43 |
|
43 |
|
44 |
|
44 |
|
45 |
|
|
|
|
45 |
|
|
46 |
|
46 |
|
47 |
|
47 |
|
48 |
|
48 |
|
|
|
||
23 |
|
23 |
|
24 |
|
24 |
|
25 |
|
25 |
|
26 |
|
|
|
|
26 |
|
|
27 |
|
27 |
|
28 |
|
28 |
|
29 |
|
29 |
|
|
|
||
32 |
|
32 |
|
33 |
|
33 |
|
34 |
|
34 |
|
35 |
|
|
|
|
35 |
|
|
36 |
|
36 |
|
37 |
|
37 |
|
38 |
|
38 |
|
|
|
||
40 |
|
40 |
|
41 |
|
41 |
|
42 |
|
42 |
|
43 |
|
|
|
|
43 |
|
|
44 |
|
44 |
|
45 |
|
45 |
|
46 |
|
46 |
|
|
|
||
54 |
|
54 |
|
55 |
|
55 |
|
56 |
|
56 |
|
57 |
|
|
|
|
57 |
|
|
58 |
|
58 |
|
59 |
|
59 |
|
60 |
|
60 |
|
|
|
||
62 |
|
62 |
|
63 |
|
63 |
|
64 |
|
64 |
|
65 |
|
|
|
66 |
|
65 |
|
67 |
|
66 |
|
68 |
|
67 |
|
|
|
||
31 |
|
31 |
|
32 |
|
32 |
|
33 |
|
33 |
|
34 |
|
|
|
|
34 |
|
|
35 |
|
35 |
|
36 |
|
36 |
|
37 |
|
37 |
|
|
|
||
49 |
|
49 |
|
50 |
|
50 |
|
51 |
|
51 |
|
52 |
|
|
|
|
52 |
|
|
53 |
|
53 |
|
54 |
|
54 |
|
55 |
|
55 |
|
|
|
||
22 |
|
22 |
|
23 |
|
23 |
|
24 |
|
24 |
|
25 |
|
|
|
|
25 |
|
|
26 |
|
26 |
|
27 |
|
27 |
|
28 |
|
28 |
|
|
|
||
30 |
|
30 |
|
31 |
|
31 |
|
32 |
|
32 |
|
33 |
|
|
|
|
33 |
|
|
34 |
|
34 |
|
35 |
|
35 |
|
36 |
|
36 |
|
|
|
||
26 |
|
26 |
|
27 |
|
27 |
|
28 |
|
28 |
|
29 |
|
|
|
|
29 |
|
|
30 |
|
30 |
|
31 |
|
31 |
|
32 |
|
32 |
|
|
|
||
45 |
|
45 |
|
46 |
|
46 |
|
47 |
|
47 |
|
48 |
|
|
|
|
48 |
|
|
49 |
|
49 |
|
50 |
|
50 |
|
51 |
|
51 |
|
|
|
||
35 |
|
35 |
|
36 |
|
36 |
|
37 |
|
37 |
|
38 |
|
|
|
|
38 |
|
|
39 |
|
39 |
|
40 |
|
40 |
|
41 |
|
41 |
|
|
|
||
55 |
|
55 |
|
56 |
|
56 |
|
57 |
|
57 |
|
58 |
|
|
|
|
58 |
|
|
59 |
|
59 |
|
60 |
|
60 |
|
61 |
|
61 |
|
|
|
||
22 |
|
22 |
|
23 |
|
23 |
|
24 |
|
24 |
|
25 |
|
|
|
|
25 |
|
|
26 |
|
26 |
|
27 |
|
27 |
|
28 |
|
28 |
|
29 |
|
29 |
|
30 |
|
|
|
|
30 |
|
|
31 |
|
31 |
|
32 |
|
32 |
|
33 |
|
33 |
|
|
|
||
22 |
|
22 |
|
23 |
|
23 |
|
24 |
|
24 |
|
25 |
|
|
|
|
25 |
|
|
26 |
|
26 |
|
27 |
|
27 |
|
28 |
|
28 |
|
29 |
|
29 |
|
30 |
|
|
|
|
30 |
|
|
31 |
|
31 |
|
32 |
|
32 |
|
33 |
|
33 |
|
|
|
||
25 |
|
25 |
|
26 |
|
26 |
|
27 |
|
27 |
|
28 |
|
|
|
|
28 |
|
|
29 |
|
29 |
|
30 |
|
30 |
|
31 |
|
31 |
|
|
|
||
35 |
|
35 |
|
36 |
|
36 |
|
37 |
|
37 |
|
38 |
|
|
|
|
38 |
|
|
39 |
|
39 |
|
40 |
|
40 |
|
41 |
|
41 |
|
|
|
||
25 |
|
25 |
|
26 |
|
26 |
|
27 |
|
27 |
|
28 |
|
|
|
|
28 |
|
|
29 |
|
29 |
|
30 |
|
30 |
|
31 |
|
31 |
|
|
|
||
34 |
|
34 |
|
35 |
|
35 |
|
36 |
|
36 |
|
37 |
|
|
|
|
37 |
|
|
38 |
|
38 |
|
39 |
|
39 |
|
40 |
|
40 |
|
|
|
||
51 |
|
51 |
|
52 |
|
52 |
|
53 |
|
53 |
|
54 |
|
|
|
|
54 |
|
|
55 |
|
55 |
|
56 |
|
56 |
|
57 |
|
57 |
|
|
|
||
83 |
|
83 |
|
84 |
|
84 |
|
85 |
|
85 |
|
86 |
|
|
|
|
86 |
|
|
87 |
|
87 |
|
88 |
|
88 |
|
89 |
|
89 |
|
|
|
||
22 |
|
22 |
|
23 |
|
23 |
|
24 |
|
24 |
|
25 |
|
|
|
|
25 |
|
|
26 |
|
26 |
|
27 |
|
27 |
|
28 |
|
28 |
|
|
|
||
32 |
|
32 |
|
33 |
|
33 |
|
34 |
|
34 |
|
35 |
|
|
|
|
35 |
|
|
36 |
|
36 |
|
37 |
|
37 |
|
38 |
|
38 |
|
|
|
||
31 |
|
31 |
|
32 |
|
32 |
|
33 |
|
33 |
|
34 |
|
|
|
|
34 |
|
|
35 |
|
35 |
|
36 |
|
36 |
|
37 |
|
37 |
|
|
|
||
43 |
|
43 |
|
44 |
|
44 |
|
45 |
|
45 |
|
46 |
|
|
|
|
46 |
|
|
47 |
|
47 |
|
48 |
|
48 |
|
49 |
|
49 |
|
|
|
||
31 |
|
31 |
|
32 |
|
32 |
|
33 |
|
33 |
|
34 |
|
|
|
|
34 |
|
|
35 |
|
35 |
|
36 |
|
36 |
|
37 |
|
37 |
|
|
|
||
42 |
|
42 |
|
43 |
|
43 |
|
44 |
|
44 |
|
45 |
|
|
|
|
45 |
|
|
46 |
|
46 |
|
47 |
|
47 |
|
48 |
|
48 |
|
|
|
||
32 |
|
32 |
|
33 |
|
33 |
|
34 |
|
34 |
|
35 |
|
|
|
|
35 |
|
|
36 |
|
36 |
|
37 |
|
37 |
|
38 |
|
38 |
|
|
|
||
46 |
|
46 |
|
47 |
|
47 |
|
48 |
|
48 |
|
49 |
|
|
|
|
49 |
|
|
50 |
|
50 |
|
51 |
|
51 |
|
52 |
|
52 |
|
|
|
||
42 |
|
42 |
|
43 |
|
43 |
|
44 |
|
44 |
|
45 |
|
|
|
|
45 |
|
|
46 |
|
46 |
|
47 |
|
47 |
|
48 |
|
48 |
|
|
|
||
56 |
|
56 |
|
57 |
|
57 |
|
58 |
|
58 |
|
59 |
|
|
|
|
59 |
|
|
60 |
|
60 |
|
61 |
|
61 |
|
62 |
|
62 |
|