empathy r469 - in trunk: . libempathy libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: 2007-12-06 15:49:12 +0000 (Thu, 06 Dec 2007)
New Revision: 469
ViewCVS link: http://svn.gnome.org/viewcvs/empathy?rev=469&view=rev

Modified:
   trunk/ChangeLog
   trunk/libempathy-gtk/empathy-preferences.c
   trunk/libempathy-gtk/empathy-preferences.glade
   trunk/libempathy/empathy-idle.c
Log:
2007-12-06  Xavier Claessens  <xclaesse gmail com>

	* libempathy-gtk/empathy-preferences.c:
	* libempathy-gtk/empathy-preferences.glade:
	* libempathy/empathy-idle.c: When NM is in sleeping (=disabled) state,
	do just like if it was connected. Remove option from preference dialog
	to disabled NM support because NM can be disabled using nm-applet, but
	let the option in gconf, it can be useful in case of buggy NM.