com gtk/php-gtk: Fix UTF-8 in GtkTreeViewColumn constructor.: ext/gtk+/gtktreeview.overrides
[email protected] (David Soria Parra) Tue, 14 Feb 2006 03:09:54 +0000
| Newsgroups | php.gtk.cvs |
|---|---|
| Message-ID | <[email protected]> |
Commit: 3506cdc49c1fad7002216015169f84a2cf2f45dc Author: Andrei Zmievski <[email protected]> Tue, 14 Feb 2006 03:09:54 +0000 Parents: 046f62f70518d9aea3ee925db310916ddb23fe16 Branches: master Link: http://git.php.net/?p=gtk/php-gtk.git;a=commitdiff;h=3506cdc49c1fad7002216015169f84a2cf2f45dc Log: Fix UTF-8 in GtkTreeViewColumn constructor. Changed paths: M ext/gtk+/gtktreeview.overrides Diff: 3506cdc49c1fad7002216015169f84a2cf2f45dc diff --git a/ext/gtk+/gtktreeview.overrides b/ext/gtk+/gtktreeview.overrides index 0978aa2..686b9fe 100644 --- a/ext/gtk+/gtktreeview.overrides +++ b/ext/gtk+/gtktreeview.overrides @@ -1114,7 +1114,6 @@ PHP_METHOD %% }}} - %% {{{ GtkTreeViewColumn %% @@ -1134,14 +1133,15 @@ PHP_METHOD GtkCellRenderer *cell = NULL; GtkTreeViewColumn *tvc = NULL; zval ***args = NULL; + zend_bool free_title = FALSE; int i, argc = ZEND_NUM_ARGS(); if (argc <= 2) { - if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "|sN", &title, &php_cell, gtkcellrenderer_ce)) { + if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "|uN", &title, &free_title, &php_cell, gtkcellrenderer_ce)) { PHPG_THROW_CONSTRUCT_EXCEPTION(GtkTreeViewColumn); } } else { - if (!php_gtk_parse_args(2, "|sN", &title, &php_cell, gtkcellrenderer_ce)) { + if (!php_gtk_parse_args(2, "|uN", &title, &free_title, &php_cell, gtkcellrenderer_ce)) { PHPG_THROW_CONSTRUCT_EXCEPTION(GtkTreeViewColumn); } } @@ -1189,6 +1189,7 @@ PHP_METHOD } phpg_gobject_set_wrapper(this_ptr, (GObject *)tvc TSRMLS_CC); + if (free_title) g_free(title); }