cvs: php-gtk /ext/libglade libglade.overrides
| From: | Steph Fox | Date: | Sat, 05 Nov 2005 18:16:05 +0000 |
| Subject: | cvs: php-gtk /ext/libglade libglade.overrides | ||
| Groups: | php.gtk.cvs | ||
| Request: | Send a blank email to php-gtk-cvs+get-2000@lists.php.net to get a copy of this message | ||
sfox Sat Nov 5 13:16:05 2005 EDT
Modified files:
/php-gtk/ext/libglade libglade.overrides
Log:
Eliminate need for tag
http://cvs.php.net/diff.php/php-gtk/ext/libglade/libglade.overrides?r1=1.30&r2=1.31&ty=u
Index: php-gtk/ext/libglade/libglade.overrides
diff -u php-gtk/ext/libglade/libglade.overrides:1.30 php-gtk/ext/libglade/libglade.overrides:1.31
--- php-gtk/ext/libglade/libglade.overrides:1.30 Sat Nov 5 10:59:01 2005
+++ php-gtk/ext/libglade/libglade.overrides Sat Nov 5 13:16:05 2005
@@ -169,6 +169,7 @@
GClosure *closure = NULL;
int handler_id, len = 0, connect_normal = 1;
char *php_class = NULL, *php_method = NULL;
+ zend_class_entry *ce = NULL, **pce;
TSRMLS_FETCH();
/*
@@ -177,14 +178,15 @@
* course, but those connections are much less useful.
*/
if (strstr(handler_name, "::")) {
- /* If the handler is prefixed by '-', use simple signal connection. */
- if (handler_name[0] == '-') {
- connect_normal = 0;
- handler_name++;
- }
len = strcspn(handler_name, ":");
php_class = safe_estrndup(handler_name, len);
php_method = strstr(handler_name, "::") + 2;
+ if (zend_lookup_class(php_class, strlen(php_class), &pce TSRMLS_CC) == SUCCESS) {
+ ce = *pce;
+ if (ce->type == ZEND_INTERNAL_CLASS) {
+ connect_normal = 0;
+ }
+ }
MAKE_STD_ZVAL(callback);
array_init(callback);
add_next_index_string(callback, php_class, 1);