comparison pidgin/gtkdialogs.c @ 26213:ff4212a5268f

propagate from branch 'im.pidgin.pidgin' (head 431618de0f30a6938f7e14d2d61ee5d7738acd59) to branch 'im.pidgin.pidgin.vv' (head 8df00cb1a28baa69d0a68e0e96af201ec7d87c09)
author Marcus Lundblad <ml@update.uu.se>
date Mon, 02 Mar 2009 18:47:27 +0000
parents 4b8c4870b13a 9fcff08ce726
children 38238d41923b
comparison
equal deleted inserted replaced
25446:52fbda23e398 26213:ff4212a5268f
641 } else { 641 } else {
642 g_string_append(str, " <b>Tcl:</b> Disabled<br/>"); 642 g_string_append(str, " <b>Tcl:</b> Disabled<br/>");
643 g_string_append(str, " <b>Tk:</b> Disabled<br/>"); 643 g_string_append(str, " <b>Tk:</b> Disabled<br/>");
644 } 644 }
645 645
646 #ifdef USE_VV
647 g_string_append(str, " <b>Voice and Video:</b> Enabled<br/>");
648 #else
649 g_string_append(str, " <b>Voice and Video:</b> Disabled<br/>");
650 #endif
651
646 #ifndef _WIN32 652 #ifndef _WIN32
647 #ifdef USE_SM 653 #ifdef USE_SM
648 g_string_append(str, " <b>X Session Management:</b> Enabled<br/>"); 654 g_string_append(str, " <b>X Session Management:</b> Enabled<br/>");
649 #else 655 #else
650 g_string_append(str, " <b>X Session Management:</b> Disabled<br/>"); 656 g_string_append(str, " <b>X Session Management:</b> Disabled<br/>");