diff pidgin/gtkprefs.c @ 27929:03279387cbe2

propagate from branch 'im.pidgin.pidgin' (head 0bfcaf78ec07efb71812fff2c8b738b4532aac7f) to branch 'im.pidgin.pidgin.yaz' (head 618861a9a19cc6e1d5974402f14f3893c827756f)
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Thu, 05 Feb 2009 05:09:00 +0000
parents 2f50e850f4ab
children 25319f536d93
line wrap: on
line diff
--- a/pidgin/gtkprefs.c	Wed Feb 04 22:46:45 2009 +0000
+++ b/pidgin/gtkprefs.c	Thu Feb 05 05:09:00 2009 +0000
@@ -978,6 +978,9 @@
 	pidgin_prefs_checkbox(_("Show close b_utton on tabs"),
 				PIDGIN_PREFS_ROOT "/conversations/close_on_tabs", vbox2);
 
+	pidgin_prefs_checkbox(_("Trim names on vertical tabs"),
+				PIDGIN_PREFS_ROOT "/conversations/trim_vertical_tabs", vbox2);
+
 	label = pidgin_prefs_dropdown(vbox2, _("_Placement:"), PURPLE_PREF_INT,
 					PIDGIN_PREFS_ROOT "/conversations/tab_side",
 					_("Top"), GTK_POS_TOP,
@@ -1064,7 +1067,7 @@
 #endif
 
 	pidgin_prefs_checkbox(_("Use smooth-scrolling"), PIDGIN_PREFS_ROOT "/conversations/use_smooth_scrolling", vbox);
-
+	pidgin_prefs_checkbox(_("Use msn messenger style"), "/purple/conversations/msnstyle", vbox);//yaz
 #ifdef _WIN32
 	pidgin_prefs_checkbox(_("F_lash window when IMs are received"), PIDGIN_PREFS_ROOT "/win32/blink_im", vbox);