--- a/pidgin/gtkaccount.c Sat May 26 13:48:41 2007 +0000
+++ b/pidgin/gtkaccount.c Sun Jul 01 00:55:03 2007 +0000
@@ -184,6 +184,7 @@
gtk_size_group_add_widget(dialog->sg, label);
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+ gtk_label_set_mnemonic_widget(GTK_LABEL(label), widget);
gtk_widget_show(label);
gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, PIDGIN_HIG_BORDER);
@@ -426,15 +427,18 @@
gtk_widget_ref(dialog->protocol_menu);
}
- hbox = add_pref_box(dialog, vbox, _("Protocol:"), dialog->protocol_menu);
+ hbox = add_pref_box(dialog, vbox, _("Pro_tocol:"), dialog->protocol_menu);
g_object_set_data(G_OBJECT(dialog->protocol_menu), "container", hbox);
gtk_widget_unref(dialog->protocol_menu);
/* Screen name */
dialog->screenname_entry = gtk_entry_new();
-
- add_pref_box(dialog, vbox, _("Screen name:"), dialog->screenname_entry);
+#if GTK_CHECK_VERSION(2,10,0)
+ g_object_set(G_OBJECT(dialog->screenname_entry), "truncate-multiline", TRUE, NULL);
+#endif
+
+ add_pref_box(dialog, vbox, _("Screen _name:"), dialog->screenname_entry);
g_signal_connect(G_OBJECT(dialog->screenname_entry), "changed",
G_CALLBACK(screenname_changed_cb), dialog);
@@ -457,7 +461,7 @@
PurpleAccountUserSplit *split = l->data;
char *buf;
- buf = g_strdup_printf("%s:", purple_account_user_split_get_text(split));
+ buf = g_strdup_printf("_%s:", purple_account_user_split_get_text(split));
entry = gtk_entry_new();
@@ -476,11 +480,15 @@
GtkWidget *entry = l->data;
PurpleAccountUserSplit *split = l2->data;
- const char *value = NULL, *protocol = NULL;
+ const char *value = NULL;
char *c;
if (dialog->account != NULL) {
- c = strrchr(username,
+ if(purple_account_user_split_get_reverse(split))
+ c = strrchr(username,
+ purple_account_user_split_get_separator(split));
+ else
+ c = strchr(username,
purple_account_user_split_get_separator(split));
if (c != NULL) {
@@ -496,8 +504,7 @@
/* Google Talk default domain hackery! */
menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->protocol_menu));
item = gtk_menu_get_active(GTK_MENU(menu));
- protocol = g_object_get_data(G_OBJECT(item), "protocol");
- if (value == NULL && !strcmp(protocol, "prpl-fake") &&
+ if (value == NULL && g_object_get_data(G_OBJECT(item), "fake") &&
!strcmp(purple_account_user_split_get_text(split), _("Domain")))
value = "gmail.com";
@@ -516,16 +523,16 @@
gtk_entry_set_visibility(GTK_ENTRY(dialog->password_entry), FALSE);
if (gtk_entry_get_invisible_char(GTK_ENTRY(dialog->password_entry)) == '*')
gtk_entry_set_invisible_char(GTK_ENTRY(dialog->password_entry), PIDGIN_INVISIBLE_CHAR);
- dialog->password_box = add_pref_box(dialog, vbox, _("Password:"),
+ dialog->password_box = add_pref_box(dialog, vbox, _("_Password:"),
dialog->password_entry);
/* Alias */
dialog->alias_entry = gtk_entry_new();
- add_pref_box(dialog, vbox, _("Local alias:"), dialog->alias_entry);
+ add_pref_box(dialog, vbox, _("_Local alias:"), dialog->alias_entry);
/* Remember Password */
dialog->remember_pass_check =
- gtk_check_button_new_with_label(_("Remember password"));
+ gtk_check_button_new_with_mnemonic(_("Remember pass_word"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->remember_pass_check),
FALSE);
gtk_box_pack_start(GTK_BOX(vbox), dialog->remember_pass_check,
@@ -596,12 +603,12 @@
/* New mail notifications */
dialog->new_mail_check =
- gtk_check_button_new_with_label(_("New mail notifications"));
+ gtk_check_button_new_with_mnemonic(_("New _mail notifications"));
gtk_box_pack_start(GTK_BOX(vbox), dialog->new_mail_check, FALSE, FALSE, 0);
gtk_widget_show(dialog->new_mail_check);
/* Buddy icon */
- dialog->icon_check = gtk_check_button_new_with_label(_("Use this buddy icon for this account:"));
+ dialog->icon_check = gtk_check_button_new_with_mnemonic(_("Use this buddy _icon for this account:"));
g_signal_connect(G_OBJECT(dialog->icon_check), "toggled", G_CALLBACK(icon_check_cb), dialog);
gtk_widget_show(dialog->icon_check);
gtk_box_pack_start(GTK_BOX(vbox), dialog->icon_check, FALSE, FALSE, 0);
@@ -690,7 +697,7 @@
PurpleAccountOption *option;
PurpleAccount *account;
GtkWidget *frame, *vbox, *check, *entry, *combo, *menu, *item;
- const GList *list, *node;
+ GList *list, *node;
gint i, idx, int_value;
GtkListStore *model;
GtkTreeIter iter;
@@ -698,8 +705,8 @@
PurpleKeyValuePair *kvp;
GList *l;
char buf[1024];
- char *title;
- const char *str_value, *protocol;
+ char *title, *tmp;
+ const char *str_value;
gboolean bool_value;
if (dialog->protocol_frame != NULL) {
@@ -755,8 +762,9 @@
purple_account_option_get_default_bool(option));
}
- check = gtk_check_button_new_with_label(
- purple_account_option_get_text(option));
+ tmp = g_strconcat("_", purple_account_option_get_text(option), NULL);
+ check = gtk_check_button_new_with_mnemonic(tmp);
+ g_free(tmp);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check),
bool_value);
@@ -788,7 +796,7 @@
entry = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(entry), buf);
- title = g_strdup_printf("%s:",
+ title = g_strdup_printf("_%s:",
purple_account_option_get_text(option));
add_pref_box(dialog, vbox, title, entry);
@@ -825,15 +833,14 @@
/* Google Talk default domain hackery! */
menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->protocol_menu));
item = gtk_menu_get_active(GTK_MENU(menu));
- protocol = g_object_get_data(G_OBJECT(item), "protocol");
- if (str_value == NULL && !strcmp(protocol, "prpl-fake") &&
+ if (str_value == NULL && g_object_get_data(G_OBJECT(item), "fake") &&
!strcmp(_("Connect server"), purple_account_option_get_text(option)))
- str_value = "talk.google.com";
-
+ str_value = "talk.google.com";
+
if (str_value != NULL)
gtk_entry_set_text(GTK_ENTRY(entry), str_value);
- title = g_strdup_printf("%s:",
+ title = g_strdup_printf("_%s:",
purple_account_option_get_text(option));
add_pref_box(dialog, vbox, title, entry);
@@ -894,7 +901,7 @@
gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo),
renderer, "text", 0, NULL);
- title = g_strdup_printf("%s:",
+ title = g_strdup_printf("_%s:",
purple_account_option_get_text(option));
add_pref_box(dialog, vbox, title, combo);
@@ -1463,18 +1470,8 @@
if ((dialog->plugin = purple_find_prpl(dialog->protocol_id)) != NULL)
dialog->prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(dialog->plugin);
-
- dialog->window = win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_role(GTK_WINDOW(win), "account");
-
- if (type == PIDGIN_ADD_ACCOUNT_DIALOG)
- gtk_window_set_title(GTK_WINDOW(win), _("Add Account"));
- else
- gtk_window_set_title(GTK_WINDOW(win), _("Modify Account"));
-
- gtk_window_set_resizable(GTK_WINDOW(win), FALSE);
-
- gtk_container_set_border_width(GTK_CONTAINER(win), PIDGIN_HIG_BORDER);
+ dialog->window = win = pidgin_create_window((type == PIDGIN_ADD_ACCOUNT_DIALOG) ? _("Add Account") : _("Modify Account"),
+ PIDGIN_HIG_BORDER, "account", FALSE);
g_signal_connect(G_OBJECT(win), "delete_event",
G_CALLBACK(account_win_destroy_cb), dialog);
@@ -2024,19 +2021,26 @@
{
GdkPixbuf *pixbuf, *buddyicon = NULL;
PurpleStoredImage *img = NULL;
+ PurplePlugin *prpl;
+ PurplePluginProtocolInfo *prpl_info = NULL;
pixbuf = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM);
if ((pixbuf != NULL) && purple_account_is_disconnected(account))
gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE);
- if (purple_account_get_bool(account, "use-global-buddyicon", TRUE)) {
- if (global_buddyicon != NULL)
- buddyicon = g_object_ref(G_OBJECT(global_buddyicon));
- /* This is for when set_account() is called for a single account */
- else
+ prpl = purple_find_prpl(purple_account_get_protocol_id(account));
+ if (prpl != NULL)
+ prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
+ if (prpl_info != NULL && prpl_info->icon_spec.format != NULL) {
+ if (purple_account_get_bool(account, "use-global-buddyicon", TRUE)) {
+ if (global_buddyicon != NULL)
+ buddyicon = g_object_ref(G_OBJECT(global_buddyicon));
+ /* This is for when set_account() is called for a single account */
+ else
+ img = purple_buddy_icons_find_account_icon(account);
+ } else {
img = purple_buddy_icons_find_account_icon(account);
- } else {
- img = purple_buddy_icons_find_account_icon(account);
+ }
}
if (img != NULL) {
@@ -2311,7 +2315,6 @@
GtkWidget *button;
int width, height;
-
if (accounts_window != NULL) {
gtk_window_present(GTK_WINDOW(accounts_window->window));
return;
@@ -2322,11 +2325,8 @@
width = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/accounts/dialog/width");
height = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/accounts/dialog/height");
- dialog->window = win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ dialog->window = win = pidgin_create_window(_("Accounts"), PIDGIN_HIG_BORDER, "accounts", TRUE);
gtk_window_set_default_size(GTK_WINDOW(win), width, height);
- gtk_window_set_role(GTK_WINDOW(win), "accounts");
- gtk_window_set_title(GTK_WINDOW(win), _("Accounts"));
- gtk_container_set_border_width(GTK_CONTAINER(win), PIDGIN_HIG_BORDER);
g_signal_connect(G_OBJECT(win), "delete_event",
G_CALLBACK(accedit_win_destroy_cb), accounts_window);
@@ -2686,3 +2686,4 @@
purple_signals_unregister_by_instance(pidgin_account_get_handle());
}
+