From 8935dc0947606f583f903b2eb8a3ce73ecb3ba51 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 11 Jun 2006 00:32:38 +0000 Subject: [PATCH] Register create_custom_widget as an object-returning signal. (#344505, 2006-06-10 Matthias Clasen * gtk/gtkprintoperation.c: Register create_custom_widget as an object-returning signal. (#344505, Marko Anastasov, patch by Christian Persch) * gtk/gtkmarshalers.list: Add the right marshaller. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ gtk/gtkmarshalers.list | 2 +- gtk/gtkprintoperation.c | 8 ++++---- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ab1ef459f5..7c02f13b13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2006-06-10 Matthias Clasen + * gtk/gtkprintoperation.c: Register create_custom_widget as + an object-returning signal. (#344505, Marko Anastasov, patch + by Christian Persch) + + * gtk/gtkmarshalers.list: Add the right marshaller. + * gtk/gtk.symbols: * gtk/gtkprintjob.[hc]: Register GtkPrintCapabilities as a flags type. (#344504, Marko Anastasov) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ab1ef459f5..7c02f13b13 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,11 @@ 2006-06-10 Matthias Clasen + * gtk/gtkprintoperation.c: Register create_custom_widget as + an object-returning signal. (#344505, Marko Anastasov, patch + by Christian Persch) + + * gtk/gtkmarshalers.list: Add the right marshaller. + * gtk/gtk.symbols: * gtk/gtkprintjob.[hc]: Register GtkPrintCapabilities as a flags type. (#344504, Marko Anastasov) diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list index e089d13351..c11f42b741 100644 --- a/gtk/gtkmarshalers.list +++ b/gtk/gtkmarshalers.list @@ -53,7 +53,7 @@ NONE:INT,BOOL NONE:INT,INT NONE:NONE NONE:STRING,INT,POINTER -POINTER:VOID +OBJECT:VOID STRING:DOUBLE VOID:DOUBLE VOID:BOOLEAN diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c index 6d9821fd98..512eae936a 100644 --- a/gtk/gtkprintoperation.c +++ b/gtk/gtkprintoperation.c @@ -511,9 +511,9 @@ custom_widget_accumulator (GSignalInvocationHint *ihint, gboolean continue_emission; GtkWidget *widget; - widget = g_value_get_pointer (handler_return); + widget = g_value_get_object (handler_return); if (widget != NULL) - g_value_set_pointer (return_accu, widget); + g_value_set_object (return_accu, widget); continue_emission = (widget == NULL); return continue_emission; @@ -773,8 +773,8 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkPrintOperationClass, create_custom_widget), custom_widget_accumulator, NULL, - _gtk_marshal_POINTER__VOID, - G_TYPE_POINTER, 0); + _gtk_marshal_OBJECT__VOID, + G_TYPE_OBJECT, 0); /** * GtkPrintOperation::custom-widget-apply: -- GitLab