aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog4
-rw-r--r--addressbook/ChangeLog4
-rw-r--r--addressbook/gui/component/addressbook.c2
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/gui/calendar-commands.c2
-rw-r--r--mail/folder-browser-factory.c9
-rw-r--r--mail/message-list.h2
-rw-r--r--notes/component-factory.c2
-rw-r--r--shell/ChangeLog13
-rw-r--r--shell/Evolution-ShellComponent.idl2
-rw-r--r--shell/e-shell-view-menu.c15
-rw-r--r--shell/e-shell-view-menu.h2
-rw-r--r--shell/e-shell-view.c2
-rw-r--r--shell/evolution-shell-component-client.c4
-rw-r--r--shell/evolution-shell-component-client.h2
-rw-r--r--shell/evolution-shell-component.c2
16 files changed, 56 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 3fd518372f..f01d3e9e5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-21 Michael Meeks <michael@helixcode.com>
+
+ * notes/component-factory.c (control_activate): upd.
+
2000-09-20 Christopher James Lahey <clahey@helixcode.com>
* ui/.cvsignore: Added a cvsignore file here.
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 7703a101e5..2db2785dee 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-21 Michael Meeks <michael@helixcode.com>
+
+ * gui/component/addressbook.c (control_activate): remove _UIHandler
+
2000-09-21 Christopher James Lahey <clahey@helixcode.com>
* backend/ebook/load-pine-addressbook.c: Added a missing include
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index 1ff63b32c4..10a092cea1 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -325,7 +325,7 @@ static void
control_activate (BonoboControl *control, BonoboUIHandler *uih,
AddressbookView *view)
{
- Bonobo_UIHandler remote_uih;
+ Bonobo_UIContainer remote_uih;
char *fname;
xmlNode *ui;
Bonobo_UIContainer container;
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index a62a368745..3a7baae15d 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-21 Michael Meeks <michael@helixcode.com>
+
+ * gui/calendar-commands.c (calendar_control_activate): _UIHandler
+ update.
+
2000-09-20 JP Rosevear <jpr@helixcode.com>
* conduits/todo/todo-conduit.c (pre_sync): Don't fail if there
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index cef814a36f..73271c0ce5 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -525,7 +525,7 @@ void
calendar_control_activate (BonoboControl *control,
GnomeCalendar *cal)
{
- Bonobo_UIHandler remote_uih;
+ Bonobo_UIContainer remote_uih;
BonoboUIHandler *uih;
uih = bonobo_control_get_ui_handler (control);
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>
diff --git a/notes/component-factory.c b/notes/component-factory.c
index 3f8176cc9c..dcdefa2216 100644
--- a/notes/component-factory.c
+++ b/notes/component-factory.c
@@ -37,7 +37,7 @@ control_deactivate (BonoboControl *control, BonoboUIHandler *uih)
static void
control_activate (BonoboControl *control, BonoboUIHandler *uih)
{
- Bonobo_UIHandler remote_uih;
+ Bonobo_UIContainer remote_uih;
GtkWidget *toolbar, *toolbar_frame;
BonoboControl *toolbar_control ;
diff --git a/shell/ChangeLog b/shell/ChangeLog
index e592ffac5f..6c4f9487b9 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,16 @@
+2000-09-21 Michael Meeks <michael@helixcode.com>
+
+ * e-shell-view.c (show_existing_view): upd.
+
+ * Evolution-ShellComponent.idl: upd.
+
+ * evolution-shell-component.c (impl_ShellComponent_populate_folder_context_menu):
+ upd.
+
+2000-09-18 Michael Meeks <michael@helixcode.com>
+
+ * e-shell-view-menu.c (command_xml_dump): add xml dump option.
+
2000-09-18 Christopher James Lahey <clahey@helixcode.com>
* Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
diff --git a/shell/Evolution-ShellComponent.idl b/shell/Evolution-ShellComponent.idl
index f907cca72b..106ec0d571 100644
--- a/shell/Evolution-ShellComponent.idl
+++ b/shell/Evolution-ShellComponent.idl
@@ -55,7 +55,7 @@ module Evolution {
in string physical_uri)
raises (Busy);
- void populate_folder_context_menu (in Bonobo::UIHandler uih,
+ void populate_folder_context_menu (in Bonobo::UIContainer uih,
in string physical_uri,
in string type);
};
diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c
index 0d7c992292..7cf14307c0 100644
--- a/shell/e-shell-view-menu.c
+++ b/shell/e-shell-view-menu.c
@@ -359,6 +359,20 @@ command_create_folder (BonoboUIHandler *uih,
e_shell_show_folder_creation_dialog (shell, GTK_WINDOW (shell_view), default_folder);
}
+static void
+command_xml_dump (gpointer dummy,
+ EShellView *view)
+{
+ BonoboUIHandler *uih;
+ BonoboWin *win;
+
+ uih = e_shell_view_get_bonobo_ui_handler (view);
+
+ win = bonobo_ui_handler_get_app (uih);
+
+ bonobo_win_dump (win, "On demand");
+}
+
/* Unimplemented commands. */
@@ -401,6 +415,7 @@ BonoboUIVerb help_verbs [] = {
BONOBO_UI_VERB_DATA ("HelpUsingMail", command_help, "usage-mail.html"),
BONOBO_UI_VERB_DATA ("HelpUsingCalender", command_help, "usage-calender.html"),
BONOBO_UI_VERB_DATA ("HelpUsingContact", command_help, "usage-contact.html"),
+ BONOBO_UI_VERB ("DumpXML", command_xml_dump),
BONOBO_UI_VERB_END
};
diff --git a/shell/e-shell-view-menu.h b/shell/e-shell-view-menu.h
index fb86cb9e98..948a2aa6a3 100644
--- a/shell/e-shell-view-menu.h
+++ b/shell/e-shell-view-menu.h
@@ -26,7 +26,7 @@
#ifndef E_SHELL_VIEW_MENU_H
#define E_SHELL_VIEW_MENU_H
-#include <bonobo/bonobo-ui-handler.h>
+#include <bonobo/bonobo-ui-compat.h>
#include "e-shell-view.h"
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 1b8a84e603..a7a0a766e5 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -1145,7 +1145,7 @@ show_existing_view (EShellView *shell_view,
control is dead; if it's zombie, we have to recreate it. */
if (bonobo_widget_is_dead (BONOBO_WIDGET (control))) {
GtkWidget *parent;
- Bonobo_UIHandler uih;
+ Bonobo_UIContainer uih;
parent = control->parent;
uih = bonobo_object_corba_objref (BONOBO_OBJECT (priv->uih));
diff --git a/shell/evolution-shell-component-client.c b/shell/evolution-shell-component-client.c
index 318554a826..4a456040fa 100644
--- a/shell/evolution-shell-component-client.c
+++ b/shell/evolution-shell-component-client.c
@@ -426,7 +426,7 @@ evolution_shell_component_client_create_view (EvolutionShellComponentClient *she
if (result != EVOLUTION_SHELL_COMPONENT_OK) {
*control_return = NULL;
} else {
- Bonobo_UIHandler corba_uih;
+ Bonobo_UIContainer corba_uih;
corba_uih = bonobo_object_corba_objref (BONOBO_OBJECT (uih));
*control_return = BONOBO_CONTROL (bonobo_widget_new_control_from_objref (corba_control,
@@ -497,7 +497,7 @@ evolution_shell_component_client_populate_folder_context_menu (EvolutionShellCom
const char *physical_uri,
const char *type)
{
- Bonobo_UIHandler corba_uih;
+ Bonobo_UIContainer corba_uih;
EvolutionShellComponentClientPrivate *priv;
Evolution_ShellComponent corba_shell_component;
CORBA_Environment ev;
diff --git a/shell/evolution-shell-component-client.h b/shell/evolution-shell-component-client.h
index fa066cb27d..70423c9056 100644
--- a/shell/evolution-shell-component-client.h
+++ b/shell/evolution-shell-component-client.h
@@ -25,7 +25,7 @@
#define EVOLUTION_SHELL_COMPONENT_CLIENT_H
#include <bonobo/bonobo-object-client.h>
-#include <bonobo/bonobo-ui-handler.h>
+#include <bonobo/bonobo-ui-compat.h>
#include "evolution-shell-component.h"
diff --git a/shell/evolution-shell-component.c b/shell/evolution-shell-component.c
index 6361272714..7dbb07e3fc 100644
--- a/shell/evolution-shell-component.c
+++ b/shell/evolution-shell-component.c
@@ -267,7 +267,7 @@ impl_ShellComponent_async_remove_folder (PortableServer_Servant servant,
static void
impl_ShellComponent_populate_folder_context_menu (PortableServer_Servant servant,
- const Bonobo_UIHandler corba_uih,
+ const Bonobo_UIContainer corba_uih,
const CORBA_char *physical_uri,
const CORBA_char *type,
CORBA_Environment *ev)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 10:26:55 +0800