Patch from James Westby <jw+debian@jameswestby.net>

2008-07-29  Rodrigo Moya <rodrigo@gnome-db.org>

	Patch from James Westby <jw+debian@jameswestby.net>
	
	* gnome-da-capplet.c (combo_conv_from_widget): don't return NULL, but
	the already set 'ret' variable, to allow Custom commands to work (bug
	#545280)

svn path=/trunk/; revision=8823
This commit is contained in:
Rodrigo Moya 2008-07-29 12:12:34 +00:00 committed by Rodrigo Moya
parent 5b7ea158a0
commit ebc660f223
2 changed files with 9 additions and 1 deletions

View file

@ -1,3 +1,11 @@
2008-07-29 Rodrigo Moya <rodrigo@gnome-db.org>
Patch from James Westby <jw+debian@jameswestby.net>
* gnome-da-capplet.c (combo_conv_from_widget): don't return NULL, but
the already set 'ret' variable, to allow Custom commands to work (bug
#545280)
2008-07-24 Jens Granseuer <jensgr@gmx.net>
* gnome-default-applications.xml.in: use -x instead of -e as exec_flag

View file

@ -548,7 +548,7 @@ combo_conv_from_widget (GConfPropertyEditor *peditor, const GConfValue *value)
* prevent the combo box from jumping back to the previous value if the
* user has selected Custom */
gconf_value_set_string (ret, "");
return NULL;
return ret;
}
else
{