diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/folder-browser-factory.c | 9 | ||||
| -rw-r--r-- | mail/message-list.h | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c index 39c774f7e1..1ba9a16c80 100644 --- a/mail/folder-browser-factory.c +++ b/mail/folder-browser-factory.c @@ -164,15 +164,14 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih, FolderBrowser *fb) { GtkWidget *folder_browser; - Bonobo_UIHandler remote_uih; BonoboUIComponent *component; Bonobo_UIContainer container; - remote_uih = bonobo_control_get_remote_ui_handler (control); - bonobo_ui_handler_set_container (uih, remote_uih); - bonobo_object_release_unref (remote_uih, NULL); + container = bonobo_control_get_remote_ui_handler (control); + bonobo_ui_handler_set_container (uih, container); + bonobo_object_release_unref (container, NULL); - container = bonobo_ui_compat_get_container (uih); + g_assert (container == bonobo_ui_compat_get_container (uih)); g_return_if_fail (container != CORBA_OBJECT_NIL); folder_browser = bonobo_control_get_widget (control); diff --git a/mail/message-list.h b/mail/message-list.h index e65a06b327..4871d74a8a 100644 --- a/mail/message-list.h +++ b/mail/message-list.h @@ -6,7 +6,7 @@ #include "mail-types.h" #include <bonobo/bonobo-main.h> #include <bonobo/bonobo-object.h> -#include <bonobo/bonobo-ui-handler.h> +#include <bonobo/bonobo-ui-compat.h> #include <gal/e-table/e-table-scrolled.h> #include <gal/e-table/e-table-simple.h> #include <gal/e-table/e-tree-simple.h> |