[gtk/wip/chergert/remove-cclosure] gtk: rely on default marshallers
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/chergert/remove-cclosure] gtk: rely on default marshallers
- Date: Fri, 31 May 2019 03:57:52 +0000 (UTC)
commit bd26cce812c426ab37db1613a05be52023ea1778
Author: Christian Hergert <chergert redhat com>
Date: Thu May 30 20:56:50 2019 -0700
gtk: rely on default marshallers
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
gdk/gdkdevice.c | 2 +-
gdk/gdkdisplay.c | 10 +++++-----
gdk/gdkdisplaymanager.c | 2 +-
gdk/gdkdrag.c | 2 +-
gdk/gdkseat.c | 8 ++++----
gtk/gtkapplication.c | 4 ++--
gtk/gtkassistant.c | 2 +-
gtk/gtkcellrendereraccel.c | 2 +-
gtk/gtkcombobox.c | 2 +-
gtk/gtkentry.c | 4 ++--
gtk/gtkflowbox.c | 2 +-
gtk/gtkiconview.c | 2 +-
gtk/gtkinfobar.c | 2 +-
gtk/gtklistbox.c | 4 ++--
gtk/gtknativedialog.c | 2 +-
gtk/gtkprintbackend.c | 6 +++---
gtk/gtkprinter.c | 2 +-
gtk/gtkprintoperation.c | 8 ++++----
gtk/gtkprintoperationpreview.c | 2 +-
gtk/gtksearchengine.c | 4 ++--
gtk/gtktexthandle.c | 4 ++--
gtk/gtktoolbar.c | 4 ++--
gtk/gtkwidget.c | 2 +-
23 files changed, 41 insertions(+), 41 deletions(-)
---
diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c
index 603231ee73..7b523ad730 100644
--- a/gdk/gdkdevice.c
+++ b/gdk/gdkdevice.c
@@ -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);
}
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index d8bdff8abb..c2a9e26bf7 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -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);
/**
diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c
index 8025ae406c..8a359b77c6 100644
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@ -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);
diff --git a/gdk/gdkdrag.c b/gdk/gdkdrag.c
index 5f2f489168..acf7a7bede 100644
--- a/gdk/gdkdrag.c
+++ b/gdk/gdkdrag.c
@@ -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);
/**
diff --git a/gdk/gdkseat.c b/gdk/gdkseat.c
index c13fbed615..3f5f4d7622 100644
--- a/gdk/gdkseat.c
+++ b/gdk/gdkseat.c
@@ -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);
diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c
index 5d8ca76a15..25ac949081 100644
--- a/gtk/gtkapplication.c
+++ b/gtk/gtkapplication.c
@@ -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);
/**
diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index cb94ee91c8..206f78ca4a 100644
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -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);
/**
diff --git a/gtk/gtkcellrendereraccel.c b/gtk/gtkcellrendereraccel.c
index 4f0f1b2bf1..38dbf83f23 100644
--- a/gtk/gtkcellrendereraccel.c
+++ b/gtk/gtkcellrendereraccel.c
@@ -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);
}
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index ca13dc037a..3d8afc863b 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -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);
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index aa447f5739..e1cf3131f0 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -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);
diff --git a/gtk/gtkflowbox.c b/gtk/gtkflowbox.c
index e52f505a94..53a417df82 100644
--- a/gtk/gtkflowbox.c
+++ b/gtk/gtkflowbox.c
@@ -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);
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index ef76d1c585..aa33469028 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -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);
diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c
index dcb130e0d5..2e52a5838d 100644
--- a/gtk/gtkinfobar.c
+++ b/gtk/gtkinfobar.c
@@ -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);
diff --git a/gtk/gtklistbox.c b/gtk/gtklistbox.c
index 02c271c43a..ca788a9176 100644
--- a/gtk/gtklistbox.c
+++ b/gtk/gtklistbox.c
@@ -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] =
diff --git a/gtk/gtknativedialog.c b/gtk/gtknativedialog.c
index ffe783c99f..c97c6c0697 100644
--- a/gtk/gtknativedialog.c
+++ b/gtk/gtknativedialog.c
@@ -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);
}
diff --git a/gtk/gtkprintbackend.c b/gtk/gtkprintbackend.c
index 3c963bb068..06be0798e6 100644
--- a/gtk/gtkprintbackend.c
+++ b/gtk/gtkprintbackend.c
@@ -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"),
diff --git a/gtk/gtkprinter.c b/gtk/gtkprinter.c
index 25c189265a..a871b45466 100644
--- a/gtk/gtkprinter.c
+++ b/gtk/gtkprinter.c
@@ -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);
}
diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c
index 5fb26d386e..03735d5ba9 100644
--- a/gtk/gtkprintoperation.c
+++ b/gtk/gtkprintoperation.c
@@ -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);
/**
diff --git a/gtk/gtkprintoperationpreview.c b/gtk/gtkprintoperationpreview.c
index cea332fddd..98cca3ffdb 100644
--- a/gtk/gtkprintoperationpreview.c
+++ b/gtk/gtkprintoperationpreview.c
@@ -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);
diff --git a/gtk/gtksearchengine.c b/gtk/gtksearchengine.c
index 9f1c20e0f4..74496c9695 100644
--- a/gtk/gtksearchengine.c
+++ b/gtk/gtksearchengine.c
@@ -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);
}
diff --git a/gtk/gtktexthandle.c b/gtk/gtktexthandle.c
index 5edbee5de5..25ecd116ea 100644
--- a/gtk/gtktexthandle.c
+++ b/gtk/gtktexthandle.c
@@ -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);
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 5c2574fde8..93ecd03c04 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -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);
/**
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 67456abcd5..91d74550b5 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
