From 15c220946024f29ddec9cf938f2704c03cdccaaf Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Mon, 21 Oct 2019 09:59:31 -0300 Subject: [PATCH] Small adjustment in the widget signals. --- src/dialogs/colorscheme.c | 2 +- src/filetransfer/activitylist.c | 4 ++-- src/filetransfer/settings.c | 4 ++-- src/filetransfer/v3270ftprogress.c | 5 +++-- src/filetransfer/worker.c | 8 ++++---- src/include/internals.h | 5 ++++- src/terminal/widget.c | 38 +++++++++++++++++++------------------- src/trace/trace.c | 2 +- 8 files changed, 36 insertions(+), 32 deletions(-) diff --git a/src/dialogs/colorscheme.c b/src/dialogs/colorscheme.c index 9ae7d8a..27a379c 100644 --- a/src/dialogs/colorscheme.c +++ b/src/dialogs/colorscheme.c @@ -100,7 +100,7 @@ color_signal[CHANGED] = g_signal_new( - "update-colors", + I_("update-colors"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, 0, diff --git a/src/filetransfer/activitylist.c b/src/filetransfer/activitylist.c index 02c3a5d..538d89c 100644 --- a/src/filetransfer/activitylist.c +++ b/src/filetransfer/activitylist.c @@ -139,7 +139,7 @@ klass->signal.has_file = V3270FTActivityList_has_file; v3270_activity_list_signals[V3270_ACTIVITY_LIST_HAS_FILE_SIGNAL] = - g_signal_new( "has-file", + g_signal_new( I_("has-file"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (V3270FTActivityListClass, signal.has_file), @@ -148,7 +148,7 @@ G_TYPE_NONE, 1, G_TYPE_BOOLEAN); v3270_activity_list_signals[V3270_ACTIVITY_LIST_SELECTED_SIGNAL] = - g_signal_new( "changed", + g_signal_new( I_("changed"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, 0, diff --git a/src/filetransfer/settings.c b/src/filetransfer/settings.c index 32ea56c..dccf557 100644 --- a/src/filetransfer/settings.c +++ b/src/filetransfer/settings.c @@ -117,7 +117,7 @@ static void V3270FTSettings_has_activity(GtkWidget G_GNUC_UNUSED(*widget), gbool klass->signal.has_activity = V3270FTSettings_has_activity; v3270_ft_settings_signals[V3270_FT_SETTINGS_VALIDITY_SIGNAL] = - g_signal_new( "validity", + g_signal_new( I_("validity"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (V3270FTSettingsClass, signal.validity), @@ -127,7 +127,7 @@ static void V3270FTSettings_has_activity(GtkWidget G_GNUC_UNUSED(*widget), gbool v3270_ft_settings_signals[V3270_FT_SETTINGS_HAS_ACTIVITY_SIGNAL] = - g_signal_new( "has-activity", + g_signal_new( I_("has-activity"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (V3270FTSettingsClass, signal.has_activity), diff --git a/src/filetransfer/v3270ftprogress.c b/src/filetransfer/v3270ftprogress.c index aac5397..f4853c1 100644 --- a/src/filetransfer/v3270ftprogress.c +++ b/src/filetransfer/v3270ftprogress.c @@ -37,6 +37,7 @@ #include "private.h" #include "marshal.h" + #include #include /*--[ GTK Requires ]---------------------------------------------------------------------------------*/ @@ -316,7 +317,7 @@ static void v3270ftprogress_class_init(v3270ftprogressClass *klass) { dialog_class->close = dialog_close; v3270ftprogress_signal[V3270FTPROGRESS_SIGNAL_SUCCESS] = - g_signal_new( "success", + g_signal_new( I_("success"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, 0, @@ -325,7 +326,7 @@ static void v3270ftprogress_class_init(v3270ftprogressClass *klass) { G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); v3270ftprogress_signal[V3270FTPROGRESS_SIGNAL_FAILED] = - g_signal_new( "failed", + g_signal_new( I_("failed"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, 0, diff --git a/src/filetransfer/worker.c b/src/filetransfer/worker.c index c003438..146b6f4 100644 --- a/src/filetransfer/worker.c +++ b/src/filetransfer/worker.c @@ -145,7 +145,7 @@ v3270_worker_signals[V3270_WORKER_ACTIVITY_SIGNAL] = g_signal_new( - "activity", + I_("activity"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, 0, @@ -156,7 +156,7 @@ v3270_worker_signals[V3270_WORKER_TRANSFER_FAILED_SIGNAL] = g_signal_new( - "failed", + I_("failed"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, 0, @@ -167,7 +167,7 @@ v3270_worker_signals[V3270_WORKER_TRANSFER_SUCCESS_SIGNAL] = g_signal_new( - "success", + I_("success"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, 0, @@ -178,7 +178,7 @@ v3270_worker_signals[V3270_WORKER_TRANSFER_STATE_SIGNAL] = g_signal_new( - "ft-state-changed", + I_("ft-state-changed"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, 0, diff --git a/src/include/internals.h b/src/include/internals.h index 153ab4a..6b02ccc 100644 --- a/src/include/internals.h +++ b/src/include/internals.h @@ -44,7 +44,10 @@ #include #include - G_BEGIN_DECLS + G_BEGIN_DECLS + + /* not really I18N-related, but also a string marker macro */ + #define I_(string) g_intern_static_string (string) /*--[ Structures ]-----------------------------------------------------------------------------------*/ diff --git a/src/terminal/widget.c b/src/terminal/widget.c index b046848..0b0d5a7 100644 --- a/src/terminal/widget.c +++ b/src/terminal/widget.c @@ -285,7 +285,7 @@ static void v3270_class_init(v3270Class *klass) // Signals widget_class->activate_signal = - g_signal_new( "activate", + g_signal_new( I_("activate"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (v3270Class, activate), @@ -294,7 +294,7 @@ static void v3270_class_init(v3270Class *klass) G_TYPE_NONE, 0); v3270_widget_signal[V3270_SIGNAL_TOGGLE_CHANGED] = - g_signal_new( "toggle_changed", + g_signal_new( I_("toggle_changed"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (v3270Class, toggle_changed), @@ -303,7 +303,7 @@ static void v3270_class_init(v3270Class *klass) G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_BOOLEAN, G_TYPE_STRING); v3270_widget_signal[V3270_SIGNAL_MESSAGE_CHANGED] = - g_signal_new( "message_changed", + g_signal_new( I_("message_changed"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (v3270Class, message_changed), @@ -312,7 +312,7 @@ static void v3270_class_init(v3270Class *klass) G_TYPE_NONE, 1, G_TYPE_UINT); v3270_widget_signal[V3270_SIGNAL_KEYPRESS] = - g_signal_new( "keypress", + g_signal_new( I_("keypress"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST, 0, @@ -321,7 +321,7 @@ static void v3270_class_init(v3270Class *klass) G_TYPE_BOOLEAN, 2, G_TYPE_UINT, G_TYPE_UINT); v3270_widget_signal[V3270_SIGNAL_CONNECTED] = - g_signal_new( "connected", + g_signal_new( I_("connected"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, 0, @@ -330,7 +330,7 @@ static void v3270_class_init(v3270Class *klass) G_TYPE_NONE, 1, G_TYPE_STRING); v3270_widget_signal[V3270_SIGNAL_DISCONNECTED] = - g_signal_new( "disconnected", + g_signal_new( I_("disconnected"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, 0, @@ -339,7 +339,7 @@ static void v3270_class_init(v3270Class *klass) G_TYPE_NONE, 0); v3270_widget_signal[V3270_SIGNAL_SESSION_CHANGED] = - g_signal_new( "session_changed", + g_signal_new( I_("session_changed"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, 0, @@ -348,7 +348,7 @@ static void v3270_class_init(v3270Class *klass) G_TYPE_NONE, 0); v3270_widget_signal[V3270_SIGNAL_UPDATE_CONFIG] = - g_signal_new( "update_config", + g_signal_new( I_("update_config"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, 0, @@ -357,7 +357,7 @@ static void v3270_class_init(v3270Class *klass) G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); v3270_widget_signal[V3270_SIGNAL_MODEL_CHANGED] = - g_signal_new( "model_changed", + g_signal_new( I_("model_changed"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, 0, @@ -366,7 +366,7 @@ static void v3270_class_init(v3270Class *klass) G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING); v3270_widget_signal[V3270_SIGNAL_SELECTING] = - g_signal_new( "selecting", + g_signal_new( I_("selecting"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, 0, @@ -375,7 +375,7 @@ static void v3270_class_init(v3270Class *klass) G_TYPE_NONE, 1, G_TYPE_BOOLEAN); v3270_widget_signal[V3270_SIGNAL_POPUP] = - g_signal_new( "popup", + g_signal_new( I_("popup"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST, 0, @@ -384,7 +384,7 @@ static void v3270_class_init(v3270Class *klass) G_TYPE_BOOLEAN, 3, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_POINTER); v3270_widget_signal[V3270_SIGNAL_PASTENEXT] = - g_signal_new( "pastenext", + g_signal_new( I_("pastenext"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, 0, @@ -393,7 +393,7 @@ static void v3270_class_init(v3270Class *klass) G_TYPE_NONE, 1, G_TYPE_BOOLEAN); v3270_widget_signal[V3270_SIGNAL_CLIPBOARD] = - g_signal_new( "has_text", + g_signal_new( I_("has_text"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, 0, @@ -402,7 +402,7 @@ static void v3270_class_init(v3270Class *klass) G_TYPE_NONE, 1, G_TYPE_BOOLEAN); v3270_widget_signal[V3270_SIGNAL_CHANGED] = - g_signal_new( "changed", + g_signal_new( I_("changed"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, 0, @@ -411,7 +411,7 @@ static void v3270_class_init(v3270Class *klass) G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); v3270_widget_signal[V3270_SIGNAL_MESSAGE] = - g_signal_new( "popup_message", + g_signal_new( I_("popup_message"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (v3270Class, popup_message), @@ -420,7 +420,7 @@ static void v3270_class_init(v3270Class *klass) G_TYPE_NONE, 4, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); v3270_widget_signal[V3270_SIGNAL_FIELD] = - g_signal_new( "field_clicked", + g_signal_new( I_("field_clicked"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST, 0, @@ -430,7 +430,7 @@ static void v3270_class_init(v3270Class *klass) v3270_widget_signal[V3270_SIGNAL_PRINT_SETUP] = - g_signal_new( "print-begin", + g_signal_new( I_("print-begin"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, 0, @@ -439,7 +439,7 @@ static void v3270_class_init(v3270Class *klass) G_TYPE_NONE, 1, G_TYPE_POINTER, 0); v3270_widget_signal[V3270_SIGNAL_PRINT_APPLY] = - g_signal_new( "print-apply", + g_signal_new( I_("print-apply"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, 0, @@ -448,7 +448,7 @@ static void v3270_class_init(v3270Class *klass) G_TYPE_NONE, 1, G_TYPE_POINTER, 0); v3270_widget_signal[V3270_SIGNAL_PRINT_DONE] = - g_signal_new( "print-done", + g_signal_new( I_("print-done"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, 0, diff --git a/src/trace/trace.c b/src/trace/trace.c index 9b2a52c..2789f80 100644 --- a/src/trace/trace.c +++ b/src/trace/trace.c @@ -113,7 +113,7 @@ gobject_class->finalize = finalize; v3270_trace_signal[V3270_TRACE_SIGNAL_COMMAND] = - g_signal_new( "command", + g_signal_new( I_("command"), G_OBJECT_CLASS_TYPE(klass), G_SIGNAL_RUN_LAST, 0, -- libgit2 0.21.2