[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-gtk-cvs
Subject:    [php-gtk-cvs] cvs: php-gtk /main php_gtk.h phpg_gobject.c
From:       "Andrei Zmievski" <andrei () php ! net>
Date:       2004-08-13 6:13:19
Message-ID: cvsandrei1092377599 () cvsserver
[Download RAW message or body]

andrei		Fri Aug 13 02:13:19 2004 EDT

  Modified files:              
    /php-gtk/main	php_gtk.h phpg_gobject.c 
  Log:
  Rename phpg_set_wrapper() to phpg_gobject_set_wrapper() so its usage is
  clear.
  
  
http://cvs.php.net/diff.php/php-gtk/main/php_gtk.h?r1=1.74&r2=1.75&ty=u
Index: php-gtk/main/php_gtk.h
diff -u php-gtk/main/php_gtk.h:1.74 php-gtk/main/php_gtk.h:1.75
--- php-gtk/main/php_gtk.h:1.74	Thu Aug 12 03:26:16 2004
+++ php-gtk/main/php_gtk.h	Fri Aug 13 02:13:19 2004
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
  
-/* $Id: php_gtk.h,v 1.74 2004/08/12 07:26:16 andrei Exp $: */
+/* $Id: php_gtk.h,v 1.75 2004/08/13 06:13:19 andrei Exp $: */
 
 #ifndef _PHP_GTK_H
 #define _PHP_GTK_H
@@ -242,7 +242,6 @@
 PHP_GTK_API zval* php_gtype_new(GType type);
 PHP_GTK_API GType php_gtype_from_zval(zval *value);
 
-PHP_GTK_API void phpg_set_wrapper(zval *zobj, void *obj, phpg_dtor_t dtor TSRMLS_DC);
 
 /* GValue */
 PHP_GTK_API zval* phpg_gvalue_as_zval(const GValue *gval, zend_bool copy_boxed);
@@ -252,6 +251,7 @@
 
 /* GObject */
 PHP_GTK_API void phpg_gobject_new(GObject *obj, zval **zobj TSRMLS_DC);
+PHP_GTK_API void phpg_gobject_set_wrapper(zval *zobj, GObject *obj TSRMLS_DC);
 void phpg_gobject_register_self();
 
 PHP_GTK_API extern PHP_GTK_EXPORT_CE(gtype_ce);
http://cvs.php.net/diff.php/php-gtk/main/phpg_gobject.c?r1=1.6&r2=1.7&ty=u
Index: php-gtk/main/phpg_gobject.c
diff -u php-gtk/main/phpg_gobject.c:1.6 php-gtk/main/phpg_gobject.c:1.7
--- php-gtk/main/phpg_gobject.c:1.6	Thu Aug 12 03:26:16 2004
+++ php-gtk/main/phpg_gobject.c	Fri Aug 13 02:13:19 2004
@@ -322,8 +322,8 @@
 }
 /* }}} */
 
-/* {{{ PHP_GTK_API phpg_set_wrapper() */
-PHP_GTK_API void phpg_set_wrapper(zval *zobj, void *obj, phpg_dtor_t dtor TSRMLS_DC)
+/* {{{ PHP_GTK_API phpg_gobject_set_wrapper() */
+PHP_GTK_API void phpg_gobject_set_wrapper(zval *zobj, GObject *obj TSRMLS_DC)
 {
     phpg_gobject_t *pobj = NULL;
 
@@ -334,8 +334,7 @@
     zend_objects_store_add_ref(zobj TSRMLS_CC);
     pobj = zend_object_store_get_object(zobj TSRMLS_CC);
     pobj->obj = obj;
-    pobj->dtor = dtor;
-    /* XXX do better checking for whether obj is a sinkable object */
+    pobj->dtor = g_object_unref;
     phpg_sink_object(pobj->obj);
     g_object_set_qdata(pobj->obj, gobject_wrapper_key, (void*)Z_OBJ_HANDLE_P(zobj));
 }
@@ -409,7 +408,7 @@
 
     obj = PHPG_GET(this_ptr);
     numc = snprintf(buf, sizeof(buf),
-                    "[%s object (%s type)]", Z_OBJCE_P(this_ptr)->name,
+                    "[%s object (%s Gtk+ type)]", Z_OBJCE_P(this_ptr)->name,
                     obj ? G_OBJECT_TYPE_NAME(obj) : "uninitialized");
     RETURN_STRINGL(buf, numc, 1);
 }

-- 
PHP-GTK CVS Mailing List (http://gtk.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread]