callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make the local storage name "Local Folders" instead of "local", looks

Browse Source 
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".

svn path=/trunk/; revision=11241
This commit is contained in:
Jason Leach
2001-07-19 21:55:47 +00:00
committed by Jacob Leach
parent 01e51e6eb2
commit c604cce9c6
7 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
shell/ChangeLog
View File

@ -1,3 +1,21 @@
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):

2
shell/e-local-storage.h
View File

@ -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);

2
shell/e-shell-folder-commands.c
View File

@ -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);

2
shell/e-shell-view.c
View File

@ -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

2
shell/e-shell-view.h
View File

@ -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,

8
shell/e-shortcuts.c
View File

@ -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

5
shell/main.c
View File

@ -43,9 +43,6 @@
#include "e-shell.h"
#define STARTUP_URI "evolution:/local/Inbox"
static EShell *shell = NULL;
static char *evolution_directory = NULL;
@ -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)