diff pidgin/gtkprefs.c @ 27848:d201287d3a0e

propagate from branch 'im.pidgin.pidgin' (head 5e69fb5f354ed74d6deb6f4d1f6aff46afd8a072) to branch 'im.pidgin.pidgin.yaz' (head c9cf3408041207af022d43f3d2ce3cf90427c243)
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Wed, 04 Jun 2008 05:13:07 +0000
parents acef4202e147
children 0ee06de49812
line wrap: on
line diff
--- a/pidgin/gtkprefs.c	Wed Jun 04 03:22:36 2008 +0000
+++ b/pidgin/gtkprefs.c	Wed Jun 04 05:13:07 2008 +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);