cvs: php-gtk /ext/libglade libglade.overrides
| From: | Steph | Date: | Mon, 17 Oct 2005 02:13:45 +0000 |
| Subject: | cvs: php-gtk /ext/libglade libglade.overrides | ||
| Groups: | php.gtk.cvs | ||
| Request: | Send a blank email to php-gtk-cvs+get-1913@lists.php.net to get a copy of this message | ||
sfox Sun Oct 16 22:13:45 2005 EDT
Modified files:
/php-gtk/ext/libglade libglade.overrides
Log:
(char *) NULL != (const char*) NULL
Problem solved.
http://cvs.php.net/diff.php/php-gtk/ext/libglade/libglade.overrides?r1=1.16&r2=1.17&ty=u
Index: php-gtk/ext/libglade/libglade.overrides
diff -u php-gtk/ext/libglade/libglade.overrides:1.16 php-gtk/ext/libglade/libglade.overrides:1.17
--- php-gtk/ext/libglade/libglade.overrides:1.16 Sun Oct 16 21:30:23 2005
+++ php-gtk/ext/libglade/libglade.overrides Sun Oct 16 22:13:43 2005
@@ -15,7 +15,7 @@
override glade_xml_new
PHP_METHOD
{
- char *fname, *root = "window1", *domain = NULL;
+ char *fname, *root = NULL, *domain = NULL;
zend_bool free_fname, free_root, free_domain;
GObject *wrapped_obj;
@@ -23,7 +23,7 @@
PHPG_THROW_CONSTRUCT_EXCEPTION(GladeXML);
}
- wrapped_obj = (GObject *) glade_xml_new(fname, root, domain);
+ wrapped_obj = (GObject *) glade_xml_new(fname, (const char *)root, (const char *)domain);
if (free_fname) g_free(fname);
if (free_root) g_free(root);
if (free_domain) g_free(domain);