cvs: php-gtk /ext/libglade libglade.overrides

sfox Sun Oct 16 21:30:23 2005 EDT Modified files: /php-gtk/ext/libglade libglade.overrides Log: Still no answer to the 'root-free' problem, just tidying it up a little. http://cvs.php.net/diff.php/php-gtk/ext/libglade/libglade.overrides?r1=1.15&r2=1.16&ty=u Index: php-gtk/ext/libglade/libglade.overrides diff -u php-gtk/ext/libglade/libglade.overrides:1.15 php-gtk/ext/libglade/libglade.overrides:1.16 --- php-gtk/ext/libglade/libglade.overrides:1.15 Sun Oct 16 17:03:02 2005 +++ php-gtk/ext/libglade/libglade.overrides Sun Oct 16 21:30:23 2005 @@ -15,7 +15,7 @@ override glade_xml_new PHP_METHOD { - char *fname, *root = NULL, *domain = NULL; + char *fname, *root = "window1", *domain = NULL; zend_bool free_fname, free_root, free_domain; GObject *wrapped_obj; @@ -23,9 +23,6 @@ PHPG_THROW_CONSTRUCT_EXCEPTION(GladeXML); } - /* Glade's default name for the toplevel window is hard-coded - but there may be a better way */ - if (!root) root = (char *)"window1"; - wrapped_obj = (GObject *) glade_xml_new(fname, root, domain); if (free_fname) g_free(fname); if (free_root) g_free(root);