Mercurial > pidgin
comparison src/gtkimhtmltoolbar.c @ 11525:b47708f46a38
[gaim-migrate @ 13773]
Here's the rest of that custom smiley receiving patch, with some changes
from me. I'm still not all that happy with it, but that's probably not
the author's fault, and I don't have time to take it further right now.
committer: Tailor Script <tailor@pidgin.im>
author | Tim Ringenbach <marv@pidgin.im> |
---|---|
date | Mon, 12 Sep 2005 13:25:41 +0000 |
parents | bcc7f30c91bd |
children | dc51cdcb648e |
comparison
equal
deleted
inserted
replaced
11524:4fd0c3a663b8 | 11525:b47708f46a38 |
---|---|
32 #include "gtkstock.h" | 32 #include "gtkstock.h" |
33 #include "util.h" | 33 #include "util.h" |
34 | 34 |
35 #include "gtkdialogs.h" | 35 #include "gtkdialogs.h" |
36 #include "gtkimhtmltoolbar.h" | 36 #include "gtkimhtmltoolbar.h" |
37 #include "gtkthemes.h" | |
37 #include "gtkutils.h" | 38 #include "gtkutils.h" |
38 | 39 |
39 static GtkHBoxClass *parent_class = NULL; | 40 static GtkHBoxClass *parent_class = NULL; |
40 | 41 |
41 static void toggle_button_set_active_block(GtkToggleButton *button, | 42 static void toggle_button_set_active_block(GtkToggleButton *button, |
650 gtk_widget_grab_focus(toolbar->imhtml); | 651 gtk_widget_grab_focus(toolbar->imhtml); |
651 return; | 652 return; |
652 } | 653 } |
653 | 654 |
654 if (toolbar->sml) | 655 if (toolbar->sml) |
655 smileys = get_proto_smileys(toolbar->sml); | 656 smileys = gaim_gtkthemes_get_proto_smileys(toolbar->sml); |
656 else | 657 else |
657 smileys = get_proto_smileys(NULL); | 658 smileys = gaim_gtkthemes_get_proto_smileys(NULL); |
658 | 659 |
659 while(smileys) { | 660 while(smileys) { |
660 GtkIMHtmlSmiley *smiley = smileys->data; | 661 GtkIMHtmlSmiley *smiley = smileys->data; |
661 if(!smiley->hidden) { | 662 if(!smiley->hidden) { |
662 if(smiley_is_unique(unique_smileys, smiley)) | 663 if(smiley_is_unique(unique_smileys, smiley)) |