diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2010-06-15 23:20:30 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2010-06-16 02:45:55 +0800 |
commit | 333897772f2cf3251915800aff2c836f02095c84 (patch) | |
tree | 6e5d9d2c81b0c1bdf3d3e941e09f2a724a2c56fe /shell | |
parent | 3acb21484e8b93916641dcd0a9b13fed2488a1ef (diff) | |
download | gsoc2013-evolution-333897772f2cf3251915800aff2c836f02095c84.tar gsoc2013-evolution-333897772f2cf3251915800aff2c836f02095c84.tar.gz gsoc2013-evolution-333897772f2cf3251915800aff2c836f02095c84.tar.bz2 gsoc2013-evolution-333897772f2cf3251915800aff2c836f02095c84.tar.lz gsoc2013-evolution-333897772f2cf3251915800aff2c836f02095c84.tar.xz gsoc2013-evolution-333897772f2cf3251915800aff2c836f02095c84.tar.zst gsoc2013-evolution-333897772f2cf3251915800aff2c836f02095c84.zip |
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.
Diffstat (limited to 'shell')
-rw-r--r-- | shell/e-shell-window-actions.c | 45 | ||||
-rw-r--r-- | shell/e-shell-window-actions.h | 2 |
2 files changed, 0 insertions, 47 deletions
diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c index 480b99da2b..01e5f3517c 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 616899f61c..a3f752c15e 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) \ |