From: Sean E. <sea...@gm...> - 2005-10-20 04:05:55
|
Does this remove the ability not to go idle? That's bad, I think. -s. On 10/19/05, Mark Doliner <the...@us...> wrote: > Update of /cvsroot/gaim/gaim/src > In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14607/src > > Modified Files: > gtkprefs.c idle.c > Log Message: > Get rid of the "Idle Tracking Method" preference. Use mouse/keyboard > movement when possible, otherwise fallback to Gaim-usage. > > > Index: gtkprefs.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > RCS file: /cvsroot/gaim/gaim/src/gtkprefs.c,v > retrieving revision 1.282 > retrieving revision 1.283 > diff -u -d -p -r1.282 -r1.283 > --- gtkprefs.c 12 Oct 2005 02:27:32 -0000 1.282 > +++ gtkprefs.c 20 Oct 2005 03:48:22 -0000 1.283 > @@ -1827,19 +1827,6 @@ away_page() > _("When both away and idle"), "awayidle", > NULL); > > - vbox =3D gaim_gtk_make_frame (ret, _("Idle")); > - dd =3D gaim_gtk_prefs_dropdown(vbox, _("Idle _Tracking:"), > - GAIM_PREF_STRING, "/gaim/gtk/idle/method", > - _("Gaim usage"), "gaim", > -#ifdef USE_SCREENSAVER > -#ifndef _WIN32 > - _("X usage"), "system", > -#else > - _("Windows usage"), "system", > -#endif > -#endif > - NULL); > - > button =3D gaim_gtk_prefs_checkbox(_("_Report idle time"), > "/gaim/gtk/idle/report", vbox); > > @@ -2311,13 +2298,6 @@ gaim_gtk_prefs_init(void) > > /* Idle */ > gaim_prefs_add_none("/gaim/gtk/idle"); > - gaim_prefs_add_string("/gaim/gtk/idle/method", > -#ifdef USE_SCREENSAVER > - "system" > -#else > - "gaim" > -#endif > - ); > gaim_prefs_add_bool("/gaim/gtk/idle/report", TRUE); > > /* Plugins */ > @@ -2340,7 +2320,6 @@ gaim_gtk_prefs_init(void) > } > > void gaim_gtk_prefs_update_old() { > - const char *idle_method; > /* Rename some old prefs */ > gaim_prefs_rename("/gaim/gtk/logging/log_ims", "/core/logging/log= _ims"); > gaim_prefs_rename("/gaim/gtk/logging/log_chats", "/core/logging/l= og_chats"); > @@ -2357,20 +2336,6 @@ void gaim_gtk_prefs_update_old() { > gaim_prefs_rename_boolean_toggle("/gaim/gtk/conversations/ignore_= formatting", > = "/gaim/gtk/conversations/show_incoming_formatting"); > > - gaim_prefs_rename("/gaim/gtk/idle/reporting_method", > - "/gaim/gtk/idle/method"); > - idle_method =3D gaim_prefs_get_string("/gaim/gtk/idle/method"); > - if (idle_method =3D=3D NULL || !strcmp("none", idle_method)) { > - gaim_prefs_set_string("/gaim/gtk/idle/method", > -#ifdef USE_SCREENSAVER > - "system" > -#else > - "gaim" > -#endif > - ); > - gaim_prefs_set_bool("/gaim/gtk/idle/report", FALSE); > - } > - > /* Remove some no-longer-used prefs */ > gaim_prefs_remove("/gaim/gtk/blist/auto_expand_contacts"); > gaim_prefs_remove("/gaim/gtk/blist/button_style"); > @@ -2382,6 +2347,7 @@ void gaim_gtk_prefs_update_old() { > gaim_prefs_remove("/gaim/gtk/conversations/button_type"); > gaim_prefs_remove("/gaim/gtk/conversations/ctrl_enter_sends"); > gaim_prefs_remove("/gaim/gtk/conversations/enter_sends"); > + gaim_prefs_remove("/gaim/gtk/conversations/escape_closes"); > gaim_prefs_remove("/gaim/gtk/conversations/html_shortcuts"); > gaim_prefs_remove("/gaim/gtk/conversations/icons_on_tabs"); > gaim_prefs_remove("/gaim/gtk/conversations/send_formatting"); > @@ -2400,8 +2366,8 @@ void gaim_gtk_prefs_update_old() { > gaim_prefs_remove("/gaim/gtk/conversations/chat/raise_on_events")= ; > gaim_prefs_remove("/gaim/gtk/conversations/ignore_fonts"); > gaim_prefs_remove("/gaim/gtk/conversations/ignore_font_sizes"); > + gaim_prefs_remove("/gaim/gtk/idle/method"); > gaim_prefs_remove("/gaim/gtk/logging/individual_logs"); > gaim_prefs_remove("/gaim/gtk/sound/signon"); > gaim_prefs_remove("/gaim/gtk/sound/silent_signon"); > - gaim_prefs_remove("/gaim/gtk/conversations/escape_closes"); > } > > Index: idle.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > RCS file: /cvsroot/gaim/gaim/src/idle.c,v > retrieving revision 1.72 > retrieving revision 1.73 > diff -u -d -p -r1.72 -r1.73 > --- idle.c 17 Oct 2005 05:50:30 -0000 1.72 > +++ idle.c 20 Oct 2005 03:48:22 -0000 1.73 > @@ -118,7 +118,6 @@ check_idle(gpointer data) > { > GaimConnection *gc =3D data; > gboolean report_idle; > - const char *idle_method; > GaimAccount *account; > time_t t; > int idle_time; > @@ -129,17 +128,20 @@ check_idle(gpointer data) > > time(&t); > > - idle_method =3D gaim_prefs_get_string("/gaim/gtk/idle/method"); > report_idle =3D gaim_prefs_get_bool("/gaim/gtk/idle/report"); > > #ifdef USE_SCREENSAVER > - if (idle_method !=3D NULL && !strcmp(idle_method, "system")) > idle_time =3D get_idle_time_from_system(); > - else > -#endif /* USE_SCREENSAVER */ > +#else > + /* > + * If Gaim wasn't built with xscreensaver support, then > + * fallback to calculating our idle time based on when > + * we last sent a message. > + */ > idle_time =3D t - gc->last_sent_time; > +#endif /* USE_SCREENSAVER */ > > - /* Should be become auto-away? */ > + /* Should we become auto-away? */ > if (gaim_prefs_get_bool("/core/away/away_when_idle") && > (idle_time > (60 * gaim_prefs_get_int("/core/away/mins_be= fore_away"))) > && (!gc->is_auto_away)) > > > > ------------------------------------------------------- > This SF.Net email is sponsored by: > Power Architecture Resource Center: Free content, downloads, discussions, > and more. http://solutions.newsforge.com/ibmarch.tmpl > _______________________________________________ > Gaim-commits mailing list > Gai...@li... > https://lists.sourceforge.net/lists/listinfo/gaim-commits > -- Author of Open Source Messaging Application Development: Building and Extending Gaim: http://gaim.sf.net/book.php |