AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'wip/chergert/marshalling' into 'gtk-3-24'

Browse Source 
gtk: rely on default marshallers

See merge request GNOME/gtk!897
This commit is contained in:
Matthias Clasen 2019-05-31 19:46:44 +00:00
commit 3386924dbb
24 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gdk/gdkdevice.c
View File

@ -367,7 +367,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST,
0, NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
NULL,
G_TYPE_NONE, 1, GDK_TYPE_DEVICE_TOOL);
}

6
gdk/gdkdevicemanager.c
View File

@ -203,7 +203,7 @@ gdk_device_manager_class_init (GdkDeviceManagerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GdkDeviceManagerClass, device_added),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
NULL,
G_TYPE_NONE, 1,
GDK_TYPE_DEVICE);
@ -222,7 +222,7 @@ gdk_device_manager_class_init (GdkDeviceManagerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GdkDeviceManagerClass, device_removed),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
NULL,
G_TYPE_NONE, 1,
GDK_TYPE_DEVICE);
@ -248,7 +248,7 @@ gdk_device_manager_class_init (GdkDeviceManagerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GdkDeviceManagerClass, device_changed),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
NULL,
G_TYPE_NONE, 1,
GDK_TYPE_DEVICE);
}

8
gdk/gdkdisplay.c
View File

@ -212,7 +212,7 @@ gdk_display_class_init (GdkDisplayClass *class)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
0, NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
NULL,
G_TYPE_NONE, 1, GDK_TYPE_SEAT);
/**
@ -230,7 +230,7 @@ gdk_display_class_init (GdkDisplayClass *class)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
0, NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
NULL,
G_TYPE_NONE, 1, GDK_TYPE_SEAT);
/**
@ -248,7 +248,7 @@ gdk_display_class_init (GdkDisplayClass *class)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
0, NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
NULL,
G_TYPE_NONE, 1, GDK_TYPE_MONITOR);
/**
@ -266,7 +266,7 @@ gdk_display_class_init (GdkDisplayClass *class)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
0, NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
NULL,
G_TYPE_NONE, 1, GDK_TYPE_MONITOR);
}

6
gdk/gdkdnd.c
View File

@ -289,7 +289,7 @@ gdk_drag_context_class_init (GdkDragContextClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GdkDragContextClass, cancel),
NULL, NULL,
g_cclosure_marshal_VOID__ENUM,
NULL,
G_TYPE_NONE, 1, GDK_TYPE_DRAG_CANCEL_REASON);
/**
@ -311,7 +311,7 @@ gdk_drag_context_class_init (GdkDragContextClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GdkDragContextClass, drop_performed),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
NULL,
G_TYPE_NONE, 1, G_TYPE_INT);
/**
@ -356,7 +356,7 @@ gdk_drag_context_class_init (GdkDragContextClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GdkDragContextClass, action_changed),
NULL, NULL,
g_cclosure_marshal_VOID__FLAGS,
NULL,
G_TYPE_NONE, 1, GDK_TYPE_DRAG_ACTION);
}

8
gdk/gdkseat.c
View File

@ -124,7 +124,7 @@ gdk_seat_class_init (GdkSeatClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GdkSeatClass, device_added),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
NULL,
G_TYPE_NONE, 1,
GDK_TYPE_DEVICE);
@ -144,7 +144,7 @@ gdk_seat_class_init (GdkSeatClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GdkSeatClass, device_removed),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
NULL,
G_TYPE_NONE, 1,
GDK_TYPE_DEVICE);
@ -167,7 +167,7 @@ gdk_seat_class_init (GdkSeatClass *klass)
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0, NULL, NULL,
g_cclosure_marshal_VOID__BOXED,
NULL,
G_TYPE_NONE, 1,
GDK_TYPE_DEVICE_TOOL);
@ -186,7 +186,7 @@ gdk_seat_class_init (GdkSeatClass *klass)
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0, NULL, NULL,
g_cclosure_marshal_VOID__BOXED,
NULL,
G_TYPE_NONE, 1,
GDK_TYPE_DEVICE_TOOL);

2
gtk/deprecated/gtkradioaction.c
View File

@ -179,7 +179,7 @@ gtk_radio_action_class_init (GtkRadioActionClass *klass)
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE,
G_STRUCT_OFFSET (GtkRadioActionClass, changed), NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
NULL,
G_TYPE_NONE, 1, GTK_TYPE_RADIO_ACTION);
}

2
gtk/deprecated/gtkuimanager.c
View File

@ -493,7 +493,7 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass)
G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE,
G_STRUCT_OFFSET (GtkUIManagerClass, add_widget),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
NULL,
G_TYPE_NONE, 1,
GTK_TYPE_WIDGET);

4
gtk/gtkapplication.c
View File

@ -627,7 +627,7 @@ gtk_application_class_init (GtkApplicationClass *class)
g_signal_new (I_("window-added"), GTK_TYPE_APPLICATION, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkApplicationClass, window_added),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
NULL,
G_TYPE_NONE, 1, GTK_TYPE_WINDOW);
/**
@ -645,7 +645,7 @@ gtk_application_class_init (GtkApplicationClass *class)
g_signal_new (I_("window-removed"), GTK_TYPE_APPLICATION, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkApplicationClass, window_removed),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
NULL,
G_TYPE_NONE, 1, GTK_TYPE_WINDOW);
/**

2
gtk/gtkassistant.c
View File

@ -448,7 +448,7 @@ gtk_assistant_class_init (GtkAssistantClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkAssistantClass, prepare),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
NULL,
G_TYPE_NONE, 1, GTK_TYPE_WIDGET);
/**

2
gtk/gtkcellrendereraccel.c
View File

@ -237,7 +237,7 @@ gtk_cell_renderer_accel_class_init (GtkCellRendererAccelClass *cell_accel_class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkCellRendererAccelClass, accel_cleared),
NULL, NULL,
g_cclosure_marshal_VOID__STRING,
NULL,
G_TYPE_NONE, 1,
G_TYPE_STRING);
}

2
gtk/gtkcombobox.c
View File

@ -737,7 +737,7 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_CALLBACK (gtk_combo_box_real_move_active),
NULL, NULL,
g_cclosure_marshal_VOID__ENUM,
NULL,
G_TYPE_NONE, 1,
GTK_TYPE_SCROLL_TYPE);

2
gtk/gtkflowbox.c
View File

@ -3922,7 +3922,7 @@ gtk_flow_box_class_init (GtkFlowBoxClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkFlowBoxClass, child_activated),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
NULL,
G_TYPE_NONE, 1,
GTK_TYPE_FLOW_BOX_CHILD);

2
gtk/gtkiconview.c
View File

@ -726,7 +726,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkIconViewClass, item_activated),
NULL, NULL,
g_cclosure_marshal_VOID__BOXED,
NULL,
G_TYPE_NONE, 1,
GTK_TYPE_TREE_PATH);

2
gtk/gtkinfobar.c
View File

@ -381,7 +381,7 @@ gtk_info_bar_class_init (GtkInfoBarClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkInfoBarClass, response),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
NULL,
G_TYPE_NONE, 1,
G_TYPE_INT);

4
gtk/gtklistbox.c
View File

@ -511,7 +511,7 @@ gtk_list_box_class_init (GtkListBoxClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkListBoxClass, row_selected),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
NULL,
G_TYPE_NONE, 1,
GTK_TYPE_LIST_BOX_ROW);
@ -587,7 +587,7 @@ gtk_list_box_class_init (GtkListBoxClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkListBoxClass, row_activated),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
NULL,
G_TYPE_NONE, 1,
GTK_TYPE_LIST_BOX_ROW);
signals[ACTIVATE_CURSOR_ROW] =

2
gtk/gtknativedialog.c
View File

@ -280,7 +280,7 @@ gtk_native_dialog_class_init (GtkNativeDialogClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkNativeDialogClass, response),
NULL, NULL,
g_cclosure_marshal_VOID__INT,
NULL,
G_TYPE_NONE, 1,
G_TYPE_INT);
}

6
gtk/gtkprintbackend.c
View File

@ -420,7 +420,7 @@ gtk_print_backend_class_init (GtkPrintBackendClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkPrintBackendClass, printer_added),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
NULL,
G_TYPE_NONE, 1, GTK_TYPE_PRINTER);
signals[PRINTER_REMOVED] =
g_signal_new (I_("printer-removed"),
@ -428,7 +428,7 @@ gtk_print_backend_class_init (GtkPrintBackendClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkPrintBackendClass, printer_removed),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
NULL,
G_TYPE_NONE, 1, GTK_TYPE_PRINTER);
signals[PRINTER_STATUS_CHANGED] =
g_signal_new (I_("printer-status-changed"),
@ -436,7 +436,7 @@ gtk_print_backend_class_init (GtkPrintBackendClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkPrintBackendClass, printer_status_changed),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
NULL,
G_TYPE_NONE, 1, GTK_TYPE_PRINTER);
signals[REQUEST_PASSWORD] =
g_signal_new (I_("request-password"),

2
gtk/gtkprinter.c
View File

@ -229,7 +229,7 @@ gtk_printer_class_init (GtkPrinterClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkPrinterClass, details_acquired),
NULL, NULL,
g_cclosure_marshal_VOID__BOOLEAN,
NULL,
G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
}

8
gtk/gtkprintoperation.c
View File

@ -785,7 +785,7 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkPrintOperationClass, done),
NULL, NULL,
g_cclosure_marshal_VOID__ENUM,
NULL,
G_TYPE_NONE, 1, GTK_TYPE_PRINT_OPERATION_RESULT);
/**
@ -808,7 +808,7 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkPrintOperationClass, begin_print),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
NULL,
G_TYPE_NONE, 1, GTK_TYPE_PRINT_CONTEXT);
/**
@ -954,7 +954,7 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkPrintOperationClass, end_print),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
NULL,
G_TYPE_NONE, 1, GTK_TYPE_PRINT_CONTEXT);
/**
@ -1048,7 +1048,7 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkPrintOperationClass, custom_widget_apply),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
NULL,
G_TYPE_NONE, 1, GTK_TYPE_WIDGET);
/**

2
gtk/gtkprintoperationpreview.c
View File

@ -77,7 +77,7 @@ gtk_print_operation_preview_base_init (gpointer g_iface)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkPrintOperationPreviewIface, ready),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
NULL,
G_TYPE_NONE, 1,
GTK_TYPE_PRINT_CONTEXT);

4
gtk/gtksearchengine.c
View File

@ -174,7 +174,7 @@ _gtk_search_engine_class_init (GtkSearchEngineClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkSearchEngineClass, hits_added),
NULL, NULL,
g_cclosure_marshal_VOID__POINTER,
NULL,
G_TYPE_NONE, 1,
G_TYPE_POINTER);
@ -193,7 +193,7 @@ _gtk_search_engine_class_init (GtkSearchEngineClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkSearchEngineClass, error),
NULL, NULL,
g_cclosure_marshal_VOID__STRING,
NULL,
G_TYPE_NONE, 1,
G_TYPE_STRING);
}

4
gtk/gtktexthandle.c
View File

@ -703,7 +703,7 @@ _gtk_text_handle_class_init (GtkTextHandleClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST, 0,
NULL, NULL,
g_cclosure_marshal_VOID__ENUM,
NULL,
G_TYPE_NONE, 1,
GTK_TYPE_TEXT_HANDLE_POSITION);
signals[DRAG_FINISHED] =
@ -711,7 +711,7 @@ _gtk_text_handle_class_init (GtkTextHandleClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST, 0,
NULL, NULL,
g_cclosure_marshal_VOID__ENUM,
NULL,
G_TYPE_NONE, 1,
GTK_TYPE_TEXT_HANDLE_POSITION);

4
gtk/gtktoolbar.c
View File

@ -456,7 +456,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkToolbarClass, orientation_changed),
NULL, NULL,
g_cclosure_marshal_VOID__ENUM,
NULL,
G_TYPE_NONE, 1,
GTK_TYPE_ORIENTATION);
/**
@ -472,7 +472,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkToolbarClass, style_changed),
NULL, NULL,
g_cclosure_marshal_VOID__ENUM,
NULL,
G_TYPE_NONE, 1,
GTK_TYPE_TOOLBAR_STYLE);
/**

2
gtk/gtkwidget.c
View File

@ -1971,7 +1971,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE | G_SIGNAL_DETAILED | G_SIGNAL_NO_HOOKS,
G_STRUCT_OFFSET (GtkWidgetClass, child_notify),
NULL, NULL,
g_cclosure_marshal_VOID__PARAM,
NULL,
G_TYPE_NONE, 1,
G_TYPE_PARAM);