diff options
author | Lukasz Zalewski <lukas@dcs.qmul.ac.uk> | 2007-04-10 03:38:46 +0000 |
---|---|---|
committer | Brian Cameron <bcameron@src.gnome.org> | 2007-04-10 03:38:46 +0000 |
commit | 0629610bfc43efd9e759e12d76e15f256384f6b1 (patch) | |
tree | 44190979f81d41f988daf78a448cda171ed1513b /daemon | |
parent | e05bfea92121f6b7fa62887572dc7962868bf64b (diff) | |
download | gdm-0629610bfc43efd9e759e12d76e15f256384f6b1.tar.gz |
Changes to some strings related to custom commands stuff such that they
2007-04-06 Lukasz Zalewski <lukas@dcs.qmul.ac.uk>
* daemon/gdm.c, daemon/slave.c:
* gui/gdmlogin.c, gui/gdmsetup.c:
* gui/greeter/greeter.c, gui/greeter/greeter_item.c:
* gui/greeter/greeter_parser.c, gui/greeter/greeter_system.c:
Changes to some strings related to custom commands stuff such
that they are not marked for translation. Fixes some issues
raised in bug #423158
svn path=/trunk/; revision=4818
Diffstat (limited to 'daemon')
-rw-r--r-- | daemon/gdm.c | 26 | ||||
-rw-r--r-- | daemon/slave.c | 2 |
2 files changed, 14 insertions, 14 deletions
diff --git a/daemon/gdm.c b/daemon/gdm.c index 276df1b2..85848a12 100644 --- a/daemon/gdm.c +++ b/daemon/gdm.c @@ -732,7 +732,7 @@ custom_cmd (long cmd_id) return; } - key_string = g_strdup_printf (_("%s%ld="), GDM_KEY_CUSTOM_CMD_NO_RESTART_TEMPLATE, cmd_id); + key_string = g_strdup_printf ("%s%ld=", GDM_KEY_CUSTOM_CMD_NO_RESTART_TEMPLATE, cmd_id); if (gdm_daemon_config_get_value_bool (key_string)) custom_cmd_no_restart (cmd_id); else @@ -757,7 +757,7 @@ custom_cmd_restart (long cmd_id) change_to_first_and_clear (TRUE); #endif /* __linux */ - key_string = g_strdup_printf (_("%s%ld="), GDM_KEY_CUSTOM_CMD_TEMPLATE, cmd_id); + key_string = g_strdup_printf ("%s%ld=", GDM_KEY_CUSTOM_CMD_TEMPLATE, cmd_id); argv = NULL; s = gdm_daemon_config_get_value_string (key_string); @@ -795,7 +795,7 @@ custom_cmd_no_restart (long cmd_id) const char *s; gchar *key_string; - key_string = g_strdup_printf (_("%s%ld="), GDM_KEY_CUSTOM_CMD_TEMPLATE, cmd_id); + key_string = g_strdup_printf ("%s%ld=", GDM_KEY_CUSTOM_CMD_TEMPLATE, cmd_id); argv = NULL; s = gdm_daemon_config_get_value_string (key_string); @@ -3724,11 +3724,11 @@ gdm_handle_user_message (GdmConnection *conn, for (i = 0; i < GDM_CUSTOM_COMMAND_MAX; i++) { gchar *key_string = NULL; - key_string = g_strdup_printf (_("%s%d="), GDM_KEY_CUSTOM_CMD_TEMPLATE, i); + key_string = g_strdup_printf ("%s%d=", GDM_KEY_CUSTOM_CMD_TEMPLATE, i); if (sysmenu && disp->attached && ! ve_string_empty (gdm_daemon_config_get_value_string (key_string))) { g_free (key_string); - key_string = g_strdup_printf(_("%s%d="), GDM_KEY_CUSTOM_CMD_IS_PERSISTENT_TEMPLATE, i); + key_string = g_strdup_printf("%s%d=", GDM_KEY_CUSTOM_CMD_IS_PERSISTENT_TEMPLATE, i); if (gdm_daemon_config_get_value_bool (key_string)) { g_string_append_printf (msg, "%s%s%d", sep, GDM_SUP_LOGOUT_ACTION_CUSTOM_CMD_TEMPLATE, i); if (logout_action == (GDM_LOGOUT_ACTION_CUSTOM_CMD_FIRST + i)) @@ -3765,14 +3765,14 @@ gdm_handle_user_message (GdmConnection *conn, for (i = 0; i < GDM_CUSTOM_COMMAND_MAX; i++) { gchar *key_string = NULL; - key_string = g_strdup_printf(_("%s%d="), GDM_KEY_CUSTOM_CMD_TEMPLATE, i); + key_string = g_strdup_printf("%s%d=", GDM_KEY_CUSTOM_CMD_TEMPLATE, i); if (sysmenu && disp->attached && ! ve_string_empty (gdm_daemon_config_get_value_string (key_string))) { g_free (key_string); - key_string = g_strdup_printf(_("%s%d="), GDM_KEY_CUSTOM_CMD_IS_PERSISTENT_TEMPLATE, i); + key_string = g_strdup_printf("%s%d=", GDM_KEY_CUSTOM_CMD_IS_PERSISTENT_TEMPLATE, i); if (gdm_daemon_config_get_value_bool (key_string)) { g_free (key_string); - key_string = g_strdup_printf(_("%s%d="), GDM_KEY_CUSTOM_CMD_LABEL_TEMPLATE, i); + key_string = g_strdup_printf("%s%d=", GDM_KEY_CUSTOM_CMD_LABEL_TEMPLATE, i); g_string_append_printf (msg, "%s%s", sep, gdm_daemon_config_get_value_string (key_string)); sep = ";"; } @@ -3806,14 +3806,14 @@ gdm_handle_user_message (GdmConnection *conn, for (i = 0; i < GDM_CUSTOM_COMMAND_MAX; i++) { gchar *key_string = NULL; - key_string = g_strdup_printf(_("%s%d="), GDM_KEY_CUSTOM_CMD_TEMPLATE, i); + key_string = g_strdup_printf("%s%d=", GDM_KEY_CUSTOM_CMD_TEMPLATE, i); if (sysmenu && disp->attached && ! ve_string_empty (gdm_daemon_config_get_value_string (key_string))) { g_free (key_string); - key_string = g_strdup_printf(_("%s%d="), GDM_KEY_CUSTOM_CMD_IS_PERSISTENT_TEMPLATE, i); + key_string = g_strdup_printf("%s%d=", GDM_KEY_CUSTOM_CMD_IS_PERSISTENT_TEMPLATE, i); if (gdm_daemon_config_get_value_bool (key_string)) { g_free (key_string); - key_string = g_strdup_printf(_("%s%d="), GDM_KEY_CUSTOM_CMD_NO_RESTART_TEMPLATE, i); + key_string = g_strdup_printf("%s%d=", GDM_KEY_CUSTOM_CMD_NO_RESTART_TEMPLATE, i); if(gdm_daemon_config_get_value_bool (key_string)) no_restart_status_flag |= (1 << i); } @@ -3876,7 +3876,7 @@ gdm_handle_user_message (GdmConnection *conn, int cmd_index; if (sscanf (action, GDM_SUP_LOGOUT_ACTION_CUSTOM_CMD_TEMPLATE "%d", &cmd_index) == 1) { gchar *key_string = NULL; - key_string = g_strdup_printf (_("%s%d="), GDM_KEY_CUSTOM_CMD_TEMPLATE, cmd_index); + key_string = g_strdup_printf ("%s%d=", GDM_KEY_CUSTOM_CMD_TEMPLATE, cmd_index); if (sysmenu && disp->attached && ! ve_string_empty (gdm_daemon_config_get_value_string (key_string))) { disp->logout_action = @@ -3944,7 +3944,7 @@ gdm_handle_user_message (GdmConnection *conn, int cmd_index; if (sscanf (action, GDM_SUP_LOGOUT_ACTION_CUSTOM_CMD_TEMPLATE "%d", &cmd_index) == 1) { gchar *key_string = NULL; - key_string = g_strdup_printf (_("%s%d="), GDM_KEY_CUSTOM_CMD_TEMPLATE, cmd_index); + key_string = g_strdup_printf ("%s%d=", GDM_KEY_CUSTOM_CMD_TEMPLATE, cmd_index); if (sysmenu && disp->attached && ! ve_string_empty (gdm_daemon_config_get_value_string (key_string))) { safe_logout_action = diff --git a/daemon/slave.c b/daemon/slave.c index 1f7f4513..eaeecb45 100644 --- a/daemon/slave.c +++ b/daemon/slave.c @@ -5750,7 +5750,7 @@ gdm_slave_handle_notify (const char *msg) } else if (strncmp (msg, GDM_NOTIFY_CUSTOM_CMD_TEMPLATE, strlen (GDM_NOTIFY_CUSTOM_CMD_TEMPLATE)) == 0) { if (sscanf (msg, GDM_NOTIFY_CUSTOM_CMD_TEMPLATE "%d", &val) == 1) { - gchar * key_string = g_strdup_printf(_("%s%d="), GDM_KEY_CUSTOM_CMD_TEMPLATE, val); + gchar * key_string = g_strdup_printf("%s%d=", GDM_KEY_CUSTOM_CMD_TEMPLATE, val); /* This assumes that the number of commands is < 100, i.e two digits if that is not the case then this will fail */ gdm_daemon_config_set_value_string (key_string, ((gchar *)&msg[strlen (GDM_NOTIFY_CUSTOM_CMD_TEMPLATE) + 2])); |