cvs: php-gtk /src php_gtk.c php_gtk_object.c
| From: | Andrei Zmievski | Date: | Wed, 28 Feb 2001 16:14:20 +0000 |
| Subject: | cvs: php-gtk /src php_gtk.c php_gtk_object.c | ||
| Groups: | php.gtk | ||
| Request: | Send a blank email to php-gtk+get-62@lists.php.net to get a copy of this message | ||
andrei Wed Feb 28 08:14:20 2001 EDT
Modified files:
/php-gtk/src php_gtk.c php_gtk_object.c
Log:
We do need to ref the wrapper before storing it.
Index: php-gtk/src/php_gtk.c
diff -u php-gtk/src/php_gtk.c:1.4 php-gtk/src/php_gtk.c:1.5
--- php-gtk/src/php_gtk.c:1.4 Mon Feb 26 13:21:20 2001
+++ php-gtk/src/php_gtk.c Wed Feb 28 08:14:20 2001
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id: php_gtk.c,v 1.4 2001/02/26 21:21:20 andrei Exp $: */
+/* $Id: php_gtk.c,v 1.5 2001/02/28 16:14:20 andrei Exp $: */
#include "php_gtk.h"
#include "SAPI.h"
@@ -208,7 +208,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "GTK+ support", "enabled");
sprintf(buf, "%d.%d.%d", gtk_major_version, gtk_minor_version, gtk_micro_version);
- php_info_print_table_row(2, "GTK+ Version", buf);
+ php_info_print_table_row(2, "GTK+ v", buf);
php_info_print_table_end();
/* Remove comments if you have entries in php.ini
Index: php-gtk/src/php_gtk_object.c
diff -u php-gtk/src/php_gtk_object.c:1.12 php-gtk/src/php_gtk_object.c:1.13
--- php-gtk/src/php_gtk_object.c:1.12 Tue Feb 27 09:44:42 2001
+++ php-gtk/src/php_gtk_object.c Wed Feb 28 08:14:20 2001
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id: php_gtk_object.c,v 1.12 2001/02/27 17:44:42 fmk Exp $ */
+/* $Id: php_gtk_object.c,v 1.13 2001/02/28 16:14:20 andrei Exp $ */
#include "php_gtk.h"
@@ -46,8 +46,10 @@
Z_TYPE_P(handle) = IS_LONG;
Z_LVAL_P(handle) = zend_list_insert(obj, rsrc_type);
zend_hash_index_update(Z_OBJPROP_P(wrapper), 0, &handle, sizeof(zval *), NULL);
- if (rsrc_type == le_gtk)
+ if (rsrc_type == le_gtk) {
+ zval_add_ref(&wrapper);
gtk_object_set_data_full(obj, php_gtk_wrapper_key, wrapper, php_gtk_destroy_notify);
+ }
}
void *php_gtk_get_object(zval *wrapper, int rsrc_type)