aboutsummaryrefslogtreecommitdiffstats
path: root/executive-summary
diff options
context:
space:
mode:
Diffstat (limited to 'executive-summary')
-rw-r--r--executive-summary/ChangeLog7
-rw-r--r--executive-summary/component/Makefile.in11
-rw-r--r--executive-summary/component/e-summary-factory.c67
-rw-r--r--executive-summary/evolution-services/Makefile.in7
-rw-r--r--executive-summary/idl/Makefile.in7
-rw-r--r--executive-summary/test-service/Makefile.in11
6 files changed, 53 insertions, 57 deletions
diff --git a/executive-summary/ChangeLog b/executive-summary/ChangeLog
index bc60cade9c..3f6d3e1a0c 100644
--- a/executive-summary/ChangeLog
+++ b/executive-summary/ChangeLog
@@ -1,3 +1,10 @@
+2000-10-05 Michael Meeks <michael@helixcode.com>
+
+ * component/e-summary-factory.c (control_activate): upd.
+ (set_pixmap): upd. (update_pixmaps): upd.
+ (control_activate_cb): upd.
+ (control_deactivate): upd.
+
2000-10-04 Iain Holmes <iain@helixcode.com>
* idl/SummaryComponent.idl: Added a title argument to the
diff --git a/executive-summary/component/Makefile.in b/executive-summary/component/Makefile.in
index 7aed4eb957..49846a2b60 100644
--- a/executive-summary/component/Makefile.in
+++ b/executive-summary/component/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
@@ -46,10 +46,9 @@ AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
transform = @program_transform_name@
NORMAL_INSTALL = :
@@ -241,8 +240,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
if test -f $$p; then \
- echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+ echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
else :; fi; \
done
@@ -391,7 +390,7 @@ uninstall: uninstall-am
all-am: Makefile $(PROGRAMS) all-local
all-redirect: all-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
$(mkinstalldirs) $(DESTDIR)$(bindir)
diff --git a/executive-summary/component/e-summary-factory.c b/executive-summary/component/e-summary-factory.c
index c87985be34..b023d38316 100644
--- a/executive-summary/component/e-summary-factory.c
+++ b/executive-summary/component/e-summary-factory.c
@@ -65,14 +65,14 @@ static void flash (ExecutiveSummary *summary,
void *closure);
BonoboUIVerb verbs[] = {
- BONOBO_UI_VERB ("AddService", embed_service),
+ BONOBO_UI_UNSAFE_VERB ("AddService", embed_service),
BONOBO_UI_VERB_END
};
static void
-set_pixmap (Bonobo_UIContainer container,
- const char *xml_path,
- const char *icon)
+set_pixmap (BonoboUIComponent *component,
+ const char *xml_path,
+ const char *icon)
{
char *path;
GdkPixbuf *pixbuf;
@@ -82,53 +82,46 @@ set_pixmap (Bonobo_UIContainer container,
pixbuf = gdk_pixbuf_new_from_file (path);
g_return_if_fail (pixbuf != NULL);
- bonobo_ui_util_set_pixbuf (container, xml_path, pixbuf);
+ bonobo_ui_util_set_pixbuf (component, xml_path, pixbuf);
gdk_pixbuf_unref (pixbuf);
g_free (path);
}
static void
-update_pixmaps (Bonobo_UIContainer container)
+update_pixmaps (BonoboUIComponent *component)
{
- set_pixmap (container, "/Toolbar/AddService", "add-service.png");
+ set_pixmap (component, "/Toolbar/AddService", "add-service.png");
}
static void
-control_activate (BonoboControl *control,
- BonoboUIHandler *uih,
- ESummary *esummary)
+control_activate (BonoboControl *control,
+ BonoboUIComponent *ui_component,
+ ESummary *esummary)
{
- BonoboUIComponent *component;
Bonobo_UIContainer container;
container = bonobo_control_get_remote_ui_handler (control);
- bonobo_ui_handler_set_container (uih, container);
+ bonobo_ui_component_set_container (ui_component, container);
bonobo_object_release_unref (container, NULL);
- g_assert (container == bonobo_ui_compat_get_container (uih));
- g_return_if_fail (container != CORBA_OBJECT_NIL);
-
- component = bonobo_ui_compat_get_component (uih);
- bonobo_ui_component_add_verb_list_with_data (component, verbs, esummary);
+ bonobo_ui_component_add_verb_list_with_data (ui_component, verbs, esummary);
- bonobo_ui_container_freeze (container, NULL);
+ bonobo_ui_component_freeze (ui_component, NULL);
- bonobo_ui_util_set_ui (component, container, EVOLUTION_DATADIR,
+ bonobo_ui_util_set_ui (ui_component, EVOLUTION_DATADIR,
"evolution-executive-summary.xml",
"evolution-executive-summary");
- update_pixmaps (container);
- bonobo_ui_container_thaw (container, NULL);
+ update_pixmaps (ui_component);
+ bonobo_ui_component_thaw (ui_component, NULL);
}
static void
-control_deactivate (BonoboControl *control,
- BonoboUIHandler *uih,
- ESummary *esummary)
+control_deactivate (BonoboControl *control,
+ BonoboUIComponent *ui_component,
+ ESummary *esummary)
{
- bonobo_ui_component_rm (bonobo_ui_compat_get_component (uih),
- bonobo_ui_compat_get_container (uih), "/", NULL);
- bonobo_ui_handler_unset_container (uih);
+ bonobo_ui_component_unset_container (ui_component);
}
static void
@@ -136,26 +129,26 @@ control_activate_cb (BonoboControl *control,
gboolean activate,
gpointer user_data)
{
- BonoboUIHandler *uih;
+ BonoboUIComponent *ui_component;
- uih = bonobo_control_get_ui_handler (control);
- g_assert (uih);
+ ui_component = bonobo_control_get_ui_component (control);
+ g_assert (ui_component != NULL);
- if (activate)
- control_activate (control, uih, user_data);
- else
- control_deactivate (control, uih, user_data);
+ if (activate)
+ control_activate (control, ui_component, user_data);
+ else
+ control_deactivate (control, ui_component, user_data);
}
static void
control_destroy_cb (BonoboControl *control,
gpointer user_data)
{
- GtkWidget *esummary = user_data;
+ GtkWidget *esummary = user_data;
- control_list = g_list_remove (control_list, control);
+ control_list = g_list_remove (control_list, control);
- gtk_object_destroy (GTK_OBJECT (esummary));
+ gtk_object_destroy (GTK_OBJECT (esummary));
}
static void
diff --git a/executive-summary/evolution-services/Makefile.in b/executive-summary/evolution-services/Makefile.in
index 141fb0011b..e2865c4e20 100644
--- a/executive-summary/evolution-services/Makefile.in
+++ b/executive-summary/evolution-services/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
@@ -46,10 +46,9 @@ AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
transform = @program_transform_name@
NORMAL_INSTALL = :
@@ -389,7 +388,7 @@ uninstall: uninstall-am
all-am: Makefile $(LTLIBRARIES) all-local
all-redirect: all-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
$(mkinstalldirs) $(DESTDIR)$(libdir)
diff --git a/executive-summary/idl/Makefile.in b/executive-summary/idl/Makefile.in
index bf5a1a117b..0d9d10646f 100644
--- a/executive-summary/idl/Makefile.in
+++ b/executive-summary/idl/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
@@ -46,10 +46,9 @@ AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
transform = @program_transform_name@
NORMAL_INSTALL = :
@@ -240,7 +239,7 @@ uninstall: uninstall-am
all-am: Makefile
all-redirect: all-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
diff --git a/executive-summary/test-service/Makefile.in b/executive-summary/test-service/Makefile.in
index 50e83f823f..d193f4bda1 100644
--- a/executive-summary/test-service/Makefile.in
+++ b/executive-summary/test-service/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
@@ -46,10 +46,9 @@ AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
transform = @program_transform_name@
NORMAL_INSTALL = :
@@ -234,8 +233,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
if test -f $$p; then \
- echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+ echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
else :; fi; \
done
@@ -403,7 +402,7 @@ uninstall: uninstall-am
all-am: Makefile $(PROGRAMS) $(DATA)
all-redirect: all-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(oafdir)
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 06:40:06 +0800