Mercurial > pidgin.yaz
comparison src/gtkutils.c @ 5554:7b36d02031a2
[gaim-migrate @ 5955]
More work done... Got some painful stuff to do now.
committer: Tailor Script <tailor@pidgin.im>
author | Christian Hammond <chipx86@chipx86.com> |
---|---|
date | Fri, 30 May 2003 00:00:48 +0000 |
parents | 80e4ba770f97 |
children | 5e9babc828c4 |
comparison
equal
deleted
inserted
replaced
5553:c0593bcdd5d6 | 5554:7b36d02031a2 |
---|---|
341 | 341 |
342 int | 342 int |
343 gaim_gtk_get_dispstyle(GaimConversationType type) | 343 gaim_gtk_get_dispstyle(GaimConversationType type) |
344 { | 344 { |
345 int dispstyle = 2; | 345 int dispstyle = 2; |
346 int value; | |
346 | 347 |
347 if (type == GAIM_CONV_CHAT) { | 348 if (type == GAIM_CONV_CHAT) { |
348 switch (chat_options & (OPT_CHAT_BUTTON_TEXT | OPT_CHAT_BUTTON_XPM)) { | 349 value = gaim_prefs_get_int("/gaim/gtk/conversations/chat/button_type"); |
349 | 350 |
350 case OPT_CHAT_BUTTON_TEXT: dispstyle = 1; break; | 351 switch (value) { |
351 case OPT_CHAT_BUTTON_XPM: dispstyle = 0; break; | 352 case GAIM_BUTTON_TEXT: dispstyle = 1; break; |
352 default: dispstyle = 2; break; /* both/neither */ | 353 case GAIM_BUTTON_IMAGE: dispstyle = 0; break; |
354 default: dispstyle = 2; break; /* both/neither */ | |
353 } | 355 } |
354 } | 356 } |
355 else if (type == GAIM_CONV_IM) { | 357 else if (type == GAIM_CONV_IM) { |
356 switch (im_options & (OPT_IM_BUTTON_TEXT | OPT_IM_BUTTON_XPM)) { | 358 value = gaim_prefs_get_int("/gaim/gtk/conversations/im/button_type"); |
357 | 359 |
358 case OPT_IM_BUTTON_TEXT: dispstyle = 1; break; | 360 switch (value) { |
359 case OPT_IM_BUTTON_XPM: dispstyle = 0; break; | 361 case GAIM_BUTTON_TEXT: dispstyle = 1; break; |
360 default: dispstyle = 2; break; /* both/neither */ | 362 case GAIM_BUTTON_IMAGE: dispstyle = 0; break; |
363 default: dispstyle = 2; break; /* both/neither */ | |
361 } | 364 } |
362 } | 365 } |
363 | 366 |
364 return dispstyle; | 367 return dispstyle; |
365 } | 368 } |