Fix position of capplet name in the Bonobo case (capplet_new): Don't abort

2001-07-12  Bradford Hovinen  <hovinen@ximian.com>

	* capplet-dir.c (capplet_activate): Fix position of capplet name
	in the Bonobo case
	(capplet_new): Don't abort if the entry says to run gnomecc
This commit is contained in:
Bradford Hovinen 2001-07-12 21:06:24 +00:00 committed by Bradford Hovinen (Gdict maintainer)
parent d6ec57650d
commit 3db03400d4
2 changed files with 8 additions and 2 deletions

View file

@ -1,3 +1,9 @@
2001-07-12 Bradford Hovinen <hovinen@ximian.com>
* capplet-dir.c (capplet_activate): Fix position of capplet name
in the Bonobo case
(capplet_new): Don't abort if the entry says to run gnomecc
2001-07-10 Bradford Hovinen <hovinen@ximian.com>
* capplet-dir.c (capplet_ok_cb): Notify property control of apply

View file

@ -70,7 +70,7 @@ capplet_new (CappletDir *dir, gchar *desktop_path)
}
dentry = gnome_desktop_entry_load (desktop_path);
if (!dentry || !strcmp ("gnomecc", dentry->exec[0]))
if (dentry == NULL)
return NULL;
capplet = g_new0 (Capplet, 1);
@ -199,7 +199,7 @@ capplet_activate (Capplet *capplet)
#warning FIXME: this should probably be root-manager-helper
if (!strncmp (entry->exec[0], "gnomecc", strlen ("gnomecc")))
capplet_control_launch (entry->exec[1]);
capplet_control_launch (entry->exec[2]);
else if (!strncmp (entry->exec[0], "root-manager", strlen ("root-manager")))
start_capplet_through_root_manager (entry);
else