comparison src/buddy.c @ 5089:29b80bc21ba7

[gaim-migrate @ 5451] Joe Clarke (jmarcus) writes: "The accelerator keys (e.g. ctl+q, ctl+i, etc.) do not work in GAIM 0.60. I think that's because there is no accelerator group attached to the main GAIM window. The attached patch corrects the problem." committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Wed, 09 Apr 2003 23:28:47 +0000
parents b37d7d09ec83
children c081a81ee013
comparison
equal deleted inserted replaced
5088:73e3f3c78d12 5089:29b80bc21ba7
1110 GtkCellRenderer *rend; 1110 GtkCellRenderer *rend;
1111 GtkTreeViewColumn *column; 1111 GtkTreeViewColumn *column;
1112 GtkWidget *sw; 1112 GtkWidget *sw;
1113 GtkWidget *button; 1113 GtkWidget *button;
1114 GtkSizeGroup *sg; 1114 GtkSizeGroup *sg;
1115 GtkAccelGroup *accel_group;
1115 GtkTreeSelection *selection; 1116 GtkTreeSelection *selection;
1116 GtkTargetEntry gte[] = {{"GAIM_BLIST_NODE", GTK_TARGET_SAME_APP, DRAG_ROW}, 1117 GtkTargetEntry gte[] = {{"GAIM_BLIST_NODE", GTK_TARGET_SAME_APP, DRAG_ROW},
1117 {"application/x-im-contact", 0, DRAG_BUDDY}}; 1118 {"application/x-im-contact", 0, DRAG_BUDDY}};
1118 1119
1119 if (gtkblist && gtkblist->window) { 1120 if (gtkblist && gtkblist->window) {
1134 g_signal_connect(G_OBJECT(gtkblist->window), "configure_event", G_CALLBACK(gtk_blist_configure_cb), NULL); 1135 g_signal_connect(G_OBJECT(gtkblist->window), "configure_event", G_CALLBACK(gtk_blist_configure_cb), NULL);
1135 g_signal_connect(G_OBJECT(gtkblist->window), "visibility_notify_event", G_CALLBACK(gtk_blist_visibility_cb), NULL); 1136 g_signal_connect(G_OBJECT(gtkblist->window), "visibility_notify_event", G_CALLBACK(gtk_blist_visibility_cb), NULL);
1136 gtk_widget_add_events(gtkblist->window, GDK_VISIBILITY_NOTIFY_MASK); 1137 gtk_widget_add_events(gtkblist->window, GDK_VISIBILITY_NOTIFY_MASK);
1137 1138
1138 /******************************* Menu bar *************************************/ 1139 /******************************* Menu bar *************************************/
1139 ift = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<GaimMain>", NULL); 1140 accel_group = gtk_accel_group_new();
1141 gtk_window_add_accel_group(GTK_WINDOW (gtkblist->window), accel_group);
1142 g_object_unref(accel_group);
1143 ift = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<GaimMain>", accel_group);
1140 gtk_item_factory_set_translate_func (ift, 1144 gtk_item_factory_set_translate_func (ift,
1141 item_factory_translate_func, 1145 item_factory_translate_func,
1142 NULL, NULL); 1146 NULL, NULL);
1143 gtk_item_factory_create_items(ift, sizeof(blist_menu) / sizeof(*blist_menu), 1147 gtk_item_factory_create_items(ift, sizeof(blist_menu) / sizeof(*blist_menu),
1144 blist_menu, NULL); 1148 blist_menu, NULL);