Mercurial > pidgin
comparison src/gtkblist.c @ 7859:e873d0bd0e6c
[gaim-migrate @ 8513]
I changed some stuff with conversation menus. Stuff is renamed,
moved around, not grayed out, grayed out, visible, somewhat works
for chats, etc. Ima finish this tomorrow because it's 6 o'freaking
clock. It shouldn't make anything worse, and might make some things
better.
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sun, 14 Dec 2003 11:03:54 +0000 |
parents | c364c783f678 |
children | 30ee5c52b8dc |
comparison
equal
deleted
inserted
replaced
7858:1ce040412bd5 | 7859:e873d0bd0e6c |
---|---|
710 GaimBlistNode *node; | 710 GaimBlistNode *node; |
711 | 711 |
712 if(gtk_tree_selection_get_selected(sel, NULL, &iter)){ | 712 if(gtk_tree_selection_get_selected(sel, NULL, &iter)){ |
713 gtk_tree_model_get(GTK_TREE_MODEL(gtkblist->treemodel), &iter, NODE_COLUMN, &node, -1); | 713 gtk_tree_model_get(GTK_TREE_MODEL(gtkblist->treemodel), &iter, NODE_COLUMN, &node, -1); |
714 if (GAIM_BLIST_NODE_IS_BUDDY(node)) | 714 if (GAIM_BLIST_NODE_IS_BUDDY(node)) |
715 gaim_blist_request_add_chat(NULL, (GaimGroup*)node->parent->parent); | 715 gaim_blist_request_add_chat(NULL, (GaimGroup*)node->parent->parent, NULL); |
716 if (GAIM_BLIST_NODE_IS_CONTACT(node) || GAIM_BLIST_NODE_IS_CHAT(node)) | 716 if (GAIM_BLIST_NODE_IS_CONTACT(node) || GAIM_BLIST_NODE_IS_CHAT(node)) |
717 gaim_blist_request_add_chat(NULL, (GaimGroup*)node->parent); | 717 gaim_blist_request_add_chat(NULL, (GaimGroup*)node->parent, NULL); |
718 else if (GAIM_BLIST_NODE_IS_GROUP(node)) | 718 else if (GAIM_BLIST_NODE_IS_GROUP(node)) |
719 gaim_blist_request_add_chat(NULL, (GaimGroup*)node); | 719 gaim_blist_request_add_chat(NULL, (GaimGroup*)node, NULL); |
720 } | 720 } |
721 else { | 721 else { |
722 gaim_blist_request_add_chat(NULL, NULL); | 722 gaim_blist_request_add_chat(NULL, NULL, NULL); |
723 } | 723 } |
724 } | 724 } |
725 | 725 |
726 static void gaim_gtk_blist_add_buddy_cb() | 726 static void gaim_gtk_blist_add_buddy_cb() |
727 { | 727 { |
3512 | 3512 |
3513 return (GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info != NULL); | 3513 return (GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info != NULL); |
3514 } | 3514 } |
3515 | 3515 |
3516 void | 3516 void |
3517 gaim_gtk_blist_request_add_chat(GaimAccount *account, GaimGroup *group) | 3517 gaim_gtk_blist_request_add_chat(GaimAccount *account, GaimGroup *group, |
3518 const char *alias) | |
3518 { | 3519 { |
3519 GaimGtkAddChatData *data; | 3520 GaimGtkAddChatData *data; |
3520 GaimGtkBuddyList *gtkblist; | 3521 GaimGtkBuddyList *gtkblist; |
3521 GList *l; | 3522 GList *l; |
3522 GaimConnection *gc; | 3523 GaimConnection *gc; |
3618 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); | 3619 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); |
3619 gtk_size_group_add_widget(data->sg, label); | 3620 gtk_size_group_add_widget(data->sg, label); |
3620 gtk_box_pack_start(GTK_BOX(rowbox), label, FALSE, FALSE, 0); | 3621 gtk_box_pack_start(GTK_BOX(rowbox), label, FALSE, FALSE, 0); |
3621 | 3622 |
3622 data->alias_entry = gtk_entry_new(); | 3623 data->alias_entry = gtk_entry_new(); |
3624 if (alias != NULL) | |
3625 gtk_entry_set_text(GTK_ENTRY(data->alias_entry), alias); | |
3623 gtk_box_pack_end(GTK_BOX(rowbox), data->alias_entry, TRUE, TRUE, 0); | 3626 gtk_box_pack_end(GTK_BOX(rowbox), data->alias_entry, TRUE, TRUE, 0); |
3624 | 3627 |
3625 rowbox = gtk_hbox_new(FALSE, 5); | 3628 rowbox = gtk_hbox_new(FALSE, 5); |
3626 gtk_box_pack_start(GTK_BOX(vbox), rowbox, FALSE, FALSE, 0); | 3629 gtk_box_pack_start(GTK_BOX(vbox), rowbox, FALSE, FALSE, 0); |
3627 | 3630 |