Mercurial > pidgin.yaz
changeset 8758:2db51720fd09
[gaim-migrate @ 9513]
Some minor gtkconv fixes
-Disable the "warn" conversation menu item for protocols that don't
support it. Same with Get Info, Invite, and Insert Link
-Fix the following weird icon animation bug: (sf bug 939768)
In the conversation window talking to someone on AIM if
you right click on an animated AIM buddy icon and
unanimate it then you tab over to chat to someone else
using another protocol (not AIM) (like MSN or ICQ) that
don't have buddy icons then come back to the original
AIM person you disabled the animated buddy icon, well,
it's animated again.
It works fine if you stay in AIM and tab from someone
having a disabled animated icon to someone with no
buddy icon and/or someone having a non animated buddy
icon. So I think the bug is in when you tab to another
chat protocol.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 22 Apr 2004 16:24:05 +0000 |
| parents | ffb333368cdc |
| children | 184b8c3b6d09 |
| files | src/gtkconv.c src/gtkimhtml.c |
| diffstat | 2 files changed, 7 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkconv.c Thu Apr 22 05:41:30 2004 +0000 +++ b/src/gtkconv.c Thu Apr 22 16:24:05 2004 +0000 @@ -1397,29 +1397,8 @@ break; } /* End of switch */ - -#if 0 - if (gaim_prefs_get_bool("/gaim/gtk/conversations/html_shortcuts")) { - switch (event->keyval) { - - - } - } /* End of switch */ - - if (gaim_prefs_get_bool("/gaim/gtk/conversations/smiley_shortcuts")) { - char buf[7]; - - *buf = '\0'; - - switch (event->keyval) { - - } - - - } -#endif - } + /* If ALT (or whatever) was held down... */ else if (event->state & GDK_MOD1_MASK) { @@ -1432,6 +1411,7 @@ return TRUE; } } + /* If neither CTRL nor ALT were held down... */ else { @@ -2133,9 +2113,7 @@ delay = gdk_pixbuf_animation_iter_get_delay_time(gtkconv->u.im->iter) / 10; - if (gtkconv->u.im->anim) - gtkconv->u.im->icon_timer = g_timeout_add(delay * 10, redraw_icon, - conv); + gtkconv->u.im->icon_timer = g_timeout_add(delay * 10, redraw_icon, conv); } static void @@ -2395,7 +2373,6 @@ gtk_imhtml_set_format_functions(GTK_IMHTML(gtkconv->entry), buttons); gtk_imhtmltoolbar_associate_smileys (GTK_IMHTMLTOOLBAR(gtkconv->toolbar), gaim_account_get_protocol_id(gaim_conversation_get_account(conv))); -#if 0 /* Deal with menu items */ gtk_widget_set_sensitive(gtkwin->menu.view_log, TRUE); gtk_widget_set_sensitive(gtkwin->menu.add_pounce, TRUE); @@ -2403,7 +2380,6 @@ gtk_widget_set_sensitive(gtkwin->menu.warn, (prpl_info->warn != NULL)); gtk_widget_set_sensitive(gtkwin->menu.invite, (prpl_info->chat_invite != NULL)); -#endif if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) { if (gaim_find_buddy(gaim_conversation_get_account(conv), @@ -2423,7 +2399,8 @@ (prpl_info->add_deny != NULL)); gtk_widget_set_sensitive(gtkwin->menu.add, TRUE); gtk_widget_set_sensitive(gtkwin->menu.remove, TRUE); - gtk_widget_set_sensitive(gtkwin->menu.insert_link, TRUE); + gtk_widget_set_sensitive(gtkwin->menu.insert_link, + gc->flags & GAIM_CONNECTION_HTML); gtk_widget_set_sensitive(gtkwin->menu.insert_image, (prpl_info->options & OPT_PROTO_IM_IMAGE)); } else { @@ -3886,6 +3863,7 @@ gtk_widget_show(gtkconv->bbox); setup_im_buttons(conv, gtkconv->bbox); + gtkconv->u.im->animate = gaim_prefs_get_bool("/gaim/gtk/conversations/im/animate_buddy_icons"); focus_chain = g_list_prepend (NULL, sw); gtk_container_set_focus_chain (GTK_CONTAINER(vbox2), focus_chain); @@ -5183,8 +5161,6 @@ if (gtkconv->u.im->anim) g_object_unref(G_OBJECT(gtkconv->u.im->anim)); - else - gtkconv->u.im->animate = gaim_prefs_get_bool("/gaim/gtk/conversations/im/animate_buddy_icons"); if((buddy = gaim_find_buddy(gaim_conversation_get_account(conv), gaim_conversation_get_name(conv))) != NULL) {