Mercurial > pidgin.yaz
changeset 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 | e3ca84a8b551 |
| children | 49499dec9346 |
| files | src/gtkconv.c src/gtkprefs.c |
| diffstat | 2 files changed, 17 insertions(+), 12 deletions(-) [+] |
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",
--- a/src/gtkprefs.c Thu Dec 22 04:03:06 2005 +0000 +++ b/src/gtkprefs.c Thu Dec 22 04:03:55 2005 +0000 @@ -1950,6 +1950,22 @@ gaim_prefs_remove("/gaim/gtk/logging/individual_logs"); gaim_prefs_remove("/gaim/gtk/sound/signon"); gaim_prefs_remove("/gaim/gtk/sound/silent_signon"); + + /* 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_set_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_set_string("/gaim/gtk/conversations/im/hide_new", "away"); + } + else + { + gaim_prefs_set_string("/gaim/gtk/conversations/im/hide_new", "never"); + } gaim_prefs_remove("/gaim/gtk/away/queue_messages"); gaim_prefs_remove("/gaim/gtk/away"); gaim_prefs_remove("/plugins/gtk/docklet/queue_messages");