[evolution] Kill the ipod-sync plugin, along with the HAL dependency.



commit 5a80f92d37e7e8a814f70f826b7b33f5d21b0f72
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Sep 22 07:46:44 2009 -0400

    Kill the ipod-sync plugin, along with the HAL dependency.

 configure.ac                                       |   18 +-
 plugins/ipod-sync/ChangeLog                        |  187 --------
 plugins/ipod-sync/Makefile.am                      |   30 --
 plugins/ipod-sync/evolution-ipod-sync.c            |  105 -----
 plugins/ipod-sync/evolution-ipod-sync.h            |   37 --
 plugins/ipod-sync/format-handler.h                 |   52 ---
 plugins/ipod-sync/ical-format.c                    |  126 ------
 plugins/ipod-sync/ipod-sync.c                      |  267 ------------
 plugins/ipod-sync/ipod.c                           |  256 -----------
 .../org-gnome-ipod-sync-evolution.eplug.xml        |   26 --
 plugins/ipod-sync/sync.c                           |  453 --------------------
 po/POTFILES.in                                     |    3 -
 12 files changed, 3 insertions(+), 1557 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a188caf..5ba9b02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1395,16 +1395,6 @@ dnl ********************************
 
 FULL_GNOME_DEPS="gconf-2.0 gthread-2.0 gobject-2.0 libglade-2.0"
 
-PKG_CHECK_MODULES([HAL], [hal >= hal_minimum_version], [HAVE_HAL="yes"], [HAVE_HAL="no"])
-if test "x$HAVE_HAL" = "xyes"; then
-	AC_DEFINE(HAVE_HAL, 1, [hal available])
-	HAL_REQUIREMENT="hal"
-	IPOD_SYNC="ipod-sync"
-else
-	HAL_REQUIREMENT=""
-	IPOD_SYNC=""
-fi
-
 dnl ******************************
 dnl TNEF implementation
 dnl ******************************
@@ -1767,8 +1757,8 @@ plugins_standard="$plugins_standard_always"
 all_plugins_standard="$plugins_standard"
 
 plugins_experimental_always="face external-editor hula-account-setup"
-plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS"
-all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments"
+plugins_experimental="$plugins_experimental_always $TNEF_ATTACHMENTS"
+all_plugins_experimental="$plugins_experimental_always tnef-attachments"
 
 case x"$enable_plugins" in
 xno)
@@ -1794,7 +1784,7 @@ xexperimental)
 esac
 
 dnl Temporary KILL-BONOBO hack
-for broken_plugin in exchange-operations groupwise-features ipod-sync
+for broken_plugin in exchange-operations groupwise-features
 do
 	if echo ${plugins_enabled} | grep "$broken_plugin" > /dev/null
 	then
@@ -2047,7 +2037,6 @@ plugins/groupwise-account-setup/Makefile
 plugins/groupwise-features/Makefile
 plugins/hula-account-setup/Makefile
 plugins/imap-features/Makefile
-plugins/ipod-sync/Makefile
 plugins/itip-formatter/Makefile
 plugins/mail-notification/Makefile
 plugins/mail-to-task/Makefile
@@ -2090,7 +2079,6 @@ fi
 
 echo "
 	LDAP support:		$msg_ldap
-	HAL:			$HAVE_HAL
 	NetworkManager:		$NM_SUPPORT
 	NNTP support:		$msg_nntp
 	Pilot conduits:		$msg_pilot
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 72f42ed..bf4ec0e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -374,9 +374,6 @@ plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml
 plugins/imap-features/imap-headers.c
 plugins/imap-features/imap-headers.glade
 plugins/imap-features/org-gnome-imap-features.eplug.xml
-plugins/ipod-sync/evolution-ipod-sync.c
-plugins/ipod-sync/ical-format.c
-plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml
 plugins/itip-formatter/itip-formatter.c
 plugins/itip-formatter/itip-view.c
 plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]