Line 0
Link Here
|
|
|
1 |
--- altyo_settings.vala.orig 2016-04-19 20:55:59 UTC |
2 |
+++ altyo_settings.vala |
3 |
@@ -701,7 +701,11 @@ public class AYSettings : AYTab{ |
4 |
view.get_cursor(out path,out s_column); |
5 |
if(store.get_iter(out iter,path)) |
6 |
if(!store.iter_has_child(iter)){ |
7 |
+#if VALA_0_36 |
8 |
+ store.remove(ref iter); |
9 |
+#else |
10 |
store.remove(iter); |
11 |
+#endif |
12 |
if(store.get_iter(out iter,path)) |
13 |
view.set_cursor(path,null,false); |
14 |
else if(path.prev()) |
15 |
@@ -735,7 +739,11 @@ public class AYSettings : AYTab{ |
16 |
view.get_cursor(out path,out s_column); |
17 |
if(store.get_iter(out iter,path)) |
18 |
if(!store.iter_has_child(iter)){ |
19 |
+#if VALA_0_36 |
20 |
+ store.remove(ref iter); |
21 |
+#else |
22 |
store.remove(iter); |
23 |
+#endif |
24 |
if(store.get_iter(out iter,path)) |
25 |
view.set_cursor(path,null,false); |
26 |
else if(path.prev()) |
27 |
@@ -769,7 +777,11 @@ public class AYSettings : AYTab{ |
28 |
view.get_cursor(out path,out s_column); |
29 |
if(store.get_iter(out iter,path)) |
30 |
if(!store.iter_has_child(iter)){ |
31 |
+#if VALA_0_36 |
32 |
+ store.remove(ref iter); |
33 |
+#else |
34 |
store.remove(iter); |
35 |
+#endif |
36 |
if(store.get_iter(out iter,path)) |
37 |
view.set_cursor(path,null,false); |
38 |
else if(path.prev()) |
39 |
@@ -956,7 +968,7 @@ public class AYSettings : AYTab{ |
40 |
string msg=""; |
41 |
uint line,pos; |
42 |
if(!this.check_css(B.buffer.text,ref S,out line,out pos)){ |
43 |
- msg=_("in line %d at position %d error:%s").printf(line,pos,S); |
44 |
+ msg=_("in line %d at position %d error:%s").printf((int)line,(int)pos,S); |
45 |
debug("on_check_css_button_activate %s",msg); |
46 |
TextIter where; |
47 |
B.buffer.get_iter_at_line_offset(out where,(int)line,(int)pos); |
48 |
@@ -1606,7 +1618,7 @@ public class AYSettings : AYTab{ |
49 |
string S=""; |
50 |
uint line,pos; |
51 |
if(!this.check_css(s,ref S,out line,out pos)){ |
52 |
- string msg=_("New style will not be saved!\nin line %d at position %d\nerror:%s").printf(line,pos,S); |
53 |
+ string msg=_("New style will not be saved!\nin line %d at position %d\nerror:%s").printf((int)line,(int)pos,S); |
54 |
debug("on config apply css error %s",msg); |
55 |
this.ayobject.main_window.show_message_box(_("AltYo CSS style error"),msg); |
56 |
}else{//looks good |