Merge lp:~ivaldi/midori/devpet-backtrace-vapi into lp:midori

[André Stösel]

Added fixed version of backtrace_symbols to midori vapi

This fixes build errors with older vala versions

[Rico Tzschichholz (ricotz)]

https://git.gnome.org/browse/vala/commit/?id=f402af94e8471c8314ee7a312260a776e4d6fbe2

http://linux.die.net/man/3/backtrace_symbols
"The strings pointed to by the array of pointers need not and should not be freed."

[lp:~ivaldi/midori/devpet-backtrace-vapi]

6300. By André Stösel on 2013-08-03

bugfix: https://git.gnome.org/browse/vala/commit/?id=f402af94e8471c8314ee7a312260a776e4d6fbe2

[André Stösel (ivaldi)]

Hm... funny, Christian and I talked about this in jabber and we both wondered why they changed it...

Thank you very much!

[Cris Dywan (kalikiana)]

review: Approve

=== modified file 'extensions/devpet.vala'
--- extensions/devpet.vala	2013-08-02 09:15:21 +0000
+++ extensions/devpet.vala	2013-08-03 21:06:28 +0000
@@ -178,7 +178,8 @@
                 string bt = "";
                 void* buffer[100];
                 int num = Linux.backtrace (buffer, 100);
-                unowned string[] symbols = Linux.backtrace_symbols (buffer, num);
+                /* Upstream bug: https://git.gnome.org/browse/vala/commit/?id=f402af94e8471c8314ee7a312260a776e4d6fbe2 */
+                unowned string[] symbols = Midori.Linux.backtrace_symbols (buffer, num);
                 if (symbols != null) {
                     /* we don't need the first three lines */
                     for (int i = 3; i < num; i++) {

=== modified file 'midori/midori.vapi'
--- midori/midori.vapi	2013-08-02 23:45:16 +0000
+++ midori/midori.vapi	2013-08-03 21:06:28 +0000
@@ -258,5 +258,13 @@
         public static void create_win32_desktop_lnk (string prefix, string filename, string uri);
     #endif
     }
+
+    #if !HAVE_WIN32
+    [CCode (lower_case_cprefix = "")]
+    namespace Linux {
+        [CCode (cheader_filename = "execinfo.h", array_length = false)]
+        public unowned string[] backtrace_symbols (void* buffer, int size);
+    }
+    #endif
 }