Fix some miscellaneous address book bugs.

Kill e-shell-constants.h.

svn path=/branches/kill-bonobo/; revision=36392

5 files changed, 5 insertions, 52 deletions

diff --git a/shell/Makefile.am b/shell/Makefile.am
index aff540d0fa..3afa351426 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -98,7 +98,6 @@ evolution_SOURCES =				\
 	e-config-upgrade.h			\
 	e-shell.c				\
 	e-shell.h				\
-	e-shell-constants.h			\
 	e-shell-importer.c			\
 	e-shell-importer.h			\
 	e-shell-window-private.c		\
diff --git a/shell/e-shell-common.h b/shell/e-shell-common.h
index 9887a3baff..bfce3ac49b 100644
--- a/shell/e-shell-common.h
+++ b/shell/e-shell-common.h
@@ -27,5 +27,6 @@
 
 #include <gio/gio.h>
 #include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
 
 #endif /* E_SHELL_COMMON_H */
diff --git a/shell/e-shell-constants.h b/shell/e-shell-constants.h
deleted file mode 100644
index 25aec79d6f..0000000000
--- a/shell/e-shell-constants.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
- *
- *
- * Authors:
- *		Ettore Perazzoli <ettore@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifndef E_SHELL_CONSTANTS_H
-#define E_SHELL_CONSTANTS_H
-
-#define E_SHELL_URI_PREFIX		"evolution:"
-#define E_SHELL_URI_PREFIX_LEN		10
-
-#define E_SHELL_DEFAULTURI_PREFIX	"default:"
-#define E_SHELL_DEFAULTURI_PREFIX_LEN	8
-
-#define E_SHELL_MINI_ICON_SUFFIX	"-mini"
-#define E_SHELL_MINI_ICON_SUFFIX_LEN	5
-
-#define E_SHELL_ICON_SIZE		48
-#define E_SHELL_MINI_ICON_SIZE		16
-
-#define E_PATH_SEPARATOR                '/'
-#define E_PATH_SEPARATOR_S		"/"
-
-#define E_LOCAL_STORAGE_NAME            "local"
-#define E_SUMMARY_STORAGE_NAME          "summary"
-
-#define E_SUMMARY_URI			"evolution:/summary"
-#define E_LOCAL_INBOX_URI		"evolution:/local/Inbox"
-#define E_LOCAL_CONTACTS_URI		"evolution:/local/Contacts"
-#define E_LOCAL_CALENDAR_URI		"evolution:/local/Calendar"
-#define E_LOCAL_TASKS_URI		"evolution:/local/Tasks"
-
-#endif
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index c01d19dea5..bea25420fb 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -48,7 +48,6 @@
 
 #include "e-shell.h"
 #include "e-shell-window.h"
-#include "e-shell-constants.h"
 
 #include "e-shell-importer.h"
 
diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c
index 8ec551039f..8bfdefc536 100644
--- a/shell/e-shell-window-private.c
+++ b/shell/e-shell-window-private.c
@@ -244,6 +244,10 @@ e_shell_window_private_init (EShellWindow *shell_window)
 
 	item = e_menu_tool_button_new (_("New"));
 	gtk_tool_item_set_is_important (GTK_TOOL_ITEM (item), TRUE);
+	gtk_widget_add_accelerator (
+		GTK_WIDGET (item), "clicked",
+		gtk_ui_manager_get_accel_group (priv->ui_manager),
+		GDK_N, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
 	gtk_toolbar_insert (GTK_TOOLBAR (widget), item, 0);
 	priv->menu_tool_button = g_object_ref (item);
 	gtk_widget_show (GTK_WIDGET (item));