View | Details | Raw Unified | Return to bug 222016 | Differences between
and this patch

Collapse All | Expand All

(-)x11/altyo/Makefile (-1 / +1 lines)
Lines 4-11 Link Here
4
PORTNAME=	altyo
4
PORTNAME=	altyo
5
DISTVERSIONPREFIX=	debian/
5
DISTVERSIONPREFIX=	debian/
6
DISTVERSION=	0.4_rc19
6
DISTVERSION=	0.4_rc19
7
DISTVERSIONSUFFIX=	-${GH_ACCOUNT}1
7
PORTREVISION=	1
8
PORTREVISION=	1
8
DISTVERSIONSUFFIX=	-${GH_ACCOUNT}1
9
CATEGORIES=	x11
9
CATEGORIES=	x11
10
10
11
MAINTAINER=	nivit@FreeBSD.org
11
MAINTAINER=	nivit@FreeBSD.org
(-)x11/altyo/files/patch-altyo__settings.vala (+62 lines)
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,11 @@ 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
+#if VALA_0_36
44
+      msg=_("in line %d  at position %d error:%s").printf((int)line,(int)pos,S);
45
+#else
46
       msg=_("in line %d  at position %d error:%s").printf(line,pos,S);
47
+#endif
48
       debug("on_check_css_button_activate %s",msg);
49
       TextIter where;
50
       B.buffer.get_iter_at_line_offset(out where,(int)line,(int)pos);
51
@@ -1606,7 +1622,11 @@ public class AYSettings : AYTab{
52
               string S="";
53
               uint line,pos;
54
               if(!this.check_css(s,ref S,out line,out pos)){
55
+#if VALA_0_36
56
+                string msg=_("New style will not be saved!\nin line %d  at position %d\nerror:%s").printf((int)line,(int)pos,S);
57
+#else
58
                 string msg=_("New style will not be saved!\nin line %d  at position %d\nerror:%s").printf(line,pos,S);
59
+#endif
60
                 debug("on config apply css error %s",msg);
61
                 this.ayobject.main_window.show_message_box(_("AltYo CSS style error"),msg);
62
               }else{//looks good
(-)x11/altyo/files/patch-altyo__window.vala (+14 lines)
Line 0 Link Here
1
--- altyo_window.vala.orig	2016-04-19 20:55:59 UTC
2
+++ altyo_window.vala
3
@@ -2889,7 +2889,11 @@ public class AYObject :Object{
4
       for (item_it = this.children_removed.last(); item_it != null; item_it = item_it.prev) {
5
         AYTab tab = item_it.data;
6
         tab.stop_remove_timer();//disable timer while popup shown
7
+#if VALA_0_36
8
+        string s = ( tab.tbutton.tab_title != null ? tab.tbutton.tab_title : _("index %d").printf((int)tab.tbutton.tab_index) );
9
+#else
10
         string s = ( tab.tbutton.tab_title != null ? tab.tbutton.tab_title : _("index %d").printf(tab.tbutton.tab_index) );
11
+#endif
12
         menuitem = new Gtk.MenuItem.with_label ("%d: %s".printf(index,s));
13
         menuitem.activate.connect(()=>{
14
           debug("trying to restore tab %s",menuitem.label);

Return to bug 222016