# HG changeset patch # User Mark Doliner # Date 1101575248 0 # Node ID bf1ebc8f3bf33f21f221b954b228b7532e71e7e9 # Parent 361c9170d8afa5cc8fa97169ec48a4e53be3497f [gaim-migrate @ 11421] Change "Signoff" to "Log Out" in a few user-visible places. I consistency. committer: Tailor Script diff -r 361c9170d8af -r bf1ebc8f3bf3 plugins/docklet/docklet.c --- a/plugins/docklet/docklet.c Sat Nov 27 16:09:31 2004 +0000 +++ b/plugins/docklet/docklet.c Sat Nov 27 17:07:28 2004 +0000 @@ -221,7 +221,7 @@ case offline_connecting: break; default: - gaim_new_item_from_stock(menu, _("Signoff"), GTK_STOCK_CLOSE, G_CALLBACK(gaim_connections_disconnect_all), NULL, 0, 0, 0); + gaim_new_item_from_stock(menu, _("Log Out"), GTK_STOCK_CLOSE, G_CALLBACK(gaim_connections_disconnect_all), NULL, 0, 0, 0); break; } @@ -410,13 +410,13 @@ /* callbacks */ static void -gaim_signon(GaimConnection *gc, void *data) +gaim_login(GaimConnection *gc, void *data) { docklet_update_status(); } static void -gaim_signoff(GaimConnection *gc, void *data) +gaim_logout(GaimConnection *gc, void *data) { /* do this when idle so that if the prpl was connecting and was cancelled, we register that connecting_count @@ -504,9 +504,9 @@ ui_ops->create(); gaim_signal_connect(conn_handle, "signed-on", - plugin, GAIM_CALLBACK(gaim_signon), NULL); + plugin, GAIM_CALLBACK(gaim_login), NULL); gaim_signal_connect(conn_handle, "signed-off", - plugin, GAIM_CALLBACK(gaim_signoff), NULL); + plugin, GAIM_CALLBACK(gaim_logout), NULL); gaim_signal_connect(accounts_handle, "account-connecting", plugin, GAIM_CALLBACK(gaim_connecting), NULL); gaim_signal_connect(accounts_handle, "account-away", diff -r 361c9170d8af -r bf1ebc8f3bf3 plugins/filectl.c --- a/plugins/filectl.c Sat Nov 27 16:09:31 2004 +0000 +++ b/plugins/filectl.c Sat Nov 27 17:07:28 2004 +0000 @@ -57,7 +57,7 @@ gaim_debug_misc("filectl", "read: %s\n", buffer); command = getarg(buffer, 0, 0); - if (!strncasecmp(command, "signon", 6)) { + if (!strncasecmp(command, "login", 6)) { GaimAccount *account; arg1 = getarg(buffer, 1, 0); @@ -70,7 +70,7 @@ free(arg1); free(arg2); - } else if (!strncasecmp(command, "signoff", 7)) { + } else if (!strncasecmp(command, "logout", 7)) { GaimAccount *account; GaimConnection *gc; diff -r 361c9170d8af -r bf1ebc8f3bf3 src/connection.h --- a/src/connection.h Sat Nov 27 16:09:31 2004 +0000 +++ b/src/connection.h Sat Nov 27 17:07:28 2004 +0000 @@ -93,7 +93,7 @@ gboolean is_auto_away; /**< Whether or not it's auto-away. */ gboolean wants_to_die; /**< Wants to Die state. This is set - when the user chooses to sign off, + when the user chooses to log out, or when the protocol is disconnected and should not be automatically reconnected @@ -127,9 +127,9 @@ void gaim_connection_destroy(GaimConnection *gc); /** - * Signs a connection on. + * Logs in to this connection. * - * @param gc The connection to sign on. + * @param gc The connection to log in. * * @see gaim_connection_disconnect() */ @@ -143,9 +143,9 @@ void gaim_connection_register(GaimConnection *gc); /** - * Signs a connection off. + * Logs out of this connection. * - * @param gc The connection to sign off. + * @param gc The connection to log out. * * @see gaim_connection_connect() */ diff -r 361c9170d8af -r bf1ebc8f3bf3 src/gtkprefs.c --- a/src/gtkprefs.c Sat Nov 27 16:09:31 2004 +0000 +++ b/src/gtkprefs.c Sat Nov 27 17:07:28 2004 +0000 @@ -1352,7 +1352,7 @@ sys_box = gaim_gtk_prefs_checkbox(_("_Enable system log"), "/core/logging/log_system", vbox); - box = gaim_gtk_prefs_checkbox(_("Log when buddies _sign on/sign off"), + box = gaim_gtk_prefs_checkbox(_("Log when buddies log in/log _out"), "/core/logging/log_signon_signoff", vbox); g_signal_connect(G_OBJECT(sys_box), "clicked", G_CALLBACK(gaim_gtk_toggle_sensitive), box); @@ -1370,7 +1370,7 @@ G_CALLBACK(gaim_gtk_toggle_sensitive), box); gtk_widget_set_sensitive(box, syslog_enabled); - box = gaim_gtk_prefs_checkbox(_("Log your _own signons/idleness/awayness"), + box = gaim_gtk_prefs_checkbox(_("Log your own _signons/idleness/awayness"), "/core/logging/log_own_states", vbox); g_signal_connect(G_OBJECT(sys_box), "clicked", G_CALLBACK(gaim_gtk_toggle_sensitive), box);