aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Meeks <michael@helixcode.com>2000-10-19 11:19:23 +0800
committerMichael Meeks <mmeeks@src.gnome.org>2000-10-19 11:19:23 +0800
commitf3533f595d179df1f433501bf7eaa0f5dbc3478c (patch)
treeff55a3f1be0b04d7c9b0949fcb63bb55e461eb18
parent3c075e5ac84195117f546c780c2c95df4e7da3bf (diff)
downloadgsoc2013-evolution-f3533f595d179df1f433501bf7eaa0f5dbc3478c.tar.gz
gsoc2013-evolution-f3533f595d179df1f433501bf7eaa0f5dbc3478c.tar.zst
gsoc2013-evolution-f3533f595d179df1f433501bf7eaa0f5dbc3478c.zip
update for new UI handler.
2000-10-18 Michael Meeks <michael@helixcode.com> * evolution-shell-component.c (impl_ShellComponent_populate_folder_context_menu): update for new UI handler. svn path=/trunk/; revision=6022
-rw-r--r--ChangeLog5
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/evolution-shell-component.c10
-rw-r--r--shell/evolution-shell-component.h2
4 files changed, 16 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 34cdb26757..51f6049aa7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-18 Michael Meeks <michael@helixcode.com>
+
+ * notes/component-factory.c (control_activate, control_deactivate),
+ (create_view): cripple, not worth updating to new UI code.
+
2000-10-17 Tuomas Kuosmanen <tigert@helixcode.com>
* art/splash.png: This looks happier than the dark piece of rusty
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 21942fe255..3f376af774 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-18 Michael Meeks <michael@helixcode.com>
+
+ * evolution-shell-component.c (impl_ShellComponent_populate_folder_context_menu):
+ update for new UI handler.
+
2000-10-18 Iain Holmes <iain@helixcode.com>
* e-shell-view.c (start_progress_bar): If the widget is not realized
diff --git a/shell/evolution-shell-component.c b/shell/evolution-shell-component.c
index 7dbb07e3fc..a886ba6b7c 100644
--- a/shell/evolution-shell-component.c
+++ b/shell/evolution-shell-component.c
@@ -275,7 +275,7 @@ impl_ShellComponent_populate_folder_context_menu (PortableServer_Servant servant
BonoboObject *bonobo_object;
EvolutionShellComponent *shell_component;
EvolutionShellComponentPrivate *priv;
- BonoboUIHandler *uih;
+ BonoboUIComponent *uic;
bonobo_object = bonobo_object_from_servant (servant);
shell_component = EVOLUTION_SHELL_COMPONENT (bonobo_object);
@@ -284,13 +284,13 @@ impl_ShellComponent_populate_folder_context_menu (PortableServer_Servant servant
if (priv->populate_folder_context_menu_fn == NULL)
return;
- uih = bonobo_ui_handler_new ();
- bonobo_ui_handler_set_container (uih, corba_uih);
+ uic = bonobo_ui_component_new_default ();
+ bonobo_ui_component_set_container (uic, corba_uih);
bonobo_object_release_unref (corba_uih, NULL);
- (* priv->populate_folder_context_menu_fn) (shell_component, uih, physical_uri, type, priv->closure);
+ (* priv->populate_folder_context_menu_fn) (shell_component, uic, physical_uri, type, priv->closure);
- bonobo_object_unref (BONOBO_OBJECT (uih));
+ bonobo_object_unref (BONOBO_OBJECT (uic));
}
diff --git a/shell/evolution-shell-component.h b/shell/evolution-shell-component.h
index db6dfe69b4..2ae350932c 100644
--- a/shell/evolution-shell-component.h
+++ b/shell/evolution-shell-component.h
@@ -89,7 +89,7 @@ typedef void (* EvolutionShellComponentRemoveFolderFn) (EvolutionShellComponent
const Evolution_ShellComponentListener listener,
void *closure);
typedef void (* EvolutionShellComponentPopulateFolderContextMenu) (EvolutionShellComponent *shell_component,
- BonoboUIHandler *uih,
+ BonoboUIComponent *uic,
const char *physical_uri,
const char *type,
void *closure);