Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Register create_custom_widget as an object-returning signal. (#344505,

Browse Source 
2006-06-10  Matthias Clasen <mclasen@redhat.com>

        * 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.
This commit is contained in:
Matthias Clasen
2006-06-11 00:32:38 +00:00
committed by Matthias Clasen
parent 4e61a85224
commit 8935dc0947
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,5 +1,11 @@
2006-06-10 Matthias Clasen <mclasen@redhat.com>
* 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)

6
ChangeLog.pre-2-10
View File

@@ -1,5 +1,11 @@
2006-06-10 Matthias Clasen <mclasen@redhat.com>
* 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)

2
gtk/gtkmarshalers.list
View File

@@ -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

8
gtk/gtkprintoperation.c
View File

@@ -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: