com gtk/php-gtk: Adjust to the modified API.: ext/gtk+/gtktreeview.overrides ext/gtk+/php_gtk+_types.c

[email protected] (David Soria Parra) Thu, 09 Feb 2006 08:46:51 +0000
Newsgroups php.gtk.cvs
Message-ID <[email protected]>
Commit:    cc3967a75d0610f780ec9f3410021868fcd19a7d
Author:    Andrei Zmievski <[email protected]>         Thu, 9 Feb 2006 08:46:51 +0000
Parents:   5d2ed39cfd630f1eab09470d6a07d98d6808d59a
Branches:  master

Link:       http://git.php.net/?p=gtk/php-gtk.git;a=commitdiff;h=cc3967a75d0610f780ec9f3410021868fcd19a7d

Log:
Adjust to the modified API.

Changed paths:
  M  ext/gtk+/gtktreeview.overrides
  M  ext/gtk+/php_gtk+_types.c


Diff:
cc3967a75d0610f780ec9f3410021868fcd19a7d
diff --git a/ext/gtk+/gtktreeview.overrides b/ext/gtk+/gtktreeview.overrides
index e20cd2a..0978aa2 100644
--- a/ext/gtk+/gtktreeview.overrides
+++ b/ext/gtk+/gtktreeview.overrides
@@ -287,7 +287,7 @@ PHP_METHOD
 
             g_value_init(&values[i], gtk_tree_model_get_column_type(model, i));
 
-            if (phpg_gvalue_from_zval(&values[i], *item TSRMLS_CC) == FAILURE) {
+            if (phpg_gvalue_from_zval(&values[i], *item, TRUE TSRMLS_CC) == FAILURE) {
                 php_error(E_WARNING, "Cannot set row: type of element %d does not match the model", i);
                 for ( ; i >= 0; i--) {
                     g_value_unset(&values[i]);
@@ -380,7 +380,7 @@ static void phpg_store_set_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_tree)
 
         g_value_init(&value, gtk_tree_model_get_column_type(model, column));
 
-        if (phpg_gvalue_from_zval(&value, zvalue TSRMLS_CC) == FAILURE) {
+        if (phpg_gvalue_from_zval(&value, zvalue, TRUE TSRMLS_CC) == FAILURE) {
             php_error(E_WARNING, "%s::%s(): argument %d is of the wrong type for column %d",
                       get_active_class_name(NULL TSRMLS_CC), get_active_function_name(TSRMLS_C),
                       i+1, column);
@@ -727,7 +727,7 @@ PHP_METHOD
     }
 
     gtk_tree_model_get_value(model, iter, column, &value);
-    phpg_gvalue_to_zval(&value, &return_value, TRUE TSRMLS_CC);
+    phpg_gvalue_to_zval(&value, &return_value, TRUE, TRUE TSRMLS_CC);
     g_value_unset(&value);
 }
 
diff --git a/ext/gtk+/php_gtk+_types.c b/ext/gtk+/php_gtk+_types.c
index e79b68c..da29a56 100644
--- a/ext/gtk+/php_gtk+_types.c
+++ b/ext/gtk+/php_gtk+_types.c
@@ -430,7 +430,7 @@ int phpg_model_set_row(GtkTreeModel *model, GtkTreeIter *iter, zval *items)
          zend_hash_move_forward(Z_ARRVAL_P(items)), i++) {
         GValue value = { 0, };
         g_value_init(&value, gtk_tree_model_get_column_type(model, i));
-        if (phpg_gvalue_from_zval(&value, *item TSRMLS_CC) == FAILURE) {
+        if (phpg_gvalue_from_zval(&value, *item, TRUE TSRMLS_CC) == FAILURE) {
             php_error(E_WARNING, "Cannot set row: type of element %d does not match the model", i);
             return FAILURE;
         }