diff options
| author | Dan Winship <danw@src.gnome.org> | 2001-10-14 01:35:40 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2001-10-14 01:35:40 +0800 |
| commit | da2d6ee08c364cbc4b99a7c2eb39678c350188f1 (patch) | |
| tree | 8611345b1adb12fba3dbc25f2e31faf9ecdd4cab /composer/e-msg-composer-hdrs.c | |
| parent | c72b6cb1e405d8fe3363f40520aa4e3f2e69a9d2 (diff) | |
| download | gsoc2013-evolution-da2d6ee08c364cbc4b99a7c2eb39678c350188f1.tar.gz gsoc2013-evolution-da2d6ee08c364cbc4b99a7c2eb39678c350188f1.tar.zst gsoc2013-evolution-da2d6ee08c364cbc4b99a7c2eb39678c350188f1.zip | |
Don't pop up an "unable to retrieve message" if the composer never
* e-msg-composer.c (autosave_manager_unregister): Don't pop up an
"unable to retrieve message" if the composer never finished
initializing.
(init): Don't call autosave_manager_register here: wait until the
end of create_composer.
(create_composer): Remove the distinction between this and
e_msg_composer_construct since there's no need for the latter. Use
e_activation_failure_dialog if either the selectnames component or
the gtkhtml editor fails.
* e-msg-composer-hdrs.c (setup_corba): Don't g_warn if the oaf
activation fails. create_composer() will tell the user.
svn path=/trunk/; revision=13661
Diffstat (limited to 'composer/e-msg-composer-hdrs.c')
| -rw-r--r-- | composer/e-msg-composer-hdrs.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c index ec08a94f7a..c64aab4cb9 100644 --- a/composer/e-msg-composer-hdrs.c +++ b/composer/e-msg-composer-hdrs.c @@ -49,7 +49,6 @@ #include "addressbook/backend/ebook/e-book-util.h" -#define SELECT_NAMES_OAFID "OAFIID:GNOME_Evolution_Addressbook_SelectNames" /* Indexes in the GtkTable assigned to various items */ @@ -103,12 +102,11 @@ setup_corba (EMsgComposerHdrs *hdrs) CORBA_exception_init (&ev); - priv->corba_select_names = oaf_activate_from_id (SELECT_NAMES_OAFID, 0, NULL, &ev); + priv->corba_select_names = oaf_activate_from_id (SELECT_NAMES_OAFIID, 0, NULL, &ev); /* OAF seems to be broken -- it can return a CORBA_OBJECT_NIL without raising an exception in `ev'. */ if (ev._major != CORBA_NO_EXCEPTION || priv->corba_select_names == CORBA_OBJECT_NIL) { - g_warning ("Cannot activate -- %s", SELECT_NAMES_OAFID); CORBA_exception_free (&ev); return FALSE; } |