Merge lp:~monkey-libre/valide/vala-0.11.5 into lp:valide

[Monkey]

Update and set to vala 0.11.5

Review carefully the changes.
Thanks in advance.

[Monkey (monkey-libre)]

Sorry but I can't update symbol file :( (I can compile but valide when tries to gets symbols shows a warning window

Backtrace:

#0 0x0012d422 in __kernel_vsyscall ()
#1 0x00fceb86 in poll () from /lib/tls/i686/cmov/libc.so.6
#2 0x00b434eb in g_poll () from /lib/libglib-2.0.so.0
#3 0x00b360ac in ?? () from /lib/libglib-2.0.so.0
#4 0x00b36817 in g_main_loop_run () from /lib/libglib-2.0.so.0
#5 0x0032eabf in gtk_dialog_run () from /usr/lib/libgtk-x11-2.0.so.0
#6 0x001c8615 in valide_window_message (self=0x80bf088, log_domain=0x0,
    log_levels=G_LOG_LEVEL_CRITICAL,
    message=0x81a0040 "symbol_get_full_name: assertion `self != NULL' failed")
    at debug/libvalide/window.c:507
#7 0x001cd97b in _valide_window_message_glog_func (log_domain=0x0,
    log_levels=G_LOG_LEVEL_CRITICAL,
    message=0x81a0040 "symbol_get_full_name: assertion `self != NULL' failed",
    self=0x80bf088) at debug/libvalide/window.c:2068
#8 0x00b3cbea in g_logv () from /lib/libglib-2.0.so.0
#9 0x00b3d056 in g_log () from /lib/libglib-2.0.so.0
#10 0x00b3d2bb in g_return_if_fail_warning () from /lib/libglib-2.0.so.0
#11 0x0166201e in symbol_get_full_name (self=0x0)
    at debug/plugins/symbol/symbol.c:291
#12 0x01663e36 in symbol_browser_parse_line (self=0x8219878,
    line=0x849bd48 "Valide.Application\t/home/monkey/Escritorio/valide/src/main.vala\t40;\"\tkind:class\tline:40\tlanguage:Vala\tinherits:Object\taccess:public\timplementation:") at debug/plugins/symbol/symbol.c:907
#13 0x01664652 in symbol_browser_exec_ctags (self=0x8219878,
    filename=0x847c380 "/home/monkey/Escritorio/valide/src/main.vala",
    error=0xbfffe5c4) at debug/plugins/symbol/symbol.c:1093
#14 0x01665832 in symbol_browser_populate_symbols_asc (self=0x8219878)
    at debug/plugins/symbol/symbol.c:1427
#15 0x01665d95 in _symbol_browser_populate_symbols_asc_gsource_func (
    self=0x8219878) at debug/plugins/symbol/symbol.c:1528
#16 0x00b30661 in ?? () from /lib/libglib-2.0.so.0
#17 0x00b325e5 in g_main_context_dispatch () from /lib/libglib-2.0.so.0
#18 0x00b362d8 in ?? () from /lib/libglib-2.0.so.0
#19 0x00b364b8 in g_main_context_iteration () from /lib/libglib-2.0.so.0
#20 0x003b5224 in gtk_main_iteration () from /usr/lib/libgtk-x11-2.0.so.0
#21 0x00189d27 in valide_utils_process_gtk_events ()
    at debug/libvalide/utils.c:1028
#22 0x0018dcd7 in valide_document_manager_create (self=0x811d050,
    filename=0x8189258 "/home/monkey/Escritorio/valide/src/main.vala",
    error=0xbfffe894) at debug/libvalide/document-manager.c:1020
#23 0x0019ef18 in valide_project_open_file (self=0x82dd100,
    filename=0x84290c0 "/home/monkey/Escritorio/valide/src/main.vala",
    error=0xbfffe914) at debug/libvalide/project.c:1608
#24 0x001be92c in valide_project_manager_file_select (self=0x81b8040,
    sender=0x8215208, path=0x81a1440, column=0x818a960)
    at debug/libvalide/project-manager.c:921
#25 0x001c4133 in _valide_project_manager_file_select_gtk_tree_view_row_activated (_sender=0x8215208, path=0x81a1440, column=0x818a960, self=0x81b8040)
    at debug/libvalide/project-manager.c:2656
#26 0x003b96df in ?? () from /usr/lib/libgtk-x11-2.0.so.0
#27 0x00aaf252 in g_closure_invoke () from /usr...

[lp:~monkey-libre/valide/vala-0.11.5]

578. By Monkey on 2011-01-22

Update and set vala 0.11.5

[Monkey (monkey-libre)]

I´ve finished and valide seems works fine now. But test it carefully.

[Nicolas Joseph (gege2061)]

review: Approve

=== modified file 'libvalide/utils.vala'
--- libvalide/utils.vala	2011-01-19 18:07:06 +0000
+++ libvalide/utils.vala	2011-01-22 12:04:09 +0000
@@ -125,10 +125,11 @@
    */
   public static string get_extension (string filename)
   {
-    string ext = filename.rchr (-1, '.');
-    if (ext != null)
+    string ext = null;
+    int index_char = filename.last_index_of_char ('.',-1);
+    if (index_char != -1)
     {
-      ext = ext.substring (1).down ();
+      ext = ext.substring (index_char).down ();
     }
     return ext;
   }
@@ -146,10 +147,10 @@
 
     if (filename != "." && filename != "..")
     {
-      unowned string ext;
+      int ext;
 
-      ext = filename.rchr (-1, '.');
-      if (ext != null)
+      ext = filename.last_index_of_char ('.',-1);
+      if (ext != -1)
       {
         long pos;
 
@@ -479,10 +480,10 @@
   {
     int offset;
     bool ret = false;
-    unowned string pos;
+    int pos;
 
-    pos = s.rchr (-1, sep);
-    if (pos != null)
+    pos = s.last_index_of_char (sep);
+    if (pos != -1)
     {
       offset = (int)s.char_count ((ssize_t)pos);
       s = s.substring (offset);
@@ -503,10 +504,10 @@
   {
     int offset;
     string ret;
-    unowned string pos;
+    int pos;
 
-    pos = s.rchr (-1, sep);
-    if (pos != null)
+    pos = s.last_index_of_char (sep, -1);
+    if (pos != -1)
     {
       offset = (int)s.char_count ((ssize_t)pos);
       offset++;

=== modified file 'plugins/symbol/symbol.vala'
--- plugins/symbol/symbol.vala	2010-09-19 02:12:01 +0000
+++ plugins/symbol/symbol.vala	2011-01-22 12:04:09 +0000
@@ -233,17 +233,18 @@
     /*          name  file  ex_cmd;"  kind:function  line:x  language:x  signature:x */
     /*          name  file  ex_cmd;"  kind:variable  line:x  language:x */
 
-    string[] fields;
+    string[] fields = null;
     Symbol symbol = null;
-
+    int name_ext; 
     fields = line.split ("\t", 0);
     if (fields[0] != null)
     {
       symbol = new Symbol ();
       symbol.full_name = fields[0];
-      if (symbol.full_name.rchr (-1, '.') != null)
+      name_ext = symbol.full_name.last_index_of_char ('.',-1);
+      if (name_ext != -1)
       {
-        symbol.name = symbol.full_name.rchr (-1, '.').offset (1);
+        symbol.name = symbol.full_name.substring (name_ext);
       }
       else
       {

=== modified file 'plugins/waf/waf-executable.vala'
--- plugins/waf/waf-executable.vala	2010-09-03 21:40:48 +0000
+++ plugins/waf/waf-executable.vala	2011-01-22 12:04:09 +0000
@@ -86,11 +86,11 @@
     {
       Gdk.Color.parse (Utils.Color.INFO, out color);
     }
-    else if (line.str ("warning:") != null)
+    else if (line.index_of ("warning:") != 0)
     {
       Gdk.Color.parse (Utils.Color.WARNING, out color);
     }
-    else if (line.str ("error:") != null)
+    else if (line.index_of ("error:") != 0)
     {
       Gdk.Color.parse (Utils.Color.ERROR, out color);
     }
@@ -112,11 +112,11 @@
       switch (this.step)
       {
         case BuildingStep.CONFIGURE:
-          if (line.str (": ok") != null || line.str (": yes") != null)
+          if (line.index_of (": ok") != 0 || line.index_of (": yes") != 0)
           {
             Gdk.Color.parse (Utils.Color.SUCCESS, out color);
           }
-          else if (line.str (": fail") != null)
+          else if (line.index_of (": fail") != 0)
           {
             Gdk.Color.parse (Utils.Color.WARNING, out color);
           }

=== modified file 'wscript'
--- wscript	2011-01-19 18:12:19 +0000
+++ wscript	2011-01-22 12:04:09 +0000
@@ -50,7 +50,7 @@
   conf.check_cfg (package='gtk+-2.0',          uselib_store='GTK+',          atleast_version='2.18.0', args='--cflags --libs', mandatory=True)
   conf.check_cfg (package='libxml-2.0',        uselib_store='LIBXML',        atleast_version='2.5.0',  args='--cflags --libs', mandatory=True)
   conf.check_cfg (package='gtksourceview-2.0', uselib_store='GTKSOURCEVIEW', atleast_version='2.10.0', args='--cflags --libs', mandatory=True)
-  conf.check_cfg (package='libvala-0.12',      uselib_store='VALA',          atleast_version='0.11.4', args='--cflags --libs', mandatory=True)
+  conf.check_cfg (package='libvala-0.12',      uselib_store='VALA',          atleast_version='0.11.5', args='--cflags --libs', mandatory=True)
   conf.check_cfg (package='gdl-1.0',           uselib_store='GDL',           atleast_version='2.28',   args='--cflags --libs', mandatory=True)
   if not Options.options.without_libunique:
     conf.check_cfg (package='unique-1.0',        uselib_store='UNIQUE',        atleast_version='1.0.0',  args='--cflags --libs', mandatory=False)