com gtk/php-gtk: Fixed a bug where the values for G_TYPE_PH P_VALUE columns were overly restricted.: main/p hpg_gvalue.c

Commit:    6846489ad9950cd47b4f706b3a6d8605646f14f8
Author:    Andrei Zmievski <[email protected]>         Tue, 22 Nov 2005 05:13:20 +0000
Parents:   d8d5fc5d762a30e5ab9a0ddcae8945e27ed4d01e
Branches:  master

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

Log:
Fixed a bug where the values for G_TYPE_PHP_VALUE columns were overly
restricted.

Changed paths:
  M  main/phpg_gvalue.c


Diff:
6846489ad9950cd47b4f706b3a6d8605646f14f8
diff --git a/main/phpg_gvalue.c b/main/phpg_gvalue.c
index be3ce5e..825308b 100644
--- a/main/phpg_gvalue.c
+++ b/main/phpg_gvalue.c
@@ -279,7 +279,11 @@ PHP_GTK_API int phpg_gvalue_from_zval(GValue *gval, zval *value TSRMLS_DC)
 
             if (Z_TYPE_P(value) == IS_NULL) {
                 g_value_set_boxed(gval, NULL);
-            } else if (G_VALUE_HOLDS(gval, G_TYPE_PHP_VALUE) && phpg_gtype_from_zval(value) == G_TYPE_PHP_VALUE) {
+            /*
+             * We should be safe just setting the zval here, since G_TYPE_PHP_VALUE is
+             * supposed to take any zval type.
+             */
+            } else if (G_VALUE_HOLDS(gval, G_TYPE_PHP_VALUE)) {
                 g_value_set_boxed(gval, value);
             } else if (Z_TYPE_P(value) == IS_OBJECT
                        && instanceof_function(Z_OBJCE_P(value), gboxed_ce TSRMLS_CC)