applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use timeout when launching desktop entry; idle handler when launching

Browse source 
2001-07-27  Bradford Hovinen  <hovinen@ximian.com>

	* capplet-dir.c (capplet_activate): Use timeout when launching
	desktop entry; idle handler when launching Bonobo control
This commit is contained in:
Bradford Hovinen 2001-07-27 17:31:37 +00:00 • committed by Bradford Hovinen (Gdict maintainer)
parent daf686feb0
commit 6c25caa8cc
2 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
control-center/ChangeLog
View file

@ -1,5 +1,8 @@
2001-07-27 Bradford Hovinen <hovinen@ximian.com> 2001-07-27 Bradford Hovinen <hovinen@ximian.com>
* capplet-dir.c (capplet_activate): Use timeout when launching
desktop entry; idle handler when launching Bonobo control
* RELEASE : 1.5.2 * RELEASE : 1.5.2
2001-07-26 Bradford Hovinen <hovinen@ximian.com> 2001-07-26 Bradford Hovinen <hovinen@ximian.com>

32
control-center/capplet-dir.c
View file

@ -208,25 +208,31 @@ capplet_activate (Capplet *capplet)
{ {
GnomeDesktopEntry *entry; GnomeDesktopEntry *entry;
if (capplet->launching) {
return;
} else {
capplet->launching = TRUE;
gtk_idle_add ((GtkFunction) capplet_reset_cb, capplet);
}
entry = CAPPLET_DIR_ENTRY (capplet)->entry; entry = CAPPLET_DIR_ENTRY (capplet)->entry;
#warning FIXME: this should probably be root-manager-helper #warning FIXME: this should probably be root-manager-helper
#ifdef HAVE_BONOBO #ifdef HAVE_BONOBO
if (!strncmp (entry->exec[0], "gnomecc", strlen ("gnomecc"))) if (!strncmp (entry->exec[0], "gnomecc", strlen ("gnomecc"))) {
capplet_control_launch (entry->exec[2], entry->name); if (capplet->launching) {
else return;
} else {
capplet->launching = TRUE;
gtk_idle_add ((GtkFunction) capplet_reset_cb, capplet);
capplet_control_launch (entry->exec[2], entry->name);
}
} else
#endif #endif
if (!strncmp (entry->exec[0], "root-manager", strlen ("root-manager"))) if (!strncmp (entry->exec[0], "root-manager", strlen ("root-manager"))) {
start_capplet_through_root_manager (entry); start_capplet_through_root_manager (entry);
else } else {
gnome_desktop_entry_launch (entry); if (capplet->launching) {
return;
} else {
capplet->launching = TRUE;
gtk_timeout_add (1000, (GtkFunction) capplet_reset_cb, capplet);
gnome_desktop_entry_launch (entry);
}
}
} }
void void