From 74227fb5dcbb8c0c68ca7cbd88864f3366c2f238 Mon Sep 17 00:00:00 2001 From: Bradford Hovinen Date: Mon, 17 Dec 2001 20:33:19 +0000 Subject: [PATCH] Remove support for launching capplets (real_launch_control): Remove 2001-12-17 Bradford Hovinen * main.c (main): Remove support for launching capplets (real_launch_control): Remove * capplet-dir.c: Remove bonobo capplet utility functions (capplet_activate): Don't use capplet_control_launch --- control-center/ChangeLog | 8 ++ control-center/capplet-dir.c | 138 ++--------------------------------- control-center/main.c | 44 +++-------- 3 files changed, 22 insertions(+), 168 deletions(-) diff --git a/control-center/ChangeLog b/control-center/ChangeLog index 63912a9af..36dac62b6 100644 --- a/control-center/ChangeLog +++ b/control-center/ChangeLog @@ -1,3 +1,11 @@ +2001-12-17 Bradford Hovinen + + * main.c (main): Remove support for launching capplets + (real_launch_control): Remove + + * capplet-dir.c: Remove bonobo capplet utility functions + (capplet_activate): Don't use capplet_control_launch + 2001-12-13 Richard Hestilow * capplet-dir-view-list.c: Remove all g_print statements. diff --git a/control-center/capplet-dir.c b/control-center/capplet-dir.c index 621a1560b..166223805 100644 --- a/control-center/capplet-dir.c +++ b/control-center/capplet-dir.c @@ -247,19 +247,11 @@ capplet_activate (Capplet *capplet) entry = CAPPLET_DIR_ENTRY (capplet); #warning FIXME: this should probably be root-manager-helper - if (!strncmp (entry->exec[0], "gnomecc", strlen ("gnomecc"))) { - if (capplet->launching) { - return; - } else { - capplet->launching = TRUE; - gtk_idle_add ((GtkFunction) capplet_reset_cb, capplet); - capplet_control_launch (entry->exec[2], entry->label); - } -#ifdef USE_ROOT_MANAGER - } else if (!strncmp (entry->exec[0], "root-manager", strlen ("root-manager"))) { +#if 0 + if (!strncmp (entry->exec[0], "root-manager", strlen ("root-manager"))) { start_capplet_through_root_manager (entry->entry); -#endif } else { +#endif if (capplet->launching) { return; } else { @@ -267,7 +259,9 @@ capplet_activate (Capplet *capplet) gtk_timeout_add (1000, (GtkFunction) capplet_reset_cb, capplet); gnome_desktop_item_launch (entry->entry, NULL, 0, NULL); } +#if 0 } +#endif } void @@ -448,125 +442,3 @@ get_root_capplet_dir (void) return root_dir; } - -static void -capplet_apply_cb (GtkWidget *widget, GtkWidget *app) -{ - CORBA_Environment ev; - Bonobo_PropertyControl pc; - - CORBA_exception_init (&ev); - - pc = gtk_object_get_data (GTK_OBJECT (app), "property-control"); - Bonobo_PropertyControl_notifyAction (pc, 0, Bonobo_PropertyControl_APPLY, &ev); - - CORBA_exception_free (&ev); -} - -static void -capplet_close_cb (GtkWidget *widget, GtkWidget *app) -{ - CORBA_Environment ev; - Bonobo_PropertyControl pc; - - CORBA_exception_init (&ev); - - pc = gtk_object_get_data (GTK_OBJECT (app), "property-control"); - gtk_widget_destroy (app); - - bonobo_object_release_unref (pc, &ev); - - CORBA_exception_free (&ev); -} - -/* capplet_control_launch - * - * Launch a capplet as a Bonobo control; returns the relevant BonoboWindow or - * NULL if the capplet could not be launched - */ - -GtkWidget * -capplet_control_launch (const gchar *capplet_name, gchar *window_title) -{ - gchar *oaf_iid; - gchar *moniker; - gchar *tmp; - gchar *tmp1; - - GtkWidget *app; - GtkWidget *control; - GtkWidget *dialog; - CORBA_Environment ev; - - Bonobo_PropertyControl property_control; - Bonobo_Control control_ref; - Bonobo_PropertyBag pb; - - BonoboControlFrame *cf; - - g_return_val_if_fail (capplet_name != NULL, NULL); - - CORBA_exception_init (&ev); - - tmp = g_strdup (capplet_name); - if ((tmp1 = strstr (tmp, "-capplet")) != NULL) *tmp1 = '\0'; - moniker = g_strconcat ("archive:user-archive#archiverdb:", tmp, NULL); - while ((tmp1 = strchr (tmp, '-'))) *tmp1 = '_'; - - oaf_iid = g_strconcat ("OAFIID:Bonobo_Control_Capplet_", tmp, NULL); - g_free (tmp); - - property_control = bonobo_get_object (oaf_iid, "IDL:Bonobo/PropertyControl:1.0", &ev); - g_free (oaf_iid); - - if (BONOBO_EX (&ev) || property_control == CORBA_OBJECT_NIL) { - dialog = gnome_error_dialog ("Could not load the capplet."); - gnome_dialog_run_and_close (GNOME_DIALOG (dialog)); - g_free (moniker); - return NULL; - } - - control_ref = Bonobo_PropertyControl_getControl (property_control, 0, &ev); - - if (BONOBO_EX (&ev) || control_ref == CORBA_OBJECT_NIL) { - bonobo_object_release_unref (property_control, &ev); - g_free (moniker); - return NULL; - } - - app = gnome_dialog_new (window_title, GNOME_STOCK_BUTTON_APPLY, - GNOME_STOCK_BUTTON_CLOSE, NULL); - gtk_object_set_data (GTK_OBJECT (app), "property-control", property_control); - control = bonobo_widget_new_control_from_objref (control_ref, CORBA_OBJECT_NIL); - - if (control == NULL) { - g_critical ("Could not create widget from control"); - gtk_widget_destroy (app); - bonobo_object_release_unref (property_control, &ev); - app = NULL; - } else { - gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (app)->vbox), control, TRUE, TRUE, 0); - - cf = bonobo_widget_get_control_frame (BONOBO_WIDGET (control)); - pb = bonobo_control_frame_get_control_property_bag (cf, &ev); - bonobo_property_bag_client_set_value_string (pb, "moniker", moniker, &ev); - bonobo_object_release_unref (pb, NULL); - - if (BONOBO_EX (&ev)) { - dialog = gnome_error_dialog ("Could not load your configuration settings."); - gnome_dialog_run_and_close (GNOME_DIALOG (dialog)); - gtk_widget_destroy (app); - bonobo_object_release_unref (property_control, &ev); - app = NULL; - } else { - gnome_dialog_button_connect (GNOME_DIALOG (app), 0, GTK_SIGNAL_FUNC (capplet_apply_cb), app); - gnome_dialog_button_connect (GNOME_DIALOG (app), 1, GTK_SIGNAL_FUNC (capplet_close_cb), app); - gtk_widget_show_all (app); - } - } - - CORBA_exception_free (&ev); - g_free (moniker); - - return app; -} diff --git a/control-center/main.c b/control-center/main.c index 8bedc5d71..0d9ac7d8c 100644 --- a/control-center/main.c +++ b/control-center/main.c @@ -33,22 +33,6 @@ #include "capplet-dir.h" #include "capplet-dir-view.h" -static gint -real_launch_control (gchar *capplet) -{ - GtkWidget *app; - if ((app = capplet_control_launch (capplet, _("Configuration"))) == NULL) - { - gtk_main_quit (); - return FALSE; - } - - gtk_signal_connect (GTK_OBJECT (app), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), NULL); - - return FALSE; -} - int main (int argc, char **argv) { @@ -58,34 +42,24 @@ main (int argc, char **argv) CappletDir *dir; static gchar *capplet = NULL; - static struct poptOption gnomecc_options[] = { - { "run-capplet", '\0', POPT_ARG_STRING, &capplet, 0, - N_("Run the capplet CAPPLET"), N_("CAPPLET") }, - { NULL, '\0', 0, NULL, 0, NULL, NULL } - }; bindtextdomain (PACKAGE, GNOMELOCALEDIR); bind_textdomain_codeset (PACKAGE, "UTF-8"); textdomain (PACKAGE); gnome_program_init ("control-center", VERSION, LIBGNOMEUI_MODULE, - argc, argv, - GNOME_PARAM_POPT_TABLE, gnomecc_options); + argc, argv, NULL); gconf_init (argc, argv, NULL); - if (capplet == NULL) { - gnomecc_init (); - dir = get_root_capplet_dir (); - if (!dir) - return -1; - entry = CAPPLET_DIR_ENTRY (dir); - if (!entry) - return -1; - capplet_dir_entry_activate (entry, NULL); - } else { - gtk_idle_add ((GtkFunction) real_launch_control, capplet); - } + gnomecc_init (); + dir = get_root_capplet_dir (); + if (dir == NULL) + return -1; + entry = CAPPLET_DIR_ENTRY (dir); + if (entry == NULL) + return -1; + capplet_dir_entry_activate (entry, NULL); gtk_main ();