Menu
▾
▴
[Gaim-commits] CVS: gaim/src dialogs.c,1.355,1.356
|
From: Sean E. <sea...@us...> - 2002-10-22 00:32:51
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv14068/src
Modified Files:
dialogs.c
Log Message:
Whoops.
Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -d -r1.355 -r1.356
--- dialogs.c 22 Oct 2002 00:23:06 -0000 1.355
+++ dialogs.c 22 Oct 2002 00:32:47 -0000 1.356
@@ -2841,7 +2841,7 @@
showtext = gtk_entry_get_text(GTK_ENTRY(b->text));
g_snprintf(open_tag, 2048, "<A HREF=\"%s\">%s", urltext, showtext);
-/* FIXME surround(b, open_tag, "</A>");*/
+ surround(b->entry, open_tag, "</A>");
g_free(open_tag);
destroy_dialog(NULL, b->window);
@@ -2924,7 +2924,7 @@
gtk_window_set_focus(GTK_WINDOW(c->link_dialog), b->url);
b->window = c->link_dialog;
b->toggle = linky;
-/* FIXME b->entry_view = c->entry_view;*/
+ b->entry = c->entry;
gtk_widget_realize(c->link_dialog);
}
@@ -2986,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, open_tag, "</FONT>");
+ surround(c->entry, 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);
@@ -3013,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, open_tag, "</BODY>");
+ surround(c->entry, 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);
@@ -3559,9 +3559,26 @@
void insert_smiley_text(GtkWidget *widget, struct conversation *c)
{
- gtk_text_buffer_insert_at_cursor(c->entry_buffer,
- current_smiley, -1);
+ 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);
+
close_smiley_dialog(NULL, c);
+
+ return;
}
static void toolbar_add_smiley(struct conversation *c, GtkWidget *bar, char **xpm, GtkWidget *win,
|