comparison: pidgin/gtkprefs.c
pidgin/gtkprefs.c
- branch
- next.major
- changeset 31867
- 70ea6446a8b1
- parent 31831
- c3778a69ecee
- parent 31782
- 888360ff2f41
- child 31992
- 7b7a143ddfaf
equal
deleted
inserted
replaced
| 31866:5d3065054efd | 31867:70ea6446a8b1 |
|---|---|
| 2859 void | 2859 void |
| 2860 pidgin_prefs_update_old(void) | 2860 pidgin_prefs_update_old(void) |
| 2861 { | 2861 { |
| 2862 const char *str = NULL; | 2862 const char *str = NULL; |
| 2863 | 2863 |
| 2864 purple_prefs_rename("/gaim/gtk", PIDGIN_PREFS_ROOT); | |
| 2865 | |
| 2866 /* Rename some old prefs */ | 2864 /* Rename some old prefs */ |
| 2867 purple_prefs_rename(PIDGIN_PREFS_ROOT "/logging/log_ims", "/purple/logging/log_ims"); | 2865 purple_prefs_rename(PIDGIN_PREFS_ROOT "/logging/log_ims", "/purple/logging/log_ims"); |
| 2868 purple_prefs_rename(PIDGIN_PREFS_ROOT "/logging/log_chats", "/purple/logging/log_chats"); | 2866 purple_prefs_rename(PIDGIN_PREFS_ROOT "/logging/log_chats", "/purple/logging/log_chats"); |
| 2869 purple_prefs_rename("/purple/conversations/placement", | 2867 purple_prefs_rename("/purple/conversations/placement", |
| 2870 PIDGIN_PREFS_ROOT "/conversations/placement"); | 2868 PIDGIN_PREFS_ROOT "/conversations/placement"); |
| 2883 */ | 2881 */ |
| 2884 if((str = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/browsers/command")) != NULL) { | 2882 if((str = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/browsers/command")) != NULL) { |
| 2885 purple_prefs_set_string(PIDGIN_PREFS_ROOT "/browsers/manual_command", str); | 2883 purple_prefs_set_string(PIDGIN_PREFS_ROOT "/browsers/manual_command", str); |
| 2886 purple_prefs_remove(PIDGIN_PREFS_ROOT "/browsers/command"); | 2884 purple_prefs_remove(PIDGIN_PREFS_ROOT "/browsers/command"); |
| 2887 } | 2885 } |
| 2888 | |
| 2889 /* this string pref moved into the core, try to be friendly */ | |
| 2890 purple_prefs_rename(PIDGIN_PREFS_ROOT "/idle/reporting_method", "/purple/away/idle_reporting"); | |
| 2891 if ((str = purple_prefs_get_string("/purple/away/idle_reporting")) && | |
| 2892 strcmp(str, "gaim") == 0) | |
| 2893 purple_prefs_set_string("/purple/away/idle_reporting", "purple"); | |
| 2894 | 2886 |
| 2895 /* Remove some no-longer-used prefs */ | 2887 /* Remove some no-longer-used prefs */ |
| 2896 purple_prefs_remove(PIDGIN_PREFS_ROOT "/blist/auto_expand_contacts"); | 2888 purple_prefs_remove(PIDGIN_PREFS_ROOT "/blist/auto_expand_contacts"); |
| 2897 purple_prefs_remove(PIDGIN_PREFS_ROOT "/blist/button_style"); | 2889 purple_prefs_remove(PIDGIN_PREFS_ROOT "/blist/button_style"); |
| 2898 purple_prefs_remove(PIDGIN_PREFS_ROOT "/blist/grey_idle_buddies"); | 2890 purple_prefs_remove(PIDGIN_PREFS_ROOT "/blist/grey_idle_buddies"); |
