diff options
-rw-r--r-- | shell/ChangeLog | 7 | ||||
-rw-r--r-- | shell/e-component-registry.c | 2 | ||||
-rw-r--r-- | shell/e-shell-window-commands.c | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index de5b9cb28e..7e95e97e51 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2005-08-23 Not Zed <NotZed@Ximian.com> + + * e-shell-window-commands.c: include missing e-error.h + + * e-component-registry.c (query_components): cast away a seemingly + spurious warning. + 2005-08-17 Not Zed <NotZed@Ximian.com> * e-shell.c (impl_Shell_handleURI): fix warning. diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c index 2545b21f22..fd820fdbcb 100644 --- a/shell/e-component-registry.c +++ b/shell/e-component-registry.c @@ -189,7 +189,7 @@ query_components (EComponentRegistry *registry) GNOME_Evolution_Component iface; id = info_list->_buffer[i].iid; - iface = bonobo_activation_activate_from_id (id, 0, NULL, &ev); + iface = bonobo_activation_activate_from_id ((char *)id, 0, NULL, &ev); if (BONOBO_EX (&ev) || iface == CORBA_OBJECT_NIL) { char *ex_text = bonobo_exception_get_text (&ev); diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c index fa91cb7031..2623e2b46a 100644 --- a/shell/e-shell-window-commands.c +++ b/shell/e-shell-window-commands.c @@ -33,6 +33,7 @@ #include "e-util/e-icon-factory.h" #include "e-util/e-dialog-utils.h" +#include "e-util/e-error.h" #include <glib/gprintf.h> |