Mercurial > pidgin
changeset 523:023c3851db0a
[gaim-migrate @ 533]
fixed some html stuff
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Tue, 25 Jul 2000 05:09:14 +0000 |
| parents | 11cbf8b403b6 |
| children | 9ec08f6bb944 |
| files | TODO src/about.c src/conversation.c src/gaim.h src/gtkhtml.c src/oscar.c |
| diffstat | 6 files changed, 32 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/TODO Tue Jul 25 00:33:51 2000 +0000 +++ b/TODO Tue Jul 25 05:09:14 2000 +0000 @@ -1,2 +1,3 @@ --- STUFF FOR 0.10.1 RELEASE --- + Instead of auto-accepting Direct IM, prompt Icons for buddy list (I forget what this was)
--- a/src/about.c Tue Jul 25 00:33:51 2000 +0000 +++ b/src/about.c Tue Jul 25 05:09:14 2000 +0000 @@ -41,6 +41,11 @@ } +static void about_click(GtkWidget *w, gpointer m) +{ + open_url_nw(NULL, "http://www.marko.net/gaim/"); +} + void show_about(GtkWidget *w, void *null) { @@ -48,6 +53,8 @@ GtkWidget *vbox; GtkWidget *pixmap; GtkWidget *label; + GtkWidget *eventbox; + GtkWidget *label2; GtkStyle *style; GdkPixmap *pm; GdkBitmap *bm; @@ -89,6 +96,18 @@ gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0); gtk_widget_show(label); + + eventbox = gtk_event_box_new(); + gtk_box_pack_start(GTK_BOX(vbox), eventbox, TRUE, TRUE, 0); + gtk_widget_show(eventbox); + + label2 = gtk_label_new("Gaim " VERSION " - http://www.marko.net/gaim/\n"); + gtk_container_add(GTK_CONTAINER(eventbox), label2); + gtk_widget_show(label2); + + gtk_signal_connect(GTK_OBJECT(eventbox), "button_press_event", + GTK_SIGNAL_FUNC(about_click), NULL); + gdk_window_set_cursor(eventbox->window, gdk_cursor_new(GDK_HAND2)); button = gtk_button_new_with_label(_("Close")); gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
--- a/src/conversation.c Tue Jul 25 00:33:51 2000 +0000 +++ b/src/conversation.c Tue Jul 25 05:09:14 2000 +0000 @@ -724,14 +724,15 @@ return; s = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1); pos = GTK_EDITABLE(entry)->current_pos; - sprintf(debug_buff,_("Currently at %d\n"),pos); + sprintf(debug_buff, _("Currently at %d, "), pos); debug_print(debug_buff); s2= strstr(&s[pos], post); - if (s2) + if (s2) { pos = s2 - s + strlen(post); - else - pos=strlen(s); - sprintf(debug_buff,_("Setting position to %d\n"),pos); + } else { + gtk_editable_insert_text(GTK_EDITABLE(entry), post, strlen(post), &pos); + } + sprintf(debug_buff, _("Setting position to %d\n"), pos); debug_print(debug_buff); gtk_editable_set_position(GTK_EDITABLE(entry), pos); gtk_widget_grab_focus(entry);
--- a/src/gaim.h Tue Jul 25 00:33:51 2000 +0000 +++ b/src/gaim.h Tue Jul 25 05:09:14 2000 +0000 @@ -382,7 +382,7 @@ #define TYPE_SIGNOFF 4 #define TYPE_KEEPALIVE 5 -#define REVISION "gaim:$Revision: 526 $" +#define REVISION "gaim:$Revision: 533 $" #define FLAPON "FLAPON\r\n\r\n" #define ROAST "Tic/Toc" @@ -495,7 +495,7 @@ #define OPT_FONT_STRIKE 0x00000010 #define OPT_FONT_FACE 0x00000020 -#define DEFAULT_INFO "Visit the GAIM website at <A HREF=\"http://www.marko.net/gaim\">http://www.marko.net/gaim</A>." +#define DEFAULT_INFO "Visit the GAIM " VERSION " website at <A HREF=\"http://www.marko.net/gaim\">http://www.marko.net/gaim</A>." extern int report_idle; extern int web_browser;
--- a/src/gtkhtml.c Tue Jul 25 00:33:51 2000 +0000 +++ b/src/gtkhtml.c Tue Jul 25 05:09:14 2000 +0000 @@ -3508,9 +3508,9 @@ 0, 0, NULL); gtk_html_add_text(html, cfont, current->color, current->bgcol, tag, strlen(tag), 0, 0, NULL); - gtk_html_add_text(html, cfont, current->color, current->bgcol, ">", 1, +/* gtk_html_add_text(html, cfont, current->color, current->bgcol, ">", 1, 0, 0, NULL); - } +*/ }
--- a/src/oscar.c Tue Jul 25 00:33:51 2000 +0000 +++ b/src/oscar.c Tue Jul 25 05:09:14 2000 +0000 @@ -610,6 +610,8 @@ sprintf(debug_buff, "DirectIM request from %s (%s)\n", userinfo->sn, priv->ip); debug_print(debug_buff); + /* FIXME : prompt user to see if they really want to do this */ + if (!(newconn = aim_directim_connect(sess, command->conn, priv))) { debug_print("imimage: could not connect\n"); return 1;