Accept window_title parameter and use it as the title (capplet_activate):

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

	* capplet-dir.c (capplet_control_launch): Accept window_title
	parameter and use it as the title
	(capplet_activate): Pass entry->name to capplet_control_launch
This commit is contained in:
Bradford Hovinen
2001-07-13 19:49:31 +00:00
committed by Bradford Hovinen (Gdict maintainer)
parent 41255aeb6d
commit fa695ff9ee
4 changed files with 12 additions and 5 deletions

View File

@@ -1,3 +1,9 @@
2001-07-13 Bradford Hovinen <hovinen@ximian.com>
* capplet-dir.c (capplet_control_launch): Accept window_title
parameter and use it as the title
(capplet_activate): Pass entry->name to capplet_control_launch
2001-07-13 Kai Lahmann <kl@linuxfaqs.de>
* capplet-dir-view-html.c (header_populate): made the header

View File

@@ -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[2]);
capplet_control_launch (entry->exec[2], entry->name);
else if (!strncmp (entry->exec[0], "root-manager", strlen ("root-manager")))
start_capplet_through_root_manager (entry);
else
@@ -409,7 +409,7 @@ capplet_cancel_cb (GtkWidget *widget, GtkWidget *app)
*/
GtkWidget *
capplet_control_launch (const gchar *capplet_name)
capplet_control_launch (const gchar *capplet_name, gchar *window_title)
{
gchar *oaf_iid, *moniker;
gchar *tmp, *tmp1;
@@ -450,7 +450,7 @@ capplet_control_launch (const gchar *capplet_name)
}
/* FIXME: Use a human-readable capplet name here */
app = gnome_dialog_new (_("Capplet"), GNOME_STOCK_BUTTON_OK,
app = gnome_dialog_new (window_title, GNOME_STOCK_BUTTON_OK,
GNOME_STOCK_BUTTON_CANCEL, NULL);
gtk_object_set_data (GTK_OBJECT (app), "property-control", property_control);
control = bonobo_widget_new_control_from_objref (control_ref, CORBA_OBJECT_NIL);

View File

@@ -90,6 +90,7 @@ void capplet_dir_init (CappletDirView *(*cb)
CappletDir *get_root_capplet_dir (void);
GtkWidget *capplet_control_launch (const gchar *capplet_name);
GtkWidget *capplet_control_launch (const gchar *capplet_name,
gchar *window_title);
#endif /* __CAPPLET_DIR_H */

View File

@@ -70,7 +70,7 @@ main (int argc, char **argv)
capplet_dir_entry_activate
(CAPPLET_DIR_ENTRY (get_root_capplet_dir ()), NULL);
} else {
if ((app = capplet_control_launch (capplet)) == NULL)
if ((app = capplet_control_launch (capplet, _("Configuraiton"))) == NULL)
return -1;
gtk_signal_connect (GTK_OBJECT (app), "destroy",