diff options
| -rw-r--r-- | my-evolution/ChangeLog | 10 | ||||
| -rw-r--r-- | my-evolution/Makefile.am | 39 | ||||
| -rw-r--r-- | my-evolution/component-factory.c | 2 | ||||
| -rw-r--r-- | my-evolution/e-summary-rdf.c | 7 | ||||
| -rw-r--r-- | my-evolution/e-summary.c | 2 |
5 files changed, 33 insertions, 27 deletions
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog index fb642fc467..7848bfac0f 100644 --- a/my-evolution/ChangeLog +++ b/my-evolution/ChangeLog @@ -1,3 +1,13 @@ +2003-02-06 Dan Winship <danw@ximian.com> + + * Makefile.am: clean up, update, etc + + * component-factory.c: #include string.h + + * e-summary.c (e_pixmap_file): s/IMAGEDIR/IMAGESDIR/ + + * e-summary-rdf.c: Fix some warnings + 2003-02-05 Dan Winship <danw@ximian.com> * e-summary-offline-handler.c: s/BonoboXObject/BonoboObject/ diff --git a/my-evolution/Makefile.am b/my-evolution/Makefile.am index 470136da08..d6c8ae7549 100644 --- a/my-evolution/Makefile.am +++ b/my-evolution/Makefile.am @@ -1,23 +1,18 @@ -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/shell \ - -I$(top_builddir)/shell \ - -I$(top_srcdir)/calendar \ - -I$(top_builddir)/calendar/cal-client \ - -I$(top_srcdir)/libical/src/libical \ - -I$(top_builddir)/libical/src/libical \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ - -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ - -DEVOLUTION_DATADIR=\""$(datadir)"\" \ - -DEVOLUTION_IMAGEDIR=\""$(datadir)/evolution-$(BASE_VERSION)/images"\" \ - -DEVOLUTION_BUTTONSDIR=\""$(datadir)/evolution-$(BASE_VERSION)/images/buttons"\" \ - -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \ - -DLOCATIONDIR=\""$(Locationdir)"\" \ - -DPREFIX=\"$(prefix)\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DDATADIR=\""$(datadir)"\" \ - -DLIBDIR=\""$(datadir)"\" \ - -DG_LOG_DOMAIN=\"evolution-executive-summary\" \ +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/shell \ + -I$(top_builddir)/shell \ + -I$(top_srcdir)/calendar \ + -I$(top_builddir)/calendar/cal-client \ + -I$(top_srcdir)/libical/src/libical \ + -I$(top_builddir)/libical/src/libical \ + -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DEVOLUTION_DATADIR=\""$(datadir)"\" \ + -DEVOLUTION_IMAGESDIR=\""$(imagedir)"\" \ + -DEVOLUTION_BUTTONSDIR=\""$(buttonsdir)"\" \ + -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \ + -DLOCATIONDIR=\""$(Locationdir)"\" \ + -DG_LOG_DOMAIN=\"evolution-executive-summary\" \ $(EVOLUTION_EXECUTIVE_SUMMARY_CFLAGS) IDLS = \ @@ -83,14 +78,13 @@ libevolution_executive_summary_la_SOURCES = $(summary_sources) libevolution_executive_summary_la_LIBADD = $(summary_libs) libevolution_executive_summary_la_LDFLAGS = -module -avoid-version -Locationdir = $(datadir)/evolution-$(BASE_VERSION) +Locationdir = $(privdatadir) Location_DATA = Locations # .server files server_in_files = GNOME_Evolution_Summary.server.in.in -serverdir = $(libdir)/bonobo/servers server_DATA = $(server_in_files:.server.in.in=.server) $(server_in_files:.server.in.in=.server.in): $(server_in_files) sed -e "s|\@COMPONENTDIR\@|$(componentdir)|" $< > $@ @@ -100,7 +94,6 @@ $(server_in_files:.server.in.in=.server.in): $(server_in_files) # Glade -gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade glade_DATA = my-evolution.glade # GConf schemas diff --git a/my-evolution/component-factory.c b/my-evolution/component-factory.c index ef45a3f627..4ebd7001d8 100644 --- a/my-evolution/component-factory.c +++ b/my-evolution/component-factory.c @@ -24,6 +24,8 @@ #include <config.h> #endif +#include <string.h> + #include <bonobo/bonobo-object.h> #include <bonobo/bonobo-generic-factory.h> #include <bonobo/bonobo-context.h> diff --git a/my-evolution/e-summary-rdf.c b/my-evolution/e-summary-rdf.c index 5709937e9a..34d211a689 100644 --- a/my-evolution/e-summary-rdf.c +++ b/my-evolution/e-summary-rdf.c @@ -558,7 +558,7 @@ e_summary_rdf_init (ESummary *summary) e_summary_rdf_add_uri (summary, "http://www.salon.com/feed/RDF/salon_use.rdf"); timeout = 600; } else { - GList *p; + GSList *p; for (p = prefs->rdf_urls; p; p = p->next) { e_summary_rdf_add_uri (summary, p->data); @@ -578,6 +578,7 @@ e_summary_rdf_reconfigure (ESummary *summary) { ESummaryRDF *rdf; GList *old, *p; + GSList *sp; g_return_if_fail (summary != NULL); g_return_if_fail (IS_E_SUMMARY (summary)); @@ -597,8 +598,8 @@ e_summary_rdf_reconfigure (ESummary *summary) } g_list_free (old); - for (p = summary->preferences->rdf_urls; p; p = p->next) { - e_summary_rdf_add_uri (summary, p->data); + for (sp = summary->preferences->rdf_urls; sp; sp = sp->next) { + e_summary_rdf_add_uri (summary, sp->data); } rdf->timeout = gtk_timeout_add (summary->preferences->rdf_refresh_time * 1000, (GtkFunction) e_summary_rdf_update, summary); diff --git a/my-evolution/e-summary.c b/my-evolution/e-summary.c index 414e94d73a..3723d65c4c 100644 --- a/my-evolution/e-summary.c +++ b/my-evolution/e-summary.c @@ -290,7 +290,7 @@ e_pixmap_file (const char *filename) } /* Try the evolution images dir */ - edir = g_concat_dir_and_file (EVOLUTION_IMAGEDIR, filename); + edir = g_concat_dir_and_file (EVOLUTION_IMAGESDIR, filename); if (g_file_exists (edir)) { ret = g_strdup (edir); |