diff options
| -rw-r--r-- | shell/ChangeLog | 5 | ||||
| -rw-r--r-- | shell/e-shell-folder-commands.c | 2 | ||||
| -rw-r--r-- | shell/e-shell-view-menu.c | 2 | ||||
| -rw-r--r-- | shell/e-shell-view.c | 2 | ||||
| -rw-r--r-- | shell/e-shell.c | 12 | ||||
| -rw-r--r-- | shell/e-shell.h | 4 |
6 files changed, 16 insertions, 11 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 880f3c7e09..3b4be77457 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,10 @@ 2001-06-28 Ettore Perazzoli <ettore@ximian.com> + * e-shell.c (e_shell_create_view): Renamed from + `e_shell_new_view'. + +2001-06-28 Ettore Perazzoli <ettore@ximian.com> + * main.c (idle_cb): Re-implemented to get a GSList of URIs and open them on a running shell [if any] or on a newly created shell. If no args are provided [i.e. the list is NULL], it either diff --git a/shell/e-shell-folder-commands.c b/shell/e-shell-folder-commands.c index a90c336da9..fbb562d81f 100644 --- a/shell/e-shell-folder-commands.c +++ b/shell/e-shell-folder-commands.c @@ -212,7 +212,7 @@ e_shell_command_open_folder_in_other_window (EShell *shell, g_return_if_fail (E_IS_SHELL (shell)); g_return_if_fail (shell_view != NULL && E_IS_SHELL_VIEW (shell_view)); - e_shell_new_view (shell, e_shell_view_get_current_uri (shell_view)); + e_shell_create_view (shell, e_shell_view_get_current_uri (shell_view)); } diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c index f4a8eb35ec..d141e43662 100644 --- a/shell/e-shell-view-menu.c +++ b/shell/e-shell-view-menu.c @@ -346,7 +346,7 @@ command_open_folder_in_new_window (BonoboUIComponent *uih, shell = e_shell_view_get_shell (shell_view); current_uri = e_shell_view_get_current_uri (shell_view); - e_shell_new_view (shell, current_uri); + e_shell_create_view (shell, current_uri); } diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 8951c34926..cf40178ddb 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -1199,7 +1199,7 @@ e_shell_view_construct (EShellView *shell_view, unless you know what you are doing; this is just the standard GTK+ constructor thing and it won't allow the shell to do the required bookkeeping for the created views. Instead, the right way to create a new - view is calling `e_shell_new_view()'. */ + view is calling `e_shell_create_view()'. */ EShellView * e_shell_view_new (EShell *shell) { diff --git a/shell/e-shell.c b/shell/e-shell.c index 167e718ed6..69ed651448 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -220,7 +220,7 @@ impl_Shell_createNewView (PortableServer_Servant servant, return CORBA_OBJECT_NIL; } - shell_view = e_shell_new_view (shell, uri); + shell_view = e_shell_create_view (shell, uri); if (shell_view == NULL) { CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Shell_NotFound, NULL); @@ -876,7 +876,7 @@ e_shell_new (const char *local_directory, /** - * e_shell_new_view: + * e_shell_create_view: * @shell: The shell for which to create a new view. * @uri: URI for the new view. * @@ -885,8 +885,8 @@ e_shell_new (const char *local_directory, * Return value: The new view. **/ EShellView * -e_shell_new_view (EShell *shell, - const char *uri) +e_shell_create_view (EShell *shell, + const char *uri) { EShellView *view; EShellPrivate *priv; @@ -1185,8 +1185,8 @@ e_shell_restore_from_settings (EShell *shell) EShellView *view; /* FIXME: restore the URI here. There should be an - e_shell_new_view_from_configuration() thingie. */ - view = e_shell_new_view (shell, NULL); + e_shell_create_view_from_configuration() thingie. */ + view = e_shell_create_view (shell, NULL); if (! e_shell_view_load_settings (view, i)) retval = FALSE; diff --git a/shell/e-shell.h b/shell/e-shell.h index 5c0ec4df74..021dfbd1d2 100644 --- a/shell/e-shell.h +++ b/shell/e-shell.h @@ -86,8 +86,8 @@ gboolean e_shell_construct (EShell *shell, EShell *e_shell_new (const char *local_directory, gboolean show_splash); -EShellView *e_shell_new_view (EShell *shell, - const char *uri); +EShellView *e_shell_create_view (EShell *shell, + const char *uri); const char *e_shell_get_local_directory (EShell *shell); EShortcuts *e_shell_get_shortcuts (EShell *shell); |