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

Move capplet-launching code into an idle handler. Bonobo sucks like that.

Browse source 
2001-07-25  Richard Hestilow  <hestilow@ximian.com>

	* main.c (main): Move capplet-launching code into an idle handler.
	Bonobo sucks like that.

	* capplet-dir.c (capplet_activate): Remove the check for gnomecc,
	it was causing grief with bonobo. Story at 11.
This commit is contained in:
Richard Hestilow 2001-07-25 07:04:17 +00:00 • committed by Rachel Hestilow
parent 801b831ff4
commit e88951ad3f
3 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
control-center/ChangeLog
View file

@ -1,3 +1,11 @@
2001-07-25 Richard Hestilow <hestilow@ximian.com>
* main.c (main): Move capplet-launching code into an idle handler.
Bonobo sucks like that.
* capplet-dir.c (capplet_activate): Remove the check for gnomecc,
it was causing grief with bonobo. Story at 11.
2001-07-24 Chema Celorio <chema@celorio.com> 2001-07-24 Chema Celorio <chema@celorio.com>
* capplet-dir-view-html.c (html_create): set the usize of hte * capplet-dir-view-html.c (html_create): set the usize of hte

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

@ -202,9 +202,11 @@ capplet_activate (Capplet *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
#if 0
if (!strncmp (entry->exec[0], "gnomecc", strlen ("gnomecc"))) if (!strncmp (entry->exec[0], "gnomecc", strlen ("gnomecc")))
capplet_control_launch (entry->exec[2], entry->name); capplet_control_launch (entry->exec[2], entry->name);
else if (!strncmp (entry->exec[0], "root-manager", strlen ("root-manager"))) #endif
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); gnome_desktop_entry_launch (entry);

23
control-center/main.c
View file

@ -37,11 +37,26 @@
#include "capplet-dir.h" #include "capplet-dir.h"
#include "capplet-dir-view.h" #include "capplet-dir-view.h"
static gint
real_launch_control (gchar *capplet)
{
GtkWidget *app;
if ((app = capplet_control_launch (capplet, _("Configuraiton"))) == NULL)
{
gtk_main_quit ();
return FALSE;
}
gtk_signal_connect (GTK_OBJECT (app), "destroy",
GTK_SIGNAL_FUNC (gtk_main_quit), NULL);
return FALSE;
}
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
CORBA_ORB orb; CORBA_ORB orb;
GtkWidget *app;
static gchar *capplet = NULL; static gchar *capplet = NULL;
static struct poptOption gnomecc_options[] = { static struct poptOption gnomecc_options[] = {
@ -78,11 +93,7 @@ main (int argc, char **argv)
return -1; return -1;
capplet_dir_entry_activate (entry, NULL); capplet_dir_entry_activate (entry, NULL);
} else { } else {
if ((app = capplet_control_launch (capplet, _("Configuraiton"))) == NULL) gtk_idle_add ((GtkFunction) real_launch_control, capplet);
return -1;
gtk_signal_connect (GTK_OBJECT (app), "destroy",
GTK_SIGNAL_FUNC (gtk_main_quit), NULL);
} }
bonobo_main (); bonobo_main ();