Commit 15c220946024f29ddec9cf938f2704c03cdccaaf
1 parent
9cdad54a
Exists in
master
and in
1 other branch
Small adjustment in the widget signals.
Showing
8 changed files
with
36 additions
and
32 deletions
Show diff stats
src/dialogs/colorscheme.c
src/filetransfer/activitylist.c
| ... | ... | @@ -139,7 +139,7 @@ |
| 139 | 139 | klass->signal.has_file = V3270FTActivityList_has_file; |
| 140 | 140 | |
| 141 | 141 | v3270_activity_list_signals[V3270_ACTIVITY_LIST_HAS_FILE_SIGNAL] = |
| 142 | - g_signal_new( "has-file", | |
| 142 | + g_signal_new( I_("has-file"), | |
| 143 | 143 | G_OBJECT_CLASS_TYPE (gobject_class), |
| 144 | 144 | G_SIGNAL_RUN_FIRST, |
| 145 | 145 | G_STRUCT_OFFSET (V3270FTActivityListClass, signal.has_file), |
| ... | ... | @@ -148,7 +148,7 @@ |
| 148 | 148 | G_TYPE_NONE, 1, G_TYPE_BOOLEAN); |
| 149 | 149 | |
| 150 | 150 | v3270_activity_list_signals[V3270_ACTIVITY_LIST_SELECTED_SIGNAL] = |
| 151 | - g_signal_new( "changed", | |
| 151 | + g_signal_new( I_("changed"), | |
| 152 | 152 | G_OBJECT_CLASS_TYPE (gobject_class), |
| 153 | 153 | G_SIGNAL_RUN_FIRST, |
| 154 | 154 | 0, | ... | ... |
src/filetransfer/settings.c
| ... | ... | @@ -117,7 +117,7 @@ static void V3270FTSettings_has_activity(GtkWidget G_GNUC_UNUSED(*widget), gbool |
| 117 | 117 | klass->signal.has_activity = V3270FTSettings_has_activity; |
| 118 | 118 | |
| 119 | 119 | v3270_ft_settings_signals[V3270_FT_SETTINGS_VALIDITY_SIGNAL] = |
| 120 | - g_signal_new( "validity", | |
| 120 | + g_signal_new( I_("validity"), | |
| 121 | 121 | G_OBJECT_CLASS_TYPE (gobject_class), |
| 122 | 122 | G_SIGNAL_RUN_FIRST, |
| 123 | 123 | G_STRUCT_OFFSET (V3270FTSettingsClass, signal.validity), |
| ... | ... | @@ -127,7 +127,7 @@ static void V3270FTSettings_has_activity(GtkWidget G_GNUC_UNUSED(*widget), gbool |
| 127 | 127 | |
| 128 | 128 | |
| 129 | 129 | v3270_ft_settings_signals[V3270_FT_SETTINGS_HAS_ACTIVITY_SIGNAL] = |
| 130 | - g_signal_new( "has-activity", | |
| 130 | + g_signal_new( I_("has-activity"), | |
| 131 | 131 | G_OBJECT_CLASS_TYPE (gobject_class), |
| 132 | 132 | G_SIGNAL_RUN_FIRST, |
| 133 | 133 | G_STRUCT_OFFSET (V3270FTSettingsClass, signal.has_activity), | ... | ... |
src/filetransfer/v3270ftprogress.c
| ... | ... | @@ -37,6 +37,7 @@ |
| 37 | 37 | |
| 38 | 38 | #include "private.h" |
| 39 | 39 | #include "marshal.h" |
| 40 | + #include <internals.h> | |
| 40 | 41 | #include <lib3270/filetransfer.h> |
| 41 | 42 | |
| 42 | 43 | /*--[ GTK Requires ]---------------------------------------------------------------------------------*/ |
| ... | ... | @@ -316,7 +317,7 @@ static void v3270ftprogress_class_init(v3270ftprogressClass *klass) { |
| 316 | 317 | dialog_class->close = dialog_close; |
| 317 | 318 | |
| 318 | 319 | v3270ftprogress_signal[V3270FTPROGRESS_SIGNAL_SUCCESS] = |
| 319 | - g_signal_new( "success", | |
| 320 | + g_signal_new( I_("success"), | |
| 320 | 321 | G_OBJECT_CLASS_TYPE (gobject_class), |
| 321 | 322 | G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, |
| 322 | 323 | 0, |
| ... | ... | @@ -325,7 +326,7 @@ static void v3270ftprogress_class_init(v3270ftprogressClass *klass) { |
| 325 | 326 | G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); |
| 326 | 327 | |
| 327 | 328 | v3270ftprogress_signal[V3270FTPROGRESS_SIGNAL_FAILED] = |
| 328 | - g_signal_new( "failed", | |
| 329 | + g_signal_new( I_("failed"), | |
| 329 | 330 | G_OBJECT_CLASS_TYPE (gobject_class), |
| 330 | 331 | G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, |
| 331 | 332 | 0, | ... | ... |
src/filetransfer/worker.c
| ... | ... | @@ -145,7 +145,7 @@ |
| 145 | 145 | |
| 146 | 146 | v3270_worker_signals[V3270_WORKER_ACTIVITY_SIGNAL] = |
| 147 | 147 | g_signal_new( |
| 148 | - "activity", | |
| 148 | + I_("activity"), | |
| 149 | 149 | G_OBJECT_CLASS_TYPE (gobject_class), |
| 150 | 150 | G_SIGNAL_RUN_FIRST, |
| 151 | 151 | 0, |
| ... | ... | @@ -156,7 +156,7 @@ |
| 156 | 156 | |
| 157 | 157 | v3270_worker_signals[V3270_WORKER_TRANSFER_FAILED_SIGNAL] = |
| 158 | 158 | g_signal_new( |
| 159 | - "failed", | |
| 159 | + I_("failed"), | |
| 160 | 160 | G_OBJECT_CLASS_TYPE (gobject_class), |
| 161 | 161 | G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, |
| 162 | 162 | 0, |
| ... | ... | @@ -167,7 +167,7 @@ |
| 167 | 167 | |
| 168 | 168 | v3270_worker_signals[V3270_WORKER_TRANSFER_SUCCESS_SIGNAL] = |
| 169 | 169 | g_signal_new( |
| 170 | - "success", | |
| 170 | + I_("success"), | |
| 171 | 171 | G_OBJECT_CLASS_TYPE (gobject_class), |
| 172 | 172 | G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, |
| 173 | 173 | 0, |
| ... | ... | @@ -178,7 +178,7 @@ |
| 178 | 178 | |
| 179 | 179 | v3270_worker_signals[V3270_WORKER_TRANSFER_STATE_SIGNAL] = |
| 180 | 180 | g_signal_new( |
| 181 | - "ft-state-changed", | |
| 181 | + I_("ft-state-changed"), | |
| 182 | 182 | G_OBJECT_CLASS_TYPE (gobject_class), |
| 183 | 183 | G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, |
| 184 | 184 | 0, | ... | ... |
src/include/internals.h
| ... | ... | @@ -44,7 +44,10 @@ |
| 44 | 44 | #include <v3270.h> |
| 45 | 45 | #include <v3270/toggle.h> |
| 46 | 46 | |
| 47 | - G_BEGIN_DECLS | |
| 47 | + G_BEGIN_DECLS | |
| 48 | + | |
| 49 | + /* not really I18N-related, but also a string marker macro */ | |
| 50 | + #define I_(string) g_intern_static_string (string) | |
| 48 | 51 | |
| 49 | 52 | /*--[ Structures ]-----------------------------------------------------------------------------------*/ |
| 50 | 53 | ... | ... |
src/terminal/widget.c
| ... | ... | @@ -285,7 +285,7 @@ static void v3270_class_init(v3270Class *klass) |
| 285 | 285 | |
| 286 | 286 | // Signals |
| 287 | 287 | widget_class->activate_signal = |
| 288 | - g_signal_new( "activate", | |
| 288 | + g_signal_new( I_("activate"), | |
| 289 | 289 | G_OBJECT_CLASS_TYPE (gobject_class), |
| 290 | 290 | G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, |
| 291 | 291 | G_STRUCT_OFFSET (v3270Class, activate), |
| ... | ... | @@ -294,7 +294,7 @@ static void v3270_class_init(v3270Class *klass) |
| 294 | 294 | G_TYPE_NONE, 0); |
| 295 | 295 | |
| 296 | 296 | v3270_widget_signal[V3270_SIGNAL_TOGGLE_CHANGED] = |
| 297 | - g_signal_new( "toggle_changed", | |
| 297 | + g_signal_new( I_("toggle_changed"), | |
| 298 | 298 | G_OBJECT_CLASS_TYPE (gobject_class), |
| 299 | 299 | G_SIGNAL_RUN_FIRST, |
| 300 | 300 | G_STRUCT_OFFSET (v3270Class, toggle_changed), |
| ... | ... | @@ -303,7 +303,7 @@ static void v3270_class_init(v3270Class *klass) |
| 303 | 303 | G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_BOOLEAN, G_TYPE_STRING); |
| 304 | 304 | |
| 305 | 305 | v3270_widget_signal[V3270_SIGNAL_MESSAGE_CHANGED] = |
| 306 | - g_signal_new( "message_changed", | |
| 306 | + g_signal_new( I_("message_changed"), | |
| 307 | 307 | G_OBJECT_CLASS_TYPE (gobject_class), |
| 308 | 308 | G_SIGNAL_RUN_FIRST, |
| 309 | 309 | G_STRUCT_OFFSET (v3270Class, message_changed), |
| ... | ... | @@ -312,7 +312,7 @@ static void v3270_class_init(v3270Class *klass) |
| 312 | 312 | G_TYPE_NONE, 1, G_TYPE_UINT); |
| 313 | 313 | |
| 314 | 314 | v3270_widget_signal[V3270_SIGNAL_KEYPRESS] = |
| 315 | - g_signal_new( "keypress", | |
| 315 | + g_signal_new( I_("keypress"), | |
| 316 | 316 | G_OBJECT_CLASS_TYPE (gobject_class), |
| 317 | 317 | G_SIGNAL_RUN_LAST, |
| 318 | 318 | 0, |
| ... | ... | @@ -321,7 +321,7 @@ static void v3270_class_init(v3270Class *klass) |
| 321 | 321 | G_TYPE_BOOLEAN, 2, G_TYPE_UINT, G_TYPE_UINT); |
| 322 | 322 | |
| 323 | 323 | v3270_widget_signal[V3270_SIGNAL_CONNECTED] = |
| 324 | - g_signal_new( "connected", | |
| 324 | + g_signal_new( I_("connected"), | |
| 325 | 325 | G_OBJECT_CLASS_TYPE (gobject_class), |
| 326 | 326 | G_SIGNAL_RUN_FIRST, |
| 327 | 327 | 0, |
| ... | ... | @@ -330,7 +330,7 @@ static void v3270_class_init(v3270Class *klass) |
| 330 | 330 | G_TYPE_NONE, 1, G_TYPE_STRING); |
| 331 | 331 | |
| 332 | 332 | v3270_widget_signal[V3270_SIGNAL_DISCONNECTED] = |
| 333 | - g_signal_new( "disconnected", | |
| 333 | + g_signal_new( I_("disconnected"), | |
| 334 | 334 | G_OBJECT_CLASS_TYPE (gobject_class), |
| 335 | 335 | G_SIGNAL_RUN_FIRST, |
| 336 | 336 | 0, |
| ... | ... | @@ -339,7 +339,7 @@ static void v3270_class_init(v3270Class *klass) |
| 339 | 339 | G_TYPE_NONE, 0); |
| 340 | 340 | |
| 341 | 341 | v3270_widget_signal[V3270_SIGNAL_SESSION_CHANGED] = |
| 342 | - g_signal_new( "session_changed", | |
| 342 | + g_signal_new( I_("session_changed"), | |
| 343 | 343 | G_OBJECT_CLASS_TYPE (gobject_class), |
| 344 | 344 | G_SIGNAL_RUN_FIRST, |
| 345 | 345 | 0, |
| ... | ... | @@ -348,7 +348,7 @@ static void v3270_class_init(v3270Class *klass) |
| 348 | 348 | G_TYPE_NONE, 0); |
| 349 | 349 | |
| 350 | 350 | v3270_widget_signal[V3270_SIGNAL_UPDATE_CONFIG] = |
| 351 | - g_signal_new( "update_config", | |
| 351 | + g_signal_new( I_("update_config"), | |
| 352 | 352 | G_OBJECT_CLASS_TYPE (gobject_class), |
| 353 | 353 | G_SIGNAL_RUN_FIRST, |
| 354 | 354 | 0, |
| ... | ... | @@ -357,7 +357,7 @@ static void v3270_class_init(v3270Class *klass) |
| 357 | 357 | G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); |
| 358 | 358 | |
| 359 | 359 | v3270_widget_signal[V3270_SIGNAL_MODEL_CHANGED] = |
| 360 | - g_signal_new( "model_changed", | |
| 360 | + g_signal_new( I_("model_changed"), | |
| 361 | 361 | G_OBJECT_CLASS_TYPE (gobject_class), |
| 362 | 362 | G_SIGNAL_RUN_FIRST, |
| 363 | 363 | 0, |
| ... | ... | @@ -366,7 +366,7 @@ static void v3270_class_init(v3270Class *klass) |
| 366 | 366 | G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING); |
| 367 | 367 | |
| 368 | 368 | v3270_widget_signal[V3270_SIGNAL_SELECTING] = |
| 369 | - g_signal_new( "selecting", | |
| 369 | + g_signal_new( I_("selecting"), | |
| 370 | 370 | G_OBJECT_CLASS_TYPE (gobject_class), |
| 371 | 371 | G_SIGNAL_RUN_FIRST, |
| 372 | 372 | 0, |
| ... | ... | @@ -375,7 +375,7 @@ static void v3270_class_init(v3270Class *klass) |
| 375 | 375 | G_TYPE_NONE, 1, G_TYPE_BOOLEAN); |
| 376 | 376 | |
| 377 | 377 | v3270_widget_signal[V3270_SIGNAL_POPUP] = |
| 378 | - g_signal_new( "popup", | |
| 378 | + g_signal_new( I_("popup"), | |
| 379 | 379 | G_OBJECT_CLASS_TYPE (gobject_class), |
| 380 | 380 | G_SIGNAL_RUN_LAST, |
| 381 | 381 | 0, |
| ... | ... | @@ -384,7 +384,7 @@ static void v3270_class_init(v3270Class *klass) |
| 384 | 384 | G_TYPE_BOOLEAN, 3, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_POINTER); |
| 385 | 385 | |
| 386 | 386 | v3270_widget_signal[V3270_SIGNAL_PASTENEXT] = |
| 387 | - g_signal_new( "pastenext", | |
| 387 | + g_signal_new( I_("pastenext"), | |
| 388 | 388 | G_OBJECT_CLASS_TYPE (gobject_class), |
| 389 | 389 | G_SIGNAL_RUN_FIRST, |
| 390 | 390 | 0, |
| ... | ... | @@ -393,7 +393,7 @@ static void v3270_class_init(v3270Class *klass) |
| 393 | 393 | G_TYPE_NONE, 1, G_TYPE_BOOLEAN); |
| 394 | 394 | |
| 395 | 395 | v3270_widget_signal[V3270_SIGNAL_CLIPBOARD] = |
| 396 | - g_signal_new( "has_text", | |
| 396 | + g_signal_new( I_("has_text"), | |
| 397 | 397 | G_OBJECT_CLASS_TYPE (gobject_class), |
| 398 | 398 | G_SIGNAL_RUN_FIRST, |
| 399 | 399 | 0, |
| ... | ... | @@ -402,7 +402,7 @@ static void v3270_class_init(v3270Class *klass) |
| 402 | 402 | G_TYPE_NONE, 1, G_TYPE_BOOLEAN); |
| 403 | 403 | |
| 404 | 404 | v3270_widget_signal[V3270_SIGNAL_CHANGED] = |
| 405 | - g_signal_new( "changed", | |
| 405 | + g_signal_new( I_("changed"), | |
| 406 | 406 | G_OBJECT_CLASS_TYPE (gobject_class), |
| 407 | 407 | G_SIGNAL_RUN_FIRST, |
| 408 | 408 | 0, |
| ... | ... | @@ -411,7 +411,7 @@ static void v3270_class_init(v3270Class *klass) |
| 411 | 411 | G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); |
| 412 | 412 | |
| 413 | 413 | v3270_widget_signal[V3270_SIGNAL_MESSAGE] = |
| 414 | - g_signal_new( "popup_message", | |
| 414 | + g_signal_new( I_("popup_message"), | |
| 415 | 415 | G_OBJECT_CLASS_TYPE (gobject_class), |
| 416 | 416 | G_SIGNAL_RUN_FIRST, |
| 417 | 417 | G_STRUCT_OFFSET (v3270Class, popup_message), |
| ... | ... | @@ -420,7 +420,7 @@ static void v3270_class_init(v3270Class *klass) |
| 420 | 420 | G_TYPE_NONE, 4, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); |
| 421 | 421 | |
| 422 | 422 | v3270_widget_signal[V3270_SIGNAL_FIELD] = |
| 423 | - g_signal_new( "field_clicked", | |
| 423 | + g_signal_new( I_("field_clicked"), | |
| 424 | 424 | G_OBJECT_CLASS_TYPE (gobject_class), |
| 425 | 425 | G_SIGNAL_RUN_LAST, |
| 426 | 426 | 0, |
| ... | ... | @@ -430,7 +430,7 @@ static void v3270_class_init(v3270Class *klass) |
| 430 | 430 | |
| 431 | 431 | |
| 432 | 432 | v3270_widget_signal[V3270_SIGNAL_PRINT_SETUP] = |
| 433 | - g_signal_new( "print-begin", | |
| 433 | + g_signal_new( I_("print-begin"), | |
| 434 | 434 | G_OBJECT_CLASS_TYPE (gobject_class), |
| 435 | 435 | G_SIGNAL_RUN_FIRST, |
| 436 | 436 | 0, |
| ... | ... | @@ -439,7 +439,7 @@ static void v3270_class_init(v3270Class *klass) |
| 439 | 439 | G_TYPE_NONE, 1, G_TYPE_POINTER, 0); |
| 440 | 440 | |
| 441 | 441 | v3270_widget_signal[V3270_SIGNAL_PRINT_APPLY] = |
| 442 | - g_signal_new( "print-apply", | |
| 442 | + g_signal_new( I_("print-apply"), | |
| 443 | 443 | G_OBJECT_CLASS_TYPE (gobject_class), |
| 444 | 444 | G_SIGNAL_RUN_FIRST, |
| 445 | 445 | 0, |
| ... | ... | @@ -448,7 +448,7 @@ static void v3270_class_init(v3270Class *klass) |
| 448 | 448 | G_TYPE_NONE, 1, G_TYPE_POINTER, 0); |
| 449 | 449 | |
| 450 | 450 | v3270_widget_signal[V3270_SIGNAL_PRINT_DONE] = |
| 451 | - g_signal_new( "print-done", | |
| 451 | + g_signal_new( I_("print-done"), | |
| 452 | 452 | G_OBJECT_CLASS_TYPE (gobject_class), |
| 453 | 453 | G_SIGNAL_RUN_FIRST, |
| 454 | 454 | 0, | ... | ... |
src/trace/trace.c