Mercurial > pidgin.yaz
comparison src/protocols/irc/irc.c @ 10159:952fb08c60b0
[gaim-migrate @ 11240]
Here's the deal:
I got tired of inconsistency with respect to signon v. login, so I picked
one. I picked "Log In" and "Login." I think they're more common and
make more sense.
"Log In" is the verb form, and should be used on things like a button
that causes you to log in, places that say "You're logging in,
please wait."
"Login" is the nounish form, and should be used in places like,
"Login name:" "Login Window" "login time"
Sound good?
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Fri, 05 Nov 2004 05:55:48 +0000 |
parents | 56e34a659db2 |
children | 13cb42ebb537 |
comparison
equal
deleted
inserted
replaced
10158:5dd9c1df6459 | 10159:952fb08c60b0 |
---|---|
234 userparts = g_strsplit(username, "@", 2); | 234 userparts = g_strsplit(username, "@", 2); |
235 gaim_connection_set_display_name(gc, userparts[0]); | 235 gaim_connection_set_display_name(gc, userparts[0]); |
236 irc->server = g_strdup(userparts[1]); | 236 irc->server = g_strdup(userparts[1]); |
237 g_strfreev(userparts); | 237 g_strfreev(userparts); |
238 | 238 |
239 irc->buddies = g_hash_table_new_full((GHashFunc)irc_nick_hash, (GEqualFunc)irc_nick_equal, | 239 irc->buddies = g_hash_table_new_full((GHashFunc)irc_nick_hash, (GEqualFunc)irc_nick_equal, |
240 NULL, (GDestroyNotify)irc_buddy_free); | 240 NULL, (GDestroyNotify)irc_buddy_free); |
241 irc->cmds = g_hash_table_new(g_str_hash, g_str_equal); | 241 irc->cmds = g_hash_table_new(g_str_hash, g_str_equal); |
242 irc_cmd_table_build(irc); | 242 irc_cmd_table_build(irc); |
243 irc->msgs = g_hash_table_new(g_str_hash, g_str_equal); | 243 irc->msgs = g_hash_table_new(g_str_hash, g_str_equal); |
244 irc_msg_table_build(irc); | 244 irc_msg_table_build(irc); |
245 | 245 |
246 buf = g_strdup_printf(_("Signon: %s"), username); | 246 buf = g_strdup_printf(_("Logging in: %s"), username); |
247 gaim_connection_update_progress(gc, buf, 1, 2); | 247 gaim_connection_update_progress(gc, buf, 1, 2); |
248 g_free(buf); | 248 g_free(buf); |
249 | 249 |
250 err = gaim_proxy_connect(account, irc->server, | 250 err = gaim_proxy_connect(account, irc->server, |
251 gaim_account_get_int(account, "port", IRC_DEFAULT_PORT), | 251 gaim_account_get_int(account, "port", IRC_DEFAULT_PORT), |
252 irc_login_cb, gc); | 252 irc_login_cb, gc); |
253 | 253 |
254 if (err || !account->gc) { | 254 if (err || !account->gc) { |
255 gaim_connection_error(gc, _("Couldn't create socket")); | 255 gaim_connection_error(gc, _("Couldn't create socket")); |