Mercurial > pidgin
diff src/gtkconv.c @ 12616:eee2042ad4f4
[gaim-migrate @ 14952]
Put the queuing pref conversion code in the right place so it works.
committer: Tailor Script <tailor@pidgin.im>
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Thu, 22 Dec 2005 04:03:55 +0000 |
parents | 71299d63801d |
children | 204bd8fac61f |
line wrap: on
line diff
--- a/src/gtkconv.c Thu Dec 22 04:03:06 2005 +0000 +++ b/src/gtkconv.c Thu Dec 22 04:03:55 2005 +0000 @@ -6008,18 +6008,7 @@ gaim_prefs_add_int("/gaim/gtk/conversations/im/entry_height", 50); gaim_prefs_add_bool("/gaim/gtk/conversations/im/show_buddy_icons", TRUE); - /* convert old queuing prefs to hide_new 3-way pref */ - if(gaim_prefs_exists("/plugins/gtk/docklet/queue_messages") && - gaim_prefs_get_bool("/plugins/gtk/docklet/queue_messages")) { - gaim_prefs_add_string("/gaim/gtk/conversations/im/hide_new", "always"); - } - else if(gaim_prefs_exists("/gaim/gtk/away/queue_messages") && - gaim_prefs_get_bool("/gaim/gtk/away/queue_messages")) { - gaim_prefs_add_string("/gaim/gtk/conversations/im/hide_new", "away"); - } - else { - gaim_prefs_add_string("/gaim/gtk/conversations/im/hide_new", "never"); - } + gaim_prefs_add_string("/gaim/gtk/conversations/im/hide_new", "never"); /* Connect callbacks. */ gaim_prefs_connect_callback(handle, "/gaim/gtk/conversations/close_on_tabs",