From 2a3a53e9cf40ab9a43f7b6106019325990f7ac63 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 9 Apr 2002 14:59:26 +0000 Subject: Add a "view_info" argument. * Evolution-ShellComponent.idl (createView): Add a "view_info" argument. * e-shell-view.c (get_view_for_uri): if the URI contains a '#', split it into a URI and a "view_info" at that point. (Otherwise, pass "" for the view_info to ShellComponent_createView.) This can be used for things like specifying day/month/week view to the calendar. * e-shell.c (create_view): Ignore e_shell_view_display_uri's return code: it's possible/likely that the requested URL is remote and hasn't been filled in yet. (impl_Shell_handleURI): Don't use Shell_createNewView directly, call e_shell_create_view_from_uri_and_settings. (For the above fix and some others.) * evolution-shell-component.c (impl_createView): Add view_info. * evolution-shell-component-client.c (evolution_shell_component_client_create_view): Add view_info. * evolution-test-component.c (create_view_fn): add view_data. * e-corba-storage-registry.c (impl_StorageRegistry_getFolderByUri): kill a warning svn path=/trunk/; revision=16397 --- shell/evolution-test-component.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'shell/evolution-test-component.c') diff --git a/shell/evolution-test-component.c b/shell/evolution-test-component.c index 71b41d7627..cf6f0ba53f 100644 --- a/shell/evolution-test-component.c +++ b/shell/evolution-test-component.c @@ -260,16 +260,23 @@ static EvolutionShellComponentResult create_view_fn (EvolutionShellComponent *shell_component, const char *physical_uri, const char *folder_type, + const char *view_data, BonoboControl **control_return, void *closure) { GtkWidget *vbox; - GtkWidget *label_1, *label_2; + GtkWidget *label_1, *label_2, *label_3, *label_4; GtkWidget *event_box_1, *event_box_2; label_1 = gtk_label_new ("This is just a test component, displaying the following URI:"); label_2 = gtk_label_new (physical_uri); + if (*view_data) { + label_3 = gtk_label_new ("And the following view_data:"); + label_4 = gtk_label_new (view_data); + } else + label_3 = label_4 = NULL; + event_box_1 = gtk_event_box_new (); event_box_2 = gtk_event_box_new (); @@ -278,14 +285,13 @@ create_view_fn (EvolutionShellComponent *shell_component, gtk_box_pack_start (GTK_BOX (vbox), event_box_1, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), label_1, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), label_2, FALSE, TRUE, 0); + if (label_3) { + gtk_box_pack_start (GTK_BOX (vbox), label_3, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), label_4, FALSE, TRUE, 0); + } gtk_box_pack_start (GTK_BOX (vbox), event_box_2, TRUE, TRUE, 0); - gtk_widget_show (label_1); - gtk_widget_show (label_2); - gtk_widget_show (event_box_1); - gtk_widget_show (event_box_2); - - gtk_widget_show (vbox); + gtk_widget_show_all (vbox); *control_return = bonobo_control_new (vbox); -- cgit v1.2.3