Mercurial > pidgin.yaz
comparison 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 |
comparison
equal
deleted
inserted
replaced
12615:e3ca84a8b551 | 12616:eee2042ad4f4 |
---|---|
6006 gaim_prefs_add_int("/gaim/gtk/conversations/im/default_width", 410); | 6006 gaim_prefs_add_int("/gaim/gtk/conversations/im/default_width", 410); |
6007 gaim_prefs_add_int("/gaim/gtk/conversations/im/default_height", 160); | 6007 gaim_prefs_add_int("/gaim/gtk/conversations/im/default_height", 160); |
6008 gaim_prefs_add_int("/gaim/gtk/conversations/im/entry_height", 50); | 6008 gaim_prefs_add_int("/gaim/gtk/conversations/im/entry_height", 50); |
6009 gaim_prefs_add_bool("/gaim/gtk/conversations/im/show_buddy_icons", TRUE); | 6009 gaim_prefs_add_bool("/gaim/gtk/conversations/im/show_buddy_icons", TRUE); |
6010 | 6010 |
6011 /* convert old queuing prefs to hide_new 3-way pref */ | 6011 gaim_prefs_add_string("/gaim/gtk/conversations/im/hide_new", "never"); |
6012 if(gaim_prefs_exists("/plugins/gtk/docklet/queue_messages") && | |
6013 gaim_prefs_get_bool("/plugins/gtk/docklet/queue_messages")) { | |
6014 gaim_prefs_add_string("/gaim/gtk/conversations/im/hide_new", "always"); | |
6015 } | |
6016 else if(gaim_prefs_exists("/gaim/gtk/away/queue_messages") && | |
6017 gaim_prefs_get_bool("/gaim/gtk/away/queue_messages")) { | |
6018 gaim_prefs_add_string("/gaim/gtk/conversations/im/hide_new", "away"); | |
6019 } | |
6020 else { | |
6021 gaim_prefs_add_string("/gaim/gtk/conversations/im/hide_new", "never"); | |
6022 } | |
6023 | 6012 |
6024 /* Connect callbacks. */ | 6013 /* Connect callbacks. */ |
6025 gaim_prefs_connect_callback(handle, "/gaim/gtk/conversations/close_on_tabs", | 6014 gaim_prefs_connect_callback(handle, "/gaim/gtk/conversations/close_on_tabs", |
6026 close_on_tabs_pref_cb, NULL); | 6015 close_on_tabs_pref_cb, NULL); |
6027 gaim_prefs_connect_callback(handle, "/gaim/gtk/conversations/show_timestamps", | 6016 gaim_prefs_connect_callback(handle, "/gaim/gtk/conversations/show_timestamps", |