aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog22
-rw-r--r--shell/Evolution-Activity.idl106
-rw-r--r--shell/Evolution-Session.idl41
-rw-r--r--shell/Evolution-ShellComponent.idl185
-rw-r--r--shell/Evolution-ShellComponentDnd.idl98
-rw-r--r--shell/Evolution-ShellView.idl25
-rw-r--r--shell/Evolution-Shortcuts.idl55
-rw-r--r--shell/Evolution-Storage.idl178
-rw-r--r--shell/Evolution-StorageSetView.idl37
-rw-r--r--shell/Evolution.idl8
-rw-r--r--shell/Makefile.am12
-rw-r--r--shell/e-activity-handler.c2
-rw-r--r--shell/evolution-session.c169
-rw-r--r--shell/evolution-session.h67
-rw-r--r--shell/evolution-shell-view.c258
-rw-r--r--shell/evolution-shell-view.h76
16 files changed, 22 insertions, 1317 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index fbc5e07848..becd4e7f31 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,27 @@
2003-12-03 Ettore Perazzoli <ettore@ximian.com>
+ * Evolution-Session.idl: Remove.
+ * Evolution-Activity.idl: Remove.
+ * Evolution-ShellComponent.idl: Remove.
+ * Evolution-ShellComponentDnd.idl: Remove.
+ * Evolution-ShellView.idl: Remove.
+ * Evolution-Shortcuts.idl: Remove.
+ * Evolution-Storage.idl: Remove.
+ * Evolution-StorageSetView.idl: Remove.
+
+ * evolution-shell-view.c: Remove.
+ * evolution-shell-view.h: Remove.
+
+ * evolution-session.c: Remove.
+ * evolution-session.h: Remove.
+
+2003-12-03 Ettore Perazzoli <ettore@ximian.com>
+
+ * e-activity-handler.c: Do not #include
+ "e-shell-corba-icon-utils.h".
+
+2003-12-03 Ettore Perazzoli <ettore@ximian.com>
+
* e-folder-list.c: Remove.
* e-folder-list.h: Remove.
diff --git a/shell/Evolution-Activity.idl b/shell/Evolution-Activity.idl
deleted file mode 100644
index de23d2c53b..0000000000
--- a/shell/Evolution-Activity.idl
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Activity management for Evolution.
- *
- * Authors:
- * Ettore Perazzoli <ettore@ximian.com>
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- */
-
-module GNOME {
-module Evolution {
-
-interface Activity : Bonobo::Unknown {
- typedef long ActivityId;
-
- enum DialogType {
- DIALOG_TYPE_NONE,
- DIALOG_TYPE_MESSAGE,
- DIALOG_TYPE_WARNING,
- DIALOG_TYPE_INPUT,
- DIALOG_TYPE_ERROR
- };
-
- enum DialogAction {
- DIALOG_ACTION_ERROR,
- DIALOG_ACTION_DISPLAY,
- DIALOG_ACTION_POSTPONE
- };
-
- exception InvalidIcon {};
- exception IdNotFound {};
-
- /* Events propagated through the listener:
-
- - "ShowDetails": The user wants to know details about the
- progressing operation. The component should display additional
- information about the operation in progress, or raise a pending
- alert dialog.
-
- - "Cancel": The user wants the operation to be cancelled.
- */
-
- /**
- * operationStarted:
- * @component_id: Id of the component starting the operation.
- * @information: Informative string about the operation being performed.
- * @cancellable: Whether this operation should be cancellable by
- * the user from the shell view.
- * @event_listener: Listener which the events for the activity
- * widget will be passed to.
- * @activity_id: A unique Id for the activity, to be used to update the
- * status of the operation.
- * @suggest_display: Whether displaying the dialog might be a nice idea.
- */
- void operationStarted (in string component_id,
- in AnimatedIcon icon,
- in string information,
- in boolean cancellable,
- in Bonobo::Listener event_listener,
- out ActivityId activity_id,
- out boolean suggest_display)
- raises (InvalidIcon);
-
- /**
- * operationProgressing:
- * @activity: The unique Id for the activity whose status we want to update.
- * @information: New informative string. If empty, the informative string
- * isn't changed.
- * @progress: A float from 0.0 to 1.0 indicating the status of completion.
- *
- * Update the status of the specified @activity.
- */
- void operationProgressing (in ActivityId activity,
- in string information,
- in float progress)
- raises (IdNotFound);
-
- /**
- * operationFinished:
- * @activity: The unique Id for the activity that has been completed.
- *
- * Report that the specified @activity has been completed. After this
- * method is invoked, @activity is not considered to be a valid Id
- * anymore.
- */
- void operationFinished (in ActivityId activity);
-
- /**
- * requestDialog:
- *
- * Inform the shell that the specified @activity requires user input
- * from a dialog. The returned value specifies whether the shell wants
- * the dialog to be shown now (%DIALOG_ACTION_DISPLAY) or postponed
- * (%DIALOG_ACTION_POSTPONE). If the return value is
- * %DIALOG_ACTION_POSTPONE, the component should wait for the
- * "DisplayDialog" event before proceeding further. In that case, the
- * shell will flash the label related to this activity, and emit
- * "DisplayDialog" through the event source when the user clicks on it.
- */
- DialogAction requestDialog (in ActivityId activity,
- in DialogType dialog_type);
-};
-
-};
-};
diff --git a/shell/Evolution-Session.idl b/shell/Evolution-Session.idl
deleted file mode 100644
index 35eb9ea427..0000000000
--- a/shell/Evolution-Session.idl
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Interface for saving configuration information.
- *
- * Authors:
- * Ettore Perazzoli <ettore@ximian.com>
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- */
-
-#include <Bonobo.idl>
-
-module GNOME {
-module Evolution {
-
- interface Session : Bonobo::Unknown {
- exception Failed {};
-
- /**
- * saveConfiguration:
- * @prefix: A configuration path prefix.
- *
- * Save the current configuration at the specified @prefix.
- * The component can use any path starting by @prefix for its
- * keys.
- */
- void saveConfiguration (in string prefix)
- raises (Failed);
-
- /**
- * loadConfiguration:
- * @prefix: A configuration path prefix.
- *
- * Load the saved configuration at the specified @prefix.
- */
- void loadConfiguration (in string prefix)
- raises (Failed);
- };
-
-};
-};
diff --git a/shell/Evolution-ShellComponent.idl b/shell/Evolution-ShellComponent.idl
deleted file mode 100644
index 88a594853d..0000000000
--- a/shell/Evolution-ShellComponent.idl
+++ /dev/null
@@ -1,185 +0,0 @@
-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Interface for the Evolution components.
- *
- * Authors:
- * Ettore Perazzoli <ettore@ximian.com>
- *
- * Copyright (C) 2000, 2001, 2002 Ximian, Inc.
- */
-
-#include <Bonobo.idl>
-
-module GNOME {
-module Evolution {
- interface Shell;
-
- /* URI schemas, e.g. mailto:. */
- typedef string URISchema;
- typedef sequence<URISchema> URISchemaList;
-
- /* A type of item that the component can create when asked by the user,
- e.g. a mail message or an appointment. */
- struct UserCreatableItemType {
- string id;
- string description;
- string menuDescription;
- 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 {
- exception AlreadyOwned {};
- exception Busy {};
- exception InternalError {};
- exception NotFound {};
- exception NotOwned {};
- exception OldOwnerHasDied {};
- exception UnsupportedSchema {};
- exception UnsupportedType {};
- exception AlreadyPopulated {};
- exception NotPopulated {};
-
- /* List of folders that the component supports. */
- readonly attribute FolderTypeList supportedTypes;
-
- /* Custom URI schemas that the component supports.
- (e.g. mailto, see ::handleExternalURI). */
- readonly attribute URISchemaList externalUriSchemas ;
-
- /* List of the item that the user can create (see
- ::userCreateNewItem). */
- readonly attribute UserCreatableItemTypeList userCreatableItemTypes;
-
- /* This method is invoked after the components is activated by
- the shell to notify the component that the shell is
- alive. */
- void setOwner (in Shell shell, in string evolution_homedir)
- raises (AlreadyOwned, OldOwnerHasDied);
-
- /* This is invoked when the shell releases the component. */
- void unsetOwner ()
- raises (NotOwned);
-
- /* Notify the component of whether the shell is currently
- * running in interactive mode or not. (I.e. basically,
- * whether there are any Evolution windows on the screen.)
- * @new_view_xid is an X Window ID ("None" if
- * @now_interactive is FALSE) */
- void interactive (in boolean now_interactive,
- in unsigned long new_view_xid);
-
- /* Send debugging output to the file specified. */
- void debug (in string log_path);
-
- /* Create a view for the specified @physical URI. FIXME */
- Bonobo::Control createView (in string physical_uri,
- in string type,
- in string view_info)
- raises (NotFound, UnsupportedType, InternalError);
-
- /* Handle a registered external URI scheme (eg. mailto:). */
- void handleExternalURI (in string external_uri)
- raises (NotFound, UnsupportedSchema, InternalError);
-
- /* Folder operations: */
-
- /* 1. Create a folder. */
- void createFolderAsync (in ShellComponentListener listener,
- in string physical_uri,
- in string type)
- raises (Busy);
-
- /* 2. Remove a folder. */
- void removeFolderAsync (in ShellComponentListener listener,
- in string physical_uri,
- in string type)
- raises (Busy);
-
- /* 3. Copy/move a folder. */
- void xferFolderAsync (in ShellComponentListener listener,
- in string source_physical_uri,
- in string destination_physical_uri,
- in string type,
- in boolean remove_source)
- raises (Busy);
-
- /* Ask the component to populate the UIC with the
- folder-specific menu items of the folder at the specified
- @physical_uri. */
- void populateFolderContextMenu (in Bonobo::UIContainer uih,
- in string physical_uri,
- in string type)
- raises (AlreadyPopulated);
-
- /* After you are done, you have to remove the items. This is
- because of BonoboUI sucking and not allowing the shell to
- remove the items itself. */
- void unpopulateFolderContextMenu (in Bonobo::UIContainer uih,
- in string physical_uri,
- in string type)
- raises (NotPopulated);
-
- /* Make the component create a new item of the specify @id in
- the folder specified by @parent_folder_physical_uri. This
- is supposed to pop up a dialog (say, the Addressbook
- editor) when necessary. */
- void userCreateNewItem (in string id,
- in string parent_folder_physical_uri,
- in string parent_folder_type)
- raises (UnsupportedType);
-
- /* Make the component start a Send/Receive operation. If
- @show_dialog is true, display a progress dialog for the
- operation as well. */
- void sendReceive (in boolean show_dialog);
-
- /* Request the component to quit. The component should report
- through the listener (through OK or CANCEL) whether the
- shell can quit safely. (This is meant to be used for
- confirmations before quitting.) */
- oneway void requestQuit (in ShellComponentListener listener);
- };
-
- interface ShellComponentListener {
- enum Result {
- OK,
- CANCEL,
- UNSUPPORTED_OPERATION,
- UNSUPPORTED_TYPE,
- EXISTS,
- INVALID_URI,
- PERMISSION_DENIED,
- HAS_SUBFOLDERS,
- NO_SPACE
- };
-
- void notifyResult (in Result result);
- };
-};
-};
diff --git a/shell/Evolution-ShellComponentDnd.idl b/shell/Evolution-ShellComponentDnd.idl
deleted file mode 100644
index baf715f0f7..0000000000
--- a/shell/Evolution-ShellComponentDnd.idl
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Interface for the Evolution components that want to support Drag and Drop
- * operations on their folders.
- *
- * Authors:
- * Ettore Perazzoli <ettore@ximian.com>
- *
- * Copyright (C) 2001 Ximian, Inc.
- */
-
-#include <Bonobo.idl>
-
-module GNOME {
-module Evolution {
-module ShellComponentDnd {
- typedef short Action;
- const Action ACTION_DEFAULT = 0;
- const Action ACTION_COPY = 1 << 1;
- const Action ACTION_MOVE = 1 << 2;
- const Action ACTION_LINK = 1 << 3;
- const Action ACTION_ASK = 1 << 4;
- const Action ACTION_ANY = ACTION_COPY | ACTION_MOVE | ACTION_LINK | ACTION_ASK;
-
- typedef Action ActionSet; // For readability.
-
- struct Data {
- short format;
- string target;
- sequence <octet> bytes;
- };
-
- exception NoData {};
-
- interface SourceFolder : Bonobo::Unknown {
- struct Context {
- string physicalUri;
- string folderType;
- ActionSet possibleActions;
- Action suggestedAction;
- };
-
- /* The user started a drag from this object. If the component
- receives this while still in the middle of an existing drag
- operation, it should stop the existing drag operation and
- start a new one. */
- void beginDrag (in string physical_uri,
- in string folder_type,
- out ActionSet possible_actions,
- out Action suggested_action);
-
- /* User released the mouse button and dropped the object
- somewhere, so we now want to get the data for the current
- context. */
- void getData (in Context source_context,
- in Action action,
- in string dnd_type,
- out Data data)
- raises (NoData);
-
- /* The target has finished processing the data, so we can
- delete it. */
- void deleteData (in Context source_context);
-
- /* The drag is over. This should also clean up the data if
- there was a `getData()' but no `deleteData()' after it. */
- void endDrag (in Context source_context);
- };
-
- interface DestinationFolder : Bonobo::Unknown {
- struct Context {
- string dndType;
- ActionSet possibleActions;
- Action suggestedAction;
- };
-
- /* The user is moving a dragged object over our folder. This
- will return %FALSE if the specified object cannot be
- dropped; otherwise, it will return %TRUE and then set the
- @default_action and @non_default_action we want to be
- performed when the drop happens. */
- boolean handleMotion (in string physical_uri,
- in string folder_type,
- in Context destination_context,
- out Action suggested_action);
-
- /* Data is dropped. We are given the data for the dropped
- object, and we are supposed to perform the operation
- requested. */
- boolean handleDrop (in string physical_uri,
- in string folder_type,
- in Context destination_context,
- in Action action,
- in Data data);
- };
-};
-};
-};
diff --git a/shell/Evolution-ShellView.idl b/shell/Evolution-ShellView.idl
deleted file mode 100644
index 026888913c..0000000000
--- a/shell/Evolution-ShellView.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Interface for the Evolution shell views.
- *
- * Authors:
- * Ettore Perazzoli <ettore@ximian.com>
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- */
-
-#include <Bonobo.idl>
-
-module GNOME {
-module Evolution {
- interface ShellView : Bonobo::Unknown {
- void setMessage (in string message,
- in boolean busy);
- void unsetMessage ();
- void changeCurrentView (in string uri);
- void setTitle (in string title);
- void setFolderBarLabel (in string text);
- void showSettings ();
- };
-};
-};
diff --git a/shell/Evolution-Shortcuts.idl b/shell/Evolution-Shortcuts.idl
deleted file mode 100644
index cf98f47e36..0000000000
--- a/shell/Evolution-Shortcuts.idl
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Interface for the Evolution shortcuts.
- *
- * Authors:
- * Ettore Perazzoli <ettore@ximian.com>
- *
- * Copyright (C) 2001 Ximian, Inc.
- */
-
-#include <Bonobo.idl>
-
-module GNOME {
-module Evolution {
-
- interface Shortcuts : Bonobo::Unknown {
-
- struct Shortcut {
- string uri;
- string name;
- string type;
- string customIconName;
- };
- typedef sequence <Shortcut> ShortcutList;
-
- struct Group {
- string name;
- ShortcutList shortcuts;
- };
- typedef sequence<Group> GroupList;
-
- exception NotFound {};
- exception InvalidPosition {};
- exception CannotRemove {};
-
- readonly attribute GroupList groups; // FIXME: Could be non-readonly
-
- void add (in short group_num, in short position, in Shortcut shortcut)
- raises (NotFound);
- void remove (in short group_num, in short item_num)
- raises (NotFound);
- Shortcut get (in short group_num, in short item_num)
- raises (NotFound);
-
- void addGroup (in short position, in string name)
- raises (InvalidPosition);
- void removeGroup (in short group_num)
- raises (NotFound, CannotRemove);
- Group getGroup (in short group_num)
- raises (NotFound);
-
- };
-
-};
-};
diff --git a/shell/Evolution-Storage.idl b/shell/Evolution-Storage.idl
deleted file mode 100644
index 2d6928938b..0000000000
--- a/shell/Evolution-Storage.idl
+++ /dev/null
@@ -1,178 +0,0 @@
-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Storage interface for the Evolution shell.
- *
- * Authors:
- * Ettore Perazzoli <ettore@ximian.com>
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- */
-
-#include <Bonobo.idl>
-
-module GNOME {
-module Evolution {
- interface Storage;
- interface StorageListener;
-
- interface Storage : Bonobo::Unknown {
- exception AlreadyListening {};
- exception NotFound {};
-
- enum Result {
- OK,
- UNSUPPORTED_OPERATION,
- UNSUPPORTED_TYPE,
- INVALID_URI,
- ALREADY_EXISTS,
- DOES_NOT_EXIST,
- PERMISSION_DENIED,
- NO_SPACE,
- NOT_EMPTY,
- NOT_ONLINE,
- GENERIC_ERROR
- };
-
- struct FolderResult {
- Result result;
- string path;
- };
-
- /* The name of the storage. */
- readonly attribute string name;
-
- /* Whether the storage has folders from other user's. */
- readonly attribute boolean hasSharedFolders;
-
- /* Get information for a folder. NOTE: evolutionUri in the
- returned Folder is going to be an empty string if you use
- this function. */
- Folder getFolderAtPath (in string path)
- raises (NotFound);
-
- /* Flat list of the folders in the storage. */
- readonly attribute FolderList folderList;
-
- /* The folder property items (for right-click menu etc.). */
-
- struct FolderPropertyItem {
- string label;
- string tooltip;
- Icon icon; // Currently unused
- };
- typedef sequence<FolderPropertyItem> FolderPropertyItemList;
-
- readonly attribute FolderPropertyItemList folderPropertyItems;
-
- /* Folder Operations. */
-
- void asyncCreateFolder (in string path,
- in string type,
- in string description,
- in string parent_physical_uri,
- in Bonobo::Listener listener);
-
- void asyncRemoveFolder (in string path,
- in string physical_uri,
- in Bonobo::Listener listener);
-
- void asyncXferFolder (in string source_path,
- in string destination_path,
- in boolean remove_source,
- in Bonobo::Listener listener);
-
- /* Open remote nodes. */
- void asyncOpenFolder (in string path,
- in Bonobo::Listener listener);
-
- /* Set unread count. */
- void updateFolder (in string path,
- in long unread_count);
-
- /* Shared folders. */
- void asyncDiscoverSharedFolder (in string user,
- in string folder_name,
- in Bonobo::Listener listener);
- void cancelDiscoverSharedFolder (in string user,
- in string folder_name);
- void asyncRemoveSharedFolder (in string path,
- in Bonobo::Listener listener);
-
- /* Listener handling. */
- void addListener (in StorageListener listener)
- raises (AlreadyListening);
- void removeListener (in StorageListener listener)
- raises (NotFound);
-
- /* (This should probably be in a separate interface, but
- creating a new interface in Bonobo is so painful that I'll
- just keep it here for now. */
- void showFolderProperties (in string path,
- in short itemNumber,
- in long parentWindowId);
- };
-
- interface StorageListener {
- exception Exists {};
- exception NotFound {};
-
- void notifyDestroyed ();
-
- /* FIXME exceptions don't make much sense here... */
-
- void notifyFolderCreated (in string path,
- in Folder folder)
- raises (Exists);
-
- void notifyFolderUpdated (in string path,
- in long unread_count)
- raises (NotFound);
-
- void notifyFolderRemoved (in string path)
- raises (NotFound);
-
- void notifyHasSubfolders (in string path,
- in string message)
- raises (NotFound);
- };
-
- interface StorageRegistry : Bonobo::Unknown {
- exception Exists {};
- exception NotFound {};
- exception AlreadyListening {};
-
- typedef sequence<Storage> StorageList;
-
- enum MessageType {
- STORAGE_CREATED,
- STORAGE_DESTROYED
- };
-
- struct NotifyResult {
- MessageType type;
- string name;
- };
-
- StorageListener addStorage (in Storage storage,
- in string name)
- raises (Exists);
-
- StorageList getStorageList ();
-
- Storage getStorageByName (in string name)
- raises (NotFound);
-
- void removeStorageByName (in string name)
- raises (NotFound);
-
- void addListener (in Bonobo::Listener listener)
- raises (AlreadyListening);
-
- void removeListener (in Bonobo::Listener listener)
- raises (NotFound);
-
- Folder getFolderByUri (in string uri)
- raises (NotFound);
- };
-};
-};
diff --git a/shell/Evolution-StorageSetView.idl b/shell/Evolution-StorageSetView.idl
deleted file mode 100644
index 9aca41f6ad..0000000000
--- a/shell/Evolution-StorageSetView.idl
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Interface for the Evolution's StorageSetView control.
- *
- * Authors:
- * Ettore Perazzoli <ettore@ximian.com>
- *
- * Copyright (C) 2000, 2001, 2002 Ximian, Inc.
- */
-
-#include <Bonobo.idl>
-
-module GNOME {
-module Evolution {
- interface StorageSetViewListener {
- void notifyFolderSelected (in string uri);
- void notifyFolderToggled ();
- };
-
- /* FIXME: Maybe we should have a generic Bonobo::Listener interface. */
- interface StorageSetView : Bonobo::Unknown {
- exception AlreadyListening {};
- exception NotFound {};
-
- attribute boolean showFolders;
- attribute boolean showCheckboxes;
-
- attribute FolderList checkedFolders;
-
- void addListener (in StorageSetViewListener listener)
- raises (AlreadyListening);
-
- void removeListener (in StorageSetViewListener listener)
- raises (NotFound);
- };
-};
-};
diff --git a/shell/Evolution.idl b/shell/Evolution.idl
index 01ce673724..f128d065bd 100644
--- a/shell/Evolution.idl
+++ b/shell/Evolution.idl
@@ -12,16 +12,8 @@
#include <Evolution-common.idl>
-#include <Evolution-Activity.idl>
#include <Evolution-Component.idl>
#include <Evolution-ConfigControl.idl>
-#include <Evolution-Session.idl>
-#include <Evolution-ShellComponent.idl>
-#include <Evolution-ShellComponentDnd.idl>
#include <Evolution-Offline.idl>
-#include <Evolution-ShellView.idl>
-#include <Evolution-Shortcuts.idl>
-#include <Evolution-Storage.idl>
-#include <Evolution-StorageSetView.idl>
#include <Evolution-Shell.idl>
#include <Evolution-Wizard.idl>
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 271e1ba829..37607a7a30 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -26,18 +26,10 @@ noinst_PROGRAMS = evolution
# Shell CORBA stuff
IDLS = \
- Evolution-Activity.idl \
Evolution-ConfigControl.idl \
Evolution-Component.idl \
Evolution-Offline.idl \
- Evolution-Session.idl \
Evolution-Shell.idl \
- Evolution-ShellComponent.idl \
- Evolution-ShellComponentDnd.idl \
- Evolution-ShellView.idl \
- Evolution-Shortcuts.idl \
- Evolution-Storage.idl \
- Evolution-StorageSetView.idl \
Evolution-Wizard.idl \
Evolution-common.idl \
Evolution.idl
@@ -114,9 +106,7 @@ eshellinclude_HEADERS = \
e-shell-corba-icon-utils.h \
e-shell-utils.h \
evolution-config-control.h \
- evolution-session.h \
evolution-shell-component-utils.h \
- evolution-shell-view.h \
evolution-wizard.h
libeshell_la_SOURCES = \
@@ -127,9 +117,7 @@ libeshell_la_SOURCES = \
e-shell-corba-icon-utils.c \
e-shell-utils.c \
evolution-config-control.c \
- evolution-session.c \
evolution-shell-component-utils.c \
- evolution-shell-view.c \
evolution-wizard.c \
$(eshellinclude_HEADERS)
diff --git a/shell/e-activity-handler.c b/shell/e-activity-handler.c
index aec5560b5b..a6900edd93 100644
--- a/shell/e-activity-handler.c
+++ b/shell/e-activity-handler.c
@@ -26,8 +26,6 @@
#include "e-activity-handler.h"
-#include "e-shell-corba-icon-utils.h"
-
#include <gtk/gtksignal.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
diff --git a/shell/evolution-session.c b/shell/evolution-session.c
deleted file mode 100644
index c447dec36c..0000000000
--- a/shell/evolution-session.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-session.c
- *
- * Copyright (C) 2000, 2001, 2002 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtksignal.h>
-#include <gal/util/e-util.h>
-
-#include "Evolution.h"
-
-#include "evolution-session.h"
-
-#include "e-shell-marshal.h"
-
-
-#define PARENT_TYPE bonobo_object_get_type ()
-static BonoboObjectClass *parent_class = NULL;
-
-struct _EvolutionSessionPrivate {
- int dummy;
-};
-
-enum {
- LOAD_CONFIGURATION,
- SAVE_CONFIGURATION,
- LAST_SIGNAL
-};
-
-static int signals[LAST_SIGNAL];
-
-
-/* GObject methods. */
-
-static void
-impl_dispose (GObject *object)
-{
- /* Nothing to do here. */
-
- (* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-static void
-impl_finalize (GObject *object)
-{
- EvolutionSession *session;
- EvolutionSessionPrivate *priv;
-
- session = EVOLUTION_SESSION (object);
- priv = session->priv;
-
- g_free (priv);
-
- (* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-
-/* CORBA interface implementation. */
-
-static void
-impl_GNOME_Evolution_Session_saveConfiguration (PortableServer_Servant servant,
- const CORBA_char *prefix,
- CORBA_Environment *ev)
-{
- BonoboObject *self;
-
- self = bonobo_object_from_servant (servant);
- g_signal_emit (self, signals[SAVE_CONFIGURATION], 0, prefix);
-}
-
-static void
-impl_GNOME_Evolution_Session_loadConfiguration (PortableServer_Servant servant,
- const CORBA_char *prefix,
- CORBA_Environment *ev)
-{
- BonoboObject *self;
-
- self = bonobo_object_from_servant (servant);
- g_signal_emit (self, signals[LOAD_CONFIGURATION], 0, prefix);
-}
-
-
-/* Initialization. */
-
-static void
-corba_class_init (EvolutionSessionClass *klass)
-{
- POA_GNOME_Evolution_Session__epv *epv = & (EVOLUTION_SESSION_CLASS (klass)->epv);
-
- epv = g_new0 (POA_GNOME_Evolution_Session__epv, 1);
- epv->saveConfiguration = impl_GNOME_Evolution_Session_saveConfiguration;
- epv->loadConfiguration = impl_GNOME_Evolution_Session_loadConfiguration;
-}
-
-static void
-evolution_session_class_init (EvolutionSessionClass *klass)
-{
- GObjectClass *object_class;
-
- object_class = G_OBJECT_CLASS (klass);
- parent_class = g_type_class_ref(PARENT_TYPE);
-
- object_class->dispose = impl_dispose;
- object_class->finalize = impl_finalize;
-
- signals[LOAD_CONFIGURATION]
- = g_signal_new ("load_configuration",
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (EvolutionSessionClass, load_configuration),
- NULL, NULL,
- e_shell_marshal_NONE__STRING,
- G_TYPE_NONE, 1,
- G_TYPE_STRING);
- signals[SAVE_CONFIGURATION]
- = g_signal_new ("save_configuration",
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (EvolutionSessionClass, save_configuration),
- NULL, NULL,
- e_shell_marshal_NONE__STRING,
- G_TYPE_NONE, 1,
- G_TYPE_STRING);
-
- corba_class_init (klass);
-}
-
-static void
-evolution_session_init (EvolutionSession *session)
-{
- EvolutionSessionPrivate *priv;
-
- priv = g_new (EvolutionSessionPrivate, 1);
-
- session->priv = priv;
-}
-
-
-EvolutionSession *
-evolution_session_new (void)
-{
- return g_object_new (evolution_session_get_type (), NULL);
-}
-
-
-BONOBO_TYPE_FUNC_FULL (EvolutionSession,
- GNOME_Evolution_Session,
- PARENT_TYPE,
- evolution_session)
diff --git a/shell/evolution-session.h b/shell/evolution-session.h
deleted file mode 100644
index 48d4f18d4d..0000000000
--- a/shell/evolution-session.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-session.h
- *
- * Copyright (C) 2000, 2001, 2002 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef __EVOLUTION_SESSION_H__
-#define __EVOLUTION_SESSION_H__
-
-#include <bonobo/bonobo-object.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define EVOLUTION_TYPE_SESSION (evolution_session_get_type ())
-#define EVOLUTION_SESSION(obj) (GTK_CHECK_CAST ((obj), EVOLUTION_TYPE_SESSION, EvolutionSession))
-#define EVOLUTION_SESSION_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_SESSION, EvolutionSessionClass))
-#define EVOLUTION_IS_SESSION(obj) (GTK_CHECK_TYPE ((obj), EVOLUTION_TYPE_SESSION))
-#define EVOLUTION_IS_SESSION_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_SESSION))
-
-
-typedef struct _EvolutionSession EvolutionSession;
-typedef struct _EvolutionSessionPrivate EvolutionSessionPrivate;
-typedef struct _EvolutionSessionClass EvolutionSessionClass;
-
-struct _EvolutionSession {
- BonoboObject parent;
-
- EvolutionSessionPrivate *priv;
-};
-
-struct _EvolutionSessionClass {
- BonoboObjectClass parent_class;
-
- POA_GNOME_Evolution_Session__epv epv;
-
- void (* save_configuration) (EvolutionSession *session, const char *prefix);
- void (* load_configuration) (EvolutionSession *session, const char *prefix);
-};
-
-
-GtkType evolution_session_get_type (void);
-EvolutionSession *evolution_session_new (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EVOLUTION_SESSION_H__ */
diff --git a/shell/evolution-shell-view.c b/shell/evolution-shell-view.c
deleted file mode 100644
index 4858d18e24..0000000000
--- a/shell/evolution-shell-view.c
+++ /dev/null
@@ -1,258 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-shell-view.c
- *
- * Copyright (C) 2000, 2001, 2002 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtksignal.h>
-
-#include <gal/util/e-util.h>
-
-#include "evolution-shell-view.h"
-
-#include "e-shell-marshal.h"
-
-
-#define PARENT_TYPE bonobo_object_get_type ()
-static BonoboObjectClass *parent_class = NULL;
-
-struct _EvolutionShellViewPrivate {
- int dummy;
-};
-
-enum {
- SET_MESSAGE,
- UNSET_MESSAGE,
- CHANGE_VIEW,
- SET_TITLE,
- SET_FOLDER_BAR_LABEL,
- SHOW_SETTINGS,
- LAST_SIGNAL
-};
-static int signals[LAST_SIGNAL] = { 0 };
-
-
-/* CORBA interface implementation. */
-
-static void
-impl_ShellView_set_message (PortableServer_Servant servant,
- const CORBA_char *message,
- const CORBA_boolean busy,
- CORBA_Environment *ev)
-{
- BonoboObject *bonobo_object;
-
- bonobo_object = bonobo_object_from_servant (servant);
- g_signal_emit (bonobo_object, signals[SET_MESSAGE], 0, message, busy);
-}
-
-static void
-impl_ShellView_unset_message (PortableServer_Servant servant,
- CORBA_Environment *ev)
-{
- BonoboObject *bonobo_object;
-
- bonobo_object = bonobo_object_from_servant (servant);
- g_signal_emit (bonobo_object, signals[UNSET_MESSAGE], 0);
-}
-
-static void
-impl_ShellView_change_current_view (PortableServer_Servant servant,
- const CORBA_char *uri,
- CORBA_Environment *ev)
-{
- BonoboObject *bonobo_object;
-
- bonobo_object = bonobo_object_from_servant (servant);
- g_signal_emit (bonobo_object, signals[CHANGE_VIEW], 0, uri);
-}
-
-static void
-impl_ShellView_set_title (PortableServer_Servant servant,
- const CORBA_char *title,
- CORBA_Environment *ev)
-{
- BonoboObject *bonobo_object;
-
- bonobo_object = bonobo_object_from_servant (servant);
- g_signal_emit (bonobo_object, signals[SET_TITLE], 0, title);
-}
-
-static void
-impl_ShellView_set_folder_bar_label (PortableServer_Servant servant,
- const CORBA_char *text,
- CORBA_Environment *ev)
-{
- BonoboObject *bonobo_object;
-
- bonobo_object = bonobo_object_from_servant (servant);
- g_signal_emit (bonobo_object, signals[SET_FOLDER_BAR_LABEL], 0, text);
-}
-
-static void
-impl_ShellView_show_settings (PortableServer_Servant servant,
- CORBA_Environment *ev)
-{
- BonoboObject *bonobo_object;
-
- bonobo_object = bonobo_object_from_servant (servant);
- g_signal_emit (bonobo_object, signals[SHOW_SETTINGS], 0);
-}
-
-
-/* GObject methods. */
-
-static void
-impl_dispose (GObject *object)
-{
- /* Nothing to do here. */
-
- (* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-static void
-impl_finalize (GObject *object)
-{
- EvolutionShellView *shell_view;
- EvolutionShellViewPrivate *priv;
-
- shell_view = EVOLUTION_SHELL_VIEW (object);
- priv = shell_view->priv;
-
- g_free (priv);
-
- (* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-
-static void
-evolution_shell_view_class_init (EvolutionShellViewClass *klass)
-{
- POA_GNOME_Evolution_ShellView__epv *epv;
- GObjectClass *object_class;
-
- object_class = G_OBJECT_CLASS (klass);
- object_class->dispose = impl_dispose;
- object_class->finalize = impl_finalize;
-
- epv = &klass->epv;
- epv->setMessage = impl_ShellView_set_message;
- epv->unsetMessage = impl_ShellView_unset_message;
- epv->changeCurrentView = impl_ShellView_change_current_view;
- epv->setTitle = impl_ShellView_set_title;
- epv->setFolderBarLabel = impl_ShellView_set_folder_bar_label;
- epv->showSettings = impl_ShellView_show_settings;
-
- signals[SET_MESSAGE]
- = g_signal_new ("set_message",
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (EvolutionShellViewClass, set_message),
- NULL, NULL,
- e_shell_marshal_NONE__STRING_BOOL,
- G_TYPE_NONE, 2,
- G_TYPE_STRING,
- G_TYPE_BOOLEAN);
-
- signals[UNSET_MESSAGE]
- = g_signal_new ("unset_message",
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (EvolutionShellViewClass, unset_message),
- NULL, NULL,
- e_shell_marshal_NONE__NONE,
- G_TYPE_NONE, 0);
-
- signals[CHANGE_VIEW]
- = g_signal_new ("change_current_view",
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (EvolutionShellViewClass, change_current_view),
- NULL, NULL,
- e_shell_marshal_NONE__STRING,
- G_TYPE_NONE, 1,
- G_TYPE_STRING);
-
- signals[SET_TITLE]
- = g_signal_new ("set_title",
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (EvolutionShellViewClass, set_title),
- NULL, NULL,
- e_shell_marshal_NONE__STRING,
- G_TYPE_NONE, 1,
- G_TYPE_STRING);
-
- signals[SET_FOLDER_BAR_LABEL]
- = g_signal_new ("set_folder_bar_label",
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (EvolutionShellViewClass, set_folder_bar_label),
- NULL, NULL,
- e_shell_marshal_NONE__STRING,
- G_TYPE_NONE, 1,
- G_TYPE_STRING);
-
- signals[SHOW_SETTINGS]
- = g_signal_new ("show_settings",
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (EvolutionShellViewClass, show_settings),
- NULL, NULL,
- e_shell_marshal_NONE__NONE,
- G_TYPE_NONE, 0);
-
- parent_class = g_type_class_ref(bonobo_object_get_type ());
-}
-
-static void
-evolution_shell_view_init (EvolutionShellView *shell_view)
-{
- EvolutionShellViewPrivate *priv;
-
- priv = g_new (EvolutionShellViewPrivate, 1);
- priv->dummy = 0;
-
- shell_view->priv = priv;
-}
-
-
-
-/**
- * evolution_shell_view_new:
- *
- * Create a new EvolutionShellView object.
- *
- * Return value: The new EvolutionShellView object.
- **/
-EvolutionShellView *
-evolution_shell_view_new (void)
-{
- return g_object_new (evolution_shell_view_get_type (), NULL);
-}
-
-
-BONOBO_TYPE_FUNC_FULL (EvolutionShellView,
- GNOME_Evolution_ShellView,
- PARENT_TYPE,
- evolution_shell_view)
diff --git a/shell/evolution-shell-view.h b/shell/evolution-shell-view.h
deleted file mode 100644
index 0646b42162..0000000000
--- a/shell/evolution-shell-view.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-shell-view.h
- *
- * Copyright (C) 2000 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef __EVOLUTION_SHELL_VIEW_H__
-#define __EVOLUTION_SHELL_VIEW_H__
-
-#include <glib.h>
-#include <bonobo/bonobo-object.h>
-
-#include "Evolution.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define EVOLUTION_TYPE_SHELL_VIEW (evolution_shell_view_get_type ())
-#define EVOLUTION_SHELL_VIEW(obj) (GTK_CHECK_CAST ((obj), EVOLUTION_TYPE_SHELL_VIEW, EvolutionShellView))
-#define EVOLUTION_SHELL_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_SHELL_VIEW, EvolutionShellViewClass))
-#define EVOLUTION_IS_SHELL_VIEW(obj) (GTK_CHECK_TYPE ((obj), EVOLUTION_TYPE_SHELL_VIEW))
-#define EVOLUTION_IS_SHELL_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_SHELL_VIEW))
-
-
-typedef struct _EvolutionShellView EvolutionShellView;
-typedef struct _EvolutionShellViewPrivate EvolutionShellViewPrivate;
-typedef struct _EvolutionShellViewClass EvolutionShellViewClass;
-
-struct _EvolutionShellView {
- BonoboObject parent;
-
- EvolutionShellViewPrivate *priv;
-};
-
-struct _EvolutionShellViewClass {
- BonoboObjectClass parent_class;
-
- /* Signals. */
-
- void (* set_message) (EvolutionShellView *shell_view, const char *message, gboolean busy);
- void (* unset_message) (EvolutionShellView *shell_view);
- void (* change_current_view) (EvolutionShellView *shell_view, const char *uri);
- void (* set_title) (EvolutionShellView *shell_view, const char *message);
- void (* set_folder_bar_label) (EvolutionShellView *shell_view, const char *text);
- void (* show_settings) (EvolutionShellView *shell_view);
-
- POA_GNOME_Evolution_ShellView__epv epv;
-};
-
-
-GtkType evolution_shell_view_get_type (void);
-EvolutionShellView *evolution_shell_view_new (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __EVOLUTION_SHELL_VIEW_H__ */