Mercurial > pidgin
diff src/gtkutils.c @ 9123:6ea36eac6f22
[gaim-migrate @ 9900]
(12:38:12) Me: i did try to contact you before i reverted it the first time
(12:38:28) seanegn: I know. I've been real unavailable of late.
(12:39:51) Me: i'll tell you what i'm going to do then. i'm going to pull
that, tag, and then put it back in after we get the tarballs made
(12:39:57) Me: cause i do like the changes, just not the timing
(12:42:16) seanegn: oh, of course. Everything I do is awesome.
committer: Tailor Script <tailor@pidgin.im>
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Sun, 30 May 2004 16:44:45 +0000 |
| parents | 6a17b7e2e3b2 |
| children | 05532ad61ed5 |
line wrap: on
line diff
--- a/src/gtkutils.c Sun May 30 14:19:19 2004 +0000 +++ b/src/gtkutils.c Sun May 30 16:44:45 2004 +0000 @@ -209,12 +209,23 @@ int dispstyle = 2; int value; - value = gaim_prefs_get_int("/gaim/gtk/conversations/button_type"); + if (type == GAIM_CONV_CHAT) { + value = gaim_prefs_get_int("/gaim/gtk/conversations/chat/button_type"); - switch (value) { - case GAIM_BUTTON_TEXT: dispstyle = 1; break; - case GAIM_BUTTON_IMAGE: dispstyle = 0; break; - default: dispstyle = 2; break; /* both/neither */ + switch (value) { + case GAIM_BUTTON_TEXT: dispstyle = 1; break; + case GAIM_BUTTON_IMAGE: dispstyle = 0; break; + default: dispstyle = 2; break; /* both/neither */ + } + } + else if (type == GAIM_CONV_IM) { + value = gaim_prefs_get_int("/gaim/gtk/conversations/im/button_type"); + + switch (value) { + case GAIM_BUTTON_TEXT: dispstyle = 1; break; + case GAIM_BUTTON_IMAGE: dispstyle = 0; break; + default: dispstyle = 2; break; /* both/neither */ + } } return dispstyle;