cvs: php-gtk /ext/gtk+ gtktreeview.overrides
| From: | Anant Narayanan | Date: | Fri, 22 Jun 2007 21:33:35 +0000 |
| Subject: | cvs: php-gtk /ext/gtk+ gtktreeview.overrides | ||
| Groups: | php.gtk.cvs | ||
| Request: | Send a blank email to php-gtk-cvs+get-2751@lists.php.net to get a copy of this message | ||
anant Fri Jun 22 21:33:35 2007 UTC
Modified files:
/php-gtk/ext/gtk+ gtktreeview.overrides
Log:
Fix segfault. Patch by Bob Majdak Jr
http://cvs.php.net/viewvc.cgi/php-gtk/ext/gtk+/gtktreeview.overrides?r1=1.80&r2=1.81&diff_format=u
Index: php-gtk/ext/gtk+/gtktreeview.overrides
diff -u php-gtk/ext/gtk+/gtktreeview.overrides:1.80 php-gtk/ext/gtk+/gtktreeview.overrides:1.81
--- php-gtk/ext/gtk+/gtktreeview.overrides:1.80 Sat Feb 3 15:26:13 2007
+++ php-gtk/ext/gtk+/gtktreeview.overrides Fri Jun 22 21:33:34 2007
@@ -2703,7 +2703,7 @@
{
GtkTreePath *path;
GtkTreeViewDropPosition pos;
- zval *php_path = NULL;
+ zval *php_path = NULL;
NOT_STATIC_METHOD();
@@ -2713,16 +2713,13 @@
gtk_tree_view_get_drag_dest_row(GTK_TREE_VIEW(PHPG_GOBJECT(this_ptr)), &path, &pos);
- array_init(return_value);
-
if (path) {
phpg_tree_path_to_zval(path, &php_path TSRMLS_CC);
+ gtk_tree_path_free(path);
+ php_gtk_build_value(&return_value, "(Ni)", php_path, (gint)pos);
} else {
- MAKE_STD_ZVAL(php_path);
+ RETURN_FALSE;
}
- add_next_index_zval(return_value, php_path);
-
- add_next_index_long(return_value, pos);
}
%%