--- a/pidgin/gtkblist.c Sat May 26 13:48:41 2007 +0000
+++ b/pidgin/gtkblist.c Sun Jul 01 00:55:03 2007 +0000
@@ -108,6 +108,7 @@
static guint visibility_manager_count = 0;
static gboolean gtk_blist_obscured = FALSE;
+static gboolean editing_blist = FALSE;
static GList *pidgin_blist_sort_methods = NULL;
static struct pidgin_blist_sort_method *current_sort_method = NULL;
@@ -150,11 +151,7 @@
if (!gtkblist)
return "dim grey";
if (!dim_grey_string[0]) {
- GtkStyle *style = gtk_widget_get_style(gtkblist->treeview);
- snprintf(dim_grey_string, sizeof(dim_grey_string), "#%02x%02x%02x",
- style->text_aa[GTK_STATE_NORMAL].red >> 8,
- style->text_aa[GTK_STATE_NORMAL].green >> 8,
- style->text_aa[GTK_STATE_NORMAL].blue >> 8);
+ snprintf(dim_grey_string, sizeof(dim_grey_string), "%s", pidgin_get_dim_grey_string(gtkblist->treeview));
}
return dim_grey_string;
}
@@ -177,6 +174,7 @@
static gboolean gtk_blist_window_state_cb(GtkWidget *w, GdkEventWindowState *event, gpointer data)
{
+#if GTK_CHECK_VERSION(2,2,0)
if(event->changed_mask & GDK_WINDOW_STATE_WITHDRAWN) {
if(event->new_window_state & GDK_WINDOW_STATE_WITHDRAWN)
purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/blist/list_visible", FALSE);
@@ -198,6 +196,28 @@
if (!(event->new_window_state & GDK_WINDOW_STATE_ICONIFIED))
pidgin_blist_refresh_timer(purple_get_blist());
}
+#else
+ /* At least gtk+ 2.0.6 does not properly set the change_mask when unsetting a
+ * GdkWindowState flag. To work around, the window state will be explicitly
+ * queried on these older versions of gtk+. See pidgin ticket #739.
+ */
+ GdkWindowState new_window_state = gdk_window_get_state(G_OBJECT(gtkblist->window->window));
+
+ if(new_window_state & GDK_WINDOW_STATE_WITHDRAWN) {
+ purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/blist/list_visible", FALSE);
+ } else {
+ purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/blist/list_visible", TRUE);
+ pidgin_blist_refresh_timer(purple_get_blist());
+ }
+
+ if(new_window_state & GDK_WINDOW_STATE_MAXIMIZED)
+ purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/blist/list_maximized", TRUE);
+ else
+ purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/blist/list_maximized", FALSE);
+
+ if (!(new_window_state & GDK_WINDOW_STATE_ICONIFIED))
+ pidgin_blist_refresh_timer(purple_get_blist());
+#endif
return FALSE;
}
@@ -266,20 +286,13 @@
purple_prefs_set_int(PIDGIN_PREFS_ROOT "/blist/width", event->width);
purple_prefs_set_int(PIDGIN_PREFS_ROOT "/blist/height", event->height);
- gtk_widget_set_size_request(gtkblist->headline_label,
- purple_prefs_get_int(PIDGIN_PREFS_ROOT "/blist/width")-25,-1);
/* continue to handle event normally */
return FALSE;
}
static void gtk_blist_menu_info_cb(GtkWidget *w, PurpleBuddy *b)
{
- PurpleNotifyUserInfo *info = purple_notify_user_info_new();
- purple_notify_user_info_add_pair(info, _("Information"), _("Retrieving..."));
- purple_notify_userinfo(b->account->gc, purple_buddy_get_name(b), info, NULL, NULL);
- purple_notify_user_info_destroy(info);
-
- serv_get_info(b->account->gc, b->name);
+ pidgin_retrieve_user_info(b->account->gc, purple_buddy_get_name(b));
}
static void gtk_blist_menu_im_cb(GtkWidget *w, PurpleBuddy *b)
@@ -301,15 +314,30 @@
static void gtk_blist_join_chat(PurpleChat *chat)
{
PurpleConversation *conv;
-
- conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT,
- purple_chat_get_name(chat),
+ PurplePluginProtocolInfo *prpl_info;
+ const char *name;
+ char *chat_name;
+
+ prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_find_prpl(purple_account_get_protocol_id(chat->account)));
+
+ if (prpl_info && prpl_info->get_chat_name)
+ chat_name = prpl_info->get_chat_name(chat->components);
+ else
+ chat_name = NULL;
+
+ if (chat_name)
+ name = chat_name;
+ else
+ name = purple_chat_get_name(chat);
+
+ conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, name,
chat->account);
if (conv != NULL)
purple_conversation_present(conv);
serv_join_chat(chat->account->gc, chat->components);
+ g_free(chat_name);
}
static void gtk_blist_menu_join_cb(GtkWidget *w, PurpleChat *chat)
@@ -317,6 +345,13 @@
gtk_blist_join_chat(chat);
}
+#if GTK_CHECK_VERSION(2,6,0)
+static void gtk_blist_renderer_editing_cancelled_cb(GtkCellRenderer *renderer, PurpleBuddyList *list)
+{
+ editing_blist = FALSE;
+ pidgin_blist_refresh(list);
+}
+
static void gtk_blist_renderer_editing_started_cb(GtkCellRenderer *renderer,
GtkCellEditable *editable,
gchar *path_str,
@@ -353,10 +388,12 @@
GtkEntry *entry = GTK_ENTRY (editable);
gtk_entry_set_text(entry, text);
}
-}
+ editing_blist = TRUE;
+}
+#endif
static void gtk_blist_renderer_edited_cb(GtkCellRendererText *text_rend, char *arg1,
- char *arg2, gpointer nada)
+ char *arg2, PurpleBuddyList *list)
{
GtkTreeIter iter;
GtkTreePath *path;
@@ -364,6 +401,7 @@
PurpleBlistNode *node;
PurpleGroup *dest;
+ editing_blist = FALSE;
path = gtk_tree_path_new_from_string (arg1);
gtk_tree_model_get_iter (GTK_TREE_MODEL(gtkblist->treemodel), &iter, path);
gtk_tree_path_free (path);
@@ -408,6 +446,7 @@
default:
break;
}
+ pidgin_blist_refresh(list);
}
static void gtk_blist_menu_alias_cb(GtkWidget *w, PurpleBlistNode *node)
@@ -490,7 +529,7 @@
static void gtk_blist_show_onlinehelp_cb()
{
- purple_notify_uri(NULL, PURPLE_WEBSITE "documentation.php");
+ purple_notify_uri(NULL, PURPLE_WEBSITE "documentation");
}
static void
@@ -1129,10 +1168,10 @@
if (((PurpleBlistNode*)buddy)->parent->child->next && !sub && !contact_expanded) {
pidgin_separator(menu);
pidgin_append_blist_node_privacy_menu(menu, (PurpleBlistNode *)buddy);
- pidgin_new_item_from_stock(menu, _("Alias..."), PIDGIN_STOCK_ALIAS,
+ pidgin_new_item_from_stock(menu, _("_Alias..."), PIDGIN_STOCK_ALIAS,
G_CALLBACK(gtk_blist_menu_alias_cb),
contact, 0, 0, NULL);
- pidgin_new_item_from_stock(menu, _("Remove"), GTK_STOCK_REMOVE,
+ pidgin_new_item_from_stock(menu, _("_Remove"), GTK_STOCK_REMOVE,
G_CALLBACK(pidgin_blist_remove_cb),
contact, 0, 0, NULL);
} else if (!sub || contact_expanded) {
@@ -1147,7 +1186,8 @@
}
static gboolean
-gtk_blist_key_press_cb(GtkWidget *tv, GdkEventKey *event, gpointer data) {
+gtk_blist_key_press_cb(GtkWidget *tv, GdkEventKey *event, gpointer data)
+{
PurpleBlistNode *node;
GValue val;
GtkTreeIter iter;
@@ -1174,7 +1214,7 @@
return FALSE;
}
if(buddy)
- serv_get_info(buddy->account->gc, buddy->name);
+ pidgin_retrieve_user_info(buddy->account->gc, buddy->name);
} else if (event->keyval == GDK_F2) {
gtk_blist_menu_alias_cb(tv, node);
}
@@ -1428,7 +1468,7 @@
prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
if (prpl && prpl_info->get_info)
- serv_get_info(b->account->gc, b->name);
+ pidgin_retrieve_user_info(b->account->gc, b->name);
handled = TRUE;
}
@@ -2088,51 +2128,6 @@
}
}
-static void
-roundify(GdkPixbuf *pixbuf) {
- int width, height, rowstride;
- guchar *pixels;
-
- if (!gdk_pixbuf_get_has_alpha(pixbuf))
- return;
-
- width = gdk_pixbuf_get_width(pixbuf);
- height = gdk_pixbuf_get_height(pixbuf);
- rowstride = gdk_pixbuf_get_rowstride(pixbuf);
- pixels = gdk_pixbuf_get_pixels(pixbuf);
-
- if (width < 6 || height < 6)
- return;
-
- /* Top left */
- pixels[3] = 0;
- pixels[7] = 0x80;
- pixels[11] = 0xC0;
- pixels[rowstride + 3] = 0x80;
- pixels[rowstride * 2 + 3] = 0xC0;
-
- /* Top right */
- pixels[width * 4 - 1] = 0;
- pixels[width * 4 - 5] = 0x80;
- pixels[width * 4 - 9] = 0xC0;
- pixels[rowstride + (width * 4) - 1] = 0x80;
- pixels[(2 * rowstride) + (width * 4) - 1] = 0xC0;
-
- /* Bottom left */
- pixels[(height - 1) * rowstride + 3] = 0;
- pixels[(height - 1) * rowstride + 7] = 0x80;
- pixels[(height - 1) * rowstride + 11] = 0xC0;
- pixels[(height - 2) * rowstride + 3] = 0x80;
- pixels[(height - 3) * rowstride + 3] = 0xC0;
-
- /* Bottom right */
- pixels[height * rowstride - 1] = 0;
- pixels[(height - 1) * rowstride - 1] = 0x80;
- pixels[(height - 2) * rowstride - 1] = 0xC0;
- pixels[height * rowstride - 5] = 0x80;
- pixels[height * rowstride - 9] = 0xC0;
-}
-
/* Altered from do_colorshift in gnome-panel */
static void
do_alphashift (GdkPixbuf *dest, GdkPixbuf *src, int shift)
@@ -2269,7 +2264,7 @@
gdk_pixbuf_fill(ret, 0x00000000);
gdk_pixbuf_scale(buf, ret, (32-scale_width)/2, (32-scale_height)/2, scale_width, scale_height, (32-scale_width)/2, (32-scale_height)/2, (double)scale_width/(double)orig_width, (double)scale_height/(double)orig_height, GDK_INTERP_BILINEAR);
if (pidgin_gdk_pixbuf_is_opaque(ret))
- roundify(ret);
+ pidgin_gdk_pixbuf_make_round(ret);
} else {
ret = gdk_pixbuf_scale_simple(buf,scale_width,scale_height, GDK_INTERP_BILINEAR);
}
@@ -2726,6 +2721,7 @@
{
GtkTreePath *path;
int delay;
+ GdkRectangle rect;
/*
* When dragging a buddy into a contact, this is the delay before
@@ -2741,7 +2737,17 @@
}
gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(tv), x, y, &path, NULL, NULL, NULL);
- gtk_tree_view_get_cell_area(GTK_TREE_VIEW(tv), path, NULL, >kblist->tip_rect);
+ gtk_tree_view_get_cell_area(GTK_TREE_VIEW(tv), path, NULL, &rect);
+
+ /* Only autoexpand when in the middle of the cell to avoid annoying un-intended expands */
+ if (y < rect.y + (rect.height / 3) ||
+ y > rect.y + (2 * (rect.height /3)))
+ return FALSE;
+
+ rect.height = rect.height / 3;
+ rect.y += rect.height;
+
+ gtkblist->tip_rect = rect;
if (path)
gtk_tree_path_free(path);
@@ -2863,7 +2869,6 @@
{ N_("/Tools/System _Log"), NULL, gtk_blist_show_systemlog_cb, 0, "<Item>", NULL },
{ "/Tools/sep3", NULL, NULL, 0, "<Separator>", NULL },
{ N_("/Tools/Mute _Sounds"), "<CTL>S", pidgin_blist_mute_sounds_cb, 0, "<CheckItem>", NULL },
-
/* Help */
{ N_("/_Help"), NULL, NULL, 0, "<Branch>", NULL },
{ N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "<StockItem>", GTK_STOCK_HELP },
@@ -2994,7 +2999,15 @@
signon = purple_presence_get_login_time(presence);
if (full && PURPLE_BUDDY_IS_ONLINE(b) && signon > 0)
{
- tmp = purple_str_seconds_to_string(time(NULL) - signon);
+ if (signon > time(NULL)) {
+ /*
+ * They signed on in the future?! Our local clock
+ * must be wrong, show the actual date instead of
+ * "4 days", etc.
+ */
+ tmp = g_strdup(purple_date_format_long(localtime(&signon)));
+ } else
+ tmp = purple_str_seconds_to_string(time(NULL) - signon);
purple_notify_user_info_add_pair(user_info, _("Logged In"), tmp);
g_free(tmp);
}
@@ -3103,6 +3116,15 @@
} else if(PURPLE_BLIST_NODE_IS_BUDDY(node)) {
buddy = (PurpleBuddy*)node;
gtkbuddynode = node->ui_data;
+ p = purple_buddy_get_presence(buddy);
+ if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_MOBILE)) {
+ path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emblems",
+ "16", "mobile.png", NULL);
+ ret = gdk_pixbuf_new_from_file(path, NULL);
+ g_free(path);
+ return ret;
+ }
+
if (((struct _pidgin_blist_node*)(node->parent->ui_data))->contact_expanded)
return pidgin_create_prpl_icon(((PurpleBuddy*)node)->account, PIDGIN_PRPL_ICON_SMALL);
} else if(PURPLE_BLIST_NODE_IS_CHAT(node)) {
@@ -3244,6 +3266,9 @@
else if (purple_presence_is_idle(p) && size == PIDGIN_STATUS_ICON_SMALL)
ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_AVAILABLE_I,
icon_size, "GtkTreeView");
+ else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_INVISIBLE))
+ ret = gtk_widget_render_icon(GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_INVISIBLE,
+ icon_size, "GtkTreeView");
else
ret = gtk_widget_render_icon(GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_AVAILABLE,
icon_size, "GtkTreeView");
@@ -3258,7 +3283,7 @@
return ret;
}
-static gchar *pidgin_blist_get_name_markup(PurpleBuddy *b, gboolean selected)
+gchar *pidgin_blist_get_name_markup(PurpleBuddy *b, gboolean selected, gboolean aliased)
{
const char *name;
char *esc, *text = NULL;
@@ -3283,15 +3308,19 @@
}
/* XXX Good luck cleaning up this crap */
-
- contact = (PurpleContact*)((PurpleBlistNode*)b)->parent;
- if(contact)
- gtkcontactnode = ((PurpleBlistNode*)contact)->ui_data;
-
- if(gtkcontactnode && !gtkcontactnode->contact_expanded && contact->alias)
- name = contact->alias;
- else
- name = purple_buddy_get_alias(b);
+ if (aliased) {
+ contact = (PurpleContact*)((PurpleBlistNode*)b)->parent;
+ if(contact)
+ gtkcontactnode = ((PurpleBlistNode*)contact)->ui_data;
+
+ if(gtkcontactnode && !gtkcontactnode->contact_expanded && contact->alias)
+ name = contact->alias;
+ else
+ name = purple_buddy_get_alias(b);
+ } else {
+ name = b->name;
+ }
+
esc = g_markup_escape_text(name, strlen(name));
presence = purple_buddy_get_presence(b);
@@ -3413,8 +3442,16 @@
"<span color='%s' size='smaller'>%s</span>",
dim_grey(), esc, dim_grey(),
statustext != NULL ? statustext : "");
- }
-
+ } else if (!PURPLE_BUDDY_IS_ONLINE(b)) {
+ if (!selected && !statustext) /* We handle selected text later */
+ text = g_strdup_printf("<span color='%s'>%s</span>", dim_grey(), esc);
+ else if (!selected && !text)
+ text = g_strdup_printf("<span color='%s'>%s</span>\n"
+ "<span color='%s' size='smaller'>%s</span>",
+ dim_grey(), esc, dim_grey(),
+ statustext != NULL ? statustext : "");
+
+ }
/* Not idle and not selected */
else if (!selected && !text)
{
@@ -3722,8 +3759,11 @@
gboolean pidgin_blist_node_is_contact_expanded(PurpleBlistNode *node)
{
- if PURPLE_BLIST_NODE_IS_BUDDY(node)
+ if (PURPLE_BLIST_NODE_IS_BUDDY(node)) {
node = node->parent;
+ if (node == NULL)
+ return FALSE;
+ }
g_return_val_if_fail(PURPLE_BLIST_NODE_IS_CONTACT(node), FALSE);
@@ -3824,15 +3864,17 @@
static gboolean
gtk_blist_window_key_press_cb(GtkWidget *w, GdkEventKey *event, PidginBuddyList *gtkblist)
{
- GtkWidget *imhtml;
+ GtkWidget *widget;
if (!gtkblist)
return FALSE;
- imhtml = gtk_window_get_focus(GTK_WINDOW(gtkblist->window));
-
- if (GTK_IS_IMHTML(imhtml) && gtk_bindings_activate(GTK_OBJECT(imhtml), event->keyval, event->state))
- return TRUE;
+ widget = gtk_window_get_focus(GTK_WINDOW(gtkblist->window));
+
+ if (GTK_IS_IMHTML(widget) || GTK_IS_ENTRY(widget)) {
+ if (gtk_bindings_activate(GTK_OBJECT(widget), event->keyval, event->state))
+ return TRUE;
+ }
return FALSE;
}
@@ -4204,9 +4246,7 @@
gtkblist->empty_avatar = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, 32, 32);
gdk_pixbuf_fill(gtkblist->empty_avatar, 0x00000000);
- gtkblist->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_role(GTK_WINDOW(gtkblist->window), "buddy_list");
- gtk_window_set_title(GTK_WINDOW(gtkblist->window), _("Buddy List"));
+ gtkblist->window = pidgin_create_window(_("Buddy List"), 0, "buddy_list", TRUE);
g_signal_connect(G_OBJECT(gtkblist->window), "focus-in-event",
G_CALLBACK(blist_focus_cb), gtkblist);
GTK_WINDOW(gtkblist->window)->allow_shrink = TRUE;
@@ -4428,8 +4468,11 @@
#endif
"markup", NAME_COLUMN,
NULL);
+#if GTK_CHECK_VERSION(2,6,0)
g_signal_connect(G_OBJECT(rend), "editing-started", G_CALLBACK(gtk_blist_renderer_editing_started_cb), NULL);
- g_signal_connect(G_OBJECT(rend), "edited", G_CALLBACK(gtk_blist_renderer_edited_cb), NULL);
+ g_signal_connect(G_OBJECT(rend), "editing-canceled", G_CALLBACK(gtk_blist_renderer_editing_cancelled_cb), list);
+#endif
+ g_signal_connect(G_OBJECT(rend), "edited", G_CALLBACK(gtk_blist_renderer_edited_cb), list);
g_object_set(rend, "ypad", 0, "yalign", 0.5, NULL);
#if GTK_CHECK_VERSION(2,6,0)
g_object_set(rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
@@ -4724,8 +4767,15 @@
NODE_COLUMN, &new_selection, -1);
}
- /* we set this up as a timeout, otherwise the blist flickers */
- g_timeout_add(0, (GSourceFunc)do_selection_changed, new_selection);
+ /* we set this up as a timeout, otherwise the blist flickers ...
+ * but we don't do it for groups, because it causes total bizarness -
+ * the previously selected buddy node might rendered at half height.
+ */
+ if ((new_selection != NULL) && PURPLE_BLIST_NODE_IS_GROUP(new_selection)) {
+ do_selection_changed(new_selection);
+ } else {
+ g_timeout_add(0, (GSourceFunc)do_selection_changed, new_selection);
+ }
}
static gboolean insert_node(PurpleBuddyList *list, PurpleBlistNode *node, GtkTreeIter *iter)
@@ -4764,9 +4814,10 @@
gtk_tree_path_free(newpath);
- gtk_tree_store_set(gtkblist->treemodel, iter,
- NODE_COLUMN, node,
- -1);
+ if (!editing_blist)
+ gtk_tree_store_set(gtkblist->treemodel, iter,
+ NODE_COLUMN, node,
+ -1);
if(node->parent) {
GtkTreePath *expand = NULL;
@@ -4799,6 +4850,9 @@
g_return_if_fail(node != NULL);
+ if (editing_blist)
+ return;
+
if (PURPLE_BLIST_NODE_IS_GROUP(node))
gnode = node;
else if (PURPLE_BLIST_NODE_IS_BUDDY(node))
@@ -4866,10 +4920,17 @@
gboolean selected;
char group_count[12] = "";
char *mark, *esc;
+ PurpleBlistNode *selected_node = NULL;
+ GtkTreeIter iter;
group = (PurpleGroup*)gnode;
textcolor = gtkblist->treeview->style->fg[GTK_STATE_ACTIVE];
- selected = gtkblist ? (gtkblist->selected_node == gnode) : FALSE;
+
+ if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(gtkblist->treeview)), NULL, &iter)) {
+ gtk_tree_model_get(GTK_TREE_MODEL(gtkblist->treemodel), &iter,
+ NODE_COLUMN, &selected_node, -1);
+ }
+ selected = (gnode == selected_node);
if (!expanded) {
g_snprintf(group_count, sizeof(group_count), " (%d/%d)",
@@ -4900,6 +4961,9 @@
gboolean biglist = purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons");
presence = purple_buddy_get_presence(buddy);
+ if (editing_blist)
+ return;
+
status = pidgin_blist_get_status_icon((PurpleBlistNode*)buddy,
PIDGIN_STATUS_ICON_SMALL);
@@ -4917,7 +4981,7 @@
}
emblem = pidgin_blist_get_emblem((PurpleBlistNode*) buddy);
- mark = pidgin_blist_get_name_markup(buddy, selected);
+ mark = pidgin_blist_get_name_markup(buddy, selected, TRUE);
if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_idle_time") &&
purple_presence_is_idle(presence) &&
@@ -4979,6 +5043,9 @@
PurpleBuddy *buddy;
struct _pidgin_blist_node *gtknode;
+ if (editing_blist)
+ return;
+
if (PURPLE_BLIST_NODE_IS_BUDDY(node))
cnode = node->parent;
else
@@ -5075,6 +5142,9 @@
g_return_if_fail(PURPLE_BLIST_NODE_IS_CHAT(node));
+ if (editing_blist)
+ return;
+
/* First things first, update the group */
pidgin_blist_update_group(list, node->parent);
@@ -5386,12 +5456,25 @@
gtk_container_set_border_width(GTK_CONTAINER(table), 0);
gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
- label = gtk_label_new(_("Screen name:"));
+ /* Set up stuff for the account box */
+ label = gtk_label_new_with_mnemonic(_("_Account:"));
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
+ data->account_box = pidgin_account_option_menu_new(account, FALSE,
+ G_CALLBACK(add_buddy_select_account_cb), NULL, data);
+
+ gtk_table_attach_defaults(GTK_TABLE(table), data->account_box, 1, 2, 0, 1);
+ gtk_label_set_mnemonic_widget(GTK_LABEL(label), data->account_box);
+ pidgin_set_accessible_label (data->account_box, label);
+ /* End of account box */
+
+ label = gtk_label_new_with_mnemonic(_("_Screen name:"));
+ gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+ gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2);
+
data->entry = gtk_entry_new();
- gtk_table_attach_defaults(GTK_TABLE(table), data->entry, 1, 2, 0, 1);
+ gtk_table_attach_defaults(GTK_TABLE(table), data->entry, 1, 2, 1, 2);
gtk_widget_grab_focus(data->entry);
if (username != NULL)
@@ -5401,19 +5484,20 @@
GTK_RESPONSE_OK, FALSE);
gtk_entry_set_activates_default (GTK_ENTRY(data->entry), TRUE);
+ gtk_label_set_mnemonic_widget(GTK_LABEL(label), data->entry);
pidgin_set_accessible_label (data->entry, label);
g_signal_connect(G_OBJECT(data->entry), "changed",
G_CALLBACK(pidgin_set_sensitive_if_input),
data->window);
- label = gtk_label_new(_("Alias:"));
+ label = gtk_label_new_with_mnemonic(_("A_lias:"));
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
- gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2);
+ gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 2, 3);
data->entry_for_alias = gtk_entry_new();
gtk_table_attach_defaults(GTK_TABLE(table),
- data->entry_for_alias, 1, 2, 1, 2);
+ data->entry_for_alias, 1, 2, 2, 3);
if (alias != NULL)
gtk_entry_set_text(GTK_ENTRY(data->entry_for_alias), alias);
@@ -5422,29 +5506,19 @@
gtk_widget_grab_focus(GTK_WIDGET(data->entry_for_alias));
gtk_entry_set_activates_default (GTK_ENTRY(data->entry_for_alias), TRUE);
+ gtk_label_set_mnemonic_widget(GTK_LABEL(label), data->entry_for_alias);
pidgin_set_accessible_label (data->entry_for_alias, label);
- label = gtk_label_new(_("Group:"));
+ label = gtk_label_new_with_mnemonic(_("_Group:"));
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
- gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 2, 3);
+ gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 3, 4);
data->combo = gtk_combo_new();
gtk_combo_set_popdown_strings(GTK_COMBO(data->combo), groups_tree());
- gtk_table_attach_defaults(GTK_TABLE(table), data->combo, 1, 2, 2, 3);
+ gtk_table_attach_defaults(GTK_TABLE(table), data->combo, 1, 2, 3, 4);
+ gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_COMBO(data->combo)->entry);
pidgin_set_accessible_label (data->combo, label);
- /* Set up stuff for the account box */
- label = gtk_label_new(_("Account:"));
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
- gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 3, 4);
-
- data->account_box = pidgin_account_option_menu_new(account, FALSE,
- G_CALLBACK(add_buddy_select_account_cb), NULL, data);
-
- gtk_table_attach_defaults(GTK_TABLE(table), data->account_box, 1, 2, 3, 4);
- pidgin_set_accessible_label (data->account_box, label);
- /* End of account box */
-
g_signal_connect(G_OBJECT(data->window), "response",
G_CALLBACK(add_buddy_cb), data);
@@ -5750,7 +5824,7 @@
rowbox = gtk_hbox_new(FALSE, 5);
gtk_box_pack_start(GTK_BOX(vbox), rowbox, FALSE, FALSE, 0);
- label = gtk_label_new(_("Account:"));
+ label = gtk_label_new_with_mnemonic(_("_Account:"));
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
gtk_size_group_add_widget(data->sg, label);
gtk_box_pack_start(GTK_BOX(rowbox), label, FALSE, FALSE, 0);
@@ -5759,6 +5833,7 @@
G_CALLBACK(addchat_select_account_cb),
chat_account_filter_func, data);
gtk_box_pack_start(GTK_BOX(rowbox), data->account_menu, TRUE, TRUE, 0);
+ gtk_label_set_mnemonic_widget(GTK_LABEL(label), data->account_menu);
pidgin_set_accessible_label (data->account_menu, label);
data->entries_box = gtk_vbox_new(FALSE, 5);
@@ -5770,7 +5845,7 @@
rowbox = gtk_hbox_new(FALSE, 5);
gtk_box_pack_start(GTK_BOX(vbox), rowbox, FALSE, FALSE, 0);
- label = gtk_label_new(_("Alias:"));
+ label = gtk_label_new_with_mnemonic(_("A_lias:"));
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
gtk_size_group_add_widget(data->sg, label);
gtk_box_pack_start(GTK_BOX(rowbox), label, FALSE, FALSE, 0);
@@ -5780,12 +5855,15 @@
gtk_entry_set_text(GTK_ENTRY(data->alias_entry), alias);
gtk_box_pack_end(GTK_BOX(rowbox), data->alias_entry, TRUE, TRUE, 0);
gtk_entry_set_activates_default(GTK_ENTRY(data->alias_entry), TRUE);
+ gtk_label_set_mnemonic_widget(GTK_LABEL(label), data->alias_entry);
pidgin_set_accessible_label (data->alias_entry, label);
+ if (name != NULL)
+ gtk_widget_grab_focus(data->alias_entry);
rowbox = gtk_hbox_new(FALSE, 5);
gtk_box_pack_start(GTK_BOX(vbox), rowbox, FALSE, FALSE, 0);
- label = gtk_label_new(_("Group:"));
+ label = gtk_label_new_with_mnemonic(_("_Group:"));
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
gtk_size_group_add_widget(data->sg, label);
gtk_box_pack_start(GTK_BOX(rowbox), label, FALSE, FALSE, 0);
@@ -5799,6 +5877,7 @@
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(data->group_combo)->entry),
group->name);
}
+ gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_COMBO(data->group_combo)->entry);
pidgin_set_accessible_label (data->group_combo, label);
g_signal_connect(G_OBJECT(data->window), "response",
@@ -6670,3 +6749,4 @@
if (activeitem)
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(activeitem), TRUE);
}
+