From: Jacques-Pascal Deplaix <jp.deplaix@gmail.com>
Date: Mon, 20 Jun 2011 17:28:13 +0000 (+0200)
Subject: glib-2.0: Fix some issues for the experimental non-null checks
X-Git-Tag: 0.14.2~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c26945205570eef5bc1dcf88532be1c3b61b305;p=thirdparty%2Fvala.git

glib-2.0: Fix some issues for the experimental non-null checks

Fixes bug 651841.
---

diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index a3e6c94fc..5d34e36e8 100644
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -1361,7 +1361,7 @@ public class string {
 		if (str == null) {
 			str_size = 0;
 		} else {
-			str_size = str.length;
+			str_size = ((!)(str)).length;
 		}
 
 		string* result = GLib.malloc0 (this.length - (end - start) + str_size + 1);
@@ -3086,12 +3086,12 @@ namespace GLib {
 				if (c == '\n') {
 					break;
 				}
-				ret.append_c ((char) c);
+				((!)(ret)).append_c ((char) c);
 			}
 			if (ret == null) {
 				return null;
 			} else {
-				return ret.str;
+				return ((!)(ret)).str;
 			}
 		}
 	}