aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/gui/dialogs/comp-editor.c2
-rw-r--r--composer/ChangeLog6
-rw-r--r--composer/e-msg-composer.c8
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-account-gui.c2
-rw-r--r--shell/ChangeLog6
-rw-r--r--shell/Evolution-Shortcuts.idl7
-rw-r--r--shell/e-corba-shortcuts.c12
9 files changed, 46 insertions, 9 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 7f195ac2fd..76ca1ddc75 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-02 Ettore Perazzoli <ettore@ximian.com>
+
+ * gui/dialogs/comp-editor.c (setup_widgets): Use
+ `bonobo_ui_component_new_default()', not
+ `bonobo_ui_component_new()'.
+
2001-10-02 JP Rosevear <jpr@ximian.com>
* cal-client/cal-query.c: use bonobo-exception to tidy
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 79f692223d..f039c51745 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -196,7 +196,7 @@ setup_widgets (CompEditor *editor)
gtk_signal_connect (GTK_OBJECT (priv->window), "delete_event",
GTK_SIGNAL_FUNC (delete_event_cb), editor);
- priv->uic = bonobo_ui_component_new ("comp-editor");
+ priv->uic = bonobo_ui_component_new_default ();
container = bonobo_ui_container_new ();
bonobo_ui_container_set_win (container, BONOBO_WINDOW (priv->window));
bonobo_ui_component_set_container (priv->uic, BONOBO_OBJREF (container));
diff --git a/composer/ChangeLog b/composer/ChangeLog
index dc4d727a8c..925b4b6898 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-02 Ettore Perazzoli <ettore@ximian.com>
+
+ * e-msg-composer.c (setup_ui): Use
+ `bonobo_ui_component_new_default()', not
+ `bonobo_ui_component_new()'.
+
2001-09-27 Jeffrey Stedfast <fejj@ximian.com>
* e-msg-composer-attachment.c (e_msg_composer_attachment_new):
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 61ba59b32b..030a7339ff 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -1695,12 +1695,10 @@ setup_ui (EMsgComposer *composer)
container = bonobo_ui_container_new ();
bonobo_ui_container_set_win (container, BONOBO_WINDOW (composer));
- composer->uic = bonobo_ui_component_new ("evolution-message-composer");
- bonobo_ui_component_set_container (
- composer->uic, bonobo_object_corba_objref (BONOBO_OBJECT (container)));
+ composer->uic = bonobo_ui_component_new_default ();
+ bonobo_ui_component_set_container (composer->uic, bonobo_object_corba_objref (BONOBO_OBJECT (container)));
- bonobo_ui_component_add_verb_list_with_data (
- composer->uic, verbs, composer);
+ bonobo_ui_component_add_verb_list_with_data (composer->uic, verbs, composer);
/* Customize Toolbar thingie */
bonobo_ui_engine_config_set_path (bonobo_window_get_ui_engine (BONOBO_WINDOW (composer)),
diff --git a/mail/ChangeLog b/mail/ChangeLog
index d2819f162a..7156e72bc1 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-02 Ettore Perazzoli <ettore@ximian.com>
+
+ * mail-account-gui.c (launch_signature_editor): Use
+ `bonobo_ui_component_new_default()', not
+ `bonobo_ui_component_new()'.
+
2001-10-01 Jon Trowbridge <trow@ximian.com>
* mail-display.c (on_url_requested): Make sure we aren't dealing
diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c
index 3b048bb86c..d9a0da12c5 100644
--- a/mail/mail-account-gui.c
+++ b/mail/mail-account-gui.c
@@ -1133,7 +1133,7 @@ launch_signature_editor (MailAccountGui *gui, const gchar *filename, gboolean ht
container = bonobo_ui_container_new ();
bonobo_ui_container_set_win (container, BONOBO_WINDOW (editor->win));
- component = bonobo_ui_component_new ("evolution-signature-editor");
+ component = bonobo_ui_component_new_default ();
bonobo_ui_component_set_container (component, bonobo_object_corba_objref (BONOBO_OBJECT (container)));
bonobo_ui_component_add_verb_list_with_data (component, verbs, editor);
bonobo_ui_util_set_ui (component, EVOLUTION_DATADIR, "evolution-signature-editor.xml", "evolution-signature-editor");
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 2a09776847..79b0d524ef 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,11 @@
2001-10-02 Ettore Perazzoli <ettore@ximian.com>
+ * e-shell-view.c (e_shell_view_construct): Use
+ `bonobo_ui_component_new_default()', not
+ `bonobo_ui_component_new()'.
+
+2001-10-02 Ettore Perazzoli <ettore@ximian.com>
+
* e-shell-view.c (storage_set_removed_folder_callback): New,
callback for the ::removed_folder signal on the shell's
EStorageSet.
diff --git a/shell/Evolution-Shortcuts.idl b/shell/Evolution-Shortcuts.idl
index 7ffb55a164..ffd3a9cf21 100644
--- a/shell/Evolution-Shortcuts.idl
+++ b/shell/Evolution-Shortcuts.idl
@@ -29,6 +29,8 @@ module Evolution {
typedef sequence<Group> GroupList;
exception NotFound {};
+ exception InvalidPosition {};
+ exception CannotRemove {};
readonly attribute GroupList groups; // FIXME: Could be non-readonly
@@ -39,9 +41,10 @@ module Evolution {
Shortcut get (in short group_num, in short item_num)
raises (NotFound);
- void addGroup (in short position, in string name);
+ void addGroup (in short position, in string name)
+ raises (InvalidPosition);
void removeGroup (in short group_num)
- raises (NotFound);
+ raises (NotFound, CannotRemove);
Group getGroup (in short group_num)
raises (NotFound);
diff --git a/shell/e-corba-shortcuts.c b/shell/e-corba-shortcuts.c
index 076b49d796..6a583d3b00 100644
--- a/shell/e-corba-shortcuts.c
+++ b/shell/e-corba-shortcuts.c
@@ -179,6 +179,12 @@ impl_addGroup (PortableServer_Servant servant,
corba_shortcuts = E_CORBA_SHORTCUTS (bonobo_object_from_servant (servant));
priv = corba_shortcuts->priv;
+ if (position == 0) {
+ CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
+ ex_GNOME_Evolution_Shortcuts_InvalidPosition, NULL);
+ return;
+ }
+
e_shortcuts_add_group (priv->shortcuts, position, name);
}
@@ -193,6 +199,12 @@ impl_removeGroup (PortableServer_Servant servant,
corba_shortcuts = E_CORBA_SHORTCUTS (bonobo_object_from_servant (servant));
priv = corba_shortcuts->priv;
+ if (group_num == 0) {
+ CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
+ ex_GNOME_Evolution_Shortcuts_CannotRemove, NULL);
+ return;
+ }
+
e_shortcuts_remove_group (priv->shortcuts, group_num);
}