cvs: php-gtk /src php_gtk.c

andrei Sat Mar 3 13:12:51 2001 EDT Modified files: /php-gtk/src php_gtk.c Log: Move PHP-GTK initialization and shutdown into request functions. Index: php-gtk/src/php_gtk.c diff -u php-gtk/src/php_gtk.c:1.6 php-gtk/src/php_gtk.c:1.7 --- php-gtk/src/php_gtk.c:1.6 Thu Mar 1 08:43:33 2001 +++ php-gtk/src/php_gtk.c Sat Mar 3 13:12:51 2001 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_gtk.c,v 1.6 2001/03/01 16:43:33 andrei Exp $: */ +/* $Id: php_gtk.c,v 1.7 2001/03/03 21:12:51 andrei Exp $: */ #include "php_gtk.h" #include "SAPI.h" @@ -157,20 +157,6 @@ { // ZEND_INIT_MODULE_GLOBALS(gtk, NULL, NULL); - le_gtk = zend_register_list_destructors_ex(release_gtk_object_rsrc, NULL, "GtkObject", module_number); - - php_gtk_class_hash = g_hash_table_new(g_str_hash, g_str_equal); - zend_hash_init_ex(&php_gtk_prop_getters, 20, NULL, NULL, 1, 0); - zend_hash_init_ex(&php_gtk_prop_setters, 20, NULL, NULL, 1, 0); - php_gtk_register_classes(); - php_gtk_register_types(module_number); - php_gtk_register_constants(module_number ELS_CC); - - init_gtk(); - - zend_unset_timeout(); - zend_set_timeout(0); - /* Remove comments if you have entries in php.ini REGISTER_INI_ENTRIES(); */ @@ -183,21 +169,36 @@ /* Remove comments if you have entries in php.ini UNREGISTER_INI_ENTRIES(); */ - zend_hash_destroy(&php_gtk_prop_getters); - zend_hash_destroy(&php_gtk_prop_setters); - gtk_exit(0); return SUCCESS; } /* Remove if there's nothing to do at request start */ PHP_RINIT_FUNCTION(gtk) { + le_gtk = zend_register_list_destructors_ex(release_gtk_object_rsrc, NULL, "GtkObject", module_number); + + php_gtk_class_hash = g_hash_table_new(g_str_hash, g_str_equal); + zend_hash_init_ex(&php_gtk_prop_getters, 20, NULL, NULL, 1, 0); + zend_hash_init_ex(&php_gtk_prop_setters, 20, NULL, NULL, 1, 0); + php_gtk_register_classes(); + php_gtk_register_types(module_number); + php_gtk_register_constants(module_number ELS_CC); + + init_gtk(); + + zend_unset_timeout(); + zend_set_timeout(0); + return SUCCESS; } /* Remove if there's nothing to do at request end */ PHP_RSHUTDOWN_FUNCTION(gtk) { + zend_hash_destroy(&php_gtk_prop_getters); + zend_hash_destroy(&php_gtk_prop_setters); + gtk_exit(0); + return SUCCESS; }