sync

diff --git a/configure.ac b/configure.ac
index 86a899d..8a9ae29 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -35,55 +35,64 @@ PKG_CHECK_MODULES(ROOBUILDER, [
 
 dnl --- libvala -- needs to find matching really..
 
-PKG_CHECK_MODULES(LIBVALA, [libvala-0.34],
-                    [vala_3_4_enabled=yes],
-                    [vala_3_4_enabled=no]) 
-    if test $vala_3_4_enabled = yes; then
-                AC_DEFINE(HAVE_LIBVALA32,1,[libvala 0.34 support])
+PKG_CHECK_MODULES(LIBVALA, [libvala-0.36],
+                    [vala_3_6_enabled=yes],
+                    [vala_3_6_enabled=no]) 
+    if test $vala_3_6_enabled = yes; then
+                AC_DEFINE(HAVE_LIBVALA36,1,[libvala 0.36 support])
     else
-   
-    PKG_CHECK_MODULES(LIBVALA, [libvala-0.32],
-                    [vala_3_2_enabled=yes],
-                    [vala_3_2_enabled=no]) 
-    if test $vala_3_2_enabled = yes; then
-                AC_DEFINE(HAVE_LIBVALA32,1,[libvala 0.32 support])
-    else       
-        PKG_CHECK_MODULES(LIBVALA, [libvala-0.30],
-                        [vala_3_0_enabled=yes],
-                        [vala_3_0_enabled=no]) 
-        if test $vala_3_0_enabled = yes; then
-                    AC_DEFINE(HAVE_LIBVALA30,1,[libvala 0.30 support])
-        else                           
-            PKG_CHECK_MODULES(LIBVALA, [libvala-0.28],
-                        [vala_2_8_enabled=yes],
-                        [vala_2_8_enabled=no]) 
-            if test $vala_2_8_enabled = yes; then
-                    AC_DEFINE(HAVE_LIBVALA28,1,[libvala 0.28 support])
+           
+        PKG_CHECK_MODULES(LIBVALA, [libvala-0.34],
+                            [vala_3_4_enabled=yes],
+                            [vala_3_4_enabled=no]) 
+            if test $vala_3_4_enabled = yes; then
+                        AC_DEFINE(HAVE_LIBVALA34,1,[libvala 0.34 support])
             else
-                    PKG_CHECK_MODULES(LIBVALA, [libvala-0.26],
-                            [vala_2_6_enabled=yes],
-                            [vala_2_6_enabled=no])
-                
-                    if test $vala_2_6_enabled = yes; then
-                        AC_DEFINE(HAVE_LIBVALA26,1,[libvala 0.26 support])
+           
+            PKG_CHECK_MODULES(LIBVALA, [libvala-0.32],
+                            [vala_3_2_enabled=yes],
+                            [vala_3_2_enabled=no]) 
+            if test $vala_3_2_enabled = yes; then
+                        AC_DEFINE(HAVE_LIBVALA32,1,[libvala 0.32 support])
+            else       
+                PKG_CHECK_MODULES(LIBVALA, [libvala-0.30],
+                                [vala_3_0_enabled=yes],
+                                [vala_3_0_enabled=no]) 
+                if test $vala_3_0_enabled = yes; then
+                            AC_DEFINE(HAVE_LIBVALA30,1,[libvala 0.30 support])
+                else                           
+                    PKG_CHECK_MODULES(LIBVALA, [libvala-0.28],
+                                [vala_2_8_enabled=yes],
+                                [vala_2_8_enabled=no]) 
+                    if test $vala_2_8_enabled = yes; then
+                            AC_DEFINE(HAVE_LIBVALA28,1,[libvala 0.28 support])
                     else
-                         PKG_CHECK_MODULES(LIBVALA, [libvala-0.24],
-                            [vala_2_4_enabled=yes],
-                            [vala_2_4_enabled=no])
+                            PKG_CHECK_MODULES(LIBVALA, [libvala-0.26],
+                                    [vala_2_6_enabled=yes],
+                                    [vala_2_6_enabled=no])
                         
-                        if test $vala_2_4_enabled = yes; then
-                            AC_DEFINE(HAVE_LIBVALA24,1,[libvala 0.24 support])
-                        else
-                            PKG_CHECK_MODULES(LIBVALA, [libvala-0.22],
-                                [vala_2_2_enabled=yes] )
-                            
-                            AC_DEFINE(HAVE_LIBVALA22,1,[libvala 0.22 support])
-                        fi
+                            if test $vala_2_6_enabled = yes; then
+                                AC_DEFINE(HAVE_LIBVALA26,1,[libvala 0.26 support])
+                            else
+                                 PKG_CHECK_MODULES(LIBVALA, [libvala-0.24],
+                                    [vala_2_4_enabled=yes],
+                                    [vala_2_4_enabled=no])
+                                
+                                if test $vala_2_4_enabled = yes; then
+                                    AC_DEFINE(HAVE_LIBVALA24,1,[libvala 0.24 support])
+                                else
+                                    PKG_CHECK_MODULES(LIBVALA, [libvala-0.22],
+                                        [vala_2_2_enabled=yes] )
+                                    
+                                    AC_DEFINE(HAVE_LIBVALA22,1,[libvala 0.22 support])
+                                fi
+                            fi
                     fi
+                fi
             fi
         fi
-    fi
 fi
+AM_CONDITIONAL(HAVE_LIBVALA36, test "$vala_3_6_enabled" = "yes")
 AM_CONDITIONAL(HAVE_LIBVALA34, test "$vala_3_4_enabled" = "yes")
 AM_CONDITIONAL(HAVE_LIBVALA32, test "$vala_3_2_enabled" = "yes")
 AM_CONDITIONAL(HAVE_LIBVALA30, test "$vala_3_0_enabled" = "yes")

diff --git a/src/Builder4/DialogConfirm.vala b/src/Builder4/DialogConfirm.vala
index 8b940e0..7eb6e0d 100644 (file)
--- a/src/Builder4/DialogConfirm.vala
+++ b/src/Builder4/DialogConfirm.vala
@@ -19,7 +19,7 @@ public class DialogConfirm : Object
     public DialogConfirm()
     {
         _this = this;
-        this.el = new Gtk.MessageDialog( null, Gtk.DialogFlags.MODAL, Gtk.MessageType.QUESTION, Gtk.ButtonsType.YES_NO, "Tests", null );
+        this.el = new Gtk.MessageDialog( null, Gtk.DialogFlags.MODAL, Gtk.MessageType.QUESTION, Gtk.ButtonsType.YES_NO, "Tests" );
 
         // my vars (dec)
 

diff --git a/src/Makefile.am b/src/Makefile.am
index de72478..32b76d9 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,6 +28,10 @@ if HAVE_LIBVALA34
 roobuilder_LIBVALA = --pkg libvala-0.34
 endif
 
+
+if HAVE_LIBVALA36
+roobuilder_LIBVALA = --pkg libvala-0.36
+endif
 # gda
 
 

diff --git a/src/Palete/ValaSourceCompiler.vala b/src/Palete/ValaSourceCompiler.vala
index abe21d1..40f8095 100644 (file)
--- a/src/Palete/ValaSourceCompiler.vala
+++ b/src/Palete/ValaSourceCompiler.vala
@@ -227,7 +227,9 @@ namespace Palete {
                
                        context.experimental = false;
                        context.experimental_non_null = false;
-#if VALA_0_34
+#if VALA_0_36
+                       var ver=36;
+#elif VALA_0_34
                        var ver=34;
 #elif VALA_0_32
                        var ver=32;
@@ -264,7 +266,7 @@ namespace Palete {
                        context.report.enable_warnings = true;
                        context.metadata_directories = { };
                        context.gir_directories = {};
-                       context.thread = true;
+                       //context.thread = true;
                        valac += " --thread ";
                        
                        // we should parse the compilegroup to find out the flags..
@@ -426,7 +428,7 @@ namespace Palete {
                        string [] cc_options = { "-lm", "-pg" };
                        valac += " -X -lm -X -pg";
                        
-#if VALA_0_28 || VALA_0_30 || VALA_0_32 || VALA_0_34
+#if VALA_0_28 || VALA_0_30 || VALA_0_32 || VALA_0_34  || VALA_0_36
                        var pkg_config_command = Environment.get_variable ("PKG_CONFIG");
                        ccompiler.compile (context, cc_command, cc_options, pkg_config_command);
 #else

diff --git a/src/Palete/VapiParser.vala b/src/Palete/VapiParser.vala
index d72614b..1159135 100644 (file)
--- a/src/Palete/VapiParser.vala
+++ b/src/Palete/VapiParser.vala
@@ -319,7 +319,9 @@ namespace Palete {
                
                        context.experimental = false;
                        context.experimental_non_null = false;
-#if VALA_0_34
+#if VALA_0_36
+                       var ver=36;                     
+#elif VALA_0_34
                        var ver=34;                     
 #elif VALA_0_32
                        var ver=32;                     
@@ -355,7 +357,7 @@ namespace Palete {
                        context.report.enable_warnings = true;
                        context.metadata_directories = { };
                        context.gir_directories = {};
-                       context.thread = true;
+                       //context.thread = true;
                        
                        
                        //this.report = new ValaSourceReport(this.file);

diff --git a/src/vapi/clutter-1.0.vapi b/src/vapi/clutter-1.0.vapi
index 542c375..00e5659 100644 (file)
--- a/src/vapi/clutter-1.0.vapi
+++ b/src/vapi/clutter-1.0.vapi
@@ -5965,7 +5965,7 @@ namespace Clutter {
        [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_image_get_type ()")]
        public class Image : GLib.Object, Clutter.Content {
                [CCode (has_construct_function = false)]
-               protected Image ();
+               public Image ();
                public static Clutter.Content @new ();
                public bool set_area ([CCode (array_length = false)] uint8[] data, Cogl.PixelFormat pixel_format, Cairo.RectangleInt rect, uint row_stride) throws GLib.Error;
                public bool set_bytes (GLib.Bytes data, Cogl.PixelFormat pixel_format, uint width, uint height, uint row_stride) throws GLib.Error;