gnome-control-center r8823 - trunk/capplets/default-applications

[rodrigo svn gnome org]

Author: rodrigo
Date: Tue Jul 29 12:12:34 2008
New Revision: 8823
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=8823&view=rev

Log:
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)

Modified:
   trunk/capplets/default-applications/ChangeLog
   trunk/capplets/default-applications/gnome-da-capplet.c

Modified: trunk/capplets/default-applications/gnome-da-capplet.c
==============================================================================
--- trunk/capplets/default-applications/gnome-da-capplet.c	(original)
+++ trunk/capplets/default-applications/gnome-da-capplet.c	Tue Jul 29 12:12:34 2008
@@ -548,7 +548,7 @@
          * 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
     {