comparison pidgin/gtkprefs.c @ 16567:9e8883a33365

merge of '1ec321a889d16061991c01453333e23ab1a2c528' and '85368b03fda7528f3a74de0d53faeaa59a92d349'
author Richard Laager <rlaager@wiktel.com>
date Sat, 28 Apr 2007 03:23:51 +0000
parents 06ee8064b3d0
children 5a308f09c871 b3340b359804 92c3c2eeba87 fd6c3dc4641f
comparison
equal deleted inserted replaced
16564:26fb9b308cc1 16567:9e8883a33365
2027 } 2027 }
2028 2028
2029 void 2029 void
2030 pidgin_prefs_init(void) 2030 pidgin_prefs_init(void)
2031 { 2031 {
2032 /* only change this when we have a sane prefs migration path */
2033 purple_prefs_add_none("/gaim");
2034 purple_prefs_add_none(PIDGIN_PREFS_ROOT ""); 2032 purple_prefs_add_none(PIDGIN_PREFS_ROOT "");
2035 purple_prefs_add_none("/plugins/gtk"); 2033 purple_prefs_add_none("/plugins/gtk");
2036 2034
2037 #ifndef _WIN32 2035 #ifndef _WIN32
2038 /* Browsers */ 2036 /* Browsers */
2059 /* Smiley Callbacks */ 2057 /* Smiley Callbacks */
2060 purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/smileys/theme", 2058 purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/smileys/theme",
2061 smiley_theme_pref_cb, NULL); 2059 smiley_theme_pref_cb, NULL);
2062 } 2060 }
2063 2061
2064 void pidgin_prefs_update_old() { 2062 void pidgin_prefs_update_old()
2063 {
2064 const char *str;
2065
2066 purple_prefs_rename("/gaim/gtk", PIDGIN_PREFS_ROOT);
2067
2065 /* Rename some old prefs */ 2068 /* Rename some old prefs */
2066 purple_prefs_rename(PIDGIN_PREFS_ROOT "/logging/log_ims", "/purple/logging/log_ims"); 2069 purple_prefs_rename(PIDGIN_PREFS_ROOT "/logging/log_ims", "/purple/logging/log_ims");
2067 purple_prefs_rename(PIDGIN_PREFS_ROOT "/logging/log_chats", "/purple/logging/log_chats"); 2070 purple_prefs_rename(PIDGIN_PREFS_ROOT "/logging/log_chats", "/purple/logging/log_chats");
2068 purple_prefs_rename("/purple/conversations/placement", 2071 purple_prefs_rename("/purple/conversations/placement",
2069 PIDGIN_PREFS_ROOT "/conversations/placement"); 2072 PIDGIN_PREFS_ROOT "/conversations/placement");
2074 purple_prefs_rename_boolean_toggle(PIDGIN_PREFS_ROOT "/conversations/ignore_colors", 2077 purple_prefs_rename_boolean_toggle(PIDGIN_PREFS_ROOT "/conversations/ignore_colors",
2075 PIDGIN_PREFS_ROOT "/conversations/show_incoming_formatting"); 2078 PIDGIN_PREFS_ROOT "/conversations/show_incoming_formatting");
2076 2079
2077 /* this string pref moved into the core, try to be friendly */ 2080 /* this string pref moved into the core, try to be friendly */
2078 purple_prefs_rename(PIDGIN_PREFS_ROOT "/idle/reporting_method", "/purple/away/idle_reporting"); 2081 purple_prefs_rename(PIDGIN_PREFS_ROOT "/idle/reporting_method", "/purple/away/idle_reporting");
2082 if ((str = purple_prefs_get_string("/purple/away/idle_reporting")) &&
2083 strcmp(str, "gaim") == 0)
2084 purple_prefs_set_string("/purple/away/idle_reporting", "purple");
2079 2085
2080 /* Remove some no-longer-used prefs */ 2086 /* Remove some no-longer-used prefs */
2081 purple_prefs_remove(PIDGIN_PREFS_ROOT "/blist/auto_expand_contacts"); 2087 purple_prefs_remove(PIDGIN_PREFS_ROOT "/blist/auto_expand_contacts");
2082 purple_prefs_remove(PIDGIN_PREFS_ROOT "/blist/button_style"); 2088 purple_prefs_remove(PIDGIN_PREFS_ROOT "/blist/button_style");
2083 purple_prefs_remove(PIDGIN_PREFS_ROOT "/blist/grey_idle_buddies"); 2089 purple_prefs_remove(PIDGIN_PREFS_ROOT "/blist/grey_idle_buddies");
2123 purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new", "away"); 2129 purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new", "away");
2124 } 2130 }
2125 purple_prefs_remove(PIDGIN_PREFS_ROOT "/away/queue_messages"); 2131 purple_prefs_remove(PIDGIN_PREFS_ROOT "/away/queue_messages");
2126 purple_prefs_remove(PIDGIN_PREFS_ROOT "/away"); 2132 purple_prefs_remove(PIDGIN_PREFS_ROOT "/away");
2127 purple_prefs_remove("/plugins/gtk/docklet/queue_messages"); 2133 purple_prefs_remove("/plugins/gtk/docklet/queue_messages");
2128 purple_prefs_rename("/gaim/gtk", "/pidgin"); 2134 }
2129 }