comparison src/gtkprefs.c @ 12272:3ef381cdc47e

[gaim-migrate @ 14574] This should fix idle time reporting for all accounts. Previously it would only work for one account because I'm dumb. We're also doing one idleness check every 5 seconds instead of checking for each account every 20 seconds. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Wed, 30 Nov 2005 06:03:49 +0000
parents 1c0fd404e07e
children 970fec1d7062
comparison
equal deleted inserted replaced
12271:3c6675e1400e 12272:3ef381cdc47e
1666 _("When away"), "away", 1666 _("When away"), "away",
1667 _("When both away and idle"), "awayidle", 1667 _("When both away and idle"), "awayidle",
1668 NULL); 1668 NULL);
1669 1669
1670 button = gaim_gtk_prefs_checkbox(_("_Report idle time"), 1670 button = gaim_gtk_prefs_checkbox(_("_Report idle time"),
1671 "/gaim/gtk/idle/report", vbox); 1671 "/core/away/report_idle", vbox);
1672 1672
1673 vbox = gaim_gtk_make_frame (ret, _("Auto-away")); 1673 vbox = gaim_gtk_make_frame (ret, _("Auto-away"));
1674 button = gaim_gtk_prefs_checkbox(_("Change status when _idle"), 1674 button = gaim_gtk_prefs_checkbox(_("Change status when _idle"),
1675 "/core/away/away_when_idle", vbox); 1675 "/core/away/away_when_idle", vbox);
1676 1676
1865 gaim_prefs_add_int("/gaim/gtk/browsers/place", GAIM_BROWSER_DEFAULT); 1865 gaim_prefs_add_int("/gaim/gtk/browsers/place", GAIM_BROWSER_DEFAULT);
1866 gaim_prefs_add_string("/gaim/gtk/browsers/command", ""); 1866 gaim_prefs_add_string("/gaim/gtk/browsers/command", "");
1867 gaim_prefs_add_string("/gaim/gtk/browsers/browser", "mozilla"); 1867 gaim_prefs_add_string("/gaim/gtk/browsers/browser", "mozilla");
1868 #endif 1868 #endif
1869 1869
1870 /* Idle */
1871 gaim_prefs_add_none("/gaim/gtk/idle");
1872 gaim_prefs_add_bool("/gaim/gtk/idle/report", TRUE);
1873
1874 /* Plugins */ 1870 /* Plugins */
1875 gaim_prefs_add_none("/gaim/gtk/plugins"); 1871 gaim_prefs_add_none("/gaim/gtk/plugins");
1876 gaim_prefs_add_string_list("/gaim/gtk/plugins/loaded", NULL); 1872 gaim_prefs_add_string_list("/gaim/gtk/plugins/loaded", NULL);
1877 1873
1878 /* File locations */ 1874 /* File locations */
1907 "/gaim/gtk/conversations/show_incoming_formatting"); 1903 "/gaim/gtk/conversations/show_incoming_formatting");
1908 gaim_prefs_rename_boolean_toggle("/gaim/gtk/conversations/ignore_formatting", 1904 gaim_prefs_rename_boolean_toggle("/gaim/gtk/conversations/ignore_formatting",
1909 "/gaim/gtk/conversations/show_incoming_formatting"); 1905 "/gaim/gtk/conversations/show_incoming_formatting");
1910 1906
1911 /* this string pref turned into a boolean, try to be friendly */ 1907 /* this string pref turned into a boolean, try to be friendly */
1912 tmp = gaim_prefs_get_string("/gaim/gtk/idle/reporting_method"); 1908 if (gaim_prefs_exists("/gaim/gtk/idle/reporting_method"))
1913 if (tmp != NULL && !strcmp(tmp, "none")) { 1909 {
1914 gaim_prefs_set_bool("/gaim/gtk/idle/report", FALSE); 1910 tmp = gaim_prefs_get_string("/gaim/gtk/idle/reporting_method");
1911 if (tmp != NULL && !strcmp(tmp, "none"))
1912 gaim_prefs_set_bool("/core/away/report_idle", FALSE);
1915 } 1913 }
1916 1914
1917 /* Remove some no-longer-used prefs */ 1915 /* Remove some no-longer-used prefs */
1918 gaim_prefs_remove("/gaim/gtk/blist/auto_expand_contacts"); 1916 gaim_prefs_remove("/gaim/gtk/blist/auto_expand_contacts");
1919 gaim_prefs_remove("/gaim/gtk/blist/button_style"); 1917 gaim_prefs_remove("/gaim/gtk/blist/button_style");
1942 gaim_prefs_remove("/gaim/gtk/conversations/chat/color_nicks"); 1940 gaim_prefs_remove("/gaim/gtk/conversations/chat/color_nicks");
1943 gaim_prefs_remove("/gaim/gtk/conversations/chat/raise_on_events"); 1941 gaim_prefs_remove("/gaim/gtk/conversations/chat/raise_on_events");
1944 gaim_prefs_remove("/gaim/gtk/conversations/ignore_fonts"); 1942 gaim_prefs_remove("/gaim/gtk/conversations/ignore_fonts");
1945 gaim_prefs_remove("/gaim/gtk/conversations/ignore_font_sizes"); 1943 gaim_prefs_remove("/gaim/gtk/conversations/ignore_font_sizes");
1946 gaim_prefs_remove("/gaim/gtk/idle/reporting_method"); 1944 gaim_prefs_remove("/gaim/gtk/idle/reporting_method");
1945 gaim_prefs_remove("/gaim/gtk/idle");
1947 gaim_prefs_remove("/gaim/gtk/logging/individual_logs"); 1946 gaim_prefs_remove("/gaim/gtk/logging/individual_logs");
1948 gaim_prefs_remove("/gaim/gtk/sound/signon"); 1947 gaim_prefs_remove("/gaim/gtk/sound/signon");
1949 gaim_prefs_remove("/gaim/gtk/sound/silent_signon"); 1948 gaim_prefs_remove("/gaim/gtk/sound/silent_signon");
1950 gaim_prefs_remove("/gaim/gtk/away/queue_messages"); 1949 gaim_prefs_remove("/gaim/gtk/away/queue_messages");
1951 gaim_prefs_remove("/plugins/gtk/docklet/queue_messages"); 1950 gaim_prefs_remove("/plugins/gtk/docklet/queue_messages");