aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIain Holmes <iain@helixcode.com>2000-10-07 08:49:12 +0800
committerIain Holmes <iain@src.gnome.org>2000-10-07 08:49:12 +0800
commitb9db2f0137dd06111913dd93d97737542dba026d (patch)
tree8fab61b763233e5221675ca23cfa86a076b9d023
parentd412d185d593da40b2ff5c8eb913b1152cc13856 (diff)
downloadgsoc2013-evolution-b9db2f0137dd06111913dd93d97737542dba026d.tar
gsoc2013-evolution-b9db2f0137dd06111913dd93d97737542dba026d.tar.gz
gsoc2013-evolution-b9db2f0137dd06111913dd93d97737542dba026d.tar.bz2
gsoc2013-evolution-b9db2f0137dd06111913dd93d97737542dba026d.tar.lz
gsoc2013-evolution-b9db2f0137dd06111913dd93d97737542dba026d.tar.xz
gsoc2013-evolution-b9db2f0137dd06111913dd93d97737542dba026d.tar.zst
gsoc2013-evolution-b9db2f0137dd06111913dd93d97737542dba026d.zip
Use gnome-vfs to retrieve the requested files. Allows services to specify
2000-10-06 Iain Holmes <iain@helixcode.com> * component/e-summary.c (request_cb): Use gnome-vfs to retrieve the requested files. Allows services to specify remote urls. (load_default, e_summary_display_window, e_summary_rebuild_page): Change the html to match TigerT's lovely design. (e_summary_add_html_service, e_summary_add_html_service): Add the client argument so we can destroy it when we've quit. (e_summary_window_update): Only do an update if there isn't one pending. * component/e-summary-factory.c (embed_service): upd. * test-service/main.c: Made the test service be really silly and count the number of seconds since it was started. svn path=/trunk/; revision=5776
-rw-r--r--executive-summary/ChangeLog16
-rw-r--r--executive-summary/evolution-services/Makefile.am10
-rw-r--r--executive-summary/evolution-services/executive-summary-client.c1
-rw-r--r--executive-summary/evolution-services/executive-summary.c3
-rw-r--r--executive-summary/test-service/main.c36
5 files changed, 40 insertions, 26 deletions
diff --git a/executive-summary/ChangeLog b/executive-summary/ChangeLog
index 20aecf6133..9e2e5546a5 100644
--- a/executive-summary/ChangeLog
+++ b/executive-summary/ChangeLog
@@ -1,3 +1,19 @@
+2000-10-06 Iain Holmes <iain@helixcode.com>
+
+ * component/e-summary.c (request_cb): Use gnome-vfs to retrieve
+ the requested files. Allows services to specify remote urls.
+ (load_default, e_summary_display_window, e_summary_rebuild_page):
+ Change the html to match TigerT's lovely design.
+ (e_summary_add_html_service, e_summary_add_html_service): Add
+ the client argument so we can destroy it when we've quit.
+ (e_summary_window_update): Only do an update if there isn't one
+ pending.
+
+ * component/e-summary-factory.c (embed_service): upd.
+
+ * test-service/main.c: Made the test service be really silly and count
+ the number of seconds since it was started.
+
2000-10-06 Ettore Perazzoli <ettore@helixcode.com>
* component/Makefile.am (INCLUDES): Fix builddir != srcdir.
diff --git a/executive-summary/evolution-services/Makefile.am b/executive-summary/evolution-services/Makefile.am
index 8373dc72ab..4148671a0f 100644
--- a/executive-summary/evolution-services/Makefile.am
+++ b/executive-summary/evolution-services/Makefile.am
@@ -46,13 +46,3 @@ libevolution_services_la_LIBADD = \
$(GTKHTML_LIBS) \
$(UNICODE_LIBS)
-if ENABLE_PURIFY
-PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-
-all-local: evolution-mail.pure
-
-evolution-mail.pure: evolution-mail
- @rm -f evolution-mail.pure
- $(PLINK) $(evolution_mail_LDFLAGS) $(evolution_mail_OBJECTS) $(evolution_mail_LDADD) $(LIBS)
-
-endif
diff --git a/executive-summary/evolution-services/executive-summary-client.c b/executive-summary/evolution-services/executive-summary-client.c
index 2ea9175bd9..f608b0908f 100644
--- a/executive-summary/evolution-services/executive-summary-client.c
+++ b/executive-summary/evolution-services/executive-summary-client.c
@@ -151,7 +151,6 @@ executive_summary_client_update (ExecutiveSummaryClient *client,
Evolution_Summary_update_html_component (summary, corba_object,
html, &ev);
-
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning ("Error updating the component");
}
diff --git a/executive-summary/evolution-services/executive-summary.c b/executive-summary/evolution-services/executive-summary.c
index 08e4146466..f3e36f1735 100644
--- a/executive-summary/evolution-services/executive-summary.c
+++ b/executive-summary/evolution-services/executive-summary.c
@@ -116,12 +116,13 @@ impl_Evolution_Summary_update_html_component (PortableServer_Servant servant,
BonoboObject *bonobo_object;
ExecutiveSummary *summary;
ExecutiveSummaryPrivate *priv;
+ struct _queuedata *qd;
bonobo_object = bonobo_object_from_servant (servant);
summary = EXECUTIVE_SUMMARY (bonobo_object);
priv = summary->private;
- (* priv->update) (summary, component, html, priv->closure);
+ (*priv->update) (summary, component, html, priv->closure);
}
/* GtkObject methods */
diff --git a/executive-summary/test-service/main.c b/executive-summary/test-service/main.c
index 719722a599..626f179289 100644
--- a/executive-summary/test-service/main.c
+++ b/executive-summary/test-service/main.c
@@ -8,35 +8,40 @@
#include <liboaf/liboaf.h>
static int running_views = 0;
-ExecutiveSummaryComponent *component;
#define TEST_SERVICE_ID "OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6"
static BonoboGenericFactory *factory = NULL;
-void
-clicked_cb (GtkWidget *widget,
- gpointer data)
+int
+clicked_cb (ExecutiveSummaryComponent *component)
{
+ static int i = 1;
+ char *html;
+
+#if 0
executive_summary_component_set_title (component, "Iain's title");
executive_summary_component_flash (component);
+#endif
+
+ html = g_strdup_printf ("Since you started this service<br><center>%d</center><br>seconds have passed.", i);
+ executive_summary_component_update (component, html);
+ i++;
+
+ g_free (html);
+ return TRUE;
}
void
view_destroyed (GtkWidget *widget,
gpointer data)
{
- running_views--;
-
g_print ("Destroying view: %d\n", running_views);
- if (running_views <= 0) {
- g_print ("No views left, quitting\n");
- gtk_main_quit ();
- }
+ gtk_main_quit ();
}
-static BonoboObject *
+static BonoboObject*
create_view (ExecutiveSummaryComponent *component,
char **title,
void *closure)
@@ -65,8 +70,9 @@ create_html (ExecutiveSummaryComponent *component,
char **title,
void *closure)
{
- *title = g_strdup ("This is the test service");
- return g_strdup ("<b>This is<p>An <i>HTML</i></b><br><h1>Component!!!</h1>");
+ *title = g_strdup ("The Magic Counter");
+ gtk_timeout_add (1000, clicked_cb, component);
+ return g_strdup ("Since you started this service<br><center>0</center><br>seconds have passed.");
}
static void
@@ -87,12 +93,14 @@ static BonoboObject *
factory_fn (BonoboGenericFactory *_factory,
void *closure)
{
+ ExecutiveSummaryComponent *component;
+
running_views++;
component = executive_summary_component_new (create_view,
create_html,
configure,
NULL);
- gtk_signal_connect (GTK_OBJECT (component), "destroy",
+ gtk_signal_connect (GTK_OBJECT (component), "object_gone",
GTK_SIGNAL_FUNC (view_destroyed), NULL);
return BONOBO_OBJECT (component);
}