AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-19 21:40:22 +00:00
Code Issues Projects Releases Wiki Activity

gtk: rely on default marshallers

Browse Source 
Similar to previous removals of g_cclosure_marshal_VOID__VOID we can remove
other marshallers for which are a simple G_TYPE_NONE with single parameter.
In those cases, GLib will setup both a c_marshaller and va_marshaller for
us. Before this commit, we would not get a va_marshaller because the
c_marshaller is set.

Related to GNOME/Initiatives#10
This commit is contained in:
Christian Hergert 2019-05-30 20:56:50 -07:00
parent 8925c17297
commit bd26cce812
23 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gdk/gdkdevice.c
View File

@ -330,7 +330,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);
}

10
gdk/gdkdisplay.c
View File

@ -237,7 +237,7 @@ gdk_display_class_init (GdkDisplayClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GdkDisplayClass, closed),
NULL, NULL,
g_cclosure_marshal_VOID__BOOLEAN,
NULL,
G_TYPE_NONE,
1,
G_TYPE_BOOLEAN);
@ -255,7 +255,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);
/**
@ -271,7 +271,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);
/**
@ -287,7 +287,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);
/**
@ -303,7 +303,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);
/**

2
gdk/gdkdisplaymanager.c
View File

@ -156,7 +156,7 @@ gdk_display_manager_class_init (GdkDisplayManagerClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GdkDisplayManagerClass, display_opened),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
NULL,
G_TYPE_NONE,
1,
GDK_TYPE_DISPLAY);

2
gdk/gdkdrag.c
View File

@ -450,7 +450,7 @@ gdk_drag_class_init (GdkDragClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GdkDragClass, cancel),
NULL, NULL,
g_cclosure_marshal_VOID__ENUM,
NULL,
G_TYPE_NONE, 1, GDK_TYPE_DRAG_CANCEL_REASON);
/**

8
gdk/gdkseat.c
View File

@ -129,7 +129,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);
@ -147,7 +147,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);
@ -168,7 +168,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);
@ -185,7 +185,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);

4
gtk/gtkapplication.c
View File

@ -785,7 +785,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);
/**
@ -801,7 +801,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

@ -565,7 +565,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

@ -264,7 +264,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

@ -475,7 +475,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);

4
gtk/gtkentry.c
View File

@ -870,7 +870,7 @@ gtk_entry_class_init (GtkEntryClass *class)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
g_cclosure_marshal_VOID__ENUM,
NULL,
G_TYPE_NONE, 1,
GTK_TYPE_ENTRY_ICON_POSITION);
@ -888,7 +888,7 @@ gtk_entry_class_init (GtkEntryClass *class)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
g_cclosure_marshal_VOID__ENUM,
NULL,
G_TYPE_NONE, 1,
GTK_TYPE_ENTRY_ICON_POSITION);

2
gtk/gtkflowbox.c
View File

@ -3531,7 +3531,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

@ -649,7 +649,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

@ -385,7 +385,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

@ -507,7 +507,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);
@ -575,7 +575,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

@ -270,7 +270,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

@ -296,7 +296,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"),
@ -304,7 +304,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"),
@ -312,7 +312,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

@ -223,7 +223,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

@ -773,7 +773,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);
/**
@ -794,7 +794,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);
/**
@ -932,7 +932,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);
/**
@ -1018,7 +1018,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

@ -616,7 +616,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] =
@ -624,7 +624,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

@ -410,7 +410,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);
/**
@ -426,7 +426,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

@ -1666,7 +1666,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkWidgetClass, drag_leave),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
NULL,
G_TYPE_NONE, 1,
GDK_TYPE_DROP);