# HG changeset patch # User Mark Doliner # Date 1099634148 0 # Node ID 952fb08c60b0824b5e5b046737db7ec10ef478dc # Parent 5dd9c1df6459ac5ee14698f9ba78b6ce003d4d10 [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 diff -r 5dd9c1df6459 -r 952fb08c60b0 src/gtkaccount.c --- a/src/gtkaccount.c Fri Nov 05 05:26:43 2004 +0000 +++ b/src/gtkaccount.c Fri Nov 05 05:55:48 2004 +0000 @@ -733,9 +733,9 @@ FALSE, FALSE, 0); gtk_widget_show(dialog->remember_pass_check); - /* Auto-Login */ + /* Auto log in */ dialog->auto_login_check = - gtk_check_button_new_with_label(_("Auto-login")); + gtk_check_button_new_with_label(_("Auto log in")); gtk_box_pack_start(GTK_BOX(vbox), dialog->auto_login_check, FALSE, FALSE, 0); gtk_widget_show(dialog->auto_login_check); @@ -2122,7 +2122,7 @@ GtkCellRenderer *renderer; GtkTreeViewColumn *column; - /* Screen name column */ + /* Screen Name column */ column = gtk_tree_view_column_new(); gtk_tree_view_column_set_title(column, _("Screen Name")); gtk_tree_view_insert_column(GTK_TREE_VIEW(treeview), column, -1); @@ -2134,7 +2134,7 @@ gtk_tree_view_column_add_attribute(column, renderer, "pixbuf", COLUMN_ICON); - /* Screen name */ + /* Screen Name */ renderer = gtk_cell_renderer_text_new(); gtk_tree_view_column_pack_start(column, renderer, TRUE); gtk_tree_view_column_add_attribute(column, renderer, @@ -2155,13 +2155,13 @@ column = gtk_tree_view_get_column(GTK_TREE_VIEW(treeview), 1); gtk_tree_view_column_set_resizable(column, TRUE); - /* Auto-login? */ + /* Auto Log In? */ renderer = gtk_cell_renderer_toggle_new(); g_signal_connect(G_OBJECT(renderer), "toggled", G_CALLBACK(autologin_cb), dialog); - column = gtk_tree_view_column_new_with_attributes(_("Auto-login"), + column = gtk_tree_view_column_new_with_attributes(_("Auto Log In"), renderer, "active", COLUMN_AUTOLOGIN, NULL); gtk_tree_view_insert_column(GTK_TREE_VIEW(treeview), column, -1); diff -r 5dd9c1df6459 -r 952fb08c60b0 src/gtkconn.c --- a/src/gtkconn.c Fri Nov 05 05:26:43 2004 +0000 +++ b/src/gtkconn.c Fri Nov 05 05:55:48 2004 +0000 @@ -36,7 +36,7 @@ /* * The next couple of functions deal with the connection dialog */ -struct signon_meter { +struct login_meter { GaimAccount *account; GtkWidget *button; GtkWidget *progress; @@ -52,7 +52,7 @@ }; struct meter_window *meter_win = NULL; -static void kill_meter(struct signon_meter *meter, const char *text) +static void kill_meter(struct login_meter *meter, const char *text) { if(gtk_progress_bar_get_fraction(GTK_PROGRESS_BAR(meter->progress)) == 1) return; @@ -69,7 +69,7 @@ } } -static void cancel_signon(GtkWidget *button, struct signon_meter *meter) +static void cancel_login(GtkWidget *button, struct login_meter *meter) { if (meter->account->gc != NULL) { meter->account->gc->wants_to_die = TRUE; @@ -90,25 +90,25 @@ static void cancel_all () { GSList *m = meter_win ? meter_win->meters : NULL; - struct signon_meter *meter; + struct login_meter *meter; while (m) { meter = m->data; if (gaim_connection_get_state(meter->account->gc) != GAIM_CONNECTED) - cancel_signon(NULL, meter); + cancel_login(NULL, meter); m = m->next; } } -static gint meter_destroy(GtkWidget *window, GdkEvent *evt, struct signon_meter *meter) +static gint meter_destroy(GtkWidget *window, GdkEvent *evt, struct login_meter *meter) { return TRUE; } -static struct signon_meter *find_signon_meter(GaimConnection *gc) +static struct login_meter *find_login_meter(GaimConnection *gc) { GSList *m = meter_win ? meter_win->meters : NULL; - struct signon_meter *meter; + struct login_meter *meter; while (m) { meter = m->data; @@ -131,7 +131,7 @@ return image; } -static struct signon_meter * +static struct login_meter * new_meter(GaimConnection *gc, GtkWidget *widget, GtkWidget *table, gint *rows) { @@ -139,10 +139,10 @@ GtkWidget *label; GtkWidget *nest_vbox; GString *name_to_print; - struct signon_meter *meter; + struct login_meter *meter; - meter = g_new0(struct signon_meter, 1); + meter = g_new0(struct login_meter, 1); meter->account = gaim_connection_get_account(gc); name_to_print = g_string_new(gaim_account_get_username(meter->account)); @@ -154,7 +154,7 @@ nest_vbox = gtk_vbox_new (FALSE, 0); - g_string_prepend(name_to_print, _("Signon: ")); + g_string_prepend(name_to_print, _("Logging in: ")); label = gtk_label_new (name_to_print->str); g_string_free(name_to_print, TRUE); gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); @@ -167,7 +167,7 @@ meter->button = gaim_pixbuf_button_from_stock (_("Cancel"), GTK_STOCK_CANCEL, GAIM_BUTTON_HORIZONTAL); g_signal_connect(G_OBJECT (meter->button), "clicked", - G_CALLBACK (cancel_signon), meter); + G_CALLBACK (cancel_login), meter); gtk_table_attach (GTK_TABLE (table), graphic, 0, 1, *rows, *rows+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_table_attach (GTK_TABLE (table), nest_vbox, 1, 2, *rows, *rows+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); @@ -186,7 +186,7 @@ static void gaim_gtk_connection_connect_progress(GaimConnection *gc, const char *text, size_t step, size_t step_count) { - struct signon_meter *meter; + struct login_meter *meter; if(!meter_win) { GtkWidget *vbox; @@ -198,9 +198,9 @@ meter_win = g_new0(struct meter_window, 1); meter_win->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_resizable(GTK_WINDOW(meter_win->window), FALSE); - gtk_window_set_role(GTK_WINDOW(meter_win->window), "signon"); + gtk_window_set_role(GTK_WINDOW(meter_win->window), "logging_in"); gtk_container_set_border_width(GTK_CONTAINER(meter_win->window), 5); - gtk_window_set_title(GTK_WINDOW(meter_win->window), _("Signon")); + gtk_window_set_title(GTK_WINDOW(meter_win->window), _("Logging In")); vbox = gtk_vbox_new (FALSE, 0); gtk_container_add(GTK_CONTAINER(meter_win->window), vbox); @@ -223,7 +223,7 @@ G_CALLBACK(meter_destroy), NULL); } - meter = find_signon_meter(gc); + meter = find_login_meter(gc); if(!meter) { meter = new_meter(gc, meter_win->window, meter_win->table, &meter_win->rows); @@ -238,7 +238,7 @@ static void gaim_gtk_connection_connected(GaimConnection *gc) { - struct signon_meter *meter = find_signon_meter(gc); + struct login_meter *meter = find_login_meter(gc); gaim_setup(gc); @@ -253,7 +253,7 @@ static void gaim_gtk_connection_disconnected(GaimConnection *gc) { - struct signon_meter *meter = find_signon_meter(gc); + struct login_meter *meter = find_login_meter(gc); #if 0 /* XXX CORE/UI */ do_away_menu(); @@ -394,7 +394,7 @@ gtk_tree_model_get(model, &iter, 4, &account, -1); if (!gaim_account_is_connected(account) && g_list_find(l_accts, account) == NULL) - l_accts = g_list_append(l_accts, account); + l_accts = g_list_append(l_accts, account); } while (gtk_tree_model_iter_next(model, &iter)); /* remove all rows */ @@ -492,7 +492,7 @@ /* * Called whenever a different account is selected in the GtkListWhatever. */ -static void disconnect_tree_cb(GtkTreeSelection *sel, GtkTreeModel *model) +static void disconnect_tree_cb(GtkTreeSelection *sel, GtkTreeModel *model) { disconnect_window_update_buttons(model); } @@ -502,7 +502,7 @@ * gray the Reconnect All button if there is only 1 disconnected account. */ static void disconnect_connection_change_cb(GaimConnection *gc, void *data) { - GaimAccount *account = gaim_connection_get_account(gc); + GaimAccount *account = gaim_connection_get_account(gc); GtkTreeIter iter; GtkTreeModel *model; GdkPixbuf *icon; @@ -531,7 +531,7 @@ /* Add */ if (!gaim_account_is_connected(account2) && g_list_find(l_disc_accts, account2) == NULL) - l_disc_accts = g_list_append(l_disc_accts, account2); + l_disc_accts = g_list_append(l_disc_accts, account2); } while (gtk_tree_model_iter_next(model, &iter)); gtk_dialog_set_response_sensitive( diff -r 5dd9c1df6459 -r 952fb08c60b0 src/main.c --- a/src/main.c Fri Nov 05 05:26:43 2004 +0000 +++ b/src/main.c Fri Nov 05 05:55:48 2004 +0000 @@ -288,7 +288,7 @@ G_CALLBACK(gaim_gtk_prefs_show), mainwindow); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); - button = gaim_pixbuf_button_from_stock(_("_Sign on"), GAIM_STOCK_SIGN_ON, GAIM_BUTTON_VERTICAL); + button = gaim_pixbuf_button_from_stock(_("_Log in"), GAIM_STOCK_SIGN_ON, GAIM_BUTTON_VERTICAL); gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(dologin), mainwindow); diff -r 5dd9c1df6459 -r 952fb08c60b0 src/protocols/irc/irc.c --- a/src/protocols/irc/irc.c Fri Nov 05 05:26:43 2004 +0000 +++ b/src/protocols/irc/irc.c Fri Nov 05 05:55:48 2004 +0000 @@ -236,18 +236,18 @@ irc->server = g_strdup(userparts[1]); g_strfreev(userparts); - irc->buddies = g_hash_table_new_full((GHashFunc)irc_nick_hash, (GEqualFunc)irc_nick_equal, + irc->buddies = g_hash_table_new_full((GHashFunc)irc_nick_hash, (GEqualFunc)irc_nick_equal, NULL, (GDestroyNotify)irc_buddy_free); irc->cmds = g_hash_table_new(g_str_hash, g_str_equal); irc_cmd_table_build(irc); irc->msgs = g_hash_table_new(g_str_hash, g_str_equal); irc_msg_table_build(irc); - buf = g_strdup_printf(_("Signon: %s"), username); + buf = g_strdup_printf(_("Logging in: %s"), username); gaim_connection_update_progress(gc, buf, 1, 2); g_free(buf); - err = gaim_proxy_connect(account, irc->server, + err = gaim_proxy_connect(account, irc->server, gaim_account_get_int(account, "port", IRC_DEFAULT_PORT), irc_login_cb, gc);