Mercurial > pidgin.yaz
diff pidgin/gtkprefs.c @ 27800:85d5b6c06a6c
propagate from branch 'im.pidgin.pidgin' (head 33bd2430510196431b931ccb1fa0b55777482dd0)
to branch 'im.pidgin.pidgin.yaz' (head 5426ea7b0587a996037bc668698aea554c01356e)
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Mon, 17 Mar 2008 06:32:52 +0000 |
| parents | 056fb36a5770 |
| children | 61a7929a97b5 |
line wrap: on
line diff
--- a/pidgin/gtkprefs.c Mon Mar 17 06:14:38 2008 +0000 +++ b/pidgin/gtkprefs.c Mon Mar 17 06:32:52 2008 +0000 @@ -881,6 +881,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, @@ -963,7 +966,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);