Mercurial > pidgin.yaz
comparison pidgin/gtkblist.c @ 23113:8c3444f04709
propagate from branch 'im.pidgin.pidgin' (head d7144f5dbbde09137aff1ceadfd419e25303bf7d)
to branch 'im.pidgin.pidgin.next.minor' (head b6f1c6f279a87ac4b59426eea116c349eb31fe8c)
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Wed, 07 May 2008 12:14:28 +0000 |
| parents | b4a0f4b32ba5 |
| children | 5d833ca5a265 5a359f6666c2 ac567757d236 1dd0e007514d |
comparison
equal
deleted
inserted
replaced
| 23112:bb41bdce8981 | 23113:8c3444f04709 |
|---|---|
| 678 g_free(pce); | 678 g_free(pce); |
| 679 } | 679 } |
| 680 | 680 |
| 681 g_list_free(parts); | 681 g_list_free(parts); |
| 682 | 682 |
| 683 purple_request_fields(NULL, _("Edit Chat"), NULL, _("Please Update the necessary fields."), | 683 purple_request_fields(NULL, _("Edit Chat"), NULL, _("Please update the necessary fields."), |
| 684 fields, _("Edit"), G_CALLBACK(chat_components_edit_ok), _("Cancel"), NULL, | 684 fields, _("Save"), G_CALLBACK(chat_components_edit_ok), _("Cancel"), NULL, |
| 685 NULL, NULL, NULL, | 685 NULL, NULL, NULL, |
| 686 chat); | 686 chat); |
| 687 } | 687 } |
| 688 | 688 |
| 689 static void gtk_blist_menu_alias_cb(GtkWidget *w, PurpleBlistNode *node) | 689 static void gtk_blist_menu_alias_cb(GtkWidget *w, PurpleBlistNode *node) |
| 6465 data->account_box = pidgin_account_option_menu_new(account, FALSE, | 6465 data->account_box = pidgin_account_option_menu_new(account, FALSE, |
| 6466 G_CALLBACK(add_buddy_select_account_cb), NULL, data); | 6466 G_CALLBACK(add_buddy_select_account_cb), NULL, data); |
| 6467 | 6467 |
| 6468 gtk_table_attach_defaults(GTK_TABLE(table), data->account_box, 0, 2, 0, 1); | 6468 gtk_table_attach_defaults(GTK_TABLE(table), data->account_box, 0, 2, 0, 1); |
| 6469 | 6469 |
| 6470 label = gtk_label_new_with_mnemonic(_("Buddy's _screen name:")); | 6470 label = gtk_label_new_with_mnemonic(_("Buddy's _username:")); |
| 6471 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); | 6471 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); |
| 6472 gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2); | 6472 gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2); |
| 6473 | 6473 |
| 6474 data->entry = gtk_entry_new(); | 6474 data->entry = gtk_entry_new(); |
| 6475 gtk_table_attach_defaults(GTK_TABLE(table), data->entry, 1, 2, 1, 2); | 6475 gtk_table_attach_defaults(GTK_TABLE(table), data->entry, 1, 2, 1, 2); |