Pass "contacts" as the @folder_type to

* gui/component/addressbook-component.c (add_creatable_item): Pass
"contacts" as the @folder_type to
evolution_shell_component_add_user_creatable_item().

* gui/component-factory.c (add_creatable_item): New arg
@folder_type, pass it to
evolution_shell_component_add_user_creatable_item().
(create_object): Set the right folder types for the various
user-creatable items.

* component-factory.c (create_component): Pass "mail" as
@folder_type to
evolution_shell_component_add_user_creatable_item().

* evolution-test-component.c (register_component): Pass NULL for
@folder_type to
evolution_shell_component_add_user_creatable_item().

* e-shell-user-creatable-items-handler.c: New member folder_type
in struct MenuItem.
(ensure_menu_items): Initialize ->folder_type.
(item_is_default): New helper function.
(create_menu_xml): New arg @folder_type.  Put the items on the top
using item_is_default().
(shell_view_view_changed_callback): Pass the folder type to
create_menu_xml().

* evolution-shell-component.c: New member folder_type in
UserCreatableItemType.
(user_creatable_item_type_new): New arg @folder_type.
(user_creatable_item_type_free): Free ->folder_type.
(evolution_shell_component_add_user_creatable_item): New arg
@folder_type.
(impl__get_userCreatableItemTypes): Set ->folderType in the
returned CORBA structs.

* Evolution-ShellComponent.idl: New member folderType in struct
UserCreatableItemType.

* e-shell-user-creatable-items-handler.c: New member component_id
in struct MenuItem.  Removed member menu_xml from
EShellUserCreatableItemsHandlerPrivate.
(init): No need to initialize menu_xml here anymore.
(impl_destroy): ...And no need to free here, either.
(setup_menu_xml): New, derived from ensure_menu_xml().  This
orders the menu so that the items for the current component go at
the top.
(create_menu_xml): Removed.
(e_shell_user_creatable_items_handler_attach_menus): Set up
properly for the current component ID, using setup_menu_xml().

svn path=/trunk/; revision=17658

1 files changed, 21 insertions, 15 deletions

diff --git a/shell/Evolution-ShellComponent.idl b/shell/Evolution-ShellComponent.idl
index 18118b4359..96557353b9 100644
--- a/shell/Evolution-ShellComponent.idl
+++ b/shell/Evolution-ShellComponent.idl
@@ -14,21 +14,6 @@ module GNOME {
 module Evolution {
 	interface Shell;
 
-	/* Definition for a folder type.  */
-	struct FolderType {
-		string name;
-		string iconName;
-
-		string displayName;
-		string description;
-
-		boolean userCreatable;
-
-		sequence<string> acceptedDndTypes;
-		sequence<string> exportedDndTypes;
-	};
-	typedef sequence<FolderType> FolderTypeList;
-
 	/* URI schemas, e.g. mailto:.  */
 	typedef string URISchema;
 	typedef sequence<URISchema> URISchemaList;
@@ -42,9 +27,30 @@ module Evolution {
 		string tooltip;
 		char menuShortcut;
 		Icon icon;
+
+		// This specifies the folder type for which this user creatable
+		// type is a default type.
+		string folderType;
 	};
 	typedef sequence<UserCreatableItemType> UserCreatableItemTypeList;
 
+	/* Definition for a folder type.  */
+	struct FolderType {
+		string name;
+		string iconName;
+
+		string displayName;
+		string description;
+
+		boolean userCreatable;
+
+		sequence<string> acceptedDndTypes;
+		sequence<string> exportedDndTypes;
+
+		UserCreatableItemTypeList userCreatableItemTypes;
+	};
+	typedef sequence<FolderType> FolderTypeList;
+
 	interface ShellComponentListener;
 
 	interface ShellComponent : Bonobo::Unknown {