comparison: gtk/gtkprefs.c
gtk/gtkprefs.c
- changeset 14636
- 5306c329992c
- parent 14416
- c95ffd983a39
- child 14676
- 70f04fbec17b
equal
deleted
inserted
replaced
| 14635:68dfef995f7c | 14636:5306c329992c |
|---|---|
| 47 #include "gtksavedstatuses.h" | 47 #include "gtksavedstatuses.h" |
| 48 #include "gtksound.h" | 48 #include "gtksound.h" |
| 49 #include "gtkthemes.h" | 49 #include "gtkthemes.h" |
| 50 #include "gtkutils.h" | 50 #include "gtkutils.h" |
| 51 #include "gaimstock.h" | 51 #include "gaimstock.h" |
| 52 | |
| 53 #ifdef _WIN32 | |
| 54 # include "gtkwin32dep.h" | |
| 55 #endif | |
| 56 | 52 |
| 57 #define PROXYHOST 0 | 53 #define PROXYHOST 0 |
| 58 #define PROXYPORT 1 | 54 #define PROXYPORT 1 |
| 59 #define PROXYUSER 2 | 55 #define PROXYUSER 2 |
| 60 #define PROXYPASS 3 | 56 #define PROXYPASS 3 |
| 2078 gaim_prefs_remove("/gaim/gtk/sound/signon"); | 2074 gaim_prefs_remove("/gaim/gtk/sound/signon"); |
| 2079 gaim_prefs_remove("/gaim/gtk/sound/silent_signon"); | 2075 gaim_prefs_remove("/gaim/gtk/sound/silent_signon"); |
| 2080 | 2076 |
| 2081 /* Convert old queuing prefs to hide_new 3-way pref. */ | 2077 /* Convert old queuing prefs to hide_new 3-way pref. */ |
| 2082 if (gaim_prefs_exists("/plugins/gtk/docklet/queue_messages") && | 2078 if (gaim_prefs_exists("/plugins/gtk/docklet/queue_messages") && |
| 2083 gaim_prefs_get_bool("/plugins/gtk/docklet/queue_messages")) | 2079 gaim_prefs_get_bool("/plugins/gtk/docklet/queue_messages")) |
| 2084 { | 2080 { |
| 2085 gaim_prefs_set_string("/gaim/gtk/conversations/im/hide_new", "always"); | 2081 gaim_prefs_set_string("/gaim/gtk/conversations/im/hide_new", "always"); |
| 2086 } | 2082 } |
| 2087 else if (gaim_prefs_exists("/gaim/gtk/away/queue_messages") && | 2083 else if (gaim_prefs_exists("/gaim/gtk/away/queue_messages") && |
| 2088 gaim_prefs_get_bool("/gaim/gtk/away/queue_messages")) | 2084 gaim_prefs_get_bool("/gaim/gtk/away/queue_messages")) |
