aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJP Rosevear <jpr@ximian.com>2001-03-03 03:43:11 +0800
committerJP Rosevear <jpr@src.gnome.org>2001-03-03 03:43:11 +0800
commitdee3e832b9dfb54a8b9dea7daa398bb07e4f6190 (patch)
tree8e498f021ad7309b9e1e4ba62d880f82e221fd60
parent82b9322f937abdce12f1f7e9b768fc644fa95fa2 (diff)
downloadgsoc2013-evolution-dee3e832b9dfb54a8b9dea7daa398bb07e4f6190.tar.gz
gsoc2013-evolution-dee3e832b9dfb54a8b9dea7daa398bb07e4f6190.tar.zst
gsoc2013-evolution-dee3e832b9dfb54a8b9dea7daa398bb07e4f6190.zip
install conduit icons
2001-03-02 JP Rosevear <jpr@ximian.com> * art/Makefile.am: install conduit icons 2001-03-02 JP Rosevear <jpr@ximian.com> * conduit/Makefile.am: update sed script * conduit/e-address.conduit.in: update for new pilot foo 2001-03-02 JP Rosevear <jpr@ximian.com> * conduits/todo/e-todo.conduit.in: update for new pilot foo * conduits/calendar/e-calendar.conduit.in: ditto * conduits/todo/Makefile.am: update sed script * conduits/calendar/Makefile.am: ditto svn path=/trunk/; revision=8529
Diffstat
-rw-r--r--ChangeLog4
-rw-r--r--NEWS3
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/conduit/Makefile.am4
-rw-r--r--addressbook/conduit/e-address.conduit.in13
-rw-r--r--art/Makefile.am8
-rw-r--r--calendar/ChangeLog10
-rw-r--r--calendar/conduits/calendar/Makefile.am4
-rw-r--r--calendar/conduits/calendar/e-calendar.conduit.in13
-rw-r--r--calendar/conduits/todo/Makefile.am4
-rw-r--r--calendar/conduits/todo/e-todo.conduit.in13
-rw-r--r--configure.in2
12 files changed, 62 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index f8679efd02..ef1cdc5651 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-02 JP Rosevear <jpr@ximian.com>
+
+ * art/Makefile.am: install conduit icons
+
2001-03-02 Chris Toshok <toshok@ximian.com>
* configure.in: add logic to make sure we're building against OpenLDAP >= 2
diff --git a/NEWS b/NEWS
index 0b92bc991a..21215accb8 100644
--- a/NEWS
+++ b/NEWS
@@ -61,6 +61,9 @@ Tasks:
- You get asked for confirmation when trying to delete a task entry
(Federico).
+Conduits:
+
+ - Many bug fixes and cleanups (JP)
Version 0.8 "Archaeopteryx", 2000-12-14
---------------------------------------
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index d3e19f5f54..943d76cc4b 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-02 JP Rosevear <jpr@ximian.com>
+
+ * conduit/Makefile.am: update sed script
+
+ * conduit/e-address.conduit.in: update for new pilot foo
+
2001-03-02 Chris Toshok <toshok@ximian.com>
* gui/component/select-names/e-select-names-text-model.c
diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am
index bf6577661c..28b5164c23 100644
--- a/addressbook/conduit/Makefile.am
+++ b/addressbook/conduit/Makefile.am
@@ -48,7 +48,9 @@ libeaddress_conduit_la_LIBADD = \
$(GNOME_LIBS)
e-address.conduit: e-address.conduit.in Makefile
- sed -e 's^\@prefix\@^$(prefix)^g' < $(srcdir)/e-address.conduit.in > e-address.conduit.tmp \
+ sed -e 's^\@prefix\@^$(prefix)^g' \
+ -e 's^\@datadir\@^$(datadir)^g' \
+ < $(srcdir)/e-address.conduit.in > e-address.conduit.tmp \
&& mv e-address.conduit.tmp e-address.conduit
diff --git a/addressbook/conduit/e-address.conduit.in b/addressbook/conduit/e-address.conduit.in
index 1aa78a180e..99b5a15221 100644
--- a/addressbook/conduit/e-address.conduit.in
+++ b/addressbook/conduit/e-address.conduit.in
@@ -1,8 +1,9 @@
<gnome-pilot-conduit version="1.0">
-<conduit id="e_address_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libeaddress_conduit.so"/>
-<name value="EAddress"/>
-<conduit-attribute name="description" value="Synchronizes Addressbook with Evolution"/>
-<conduit-attribute name="default-synctype" value="synchronize"/>
-<conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-calendar-conduit.png"/>
-<conduit-attribute name="settings" value="TRUE"/>
+ <conduit id="e_address_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libeaddress_conduit.so"/>
+ <name value="EAddress"/>
+ <conduit-attribute name="description" value="Synchronizes Addressbook with Evolution"/>
+ <conduit-attribute name="default-synctype" value="synchronize"/>
+ <conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot merge_from_pilot merge_to_pilot"/>
+ <conduit-attribute name="settings" value="FALSE"/>
+ <conduit-attribute name="icon" value="@datadir@/images/evolution/conduits/48_evo-address-conduit.png"/>
</gnome-pilot-conduit>
diff --git a/art/Makefile.am b/art/Makefile.am
index cb5161dbb7..c0ef0a2ab3 100644
--- a/art/Makefile.am
+++ b/art/Makefile.am
@@ -67,6 +67,14 @@ buttons_DATA = \
workweekview.xpm \
yearview.xpm
+conduitsdir = $(datadir)/images/evolution/conduits
+conduits_DATA = \
+ 16_evo-address-conduit.png \
+ 16_evo-todo-conduit.png \
+ 16_evo-calendar-conduit.png \
+ 48_evo-calendar-conduit.png \
+ 48_evo-address-conduit.png \
+ 48_evo-todo-conduit.png
EXTRA_DIST = \
add-service.png \
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index fb99a66a08..983a58ad73 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,13 @@
+2001-03-02 JP Rosevear <jpr@ximian.com>
+
+ * conduits/todo/e-todo.conduit.in: update for new pilot foo
+
+ * conduits/calendar/e-calendar.conduit.in: ditto
+
+ * conduits/todo/Makefile.am: update sed script
+
+ * conduits/calendar/Makefile.am: ditto
+
2001-02-28 Federico Mena Quintero <federico@ximian.com>
* gui/event-editor.c (recurrence_exception_select_row_cb): New
diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am
index 9349cd518b..18f578cfc3 100644
--- a/calendar/conduits/calendar/Makefile.am
+++ b/calendar/conduits/calendar/Makefile.am
@@ -46,7 +46,9 @@ libecalendar_conduit_la_LIBADD = \
$(GNOME_LIBS)
e-calendar.conduit: e-calendar.conduit.in Makefile
- sed -e 's^\@prefix\@^$(prefix)^g' < $(srcdir)/e-calendar.conduit.in > e-calendar.conduit.tmp \
+ sed -e 's^\@prefix\@^$(prefix)^g' \
+ -e 's^\@datadir\@^$(datadir)^g' \
+ < $(srcdir)/e-calendar.conduit.in > e-calendar.conduit.tmp \
&& mv e-calendar.conduit.tmp e-calendar.conduit
ccenterdir = $(datadir)/control-center
diff --git a/calendar/conduits/calendar/e-calendar.conduit.in b/calendar/conduits/calendar/e-calendar.conduit.in
index 6143978e8b..86cfbeecba 100644
--- a/calendar/conduits/calendar/e-calendar.conduit.in
+++ b/calendar/conduits/calendar/e-calendar.conduit.in
@@ -1,8 +1,9 @@
<gnome-pilot-conduit version="1.0">
-<conduit id="e_calendar_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libecalendar_conduit.so"/>
-<name value="ECalendar"/>
-<conduit-attribute name="description" value="Synchronizes Calendar with Evolution"/>
-<conduit-attribute name="default-synctype" value="synchronize"/>
-<conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-calendar-conduit.png"/>
-<conduit-attribute name="settings" value="TRUE"/>
+ <conduit id="e_calendar_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libecalendar_conduit.so"/>
+ <name value="ECalendar"/>
+ <conduit-attribute name="description" value="Synchronizes Calendar with Evolution"/>
+ <conduit-attribute name="default-synctype" value="synchronize"/>
+ <conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot merge_from_pilot merge_to_pilot"/>
+ <conduit-attribute name="settings" value="FALSE"/>
+ <conduit-attribute name="icon" value="@datadir@/images/evolution/conduits/48_evo-calendar-conduit.png"/>
</gnome-pilot-conduit>
diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am
index ea7b628b15..496680e0ea 100644
--- a/calendar/conduits/todo/Makefile.am
+++ b/calendar/conduits/todo/Makefile.am
@@ -47,7 +47,9 @@ libetodo_conduit_la_LIBADD = \
$(GNOME_LIBS)
e-todo.conduit: e-todo.conduit.in Makefile
- sed -e 's^\@prefix\@^$(prefix)^g' < $(srcdir)/e-todo.conduit.in > e-todo.conduit.tmp \
+ sed -e 's^\@prefix\@^$(prefix)^g' \
+ -e 's^\@datadir\@^$(datadir)^g' \
+ < $(srcdir)/e-todo.conduit.in > e-todo.conduit.tmp \
&& mv e-todo.conduit.tmp e-todo.conduit
diff --git a/calendar/conduits/todo/e-todo.conduit.in b/calendar/conduits/todo/e-todo.conduit.in
index 40e6fd620c..733c2105db 100644
--- a/calendar/conduits/todo/e-todo.conduit.in
+++ b/calendar/conduits/todo/e-todo.conduit.in
@@ -1,8 +1,9 @@
<gnome-pilot-conduit version="1.0">
-<conduit id="e_todo_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libetodo_conduit.so"/>
-<name value="EToDo"/>
-<conduit-attribute name="description" value="Synchronizes ToDo List with Evolution"/>
-<conduit-attribute name="default-synctype" value="synchronize"/>
-<conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-calendar-conduit.png"/>
-<conduit-attribute name="settings" value="TRUE"/>
+ <conduit id="e_todo_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libetodo_conduit.so"/>
+ <name value="EToDo"/>
+ <conduit-attribute name="description" value="Synchronizes ToDo List with Evolution"/>
+ <conduit-attribute name="default-synctype" value="synchronize"/>
+ <conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot merge_from_pilot merge_to_pilot"/>
+ <conduit-attribute name="settings" value="FALSE"/>
+ <conduit-attribute name="icon" value="@datadir@/images/evolution/conduits/48_evo-todo-conduit.png"/>
</gnome-pilot-conduit>
diff --git a/configure.in b/configure.in
index 43a5c285c5..05bc27ed73 100644
--- a/configure.in
+++ b/configure.in
@@ -151,7 +151,7 @@ dnl * ldap related stuff.
dnl **************************************************
AC_ARG_ENABLE(ldap,
[ --enable-ldap=[no/yes] Enable LDAP support in evolution],,enable_ldap=no)
-if test x$enable_ldap = xyes; then
+if test x$enable_ldap = xyes; then
AC_CHECK_LIB(lber, ber_get_tag, LDAP_LIBS="-llber")
if test x$ac_cv_lib_lber_ber_get_tag = xyes; then
AC_CHECK_LIB(ldap, ldap_open, LDAP_LIBS="-lldap $LDAP_LIBS", ,-llber)
generated by cgit (git 2.34.1) at 2024-11-17 13:11:07 +0800