diff options
| author | Colomban Wendling <[email protected]> | 2019-06-25 10:42:34 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2019-06-27 10:00:18 +0200 |
| commit | dee5500dd7d1ca8b6b9ef2c25af658bb9c839262 (patch) | |
| tree | 1dc90a141ee96f7a83c094640b2afadea780b5a8 | |
| parent | 8e7e455f4327317fe711f086fbf315698324df30 (diff) | |
| download | pluma-dee5500dd7d1ca8b6b9ef2c25af658bb9c839262.tar.bz2 pluma-dee5500dd7d1ca8b6b9ef2c25af658bb9c839262.tar.xz | |
Fix use of deprecated glib-genmarshal types
This doesn't change any dependency as both non-deprecated replacements
BOOLEAN and VOID were already used in some places.
| -rw-r--r-- | plugins/filebrowser/pluma-file-browser-marshal.list | 6 | ||||
| -rw-r--r-- | plugins/filebrowser/pluma-file-browser-store.c | 2 | ||||
| -rw-r--r-- | plugins/filebrowser/pluma-file-browser-widget.c | 4 | ||||
| -rw-r--r-- | pluma/dialogs/pluma-search-dialog.c | 2 | ||||
| -rw-r--r-- | pluma/pluma-marshal.list | 2 | ||||
| -rw-r--r-- | pluma/pluma-view.c | 6 |
6 files changed, 11 insertions, 11 deletions
diff --git a/plugins/filebrowser/pluma-file-browser-marshal.list b/plugins/filebrowser/pluma-file-browser-marshal.list index 5fa72c8b..f9349d22 100644 --- a/plugins/filebrowser/pluma-file-browser-marshal.list +++ b/plugins/filebrowser/pluma-file-browser-marshal.list @@ -1,5 +1,5 @@ VOID:UINT,STRING VOID:STRING,STRING -BOOL:OBJECT,POINTER -BOOL:POINTER -BOOL:VOID +BOOLEAN:OBJECT,POINTER +BOOLEAN:POINTER +BOOLEAN:VOID diff --git a/plugins/filebrowser/pluma-file-browser-store.c b/plugins/filebrowser/pluma-file-browser-store.c index 9ffc107a..6192c035 100644 --- a/plugins/filebrowser/pluma-file-browser-store.c +++ b/plugins/filebrowser/pluma-file-browser-store.c @@ -383,7 +383,7 @@ pluma_file_browser_store_class_init (PlumaFileBrowserStoreClass * klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PlumaFileBrowserStoreClass, no_trash), g_signal_accumulator_true_handled, NULL, - pluma_file_browser_marshal_BOOL__POINTER, + pluma_file_browser_marshal_BOOLEAN__POINTER, G_TYPE_BOOLEAN, 1, G_TYPE_POINTER); model_signals[RENAME] = g_signal_new ("rename", diff --git a/plugins/filebrowser/pluma-file-browser-widget.c b/plugins/filebrowser/pluma-file-browser-widget.c index 0763e44a..d8939ea8 100644 --- a/plugins/filebrowser/pluma-file-browser-widget.c +++ b/plugins/filebrowser/pluma-file-browser-widget.c @@ -456,7 +456,7 @@ pluma_file_browser_widget_class_init (PlumaFileBrowserWidgetClass * klass) confirm_delete), g_signal_accumulator_true_handled, NULL, - pluma_file_browser_marshal_BOOL__OBJECT_POINTER, + pluma_file_browser_marshal_BOOLEAN__OBJECT_POINTER, G_TYPE_BOOLEAN, 2, G_TYPE_OBJECT, @@ -469,7 +469,7 @@ pluma_file_browser_widget_class_init (PlumaFileBrowserWidgetClass * klass) confirm_no_trash), g_signal_accumulator_true_handled, NULL, - pluma_file_browser_marshal_BOOL__POINTER, + pluma_file_browser_marshal_BOOLEAN__POINTER, G_TYPE_BOOLEAN, 1, G_TYPE_POINTER); diff --git a/pluma/dialogs/pluma-search-dialog.c b/pluma/dialogs/pluma-search-dialog.c index 1fa2ec03..1d8f59c1 100644 --- a/pluma/dialogs/pluma-search-dialog.c +++ b/pluma/dialogs/pluma-search-dialog.c @@ -163,7 +163,7 @@ pluma_search_dialog_class_init (PlumaSearchDialogClass *klass) G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (PlumaSearchDialogClass, show_replace), NULL, NULL, - pluma_marshal_BOOLEAN__NONE, + pluma_marshal_BOOLEAN__VOID, G_TYPE_BOOLEAN, 0); g_object_class_install_property (object_class, PROP_SHOW_REPLACE, diff --git a/pluma/pluma-marshal.list b/pluma/pluma-marshal.list index d2882947..4c0e766d 100644 --- a/pluma/pluma-marshal.list +++ b/pluma/pluma-marshal.list @@ -1,4 +1,4 @@ -BOOLEAN:NONE +BOOLEAN:VOID BOOLEAN:OBJECT VOID:BOOLEAN VOID:BOOLEAN,POINTER diff --git a/pluma/pluma-view.c b/pluma/pluma-view.c index 1c14fc4b..891abb59 100644 --- a/pluma/pluma-view.c +++ b/pluma/pluma-view.c @@ -261,7 +261,7 @@ pluma_view_class_init (PlumaViewClass *klass) G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (PlumaViewClass, start_interactive_search), NULL, NULL, - pluma_marshal_BOOLEAN__NONE, + pluma_marshal_BOOLEAN__VOID, G_TYPE_BOOLEAN, 0); view_signals[START_INTERACTIVE_GOTO_LINE] = @@ -270,7 +270,7 @@ pluma_view_class_init (PlumaViewClass *klass) G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (PlumaViewClass, start_interactive_goto_line), NULL, NULL, - pluma_marshal_BOOLEAN__NONE, + pluma_marshal_BOOLEAN__VOID, G_TYPE_BOOLEAN, 0); view_signals[RESET_SEARCHED_TEXT] = @@ -279,7 +279,7 @@ pluma_view_class_init (PlumaViewClass *klass) G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (PlumaViewClass, reset_searched_text), NULL, NULL, - pluma_marshal_BOOLEAN__NONE, + pluma_marshal_BOOLEAN__VOID, G_TYPE_BOOLEAN, 0); /* A new signal DROP_URIS has been added to allow plugins to intercept |