aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-09-05 08:10:03 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-09-05 08:10:03 +0800
commitbc21d949ca1a3a1eb0fc5dd735411030c01c6b79 (patch)
tree3b404beb8ec9971ce4fc60aed93efb1795fac80e
parente1fce519bb7ca23936629969494151c16565a71d (diff)
downloadgsoc2013-evolution-bc21d949ca1a3a1eb0fc5dd735411030c01c6b79.tar
gsoc2013-evolution-bc21d949ca1a3a1eb0fc5dd735411030c01c6b79.tar.gz
gsoc2013-evolution-bc21d949ca1a3a1eb0fc5dd735411030c01c6b79.tar.bz2
gsoc2013-evolution-bc21d949ca1a3a1eb0fc5dd735411030c01c6b79.tar.lz
gsoc2013-evolution-bc21d949ca1a3a1eb0fc5dd735411030c01c6b79.tar.xz
gsoc2013-evolution-bc21d949ca1a3a1eb0fc5dd735411030c01c6b79.tar.zst
gsoc2013-evolution-bc21d949ca1a3a1eb0fc5dd735411030c01c6b79.zip
[Fix #6971, Default folder should be the Summary.]
* main.c (idle_cb): s/DEFAULT_URI/E_SHELL_VIEW_DEFAULT_URI/. * e-shell.c (e_shell_create_view): s/DEFAULT_URI/E_SHELL_VIEW_DEFAULT_URI/. * e-shell-view.c (socket_destroy_cb): s/DEFAULT_URI/E_SHELL_VIEW_DEFAULT_URI/. (e_shell_view_save_settings): Likewise. * e-shell-folder-commands.c (e_shell_command_delete_folder): s/DEFAULT_URI/E_SHELL_VIEW_DEFAULT_URI/. * e-shell-view.h (DEFAULT_URI): Rename to `E_SHELL_VIEW_DEFAULT_URI'. Change from "evolution:/local/Inbox" to be "evolution:/summary". svn path=/trunk/; revision=12618
-rw-r--r--shell/ChangeLog20
-rw-r--r--shell/e-shell-folder-commands.c2
-rw-r--r--shell/e-shell-view.c6
-rw-r--r--shell/e-shell-view.h2
-rw-r--r--shell/e-shell.c2
-rw-r--r--shell/main.c2
6 files changed, 27 insertions, 7 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index f055c15da3..9d8bfd17f3 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,25 @@
2001-09-04 Ettore Perazzoli <ettore@ximian.com>
+ [Fix #6971, Default folder should be the Summary.]
+
+ * main.c (idle_cb): s/DEFAULT_URI/E_SHELL_VIEW_DEFAULT_URI/.
+
+ * e-shell.c (e_shell_create_view):
+ s/DEFAULT_URI/E_SHELL_VIEW_DEFAULT_URI/.
+
+ * e-shell-view.c (socket_destroy_cb):
+ s/DEFAULT_URI/E_SHELL_VIEW_DEFAULT_URI/.
+ (e_shell_view_save_settings): Likewise.
+
+ * e-shell-folder-commands.c (e_shell_command_delete_folder):
+ s/DEFAULT_URI/E_SHELL_VIEW_DEFAULT_URI/.
+
+ * e-shell-view.h (DEFAULT_URI): Rename to
+ `E_SHELL_VIEW_DEFAULT_URI'. Change from "evolution:/local/Inbox"
+ to be "evolution:/summary".
+
+2001-09-04 Ettore Perazzoli <ettore@ximian.com>
+
[Fix ^#7675, Crashes trying to empty trash folder.]
* e-shortcuts.c (e_shortcuts_construct): Use
diff --git a/shell/e-shell-folder-commands.c b/shell/e-shell-folder-commands.c
index 861e2cd3b8..cd72ff8acd 100644
--- a/shell/e-shell-folder-commands.c
+++ b/shell/e-shell-folder-commands.c
@@ -426,7 +426,7 @@ e_shell_command_delete_folder (EShell *shell,
shell_view);
/* Select another folder to prevent bad things from happening */
- e_shell_view_display_uri (shell_view, DEFAULT_URI);
+ e_shell_view_display_uri (shell_view, E_SHELL_VIEW_DEFAULT_URI);
}
g_free (path);
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 059df15b7f..4186427e93 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -1738,7 +1738,7 @@ socket_destroy_cb (GtkWidget *socket_widget, gpointer data)
/* We were actively viewing the component that just crashed, so flip to the Inbox */
if (viewing_closed_uri)
- e_shell_view_display_uri (shell_view, DEFAULT_URI);
+ e_shell_view_display_uri (shell_view, E_SHELL_VIEW_DEFAULT_URI);
g_free (copy_of_uri);
}
@@ -2338,7 +2338,7 @@ e_shell_view_save_settings (EShellView *shell_view,
if (uri != NULL)
bonobo_config_set_string (db, key, uri, NULL);
else
- bonobo_config_set_string (db, key, DEFAULT_URI, NULL);
+ bonobo_config_set_string (db, key, E_SHELL_VIEW_DEFAULT_URI, NULL);
g_free (key);
num_groups = e_shortcut_model_get_num_groups (shortcut_bar->model);
@@ -2434,7 +2434,7 @@ e_shell_view_load_settings (EShellView *shell_view,
key = g_strconcat (prefix, "DisplayedURI", NULL);
stringval = bonobo_config_get_string (db, key, NULL);
if (! e_shell_view_display_uri (shell_view, stringval))
- e_shell_view_display_uri (shell_view, DEFAULT_URI);
+ e_shell_view_display_uri (shell_view, E_SHELL_VIEW_DEFAULT_URI);
g_free (stringval);
g_free (key);
diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h
index 9b7b53a47d..8fbdd199df 100644
--- a/shell/e-shell-view.h
+++ b/shell/e-shell-view.h
@@ -46,7 +46,7 @@ typedef struct _EShellViewClass EShellViewClass;
#include "e-shell.h"
-#define DEFAULT_URI "evolution:/local/Inbox"
+#define E_SHELL_VIEW_DEFAULT_URI "evolution:/summary"
struct _EShellView {
BonoboWindow parent;
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 23cd4bc7e6..a328e3384e 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -1069,7 +1069,7 @@ e_shell_create_view (EShell *shell,
/* FIXME: Consider popping a dialog box up
about how the provided URI does not
exist/could not be displayed */
- e_shell_view_display_uri (E_SHELL_VIEW (view), DEFAULT_URI);
+ e_shell_view_display_uri (E_SHELL_VIEW (view), E_SHELL_VIEW_DEFAULT_URI);
shell->priv->views = g_list_prepend (shell->priv->views, view);
diff --git a/shell/main.c b/shell/main.c
index 14291562e4..41d0156981 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -190,7 +190,7 @@ idle_cb (void *data)
}
if (! restored && uri_list == NULL) {
- const char *uri = DEFAULT_URI;
+ const char *uri = E_SHELL_VIEW_DEFAULT_URI;
GNOME_Evolution_Shell_handleURI (corba_shell, uri, &ev);
if (ev._major != CORBA_NO_EXCEPTION)