com gtk/php-gtk: Still no answer to the 'root-free' problem, just tidying it up a little.: ext/libglade/libglade.overrides

Commit:    765239a2c20c477a46729bbad29fd130281f86f9
Author:    Steph Fox <[email protected]>         Mon, 17 Oct 2005 01:30:23 +0000
Parents:   e328d04b672ccd83b78749e52038c8fa18154926
Branches:  master

Link:       http://git.php.net/?p=gtk/php-gtk.git;a=commitdiff;h=765239a2c20c477a46729bbad29fd130281f86f9

Log:
Still no answer to the 'root-free' problem, just tidying it up a little.

Changed paths:
  M  ext/libglade/libglade.overrides


Diff:
765239a2c20c477a46729bbad29fd130281f86f9
diff --git a/ext/libglade/libglade.overrides b/ext/libglade/libglade.overrides
index 6a77a32..470d66c 100644
--- a/ext/libglade/libglade.overrides
+++ b/ext/libglade/libglade.overrides
@@ -15,7 +15,7 @@ ignore
 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 @@ PHP_METHOD
         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);