Re: libbonoboui patch

[Michael Meeks <michael ximian com>]

Hi Jens,

	Yes - please, looks great - slipped through the net. Note though that
g_signal_emit takes a GQuark detail argument - you should pass 0 for
that, otherwise the signals won't work.

	Thanks,

		Michael.

On Fri, 2001-12-28 at 17:41, Jens Finke wrote:
> I noticed that the bonobo-property-control implementation doesn't take
> into account that the base class is BonoboObject and has nothing to do
> with GtkObject anymore. So here is a patch for fixing this.
> 
> May I apply it?
> 
> Regards,
> 
>   Jens
> 
> -- 
> "Wer die Freiheit aufgibt, um Sicherheit zu gewinnen, wird am Ende beides
> verlieren." -- Benjamin Franklin
> ----
> 

> Index: ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/libbonoboui/ChangeLog,v
> retrieving revision 1.219
> diff -u -p -r1.219 ChangeLog
> --- ChangeLog	2001/12/27 03:46:20	1.219
> +++ ChangeLog	2001/12/28 17:35:08
> @@ -1,3 +1,15 @@
> +2001-12-28  Jens Finke <jens triq net>
> +
> +	* bonobo/bonobo-property-control.c
> +	(impl_Bonobo_PropertyControl_notifyAction),
> +	(bonobo_property_control_destroy),
> +	(bonobo_property_control_class_init),
> +	(bonobo_property_control_new_full),
> +	(bonobo_property_control_new): Replaced functions from gtk based
> +	type system with new gobject based functions.
> +
> +	* bonobo/bonobo-ui-marshal.list: Added 'VOID:INT,INT'.
> +
>  2001-12-27  Duarte Loreto <happyguy_pt hotmail com>
>  
>          * configure.in: Added portuguese to ALL_LINGUAS
> Index: bonobo/bonobo-property-control.c
> ===================================================================
> RCS file: /cvs/gnome/libbonoboui/bonobo/bonobo-property-control.c,v
> retrieving revision 1.14
> diff -u -p -r1.14 bonobo-property-control.c
> --- bonobo/bonobo-property-control.c	2001/12/02 23:01:05	1.14
> +++ bonobo/bonobo-property-control.c	2001/12/28 17:35:09
> @@ -9,13 +9,11 @@
>   */
>  #include <config.h>
>  #include <stdio.h>
> -#include <gtk/gtksignal.h>
> -#include <gtk/gtkmarshal.h>
> -#include <gtk/gtktypeutils.h>
>  #include <bonobo/bonobo-exception.h>
>  #include <bonobo/bonobo-main.h>
>  #include <bonobo/bonobo-property-control.h>
>  #include <bonobo/bonobo-event-source.h>
> +#include <bonobo/bonobo-ui-marshal.h>
>  #include <bonobo/Bonobo.h>
>  
>  struct _BonoboPropertyControlPrivate {
> @@ -33,7 +31,7 @@ enum {
>  
>  #define PARENT_TYPE BONOBO_TYPE_OBJECT
>  
> -static GtkObjectClass *parent_class;
> +static GObjectClass *parent_class;
>  
>  static guint32 signals[LAST_SIGNAL] = { 0 };
>  
> @@ -103,11 +101,11 @@ impl_Bonobo_PropertyControl_notifyAction
>  		return;
>  	}
>  	
> -	gtk_signal_emit (GTK_OBJECT (bonobo_object), signals [ACTION], pagenumber, action);
> +	g_signal_emit (G_OBJECT (bonobo_object), signals [ACTION], pagenumber, action);
>  }
>  
>  static void
> -bonobo_property_control_destroy (GtkObject *object)
> +bonobo_property_control_destroy (BonoboObject *object)
>  {
>  	BonoboPropertyControl *property_control;
>  	
> @@ -118,25 +116,28 @@ bonobo_property_control_destroy (GtkObje
>  	g_free (property_control->priv);
>  	property_control->priv = NULL;
>  
> -	parent_class->destroy (object);
> +	BONOBO_OBJECT_CLASS (parent_class)->destroy (object);
>  }
>  
>  static void
>  bonobo_property_control_class_init (BonoboPropertyControlClass *klass)
>  {
> -	GtkObjectClass *object_class;
> +	BonoboObjectClass *object_class;
>  	POA_Bonobo_PropertyControl__epv *epv = &klass->epv;
>  
> -	object_class = GTK_OBJECT_CLASS (klass);
> +	object_class = BONOBO_OBJECT_CLASS (klass);
>  	object_class->destroy = bonobo_property_control_destroy;
>  
> -	signals [ACTION] = gtk_signal_new ("action",
> -					 GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class),
> -					 GTK_SIGNAL_OFFSET (BonoboPropertyControlClass, action),
> -					 gtk_marshal_NONE__INT_INT, GTK_TYPE_NONE,
> -					 2, GTK_TYPE_INT, GTK_TYPE_INT);
> +	signals [ACTION] = g_signal_new ("action",
> +					 G_TYPE_FROM_CLASS (object_class),
> +					 G_SIGNAL_RUN_FIRST, 
> +					 G_STRUCT_OFFSET (BonoboPropertyControlClass, action),
> +					 NULL, NULL,
> +					 bonobo_ui_marshal_VOID__INT_INT,
> +					 G_TYPE_NONE,
> +					 2, G_TYPE_INT, G_TYPE_INT);
>  				     
> -	parent_class = gtk_type_class (PARENT_TYPE);
> +	parent_class = g_type_class_peek_parent (klass);
>  
>  	epv->_get_pageCount = impl_Bonobo_PropertyControl__get_pageCount;
>  	epv->getControl     = impl_Bonobo_PropertyControl_getControl;
> @@ -219,7 +220,8 @@ bonobo_property_control_new_full (Bonobo
>  	g_return_val_if_fail (num_pages > 0, NULL);
>  	g_return_val_if_fail (BONOBO_IS_EVENT_SOURCE (event_source), NULL);
>  
> -	property_control = gtk_type_new (bonobo_property_control_get_type ());
> +	property_control = g_object_new (bonobo_property_control_get_type (), 
> +					 NULL);
>  					
>  	return bonobo_property_control_construct (
>  		property_control, event_source, get_fn, num_pages, closure);
> @@ -245,7 +247,7 @@ bonobo_property_control_new (BonoboPrope
>  
>  	g_return_val_if_fail (num_pages > 0, NULL);
>  
> -	property_control = gtk_type_new (bonobo_property_control_get_type ());
> +	property_control = g_object_new (bonobo_property_control_get_type (), NULL);
>  
>  	event_source = bonobo_event_source_new ();
>  
> Index: bonobo/bonobo-ui-marshal.list
> ===================================================================
> RCS file: /cvs/gnome/libbonoboui/bonobo/bonobo-ui-marshal.list,v
> retrieving revision 1.3
> diff -u -p -r1.3 bonobo-ui-marshal.list
> --- bonobo/bonobo-ui-marshal.list	2001/10/18 02:36:37	1.3
> +++ bonobo/bonobo-ui-marshal.list	2001/12/28 17:35:09
> @@ -3,3 +3,5 @@ VOID:STRING,BOOLEAN
>  BOOLEAN:POINTER
>  VOID:POINTER,STRING
>  VOID:POINTER,POINTER
> +VOID:INT,INT
> +
-- 
 mmeeks gnu org  <><, Pseudo Engineer, itinerant idiot