Mercurial > pidgin.yaz
changeset 3780:b8d0eeb9e748
[gaim-migrate @ 3920]
You win.
committer: Tailor Script <tailor@pidgin.im>
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Tue, 22 Oct 2002 00:23:06 +0000 |
| parents | ade87dac671f |
| children | c2394f352015 |
| files | src/dialogs.c |
| diffstat | 1 files changed, 7 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/src/dialogs.c Mon Oct 21 18:56:17 2002 +0000 +++ b/src/dialogs.c Tue Oct 22 00:23:06 2002 +0000 @@ -1416,6 +1416,7 @@ deny_type = deny_opt(_("Allow all users to contact me"), 1, vbox, NULL); deny_type = deny_opt(_("Allow only the users below"), 3, vbox, deny_type); + deny_type = deny_opt(_("Allow only users on my buddy list"), 5, vbox, deny_type); label = gtk_label_new(_("Allow List")); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 5); @@ -2840,7 +2841,7 @@ showtext = gtk_entry_get_text(GTK_ENTRY(b->text)); g_snprintf(open_tag, 2048, "<A HREF=\"%s\">%s", urltext, showtext); - surround(b->entry, open_tag, "</A>"); +/* FIXME surround(b, open_tag, "</A>");*/ g_free(open_tag); destroy_dialog(NULL, b->window); @@ -2923,7 +2924,7 @@ gtk_window_set_focus(GTK_WINDOW(c->link_dialog), b->url); b->window = c->link_dialog; b->toggle = linky; - b->entry = c->entry; +/* FIXME b->entry_view = c->entry_view;*/ gtk_widget_realize(c->link_dialog); } @@ -2985,7 +2986,7 @@ c->hasfg = 1; g_snprintf(open_tag, 23, "<FONT COLOR=\"#%02X%02X%02X\">", text_color.red, text_color.green, text_color.blue); - surround(c->entry, open_tag, "</FONT>"); + surround(c, open_tag, "</FONT>"); debug_printf("#%02X%02X%02X\n", text_color.red, text_color.green, text_color.blue); g_free(open_tag); cancel_fgcolor(NULL, c); @@ -3012,7 +3013,7 @@ c->hasbg = 1; g_snprintf(open_tag, 25, "<BODY BGCOLOR=\"#%02X%02X%02X\">", text_color.red, text_color.green, text_color.blue); - surround(c->entry, open_tag, "</BODY>"); + surround(c, open_tag, "</BODY>"); debug_printf("#%02X%02X%02X\n", text_color.red, text_color.green, text_color.blue); g_free(open_tag); cancel_bgcolor(NULL, c); @@ -3558,26 +3559,9 @@ void insert_smiley_text(GtkWidget *widget, struct conversation *c) { - char *smiley_text; - - smiley_text = strdup(current_smiley); - - /* surround(c->entry, smiley_text, ""); */ - - if (GTK_OLD_EDITABLE(c->entry)->has_selection) { - int finish = GTK_OLD_EDITABLE(c->entry)->selection_end_pos; - gtk_editable_insert_text(GTK_EDITABLE(c->entry), - smiley_text, strlen(smiley_text), &finish); - } else { - int pos = GTK_OLD_EDITABLE(c->entry)->current_pos; - gtk_editable_insert_text(GTK_EDITABLE(c->entry), smiley_text, strlen(smiley_text), &pos); - } - - g_free(smiley_text); - + gtk_text_buffer_insert_at_cursor(c->entry_buffer, + current_smiley, -1); close_smiley_dialog(NULL, c); - - return; } static void toolbar_add_smiley(struct conversation *c, GtkWidget *bar, char **xpm, GtkWidget *win,