diff options
| -rw-r--r-- | shell/ChangeLog | 18 | ||||
| -rw-r--r-- | shell/e-local-storage.h | 2 | ||||
| -rw-r--r-- | shell/e-shell-folder-commands.c | 2 | ||||
| -rw-r--r-- | shell/e-shell-view.c | 2 | ||||
| -rw-r--r-- | shell/e-shell-view.h | 2 | ||||
| -rw-r--r-- | shell/e-shortcuts.c | 8 | ||||
| -rw-r--r-- | shell/main.c | 5 |
7 files changed, 27 insertions, 12 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 2eae694d46..690d3bb497 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,23 @@ 2001-07-19 Jason Leach <jleach@ximian.com> + * e-local-storage.h: Make the local storage name "Local Folders" + instead of "local", looks better with "My Evolution", "VFolders", + and "Other Contacts". + + * e-shell-view.h: Put the #define DEFAULT_URI here instead of in + e-shell-view.c. + + * main.c: Remove the duplicated #define STARTUP_URI, actually make + use of the nice defines. + + * e-shell-folder-commands.c (e_shell_command_delete_folder): Use + the DEFAULT_URI here instead of a hard coded string. + + * e-shortcuts.c (e_shortcuts_add_default_group): Fix the URI's + here to use "Local Folder". + +2001-07-19 Jason Leach <jleach@ximian.com> + * e-shell-folder-title-bar.c (e_shell_folder_title_bar_construct): Line up the padding for the folder title bar labels when you have the folder bar enabled or disabled (previously when disabled it diff --git a/shell/e-local-storage.h b/shell/e-local-storage.h index f844c34bb4..1593c09459 100644 --- a/shell/e-local-storage.h +++ b/shell/e-local-storage.h @@ -53,7 +53,7 @@ struct _ELocalStorageClass { }; -#define E_LOCAL_STORAGE_NAME "local" +#define E_LOCAL_STORAGE_NAME "Local Folders" GtkType e_local_storage_get_type (void); diff --git a/shell/e-shell-folder-commands.c b/shell/e-shell-folder-commands.c index 4fa9d71028..1f4b473e17 100644 --- a/shell/e-shell-folder-commands.c +++ b/shell/e-shell-folder-commands.c @@ -401,7 +401,7 @@ e_shell_command_delete_folder (EShell *shell, NULL); /* Select another folder to prevent bad things from happening */ - e_shell_view_display_uri (shell_view, "evolution:/local/Inbox"); + e_shell_view_display_uri (shell_view, DEFAULT_URI); } g_free (path); diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 9db1d6f219..7add4142cd 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -144,8 +144,6 @@ static guint signals[LAST_SIGNAL] = { 0 }; #define DEFAULT_WIDTH 705 #define DEFAULT_HEIGHT 550 -#define DEFAULT_URI "evolution:/local/Inbox" - #define SET_FOLDER_DELAY 250 diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h index 62a95beb83..4e99554f69 100644 --- a/shell/e-shell-view.h +++ b/shell/e-shell-view.h @@ -46,6 +46,8 @@ typedef struct _EShellViewClass EShellViewClass; #include "e-shell.h" +#define DEFAULT_URI "evolution:/Local Folders/Inbox" + enum _EShellViewSubwindowMode { E_SHELL_VIEW_SUBWINDOW_HIDDEN, E_SHELL_VIEW_SUBWINDOW_TRANSIENT, diff --git a/shell/e-shortcuts.c b/shell/e-shortcuts.c index 7c8505ab79..5f3c248fd5 100644 --- a/shell/e-shortcuts.c +++ b/shell/e-shortcuts.c @@ -981,10 +981,10 @@ e_shortcuts_add_default_group (EShortcuts *shortcuts) e_shortcuts_add_group (shortcuts, -1, _("Shortcuts")); - e_shortcuts_add_shortcut (shortcuts, 0, -1, "evolution:/local/Inbox", _("Inbox"), "mail"); - e_shortcuts_add_shortcut (shortcuts, 0, -1, "evolution:/local/Calendar", _("Calendar"), "calendar"); - e_shortcuts_add_shortcut (shortcuts, 0, -1, "evolution:/local/Tasks", _("Tasks"), "tasks"); - e_shortcuts_add_shortcut (shortcuts, 0, -1, "evolution:/local/Contacts", _("Contacts"), "contacts"); + e_shortcuts_add_shortcut (shortcuts, 0, -1, "evolution:/Local Folders/Inbox", _("Inbox"), "mail"); + e_shortcuts_add_shortcut (shortcuts, 0, -1, "evolution:/Local Folders/Calendar", _("Calendar"), "calendar"); + e_shortcuts_add_shortcut (shortcuts, 0, -1, "evolution:/Local Folders/Tasks", _("Tasks"), "tasks"); + e_shortcuts_add_shortcut (shortcuts, 0, -1, "evolution:/Local Folders/Contacts", _("Contacts"), "contacts"); } void diff --git a/shell/main.c b/shell/main.c index 635cc146bf..45d3fb278e 100644 --- a/shell/main.c +++ b/shell/main.c @@ -44,9 +44,6 @@ #include "e-shell.h" -#define STARTUP_URI "evolution:/local/Inbox" - - static EShell *shell = NULL; static char *evolution_directory = NULL; static gboolean no_splash = FALSE; @@ -172,7 +169,7 @@ idle_cb (void *data) } if (! restored && uri_list == NULL) { - const char *uri = "evolution:/local/Inbox"; + const char *uri = DEFAULT_URI; GNOME_Evolution_Shell_handleURI (corba_shell, uri, &ev); if (ev._major != CORBA_NO_EXCEPTION) |