diff options
| -rw-r--r-- | shell/ChangeLog | 6 | ||||
| -rw-r--r-- | shell/evolution-shell-component-utils.c | 47 | ||||
| -rw-r--r-- | shell/evolution-shell-component-utils.h | 4 |
3 files changed, 6 insertions, 51 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index f5dc46b5f6..361b1a30d8 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,9 @@ +2004-05-21 Jeffrey Stedfast <fejj@novell.com> + + * evolution-shell-component-utils.c (e_activation_failure_dialog): + Removed. Nothing uses this interface (which didn't use the EError + routines anyway). + 2004-05-21 Not Zed <NotZed@Ximian.com> * e-shell.c (e_shell_attempt_upgrade): remove unused. diff --git a/shell/evolution-shell-component-utils.c b/shell/evolution-shell-component-utils.c index 08db23731c..eceb9e01d9 100644 --- a/shell/evolution-shell-component-utils.c +++ b/shell/evolution-shell-component-utils.c @@ -85,53 +85,6 @@ free_pixmaps (void) g_slist_free (inited_arrays); } - -/** - * e_activation_failure_dialog: - * @parent: parent window of the dialog, or %NULL - * @msg: the context-specific part of the error message - * @oafiid: the OAFIID of the component that failed to start - * @repo_id: the repo_id of the component that failed to start - * - * This puts up an error dialog about a failed component activation - * containing as much information as we can manage to gather about - * why it failed. - **/ -void -e_activation_failure_dialog (GtkWindow *parent, const char *msg, - const char *oafiid, const char *repo_id) -{ - Bonobo_Unknown object; - CORBA_Environment ev; - char *errmsg; - - CORBA_exception_init (&ev); - object = bonobo_get_object (oafiid, repo_id, &ev); - if (ev._major == CORBA_NO_EXCEPTION) { - if (object) { - Bonobo_Unknown_unref (object, &ev); - CORBA_Object_release (object, &ev); - } - errmsg = g_strdup_printf (_("%s\n\nUnknown error."), msg); - } else if (strcmp (CORBA_exception_id (&ev), ex_Bonobo_GeneralError) != 0) { - char *bonobo_err = bonobo_exception_get_text (&ev); - errmsg = g_strdup_printf (_("%s\n\nThe error from the " - "component system is:\n%s"), - msg, bonobo_err); - g_free (bonobo_err); - } else { - Bonobo_GeneralError *errval = CORBA_exception_value (&ev); - - errmsg = g_strdup_printf (_("%s\n\nThe error from the " - "activation system is:\n%s"), - msg, errval->description); - } - CORBA_exception_free (&ev); - - e_notice (parent, GTK_MESSAGE_ERROR, errmsg); - g_free (errmsg); -} - /** * e_get_activation_failure_msg: diff --git a/shell/evolution-shell-component-utils.h b/shell/evolution-shell-component-utils.h index a1890fe4ef..ac0bac8f7f 100644 --- a/shell/evolution-shell-component-utils.h +++ b/shell/evolution-shell-component-utils.h @@ -42,10 +42,6 @@ typedef struct _EPixmap { /* Takes an array of pixmaps, terminated by E_PIXMAP_END, and loads into uic */ void e_pixmaps_update (BonoboUIComponent *uic, EPixmap *pixcache); -void e_activation_failure_dialog (GtkWindow *parent, - const char *msg, - const char *oafiid, - const char *repo_id); char *e_get_activation_failure_msg (CORBA_Environment *ev); #ifdef __cplusplus |