GNOME.org
 

[evolution] Remove gnome-pilot integration.

commit 333897772f2cf3251915800aff2c836f02095c84
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Jun 15 11:20:30 2010 -0400

    Remove gnome-pilot integration.
    
    It just doesn't belong in Evolution anymore.  We don't support syncing
    with more modern devices -- see Conduits or SyncEvolution for that -- so
    it does not make sense for older model Palm Pilot PDAs to be the lone
    exception.
    
    I have repackaged the Evolution-Data-Server conduit modules to be
    provided by gnome-pilot itself in bug #619315.  This should provide
    eqivalent Palm Pilot syncing functionality; it's just being moved to
    gnome-pilot.
    
    This completely severs our dependency on deprecated GNOME 2.x libraries
    which were still being dragged in by way of gnome-pilot dependencies.
    It was also interfereing with our bundling of libgnomecanvas.

 AUTHORS                                            |    3 -
 README                                             |   18 -
 addressbook/Makefile.am                            |    6 +-
 addressbook/conduit/Makefile.am                    |   40 -
 addressbook/conduit/address-conduit.c              | 2250 --------------------
 addressbook/conduit/e-address.conduit.in           |    9 -
 calendar/Makefile.am                               |    8 +-
 calendar/conduits/Makefile.am                      |    3 -
 calendar/conduits/calendar/Makefile.am             |   43 -
 calendar/conduits/calendar/calendar-conduit.c      | 2174 -------------------
 calendar/conduits/calendar/e-calendar.conduit.in   |    9 -
 calendar/conduits/common/Makefile.am               |   24 -
 .../conduits/common/libecalendar-common-conduit.c  |  372 ----
 .../conduits/common/libecalendar-common-conduit.h  |   36 -
 calendar/conduits/memo/Makefile.am                 |   43 -
 calendar/conduits/memo/e-memo.conduit.in           |    8 -
 calendar/conduits/memo/memo-conduit.c              | 1442 -------------
 calendar/conduits/todo/Makefile.am                 |   42 -
 calendar/conduits/todo/e-todo.conduit.in           |    9 -
 calendar/conduits/todo/todo-conduit.c              | 1634 --------------
 configure.ac                                       |   85 -
 doc/reference/shell/tmpl/eshell-unused.sgml        |    7 +
 doc/reference/shell/tmpl/shell-actions.sgml        |    8 -
 e-util/Makefile.am                                 |   54 +-
 e-util/e-pilot-map.c                               |  418 ----
 e-util/e-pilot-map.h                               |   60 -
 e-util/e-pilot-util.c                              |  119 -
 e-util/e-pilot-util.h                              |   38 -
 evolution-zip.in                                   |    2 -
 m4/evo_pilot_link_check.m4                         |  117 -
 po/POTFILES.in                                     |    5 -
 shell/e-shell-window-actions.c                     |   45 -
 shell/e-shell-window-actions.h                     |    2 -
 ui/evolution-shell.ui                              |    1 -
 widgets/misc/Makefile.am                           |   16 +-
 widgets/misc/e-pilot-settings.c                    |  190 --
 widgets/misc/e-pilot-settings.h                    |   72 -
 37 files changed, 11 insertions(+), 9401 deletions(-)
---
diff --git a/AUTHORS b/AUTHORS
index 75e6a26..80633a8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -42,9 +42,6 @@ Mailer
 Notes
 	Anders Carlsson <andersca gnu org>
 
-Pilot
-	JP Rosevear <jpr ximian com>
-
 Shell
 	Miguel de Icaza <miguel ximian com>
 	Jason Leach <jleach ximian com>
diff --git a/README b/README
index 6303392..d26b0f7 100644
--- a/README
+++ b/README
@@ -72,14 +72,6 @@ dependencies should be compiled in the order they are listed here):
           Many distributions ship these as Mozilla development
           packages.
 
-	* [Optional] gnome-pilot 2.0 or later
-
-	  This is only necessary if you want to be able to synchronize
-	  your Palm device with Evolution.
-
-	     ftp://ftp.gnome.org/pub/gnome/sources/gnome-pilot
-	     ftp://ftp.gnome.org/pub/gnome/sources/gnome-pilot-conduits
-
 	* [Optional] gnome-spell 1.0.1 or later
 
 	  This is only necessary if you want to have the spell
@@ -147,16 +139,6 @@ OPTIONAL FEATURES
 Some optional features can be enabled at compilation time by passing
 appropriate flags to the configure script:
 
-	* GNOME Pilot support.
-
-	  Assuming you have installed gnome-pilot, add the following
-	  options:
-
-	    --with-pisock=<prefix> --enable-pilot-conduits=yes
-
-	  Where <prefix> is the location where pilot-link (a package
-	  that gnome-pilot depends on) was installed.
-
 	* SSL support.
 
 	  Make sure you have Mozilla's NSS nad NSPR libraries
diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
index ca0916e..45802a5 100644
--- a/addressbook/Makefile.am
+++ b/addressbook/Makefile.am
@@ -1,9 +1,5 @@
 
-if ENABLE_PILOT_CONDUITS
-CONDUIT_SUBDIR = conduit
-endif
-
-SUBDIRS = util printing importers gui tools $(CONDUIT_SUBDIR)
+SUBDIRS = util printing importers gui tools
 
 error_DATA = addressbook.error
 errordir = $(privdatadir)/errors
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index e8974cd..dfed6e6 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -1,10 +1,4 @@
-if ENABLE_PILOT_CONDUITS
-CONDUIT_DIR = conduits
-else
-CONDUIT_DIR =
-endif
-
-SUBDIRS = common importers gui $(CONDUIT_DIR)
+SUBDIRS = common importers gui
 
 error_DATA = calendar.error
 errordir = $(privdatadir)/errors
diff --git a/configure.ac b/configure.ac
index 4a18cc3..bcaec4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,6 @@ m4_define([champlain_minimum_version], [0.4])
 m4_define([geoclue_minimum_version], [0.11.1])
 m4_define([clutter_gtk_minimum_version], [0.10.0])
 m4_define([libnotify_minimum_version], [0.3.0])
-m4_define([gnome_pilot_minimum_version], [2.0.16])
 m4_define([gweather_minimum_version], [2.25.3])
 m4_define([gtkimageview_minimum_version], [1.6])
 m4_define([gladeui_minimum_version], [3.0.0])
@@ -647,68 +646,6 @@ PKG_CHECK_MODULES([GTKHTML], [libgtkhtml-3.14 >= libgtkhtml_minimum_version])
 AC_SUBST(GTKHTML_CFLAGS)
 AC_SUBST(GTKHTML_LIBS)
 
-dnl ******************************
-dnl Pilot checking
-dnl ******************************
-AC_ARG_ENABLE([pilot-conduits],
-	AS_HELP_STRING([--enable-pilot-conduits],
-	[Enable support for building pilot conduits.]),,
-	[enable_pilot_conduits=no])
-if test "x$enable_pilot_conduits" = "xyes"; then
-	PKG_CHECK_MODULES([GNOME_PILOT], [gnome-pilot-2.0 >= gnome_pilot_minimum_version])
-
-	CFLAGS_save="$CFLAGS"
-	CFLAGS="$CFLAGS $GNOME_PILOT_CFLAGS"
-	LIBS_save="$LIBS"
-	LIBS="$LIBS $GNOME_PILOT_LIBS $LDFLAGS"
-
-	AC_CACHE_CHECK([if pilot-link handles UTF-8 conversions],[ac_cv_pilot_link_utf8],
-	AC_RUN_IFELSE([AC_LANG_SOURCE(
-	[[	#include <stdlib.h>
-		#include <string.h>
-		#include <pi-util.h>
-
-		int main (){
-		const char *utf8 = "\x66\x66\x66\x66\x66\x66\x66\xC2\xA9";
-		size_t utf8_real_len = strlen (utf8);
-		char *pstring;
-		if (convert_ToPilotChar ("UTF-8", utf8, utf8_real_len, &pstring) == -1)
-			exit (1);
-		return (0);
-		}
-	]]
-	)],[ac_cv_pilot_link_utf8=yes],[ac_cv_pilot_link_utf8=no],[ac_cv_pilot_link_utf8=no]))
-
-	CFLAGS="$CFLAGS_save"
-	LIBS="$LIBS_save"
-
-	if test "$ac_cv_pilot_link_utf8" = no; then
-		AC_MSG_ERROR([evolution requires pilot-link to have working UTF-8 conversion routines])
-	fi
-fi
-AM_CONDITIONAL(ENABLE_PILOT_CONDUITS, [test x$enable_pilot_conduits = xyes])
-dnl ******************************
-dnl If pilot conduits are enabled, check version of pilot-link
-dnl ******************************
-if test x$enable_pilot_conduits = xyes; then
-	msg_pilot=yes
-
-	PILOT_LINK_CHECK(0.11.4)
-	AC_SUBST(PILOT_LINK_MAJOR)
-	AC_SUBST(PILOT_LINK_MINOR)
-	AC_SUBST(PILOT_LINK_MICRO)
-	AC_SUBST(PILOT_LINK_PATCH)
-	AC_SUBST(PILOT_LINK_VERSION)
-
-	if test $PILOT_LINK_MINOR -ge 12; then
-		AC_DEFINE(PILOT_LINK_0_12,,[Building against pilot-link 0.12.0 or greater])
-	fi
-else
-	msg_pilot=no
-fi
-AC_SUBST(GNOME_PILOT_CFLAGS)
-AC_SUBST(GNOME_PILOT_LIBS)
-
 dnl ************
 dnl Kerberos 5
 dnl ************
@@ -1298,12 +1235,6 @@ EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)
 AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
 AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS)
 
-if test x$enable_pilot_conduits = xyes; then
-EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK_CONDUIT, gnome-pilot-2.0 $EVOLUTION_ADDRESSBOOK_DEPS)
-AC_SUBST(EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS)
-AC_SUBST(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)
-fi
-
 dnl ***************
 dnl Libnotify Flags
 dnl ***************
@@ -1334,12 +1265,6 @@ EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgtkhtml-3.14 libebook-1.2 libecal-1
 AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
 AC_SUBST(EVOLUTION_CALENDAR_LIBS)
 
-if test x$enable_pilot_conduits = xyes; then
-EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR_CONDUIT, gnome-pilot-2.0, $EVOLUTION_CALENDAR_CFLAGS, $EVOLUTION_CALENDAR_LIBS)
-AC_SUBST(EVOLUTION_CALENDAR_CONDUIT_CFLAGS)
-AC_SUBST(EVOLUTION_CALENDAR_CONDUIT_LIBS)
-fi
-
 dnl **********
 dnl Mail Flags
 dnl **********
@@ -1415,9 +1340,6 @@ AC_SUBST(etspecdir)
 viewsdir="$privdatadir/views"
 AC_SUBST(viewsdir)
 
-privconduitdir="$privlibdir/conduits"
-AC_SUBST(privconduitdir)
-
 dnl For evolution-alarm-notify.desktop
 AS_AC_EXPAND(PRIVLIBEXECDIR, "$privlibexecdir")
 
@@ -1685,7 +1607,6 @@ AC_CONFIG_FILES([ po/Makefile.in
 Makefile
 a11y/Makefile
 addressbook/Makefile
-addressbook/conduit/Makefile
 addressbook/gui/Makefile
 addressbook/gui/contact-editor/Makefile
 addressbook/gui/contact-list-editor/Makefile
@@ -1744,11 +1665,6 @@ widgets/table/Makefile
 calendar/Makefile
 calendar/importers/Makefile
 calendar/common/Makefile
-calendar/conduits/Makefile
-calendar/conduits/common/Makefile
-calendar/conduits/todo/Makefile
-calendar/conduits/calendar/Makefile
-calendar/conduits/memo/Makefile
 calendar/gui/Makefile
 calendar/gui/alarm-notify/Makefile
 calendar/gui/dialogs/Makefile
@@ -1858,7 +1774,6 @@ echo "
 	NetworkManager:		$enable_nm
 	Windows SENS:           $enable_sens
 	ConnMan:		$enable_connman
-	Pilot conduits:		$msg_pilot
 	Libnotify:		$HAVE_LIBNOTIFY
 	Kerberos 5:		$msg_krb5
 	SSL support:		$msg_ssl
diff --git a/doc/reference/shell/tmpl/eshell-unused.sgml b/doc/reference/shell/tmpl/eshell-unused.sgml
index 93f3a14..11fa503 100644
--- a/doc/reference/shell/tmpl/eshell-unused.sgml
+++ b/doc/reference/shell/tmpl/eshell-unused.sgml
@@ -4,6 +4,13 @@
 </para>
 
 
+<!-- ##### MACRO E_SHELL_WINDOW_ACTION_SYNC_OPTIONS ##### -->
+<para>
+
+</para>
+
+ window: 
+
 <!-- ##### FUNCTION e_shell_content_get_search_name ##### -->
 <para>
 
diff --git a/doc/reference/shell/tmpl/shell-actions.sgml b/doc/reference/shell/tmpl/shell-actions.sgml
index 30d5291..9a0878e 100644
--- a/doc/reference/shell/tmpl/shell-actions.sgml
+++ b/doc/reference/shell/tmpl/shell-actions.sgml
@@ -268,14 +268,6 @@ Shell Actions
 @window: 
 
 
-<!-- ##### MACRO E_SHELL_WINDOW_ACTION_SYNC_OPTIONS ##### -->
-<para>
-
-</para>
-
- window: 
-
-
 <!-- ##### MACRO E_SHELL_WINDOW_ACTION_WORK_OFFLINE ##### -->
 <para>
 
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 7df0e0d..f1c6131 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -1,5 +1,4 @@
 eutilincludedir = $(privincludedir)/e-util
-econdincludedir = $(privincludedir)/e-conduit
 ecpsdir = $(privdatadir)/ecps
 ruledir = $(privdatadir)
 
@@ -7,7 +6,7 @@ if OS_WIN32
 PLATFORM_SOURCES = e-win32-reloc.c e-win32-defaults.c e-win32-defaults.h
 endif
 
-privsolib_LTLIBRARIES = libeutil.la libeconduit.la
+privsolib_LTLIBRARIES = libeutil.la
 
 eutilinclude_HEADERS = 				\
 	e-account-utils.h			\
@@ -85,7 +84,6 @@ libeutil_la_CPPFLAGS =							\
 	-DEVOLUTION_RULEDIR=\"$(ruledir)\"				\
 	-DG_LOG_DOMAIN=\"e-utils\"					\
 	$(GNOME_PLATFORM_CFLAGS)					\
-	$(GNOME_PILOT_CFLAGS)						\
 	$(E_UTIL_CFLAGS)
 
 libeutil_la_SOURCES =				\
@@ -148,65 +146,15 @@ libeutil_la_LDFLAGS = $(NO_UNDEFINED)
 libeutil_la_LIBADD = 		\
 	$(ICONV_LIBS)		\
 	$(E_UTIL_LIBS)		\
-	$(GNOME_PILOT_LIBS)	\
 	$(GNOME_PLATFORM_LIBS)	\
 	$(INTLLIBS)
 
-econdinclude_HEADERS =		\
-	e-pilot-map.h		\
-	e-pilot-util.h
-
-pilot_sources = \
-	$(econdinclude_HEADERS)	\
-	e-pilot-map.c		\
-	e-pilot-util.c
-
-if ENABLE_PILOT_CONDUITS
-pilot_compile = $(pilot_sources)
-else
-pilot_compile = e-html-utils.c
-endif
-
-libeconduit_la_CPPFLAGS =							\
-	$(AM_CPPFLAGS)							\
-	-I$(top_srcdir)							\
-	-I$(top_builddir)						\
-	-I$(top_srcdir)/widgets						\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"				\
-	-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\"				\
-	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"			\
-	-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\"			\
-	-DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\"			\
-	-DEVOLUTION_ICONDIR=\""$(icondir)"\"				\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"			\
-	-DEVOLUTION_LIBDIR=\""$(datadir)"\"				\
-	-DEVOLUTION_LIBEXECDIR=\""$(privlibexecdir)"\"			\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"			\
-	-DEVOLUTION_PLUGINDIR=\""$(plugindir)"\"			\
-	-DEVOLUTION_PREFIX=\""$(prefix)"\"				\
-	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"			\
-	-DEVOLUTION_SOUNDDIR=\""$(soundsdir)"\"				\
-	-DEVOLUTION_SYSCONFDIR=\""$(sysconfdir)"\"			\
-	-DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\"			\
-	-DEVOLUTION_UIDIR=\""$(uidir)"\"				\
-	-DEVOLUTION_RULEDIR=\"$(ruledir)\"				\
-	-DG_LOG_DOMAIN=\"e-utils\"					\
-	$(GNOME_PILOT_CFLAGS)						\
-	$(E_UTIL_CFLAGS)
-
-libeconduit_la_SOURCES = $(pilot_compile)
-
-libeconduit_la_LDFLAGS = $(NO_UNDEFINED)
-
-libeconduit_la_LIBADD = $(E_UTIL_LIBS) 	$(GNOME_PILOT_LIBS)
-
 error_DATA = e-system.error
 errordir = $(privdatadir)/errors
 @EVO_PLUGIN_RULE@
 
 EXTRA_DIST =				\
 	e-system.error.xml		\
-	$(pilot_sources)		\
 	e-marshal.list
 
 BUILT_SOURCES = $(MARSHAL_GENERATED) $(error_DATA)
diff --git a/evolution-zip.in b/evolution-zip.in
index 4373f1c..9183c3c 100755
--- a/evolution-zip.in
+++ b/evolution-zip.in
@@ -12,7 +12,6 @@ cd @prefix@
 rm $ZIP
 zip -r $ZIP -@ <<EOF
 bin/libeabutil-0.dll
-bin/libeconduit-0.dll
 bin/libecontacteditor-0.dll
 bin/libecontactlisteditor-0.dll
 bin/libefilterbar-0.dll
@@ -63,7 +62,6 @@ fi
 rm $DEVZIP
 zip -r $DEVZIP -@ <<EOF
 lib/libeabutil.dll.a
-lib/libeconduit.dll.a
 lib/libecontacteditor.dll.a
 lib/libecontactlisteditor.dll.a
 lib/libefilterbar.dll.a
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7dec6b0..d94632f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,6 @@
 # List of source files containing translatable strings.
 # Please keep this list in alphabetic order.
 addressbook/addressbook.error.xml
-addressbook/conduit/address-conduit.c
 [type: gettext/glade]addressbook/gui/contact-editor/contact-editor.ui
 addressbook/gui/contact-editor/e-contact-editor-fullname.c
 addressbook/gui/contact-editor/e-contact-editor.c
@@ -40,9 +39,6 @@ addressbook/tools/evolution-addressbook-export.c
 addressbook/util/addressbook.c
 calendar/calendar.error.xml
 calendar/common/authentication.c
-calendar/conduits/calendar/calendar-conduit.c
-calendar/conduits/memo/memo-conduit.c
-calendar/conduits/todo/todo-conduit.c
 calendar/gui/alarm-notify/alarm-notify-dialog.c
 [type: gettext/glade]calendar/gui/alarm-notify/alarm-notify.ui
 calendar/gui/alarm-notify/alarm-queue.c
@@ -473,7 +469,6 @@ widgets/misc/e-import-assistant.c
 widgets/misc/e-map.c
 widgets/misc/e-online-button.c
 widgets/misc/e-paned.c
-widgets/misc/e-pilot-settings.c
 widgets/misc/e-popup-action.c
 widgets/misc/e-preferences-window.c
 widgets/misc/e-search-bar.c
diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c
index 480b99d..01e5f35 100644
--- a/shell/e-shell-window-actions.c
+++ b/shell/e-shell-window-actions.c
@@ -1328,38 +1328,6 @@ action_switcher_style_cb (GtkRadioAction *action,
 }
 
 /**
- * E_SHELL_WINDOW_ACTION_SYNC_OPTIONS:
- * @window: an #EShellWindow
- *
- * Activation of this action opens the Gnome Pilot settings.
- *
- * Main menu item: Edit -> GNOME Pilot Synchronization...
- **/
-static void
-action_sync_options_cb (GtkAction *action,
-                        EShellWindow *shell_window)
-{
-	const gchar *command_line;
-	GError *error = NULL;
-
-	command_line = "gpilotd-control-applet";
-
-	g_debug ("Spawning: %s", command_line);
-	g_spawn_command_line_async (command_line, &error);
-
-	if (error != NULL) {
-		const gchar *message;
-
-		if (error->code == G_SPAWN_ERROR_NOENT)
-			message = _("GNOME Pilot is not installed.");
-		else
-			message = _("GNOME Pilot could not be run.");
-		e_notice (shell_window, GTK_MESSAGE_ERROR, message);
-		g_error_free (error);
-	}
-}
-
-/**
  * E_SHELL_WINDOW_ACTION_WORK_OFFLINE:
  * @window: an #EShellWindow
  *
@@ -1618,13 +1586,6 @@ static GtkActionEntry shell_entries[] = {
 	  N_("Submit a bug report using Bug Buddy"),
 	  G_CALLBACK (action_submit_bug_cb) },
 
-	{ "sync-options",
-	  NULL,
-	  N_("GNOME Pilot _Synchronization..."),
-	  NULL,
-	  N_("Set up GNOME Pilot configuration"),
-	  G_CALLBACK (action_sync_options_cb) },
-
 	{ "work-offline",
 	  "stock_disconnect",
 	  N_("_Work Offline"),
@@ -2020,12 +1981,6 @@ e_shell_window_actions_init (EShellWindow *shell_window)
 	if (path == NULL)
 		gtk_action_set_visible (ACTION (SUBMIT_BUG), FALSE);
 	g_free (path);
-
-	/* Sychronizing your Palm PDA requires gnome-pilot. */
-	path = g_find_program_in_path ("gpilotd-control-applet");
-	if (path == NULL)
-		gtk_action_set_visible (ACTION (SYNC_OPTIONS), FALSE);
-	g_free (path);
 }
 
 static GList *
diff --git a/shell/e-shell-window-actions.h b/shell/e-shell-window-actions.h
index 616899f..a3f752c 100644
--- a/shell/e-shell-window-actions.h
+++ b/shell/e-shell-window-actions.h
@@ -103,8 +103,6 @@
 	E_SHELL_WINDOW_ACTION ((window), "switcher-style-text")
 #define E_SHELL_WINDOW_ACTION_SWITCHER_STYLE_USER(window) \
 	E_SHELL_WINDOW_ACTION ((window), "switcher-style-user")
-#define E_SHELL_WINDOW_ACTION_SYNC_OPTIONS(window) \
-	E_SHELL_WINDOW_ACTION ((window), "sync-options")
 #define E_SHELL_WINDOW_ACTION_WORK_OFFLINE(window) \
 	E_SHELL_WINDOW_ACTION ((window), "work-offline")
 #define E_SHELL_WINDOW_ACTION_WORK_ONLINE(window) \
diff --git a/ui/evolution-shell.ui b/ui/evolution-shell.ui
index c051668..97e2f22 100644
--- a/ui/evolution-shell.ui
+++ b/ui/evolution-shell.ui
@@ -34,7 +34,6 @@
       <separator/>
       <placeholder name='edit-actions'/>
       <separator/>
-      <menuitem action='sync-options'/>
       <placeholder name='administrative-actions'/>
       <menuitem action='preferences'/>
     </menu>
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index 50d8064..21faf33 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -2,18 +2,9 @@ privsolib_LTLIBRARIES = libemiscwidgets.la
 
 widgetsincludedir = $(privincludedir)/misc
 
-if ENABLE_PILOT_CONDUITS
-pilot_sources = e-pilot-settings.c
-pilot_headers = e-pilot-settings.h
-else
-pilot_sources =
-pilot_headers =
-endif
-
 ui_DATA = e-send-options.ui
 
 widgetsinclude_HEADERS =			\
-	$(pilot_headers)			\
 	e-account-combo-box.h			\
 	e-account-manager.h			\
 	e-account-tree-view.h			\
@@ -90,7 +81,6 @@ libemiscwidgets_la_CPPFLAGS =						\
 
 libemiscwidgets_la_SOURCES =			\
 	$(widgetsinclude_HEADERS)		\
-	$(pilot_sources)			\
 	e-account-combo-box.c			\
 	e-account-manager.c			\
 	e-account-tree-view.c			\
@@ -224,10 +214,6 @@ test_preferences_window_LDADD = 		\
 	$(GNOME_PLATFORM_LIBS)			\
 	$(E_WIDGETS_LIBS)
 
-
-EXTRA_DIST =			\
-	$(ui_DATA)		\
-	e-pilot-settings.h	\
-	e-pilot-settings.c
+EXTRA_DIST = $(ui_DATA)
 
 -include $(top_srcdir)/git.mk
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]