aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-06-15 23:20:30 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-06-16 02:45:55 +0800
commit333897772f2cf3251915800aff2c836f02095c84 (patch)
tree6e5d9d2c81b0c1bdf3d3e941e09f2a724a2c56fe /widgets
parent3acb21484e8b93916641dcd0a9b13fed2488a1ef (diff)
downloadgsoc2013-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 'widgets')
-rw-r--r--widgets/misc/Makefile.am16
-rw-r--r--widgets/misc/e-pilot-settings.c190
-rw-r--r--widgets/misc/e-pilot-settings.h72
3 files changed, 1 insertions, 277 deletions
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index 50d8064af3..21faf33517 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
diff --git a/widgets/misc/e-pilot-settings.c b/widgets/misc/e-pilot-settings.c
deleted file mode 100644
index e2b90897a0..0000000000
--- a/widgets/misc/e-pilot-settings.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- * JP Rosevear <jpr@novell.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <libedataserverui/e-source-combo-box.h>
-#include "e-pilot-settings.h"
-
-struct _EPilotSettingsPrivate
-{
- GtkWidget *source;
- GtkWidget *secret;
- GtkWidget *cat;
- GtkWidget *cat_btn;
-};
-
-static void class_init (EPilotSettingsClass *klass);
-static void init (EPilotSettings *ps);
-
-static GObjectClass *parent_class = NULL;
-
-GType
-e_pilot_settings_get_type (void)
-{
- static GType type = 0;
-
- if (!type) {
- static GTypeInfo info = {
- sizeof (EPilotSettingsClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) class_init,
- NULL, NULL,
- sizeof (EPilotSettings),
- 0,
- (GInstanceInitFunc) init
- };
- type = g_type_register_static (GTK_TYPE_TABLE, "EPilotSettings", &info, 0);
- }
-
- return type;
-}
-
-static void
-class_init (EPilotSettingsClass *klass)
-{
- parent_class = g_type_class_ref (GTK_TYPE_TABLE);
-}
-
-static void
-init (EPilotSettings *ps)
-{
- EPilotSettingsPrivate *priv;
-
- priv = g_new0 (EPilotSettingsPrivate, 1);
-
- ps->priv = priv;
-}
-
-static void
-build_ui (EPilotSettings *ps, ESourceList *source_list)
-{
- EPilotSettingsPrivate *priv;
- GtkWidget *lbl;
-
- priv = ps->priv;
-
- gtk_table_resize (GTK_TABLE (ps), 2, 2);
- gtk_container_set_border_width (GTK_CONTAINER (ps), 4);
- gtk_table_set_col_spacings (GTK_TABLE (ps), 6);
-
- lbl = gtk_label_new (_("Sync with:"));
- gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.5);
- priv->source = e_source_combo_box_new (source_list);
- gtk_table_attach_defaults (GTK_TABLE (ps), lbl, 0, 1, 0, 1);
- gtk_table_attach_defaults (GTK_TABLE (ps), priv->source, 1, 2, 0, 1);
- gtk_widget_show (lbl);
- gtk_widget_show (priv->source);
-
- lbl = gtk_label_new (_("Sync Private Records:"));
- gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.5);
- priv->secret = gtk_check_button_new ();
- gtk_table_attach_defaults (GTK_TABLE (ps), lbl, 0, 1, 1, 2);
- gtk_table_attach_defaults (GTK_TABLE (ps), priv->secret, 1, 2, 1, 2);
- gtk_widget_show (lbl);
- gtk_widget_show (priv->secret);
-
-#if 0
- lbl = gtk_label_new (_("Sync Categories:"));
- gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.5);
- priv->cat = gtk_check_button_new ();
- gtk_table_attach_defaults (GTK_TABLE (ps), lbl, 0, 1, 2, 3);
- gtk_table_attach_defaults (GTK_TABLE (ps), priv->cat, 1, 2, 2, 3);
- gtk_widget_show (lbl);
- gtk_widget_show (priv->cat);
-#endif
-}
-
-
-
-GtkWidget *
-e_pilot_settings_new (ESourceList *source_list)
-{
- EPilotSettings *ps;
-
- ps = g_object_new (E_TYPE_PILOT_SETTINGS, NULL);
-
- build_ui (ps, source_list);
-
- return GTK_WIDGET (ps);
-}
-
-ESource *
-e_pilot_settings_get_source (EPilotSettings *ps)
-{
- EPilotSettingsPrivate *priv;
-
- g_return_val_if_fail (ps != NULL, NULL);
- g_return_val_if_fail (E_IS_PILOT_SETTINGS (ps), NULL);
-
- priv = ps->priv;
-
- return e_source_combo_box_get_active (
- E_SOURCE_COMBO_BOX (priv->source));
-}
-
-void
-e_pilot_settings_set_source (EPilotSettings *ps, ESource *source)
-{
- EPilotSettingsPrivate *priv;
-
- g_return_if_fail (ps != NULL);
- g_return_if_fail (E_IS_PILOT_SETTINGS (ps));
-
- priv = ps->priv;
-
- e_source_combo_box_set_active (
- E_SOURCE_COMBO_BOX (priv->source), source);
-}
-
-gboolean
-e_pilot_settings_get_secret (EPilotSettings *ps)
-{
- EPilotSettingsPrivate *priv;
-
- g_return_val_if_fail (ps != NULL, FALSE);
- g_return_val_if_fail (E_IS_PILOT_SETTINGS (ps), FALSE);
-
- priv = ps->priv;
-
- return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->secret));
-}
-
-void
-e_pilot_settings_set_secret (EPilotSettings *ps, gboolean secret)
-{
- EPilotSettingsPrivate *priv;
-
- g_return_if_fail (ps != NULL);
- g_return_if_fail (E_IS_PILOT_SETTINGS (ps));
-
- priv = ps->priv;
-
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->secret),
- secret);
-}
-
diff --git a/widgets/misc/e-pilot-settings.h b/widgets/misc/e-pilot-settings.h
deleted file mode 100644
index 0c4fbd7a81..0000000000
--- a/widgets/misc/e-pilot-settings.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- * JP Rosevear <jpr@novell.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifndef _E_PILOT_SETTINGS_H_
-#define _E_PILOT_SETTINGS_H_
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <libedataserver/e-source-list.h>
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define E_TYPE_PILOT_SETTINGS (e_pilot_settings_get_type ())
-#define E_PILOT_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_PILOT_SETTINGS, EPilotSettings))
-#define E_PILOT_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_PILOT_SETTINGS, EPilotSettingsClass))
-#define E_IS_PILOT_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_PILOT_SETTINGS))
-#define E_IS_PILOT_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_PILOT_SETTINGS))
-
-
-typedef struct _EPilotSettings EPilotSettings;
-typedef struct _EPilotSettingsPrivate EPilotSettingsPrivate;
-typedef struct _EPilotSettingsClass EPilotSettingsClass;
-
-#define E_PILOT_SETTINGS_TABLE_ROWS 3
-#define E_PILOT_SETTINGS_TABLE_COLS 3
-
-struct _EPilotSettings {
- GtkTable parent;
-
- EPilotSettingsPrivate *priv;
-};
-
-struct _EPilotSettingsClass {
- GtkTableClass parent_class;
-};
-
-
-GType e_pilot_settings_get_type (void);
-GtkWidget *e_pilot_settings_new (ESourceList *source_list);
-
-ESource *e_pilot_settings_get_source (EPilotSettings *ps);
-void e_pilot_settings_set_source (EPilotSettings *ps, ESource *source);
-
-gboolean e_pilot_settings_get_secret (EPilotSettings *ps);
-void e_pilot_settings_set_secret (EPilotSettings *ps, gboolean secret);
-
-G_END_DECLS
-
-#endif