aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--addressbook/ChangeLog5
-rw-r--r--addressbook/gui/component/addressbook-component.c2
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/gui/calendar-component.c7
-rw-r--r--calendar/gui/component-factory.c7
-rw-r--r--executive-summary/ChangeLog8
-rw-r--r--executive-summary/component/component-factory.c4
-rw-r--r--executive-summary/evolution-services/executive-summary-component.c1
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/component-factory.c10
-rw-r--r--mail/folder-browser.c33
-rw-r--r--shell/ChangeLog19
-rw-r--r--shell/Evolution-ShellComponent.idl6
-rw-r--r--shell/evolution-shell-component.c53
-rw-r--r--shell/evolution-shell-component.h8
-rw-r--r--ui/evolution-mail.xml25
16 files changed, 139 insertions, 62 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 2f7e1add7a..bd05322b45 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-12 Ettore Perazzoli <ettore@helixcode.com>
+
+ * gui/component/addressbook-component.c (factory_fn): Pass NULL as
+ the @copy_folder_fn arg to `evolution_shell_component_new'.
+
2001-01-12 Miguel de Icaza <miguel@ximian.com>
* gui/widgets/e-addressbook-view.c: added i18n for etable.
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index 934496418c..fbd7424e96 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -111,7 +111,7 @@ factory_fn (BonoboGenericFactory *factory,
{
EvolutionShellComponent *shell_component;
- shell_component = evolution_shell_component_new (folder_types, create_view, NULL, NULL, NULL, NULL);
+ shell_component = evolution_shell_component_new (folder_types, create_view, NULL, NULL, NULL, NULL, NULL);
gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",
GTK_SIGNAL_FUNC (owner_set_cb), NULL);
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 832ccadd09..779e6aa30b 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-12 Ettore Perazzoli <ettore@helixcode.com>
+
+ * gui/component-factory.c (factory_fn): Pass NULL as the
+ @copy_folder_fn arg to `evolution_shell_component_new()'.
+
2001-01-12 Miguel de Icaza <miguel@ximian.com>
* gui/e-calendar-table.c: Add translation strings.
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index f0fc7fffcf..de1b2d5839 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -128,7 +128,12 @@ factory_fn (BonoboGenericFactory *factory,
EvolutionShellComponent *shell_component;
shell_component = evolution_shell_component_new (folder_types,
- create_view, create_folder, NULL, NULL, NULL);
+ create_view,
+ create_folder,
+ NULL, /* remove_folder_fn */
+ NULL, /* copy_folder_fn */
+ NULL, /* populate_folder_context_menu_fn */
+ NULL /* closure */);
gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",
GTK_SIGNAL_FUNC (owner_set_cb), NULL);
diff --git a/calendar/gui/component-factory.c b/calendar/gui/component-factory.c
index f0fc7fffcf..de1b2d5839 100644
--- a/calendar/gui/component-factory.c
+++ b/calendar/gui/component-factory.c
@@ -128,7 +128,12 @@ factory_fn (BonoboGenericFactory *factory,
EvolutionShellComponent *shell_component;
shell_component = evolution_shell_component_new (folder_types,
- create_view, create_folder, NULL, NULL, NULL);
+ create_view,
+ create_folder,
+ NULL, /* remove_folder_fn */
+ NULL, /* copy_folder_fn */
+ NULL, /* populate_folder_context_menu_fn */
+ NULL /* closure */);
gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",
GTK_SIGNAL_FUNC (owner_set_cb), NULL);
diff --git a/executive-summary/ChangeLog b/executive-summary/ChangeLog
index 26b113f03a..82341fb131 100644
--- a/executive-summary/ChangeLog
+++ b/executive-summary/ChangeLog
@@ -1,3 +1,11 @@
+2001-01-12 Ettore Perazzoli <ettore@helixcode.com>
+
+ * component/component-factory.c (factory_fn): Pass NULL as the
+ @copy_folder_fn arg to `evolution_shell_component_new()'.
+
+ * evolution-services/executive-summary-component.c
+ (executive_summary_component_destroy): Remove unused variable.
+
2001-01-12 Iain Holmes <iain@ximian.com>
* component/e-summary-util.c (e_summary_rm_dir): If base == NULL return;
diff --git a/executive-summary/component/component-factory.c b/executive-summary/component/component-factory.c
index 2597ff2ae6..56a516a5eb 100644
--- a/executive-summary/component/component-factory.c
+++ b/executive-summary/component/component-factory.c
@@ -126,9 +126,7 @@ factory_fn (BonoboGenericFactory *factory,
shell_component = evolution_shell_component_new (folder_types,
create_view,
- NULL,
- NULL,
- NULL,
+ NULL, NULL, NULL, NULL,
NULL);
gtk_signal_connect (GTK_OBJECT (shell_component), "destroy",
GTK_SIGNAL_FUNC (factory_destroy), NULL);
diff --git a/executive-summary/evolution-services/executive-summary-component.c b/executive-summary/evolution-services/executive-summary-component.c
index d2dab70947..b3b1e63215 100644
--- a/executive-summary/evolution-services/executive-summary-component.c
+++ b/executive-summary/evolution-services/executive-summary-component.c
@@ -83,7 +83,6 @@ executive_summary_component_destroy (GtkObject *object)
{
ExecutiveSummaryComponent *component;
ExecutiveSummaryComponentPrivate *priv;
- CORBA_Environment ev;
component = EXECUTIVE_SUMMARY_COMPONENT (object);
priv = component->private;
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 7e0ba16e88..71671d19d5 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,11 @@
+2001-01-12 Ettore Perazzoli <ettore@helixcode.com>
+
+ * component-factory.c (component_fn): Pass NULL as the
+ @copy_folder_fn arg to `evolution_shell_component_new()'.
+
+ * folder-browser.c (on_right_click): Removed hide menu. It
+ belongs to the view menu now.
+
2001-01-12 Miguel de Icaza <miguel@ximian.com>
* message-list.c: Add strings for localization
diff --git a/mail/component-factory.c b/mail/component-factory.c
index d280388e58..25914359ea 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -248,9 +248,13 @@ component_fn (BonoboGenericFactory *factory, void *closure)
{
EvolutionShellComponent *shell_component;
- shell_component = evolution_shell_component_new (
- folder_types, create_view, create_folder,
- NULL, NULL, NULL);
+ shell_component = evolution_shell_component_new (folder_types,
+ create_view,
+ create_folder,
+ NULL, /* remove_folder_fn */
+ NULL, /* copy_folder_fn */
+ NULL, /* populate_folder_context_menu */
+ NULL);
gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",
GTK_SIGNAL_FUNC (owner_set_cb), NULL);
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index 3b99d729d6..7b1168c7e0 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -653,20 +653,6 @@ on_right_click (ETable *table, gint row, gint col, GdkEvent *event, FolderBrowse
{ NULL, NULL, NULL, NULL, 0 }
};
- EPopupMenu hide_menu[] = {
- { _("Show all hidden"), NULL, GTK_SIGNAL_FUNC (hide_none), NULL, 128 },
- { "", NULL, GTK_SIGNAL_FUNC (NULL), NULL, 0 },
- { _("Hide selected"), NULL, GTK_SIGNAL_FUNC (hide_selected), NULL, 2 },
- { "", NULL, GTK_SIGNAL_FUNC (NULL), NULL, 0 },
- /* could use another mask, but not enough api do to it */
- { _("Hide read"), NULL, GTK_SIGNAL_FUNC (hide_read), NULL, 0 },
- { _("Hide deleted"), NULL, GTK_SIGNAL_FUNC (hide_deleted), NULL, 0 },
-#define HIDE_SUBJECT (6)
- { _("Hide Subject"), NULL, GTK_SIGNAL_FUNC (hide_subject), NULL, 2 },
-#define HIDE_SENDER (7)
- { _("Hide from Sender"), NULL, GTK_SIGNAL_FUNC (hide_sender), NULL, 2 },
- { NULL, NULL, NULL, NULL, 0 }
- };
EPopupMenu menu[] = {
{ _("Open"), NULL, GTK_SIGNAL_FUNC (view_msg), NULL, 0 },
@@ -692,7 +678,6 @@ on_right_click (ETable *table, gint row, gint col, GdkEvent *event, FolderBrowse
{ _("Apply Filters"), NULL, GTK_SIGNAL_FUNC (apply_filters), NULL, 0 },
{ "", NULL, GTK_SIGNAL_FUNC (NULL), NULL, 0 },
{ _("Create Rule From Message"), NULL, GTK_SIGNAL_FUNC (NULL), filter_menu, 2 },
- { _("Hide Messages"), NULL, GTK_SIGNAL_FUNC (NULL), hide_menu, 0 },
{ NULL, NULL, NULL, NULL, 0 }
};
@@ -785,27 +770,9 @@ display_menu:
g_free(mailing_list_name);
}
- if (subject_match != NULL) {
- hide_menu[HIDE_SUBJECT].name = g_strdup_printf(_("Hide Subject \"%s\""), subject_match);
- g_free(subject_match);
- } else
- hide_menu[HIDE_SUBJECT].name = g_strdup(_("Hide Subject"));
-
- if (from_match != NULL) {
- hide_menu[HIDE_SENDER].name = g_strdup_printf(_("Hide from Sender <%s>"), from_match);
- g_free(from_match);
- } else
- hide_menu[HIDE_SENDER].name = g_strdup(_("Hide from Sender"));
-
- /* TODO: should probably be a function to say if anything is hidden ... but this is accurate */
- if (fb->message_list->hidden == NULL)
- enable_mask |= 128;
-
e_popup_menu_run (menu, (GdkEventButton *)event, enable_mask, 0, fb);
g_free(filter_menu[last_item].name);
- g_free(hide_menu[HIDE_SUBJECT].name);
- g_free(hide_menu[HIDE_SENDER].name);
return TRUE;
}
diff --git a/shell/ChangeLog b/shell/ChangeLog
index b7a34a5964..42bae1096b 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,9 +1,28 @@
+2001-01-12 Ettore Perazzoli <ettore@ximian.com>
+
+ * evolution-shell-component.c: Add member `copy_folder_fn' to
+ `EvolutionShellComponentPrivate'.
+ (init): Init to NULL.
+ (impl_ShellComponent_async_copy_folder): New function,
+ implementation for `::asyncCopyFolder'.
+ (evolution_shell_component_construct): New arg @copy_folder_fn.
+ Set the corresponding member in `EvolutionShellComponentPrivate'.
+ (evolution_shell_component_new): New arg @copy_folder_fn. Pass it
+ to `evolution_shell_component_construct'.
+
+ * evolution-shell-component.h: New type
+ `EvolutionShellComponentCopyFolderFn'.
+
2001-01-12 Miguel de Icaza <miguel@gnu.org>
* e-splash.c (e_splash_construct): Remove nice toplevel window.
2001-01-12 Ettore Perazzoli <ettore@helixcode.com>
+ * Evolution-ShellComponent.idl: Add method `::removeFolderAsync'.
+
+2001-01-12 Ettore Perazzoli <ettore@ximian.com>
+
* evolution-shell-component.c (corba_class_init):
s/addFolderAsync/createFolderAsync/.
diff --git a/shell/Evolution-ShellComponent.idl b/shell/Evolution-ShellComponent.idl
index bd98e5ed46..4c9624e815 100644
--- a/shell/Evolution-ShellComponent.idl
+++ b/shell/Evolution-ShellComponent.idl
@@ -57,6 +57,12 @@ module Evolution {
in string physical_uri)
raises (Busy);
+ void copyFolderAsync (in ShellComponentListener listener,
+ in string source_physical_uri,
+ in string destination_physical_uri,
+ in boolean remove_source)
+ raises (Busy);
+
void populateFolderContextMenu (in Bonobo::UIContainer uih,
in string physical_uri,
in string type);
diff --git a/shell/evolution-shell-component.c b/shell/evolution-shell-component.c
index 89b4eb0b0f..a426c60375 100644
--- a/shell/evolution-shell-component.c
+++ b/shell/evolution-shell-component.c
@@ -43,6 +43,7 @@ struct _EvolutionShellComponentPrivate {
EvolutionShellComponentCreateViewFn create_view_fn;
EvolutionShellComponentCreateFolderFn create_folder_fn;
EvolutionShellComponentRemoveFolderFn remove_folder_fn;
+ EvolutionShellComponentCopyFolderFn copy_folder_fn;
EvolutionShellComponentPopulateFolderContextMenu populate_folder_context_menu_fn;
EvolutionShellClient *owner_client;
@@ -234,8 +235,8 @@ impl_ShellComponent_async_create_folder (PortableServer_Servant servant,
if (priv->create_folder_fn == NULL) {
GNOME_Evolution_ShellComponentListener_notifyResult (listener,
- GNOME_Evolution_ShellComponentListener_UNSUPPORTED_OPERATION,
- ev);
+ GNOME_Evolution_ShellComponentListener_UNSUPPORTED_OPERATION,
+ ev);
return;
}
@@ -258,8 +259,8 @@ impl_ShellComponent_async_remove_folder (PortableServer_Servant servant,
if (priv->remove_folder_fn == NULL) {
GNOME_Evolution_ShellComponentListener_notifyResult (listener,
- GNOME_Evolution_ShellComponentListener_UNSUPPORTED_OPERATION,
- ev);
+ GNOME_Evolution_ShellComponentListener_UNSUPPORTED_OPERATION,
+ ev);
return;
}
@@ -267,6 +268,37 @@ impl_ShellComponent_async_remove_folder (PortableServer_Servant servant,
}
static void
+impl_ShellComponent_async_copy_folder (PortableServer_Servant servant,
+ const GNOME_Evolution_ShellComponentListener listener,
+ const CORBA_char *source_physical_uri,
+ const CORBA_char *destination_physical_uri,
+ const CORBA_boolean remove_source,
+ CORBA_Environment *ev)
+{
+ BonoboObject *bonobo_object;
+ EvolutionShellComponent *shell_component;
+ EvolutionShellComponentPrivate *priv;
+
+ bonobo_object = bonobo_object_from_servant (servant);
+ shell_component = EVOLUTION_SHELL_COMPONENT (bonobo_object);
+ priv = shell_component->priv;
+
+ if (priv->copy_folder_fn == NULL) {
+ GNOME_Evolution_ShellComponentListener_notifyResult (listener,
+ GNOME_Evolution_ShellComponentListener_UNSUPPORTED_OPERATION,
+ ev);
+ return;
+ }
+
+ (* priv->copy_folder_fn) (shell_component,
+ source_physical_uri,
+ destination_physical_uri,
+ remove_source,
+ listener,
+ priv->closure);
+}
+
+static void
impl_ShellComponent_populate_folder_context_menu (PortableServer_Servant servant,
const Bonobo_UIContainer corba_uih,
const CORBA_char *physical_uri,
@@ -405,6 +437,7 @@ init (EvolutionShellComponent *shell_component)
priv->create_view_fn = NULL;
priv->create_folder_fn = NULL;
priv->remove_folder_fn = NULL;
+ priv->copy_folder_fn = NULL;
priv->populate_folder_context_menu_fn = NULL;
priv->owner_client = NULL;
@@ -421,6 +454,7 @@ evolution_shell_component_construct (EvolutionShellComponent *shell_component,
EvolutionShellComponentCreateViewFn create_view_fn,
EvolutionShellComponentCreateFolderFn create_folder_fn,
EvolutionShellComponentRemoveFolderFn remove_folder_fn,
+ EvolutionShellComponentCopyFolderFn copy_folder_fn,
EvolutionShellComponentPopulateFolderContextMenu populate_folder_context_menu_fn,
void *closure)
{
@@ -437,6 +471,7 @@ evolution_shell_component_construct (EvolutionShellComponent *shell_component,
priv->create_view_fn = create_view_fn;
priv->create_folder_fn = create_folder_fn;
priv->remove_folder_fn = remove_folder_fn;
+ priv->copy_folder_fn = copy_folder_fn;
priv->populate_folder_context_menu_fn = populate_folder_context_menu_fn;
priv->closure = closure;
@@ -465,6 +500,7 @@ evolution_shell_component_new (const EvolutionShellComponentFolderType folder_ty
EvolutionShellComponentCreateViewFn create_view_fn,
EvolutionShellComponentCreateFolderFn create_folder_fn,
EvolutionShellComponentRemoveFolderFn remove_folder_fn,
+ EvolutionShellComponentCopyFolderFn copy_folder_fn,
EvolutionShellComponentPopulateFolderContextMenu populate_folder_context_menu_fn,
void *closure)
{
@@ -479,8 +515,13 @@ evolution_shell_component_new (const EvolutionShellComponentFolderType folder_ty
new = gtk_type_new (evolution_shell_component_get_type ());
corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (new), servant);
- evolution_shell_component_construct (new, folder_types, corba_object,
- create_view_fn, create_folder_fn, remove_folder_fn,
+ evolution_shell_component_construct (new,
+ folder_types,
+ corba_object,
+ create_view_fn,
+ create_folder_fn,
+ remove_folder_fn,
+ copy_folder_fn,
populate_folder_context_menu_fn,
closure);
diff --git a/shell/evolution-shell-component.h b/shell/evolution-shell-component.h
index 8b627deebe..ffa3b44ff1 100644
--- a/shell/evolution-shell-component.h
+++ b/shell/evolution-shell-component.h
@@ -87,6 +87,12 @@ typedef void (* EvolutionShellComponentRemoveFolderFn) (EvolutionShellComponent
const char *physical_uri,
const GNOME_Evolution_ShellComponentListener listener,
void *closure);
+typedef void (* EvolutionShellComponentCopyFolderFn) (EvolutionShellComponent *shell_component,
+ const char *source_physical_uri,
+ const char *destination_physical_uri,
+ gboolean remove_source,
+ const GNOME_Evolution_ShellComponentListener listener,
+ void *closure);
typedef void (* EvolutionShellComponentPopulateFolderContextMenu) (EvolutionShellComponent *shell_component,
BonoboUIComponent *uic,
const char *physical_uri,
@@ -124,12 +130,14 @@ void evolution_shell_component_construct (EvolutionShellCom
EvolutionShellComponentCreateViewFn create_view_fn,
EvolutionShellComponentCreateFolderFn create_folder_fn,
EvolutionShellComponentRemoveFolderFn remove_folder_fn,
+ EvolutionShellComponentCopyFolderFn copy_folder_fn,
EvolutionShellComponentPopulateFolderContextMenu populate_folder_context_menu_fn,
void *closure);
EvolutionShellComponent *evolution_shell_component_new (const EvolutionShellComponentFolderType folder_types[],
EvolutionShellComponentCreateViewFn create_view_fn,
EvolutionShellComponentCreateFolderFn create_folder_fn,
EvolutionShellComponentRemoveFolderFn remove_folder_fn,
+ EvolutionShellComponentCopyFolderFn copy_folder_fn,
EvolutionShellComponentPopulateFolderContextMenu populate_folder_context_menu_fn,
void *closure);
EvolutionShellClient *evolution_shell_component_get_owner (EvolutionShellComponent *shell_component);
diff --git a/ui/evolution-mail.xml b/ui/evolution-mail.xml
index 0f58a6b1d1..7f9eb91563 100644
--- a/ui/evolution-mail.xml
+++ b/ui/evolution-mail.xml
@@ -6,7 +6,7 @@
_label="_Threaded" _tip="Threaded Message list" type="toggle" />
<cmd name="ViewSource"
- _label="_Source" _tip="View Raw Message Source" type="toggle" />
+ _label="S_ource" _tip="View Raw Message Source" type="toggle" />
</commands>
@@ -52,6 +52,16 @@
<menuitem name="Source" verb="ViewSource" accel=""/>
+ <separator/>
+
+ <menuitem name="MessageHideClear" verb="" _label="Show _All Messages"/>
+
+ <separator/>
+
+ <menuitem name="MessageHideSelected" verb="" _label="Hide S_elected Messages"/>
+ <menuitem name="MessageHideRead" verb="" _label="Hide _Read messages"/>
+ <menuitem name="MessageHideDeleted" verb="" _label="Hide _Deleted Messages"/>
+
</submenu>
<submenu name="Settings">
@@ -141,7 +151,7 @@
<separator/>
- <submenu name="MessageCreateRuleFromMessage" _label="Create Rule From Message">
+ <submenu name="MessageCreateRuleFromMessage" _label="Create Rule">
<menuitem name="MessageVFolderSubj" verb=""
_label="_VFolder on Subject"
@@ -171,17 +181,6 @@
</submenu>
- <submenu name="MessageHide" _label="Hide Messages">
-
- <menuitem name="MessageHideClear" verb="" _label="Show _All messages"/>
- <separator/>
- <menuitem name="MessageHideSelected" verb="" _label="Hide _Selected messages"/>
- <separator/>
- <menuitem name="MessageHideRead" verb="" _label="Hide _Read messages"/>
- <menuitem name="MessageHideDeleted" verb="" _label="Hide _Deleted messages"/>
-
- </submenu>
-
</submenu>
<submenu name="Folder" _label="F_older">
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 15:09:33 +0800