2006-02-12  Vincent Untz  <vuntz@gnome.org>

	Use GOption instead of popt

	* Makefile.am: don't link with popt
	* gnome-desktop-item-edit.c: (main): use GOption
	* main.c: (main): ditto