Remove GalDefineViewsDialog.

No longer used.

6 files changed, 0 insertions, 710 deletions

diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index ab4efa5f57..bdffb0f8af 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -44,7 +44,6 @@ ui_DATA = \
 	e-table-config.ui \
 	e-timezone-dialog.ui \
 	filter.ui \
-	gal-define-views.ui \
 	gal-view-instance-save-as-dialog.ui \
 	gal-view-new-dialog.ui \
 	$(NULL)
@@ -329,7 +328,6 @@ evolution_util_include_HEADERS =  \
 	gal-a11y-e-tree.h \
 	gal-a11y-factory.h \
 	gal-a11y-util.h \
-	gal-define-views-dialog.h \
 	gal-define-views-model.h \
 	gal-view-collection.h \
 	gal-view-etable.h \
@@ -568,7 +566,6 @@ libevolution_util_la_SOURCES = \
 	gal-a11y-e-tree-factory.c \
 	gal-a11y-e-tree.c \
 	gal-a11y-util.c \
-	gal-define-views-dialog.c \
 	gal-define-views-model.c \
 	gal-view-collection.c \
 	gal-view-etable.c \
diff --git a/e-util/e-util.h b/e-util/e-util.h
index d2bd74229c..eb59765e44 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -222,7 +222,6 @@
 #include <e-util/e-xml-utils.h>
 #include <e-util/ea-cell-table.h>
 #include <e-util/ea-factory.h>
-#include <e-util/gal-define-views-dialog.h>
 #include <e-util/gal-define-views-model.h>
 #include <e-util/gal-view-collection.h>
 #include <e-util/gal-view-etable.h>
diff --git a/e-util/gal-define-views-dialog.c b/e-util/gal-define-views-dialog.c
deleted file mode 100644
index d2c839ed8a..0000000000
--- a/e-util/gal-define-views-dialog.c
+++ /dev/null
@@ -1,451 +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:
- *		Chris Lahey <clahey@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib/gi18n.h>
-
-#include "e-misc-utils.h"
-#include "e-util-private.h"
-
-#include "gal-define-views-dialog.h"
-#include "gal-define-views-model.h"
-#include "gal-view-new-dialog.h"
-
-static void gal_define_views_dialog_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec);
-static void gal_define_views_dialog_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec);
-static void gal_define_views_dialog_dispose	 (GObject *object);
-
-/* The properties we support */
-enum {
-	PROP_0,
-	PROP_COLLECTION
-};
-
-enum {
-	COL_GALVIEW_NAME,
-	COL_GALVIEW_DATA
-};
-
-typedef struct {
-	gchar         *title;
-
-	GtkTreeView *treeview;
-	GtkTreeModel *model;
-
-	GalDefineViewsDialog *names;
-} GalDefineViewsDialogChild;
-
-G_DEFINE_TYPE (GalDefineViewsDialog, gal_define_views_dialog, GTK_TYPE_DIALOG)
-
-static void
-gal_define_views_dialog_class_init (GalDefineViewsDialogClass *class)
-{
-	GObjectClass *object_class;
-
-	object_class = (GObjectClass *) class;
-
-	object_class->set_property = gal_define_views_dialog_set_property;
-	object_class->get_property = gal_define_views_dialog_get_property;
-	object_class->dispose = gal_define_views_dialog_dispose;
-
-	g_object_class_install_property (
-		object_class,
-		PROP_COLLECTION,
-		g_param_spec_object (
-			"collection",
-			"Collection",
-			NULL,
-			GAL_TYPE_VIEW_COLLECTION,
-			G_PARAM_READWRITE));
-}
-
-/* Button callbacks */
-
-static void
-gdvd_button_new_dialog_callback (GtkWidget *widget,
-                                 gint id,
-                                 GalDefineViewsDialog *dialog)
-{
-	gchar *name;
-	GtkTreeIter iter;
-	GalView *view;
-	GalViewCollectionItem *item;
-	GalViewFactory *factory;
-
-	switch (id) {
-	case GTK_RESPONSE_OK:
-		g_object_get (
-			widget,
-			"name", &name,
-			"factory", &factory,
-			NULL);
-
-		if (name && factory) {
-			g_strchomp (name);
-			if (*name != '\0') {
-				view = gal_view_factory_new_view (factory, name);
-				gal_view_collection_append (dialog->collection, view);
-
-				item = dialog->collection->view_data[dialog->collection->view_count - 1];
-				gtk_list_store_append (GTK_LIST_STORE (dialog->model), &iter);
-				gtk_list_store_set (
-					GTK_LIST_STORE (dialog->model), &iter,
-					COL_GALVIEW_NAME, name,
-					COL_GALVIEW_DATA, item,
-					-1);
-
-				if (view && GAL_VIEW_GET_CLASS (view)->edit)
-					gal_view_edit (view, GTK_WINDOW (dialog));
-				g_object_unref (view);
-			}
-		}
-		g_object_unref (factory);
-		g_free (name);
-		break;
-	}
-	gtk_widget_destroy (widget);
-}
-
-static void
-gdvd_button_new_callback (GtkWidget *widget,
-                          GalDefineViewsDialog *dialog)
-{
-	GtkWidget *view_new_dialog = gal_view_new_dialog_new (dialog->collection);
-	gtk_window_set_transient_for (GTK_WINDOW (view_new_dialog), GTK_WINDOW (dialog));
-	g_signal_connect (
-		view_new_dialog, "response",
-		G_CALLBACK (gdvd_button_new_dialog_callback), dialog);
-	gtk_widget_show (view_new_dialog);
-}
-
-static void
-gdvd_button_modify_callback (GtkWidget *widget,
-                             GalDefineViewsDialog *dialog)
-{
-	GtkTreeIter iter;
-	GalViewCollectionItem *item;
-
-	if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (dialog->treeview),
-					 &dialog->model,
-					 &iter)) {
-		gtk_tree_model_get (dialog->model, &iter, COL_GALVIEW_DATA, &item, -1);
-
-		g_return_if_fail (item && !item->built_in);
-
-		gal_view_edit (item->view, GTK_WINDOW (dialog));
-	}
-}
-
-static void
-gdvd_button_delete_callback (GtkWidget *widget,
-                             GalDefineViewsDialog *dialog)
-{
-	gint row;
-	GtkTreeIter iter;
-	GtkTreePath *path;
-	GtkTreeSelection *selection;
-	GalViewCollectionItem *item;
-
-	selection = gtk_tree_view_get_selection (dialog->treeview);
-
-	if (gtk_tree_selection_get_selected (selection,
-					 &dialog->model,
-					 &iter)) {
-		gtk_tree_model_get (dialog->model, &iter, COL_GALVIEW_DATA, &item, -1);
-
-		g_return_if_fail (item && !item->built_in);
-
-		for (row = 0; row < dialog->collection->view_count; row++) {
-			if (item == dialog->collection->view_data[row]) {
-				gal_view_collection_delete_view (dialog->collection, row);
-				path = gtk_tree_model_get_path (dialog->model, &iter);
-				gtk_list_store_remove (GTK_LIST_STORE (dialog->model), &iter);
-
-				if (gtk_tree_path_prev (path)) {
-					gtk_tree_model_get_iter (dialog->model, &iter, path);
-				} else {
-					gtk_tree_model_get_iter_first (dialog->model, &iter);
-				}
-
-				gtk_tree_selection_select_iter (selection, &iter);
-				break;
-			}
-		}
-	}
-}
-
-static void
-gdvd_selection_changed_callback (GtkTreeSelection *selection,
-                                 GalDefineViewsDialog *dialog)
-{
-	GtkWidget *button;
-	GtkTreeIter iter;
-	GalViewCollectionItem *item = NULL;
-	GalViewClass *gvclass = NULL;
-
-	if (gtk_tree_selection_get_selected (selection, &dialog->model, &iter)) {
-		gtk_tree_model_get (dialog->model, &iter, COL_GALVIEW_DATA, &item, -1);
-
-		if (item && item->view)
-			gvclass = GAL_VIEW_GET_CLASS (item->view);
-	}
-
-	button = e_builder_get_widget (dialog->builder, "button-delete");
-	gtk_widget_set_sensitive (GTK_WIDGET (button), item && !item->built_in);
-
-	button = e_builder_get_widget (dialog->builder, "button-modify");
-	gtk_widget_set_sensitive (GTK_WIDGET (button), item && !item->built_in && gvclass && gvclass->edit != NULL);
-}
-
-static void
-gdvd_connect_signal (GalDefineViewsDialog *dialog,
-                     const gchar *widget_name,
-                     const gchar *signal,
-                     GCallback handler)
-{
-	GtkWidget *widget;
-
-	widget = e_builder_get_widget (dialog->builder, widget_name);
-
-	if (widget)
-		g_signal_connect (widget, signal, handler, dialog);
-}
-
-static void
-dialog_response (GalDefineViewsDialog *dialog,
-                 gint response_id,
-                 gpointer data)
-{
-	gal_view_collection_save (dialog->collection);
-}
-
-static void
-gal_define_views_dialog_init (GalDefineViewsDialog *dialog)
-{
-	GtkWidget *content_area;
-	GtkWidget *parent;
-	GtkWidget *widget;
-	GtkTreeSelection *selection;
-
-	dialog->collection = NULL;
-
-	dialog->builder = gtk_builder_new ();
-	e_load_ui_builder_definition (dialog->builder, "gal-define-views.ui");
-
-	widget = e_builder_get_widget (dialog->builder, "table-top");
-	if (!widget) {
-		return;
-	}
-
-	g_object_ref (widget);
-
-	parent = gtk_widget_get_parent (widget);
-	gtk_container_remove (GTK_CONTAINER (parent), widget);
-	gtk_window_set_default_size (GTK_WINDOW (dialog), 360, 270);
-	gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
-	gtk_container_set_border_width (GTK_CONTAINER (widget), 6);
-
-	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-	gtk_box_pack_start (GTK_BOX (content_area), widget, TRUE, TRUE, 0);
-
-	g_object_unref (widget);
-
-	gtk_dialog_add_buttons (
-		GTK_DIALOG (dialog),
-		GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
-		NULL);
-
-	dialog->treeview = GTK_TREE_VIEW (e_builder_get_widget (dialog->builder, "treeview1"));
-	gtk_tree_view_set_reorderable (GTK_TREE_VIEW (dialog->treeview), FALSE);
-	gtk_tree_view_set_headers_visible (dialog->treeview, TRUE);
-
-	gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
-
-	gdvd_connect_signal (dialog, "button-new",    "clicked", G_CALLBACK (gdvd_button_new_callback));
-	gdvd_connect_signal (dialog, "button-modify", "clicked", G_CALLBACK (gdvd_button_modify_callback));
-	gdvd_connect_signal (dialog, "button-delete", "clicked", G_CALLBACK (gdvd_button_delete_callback));
-	g_signal_connect (
-		dialog, "response",
-		G_CALLBACK (dialog_response), NULL);
-
-	selection = gtk_tree_view_get_selection (dialog->treeview);
-	g_signal_connect (
-		selection, "changed",
-		G_CALLBACK (gdvd_selection_changed_callback), dialog);
-	gdvd_selection_changed_callback (selection, dialog);
-
-	gtk_widget_show (GTK_WIDGET (dialog));
-}
-
-static void
-gal_define_views_dialog_dispose (GObject *object)
-{
-	GalDefineViewsDialog *gal_define_views_dialog = GAL_DEFINE_VIEWS_DIALOG (object);
-
-	if (gal_define_views_dialog->builder)
-		g_object_unref (gal_define_views_dialog->builder);
-	gal_define_views_dialog->builder = NULL;
-
-	/* Chain up to parent's dispose() method. */
-	G_OBJECT_CLASS (gal_define_views_dialog_parent_class)->dispose (object);
-}
-
-static void
-gal_define_views_dialog_set_collection (GalDefineViewsDialog *dialog,
-                                        GalViewCollection *collection)
-{
-	gint i;
-	GtkListStore *store;
-	GtkCellRenderer *renderer;
-	dialog->collection = collection;
-
-	store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_POINTER);
-
-	for (i = 0; i < collection->view_count; i++) {
-		GalViewCollectionItem *item = collection->view_data[i];
-		GtkTreeIter iter;
-
-		/* hide built in views */
-		/*if (item->built_in == 1)
-			continue;*/
-
-		gchar *title = NULL;
-		title = e_str_without_underscores (item->title);
-
-		gtk_list_store_append (store, &iter);
-		gtk_list_store_set (
-			store, &iter,
-			COL_GALVIEW_NAME, title,
-			COL_GALVIEW_DATA, item,
-			-1);
-
-		g_free (title);
-	}
-
-	gtk_tree_sortable_set_sort_column_id (
-		GTK_TREE_SORTABLE (store),
-		COL_GALVIEW_NAME, GTK_SORT_ASCENDING);
-
-	/* attaching treeview to model */
-	gtk_tree_view_set_model (dialog->treeview, GTK_TREE_MODEL (store));
-	gtk_tree_view_set_search_column (dialog->treeview, COL_GALVIEW_NAME);
-
-	dialog->model = GTK_TREE_MODEL (store);
-
-	renderer = gtk_cell_renderer_text_new ();
-	gtk_tree_view_insert_column_with_attributes (
-		dialog->treeview,
-		COL_GALVIEW_NAME, _("Name"),
-		renderer, "text", COL_GALVIEW_NAME,
-		NULL);
-
-	/* set sort column */
-	gtk_tree_sortable_set_sort_column_id (
-		GTK_TREE_SORTABLE (dialog->model),
-		COL_GALVIEW_NAME, GTK_SORT_ASCENDING);
-
-	if (dialog->builder) {
-		GtkWidget *widget = e_builder_get_widget (dialog->builder, "label-views");
-		if (widget && GTK_IS_LABEL (widget)) {
-			if (collection->title) {
-				gchar *text = g_strdup_printf (
-					_("Define Views for %s"),
-					collection->title);
-				gtk_label_set_text (
-					GTK_LABEL (widget),
-					text);
-				gtk_window_set_title (GTK_WINDOW (dialog), text);
-				g_free (text);
-			} else {
-				gtk_label_set_text (
-					GTK_LABEL (widget),
-					_("Define Views"));
-				gtk_window_set_title (
-					GTK_WINDOW (dialog),
-					_("Define Views"));
-			}
-		}
-	}
-}
-
-/**
- * gal_define_views_dialog_new
- *
- * Returns a new dialog for defining views.
- *
- * Returns: The GalDefineViewsDialog.
- */
-GtkWidget *
-gal_define_views_dialog_new (GalViewCollection *collection)
-{
-	GtkWidget *widget = g_object_new (GAL_TYPE_DEFINE_VIEWS_DIALOG, NULL);
-	gal_define_views_dialog_set_collection (GAL_DEFINE_VIEWS_DIALOG (widget), collection);
-	return widget;
-}
-
-static void
-gal_define_views_dialog_set_property (GObject *object,
-                                      guint property_id,
-                                      const GValue *value,
-                                      GParamSpec *pspec)
-{
-	GalDefineViewsDialog *dialog;
-
-	dialog = GAL_DEFINE_VIEWS_DIALOG (object);
-
-	switch (property_id) {
-	case PROP_COLLECTION:
-		if (g_value_get_object (value))
-			gal_define_views_dialog_set_collection (dialog, GAL_VIEW_COLLECTION (g_value_get_object (value)));
-		else
-			gal_define_views_dialog_set_collection (dialog, NULL);
-		break;
-
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-		return;
-	}
-}
-
-static void
-gal_define_views_dialog_get_property (GObject *object,
-                                      guint property_id,
-                                      GValue *value,
-                                      GParamSpec *pspec)
-{
-	GalDefineViewsDialog *dialog;
-
-	dialog = GAL_DEFINE_VIEWS_DIALOG (object);
-
-	switch (property_id) {
-	case PROP_COLLECTION:
-		g_value_set_object (value, dialog->collection);
-
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-		break;
-	}
-}
diff --git a/e-util/gal-define-views-dialog.h b/e-util/gal-define-views-dialog.h
deleted file mode 100644
index a3b6973cf5..0000000000
--- a/e-util/gal-define-views-dialog.h
+++ /dev/null
@@ -1,77 +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:
- *		Chris Lahey <clahey@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#if !defined (__E_UTIL_H_INSIDE__) && !defined (LIBEUTIL_COMPILATION)
-#error "Only <e-util/e-util.h> should be included directly."
-#endif
-
-#ifndef GAL_DEFINE_VIEWS_DIALOG_H
-#define GAL_DEFINE_VIEWS_DIALOG_H
-
-#include <gtk/gtk.h>
-#include <e-util/gal-view-collection.h>
-
-/* Standard GObject macros */
-#define GAL_TYPE_DEFINE_VIEWS_DIALOG \
-	(gal_define_views_dialog_get_type ())
-#define GAL_DEFINE_VIEWS_DIALOG(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST \
-	((obj), GAL_TYPE_DEFINE_VIEWS_DIALOG, GalDefineViewsDialog))
-#define GAL_DEFINE_VIEWS_DIALOG_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_CAST \
-	((cls), GAL_TYPE_DEFINE_VIEWS_DIALOG, GalDefineViewsDialogClass))
-#define GAL_IS_DEFINE_VIEWS_DIALOG(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE \
-	((obj), GAL_TYPE_DEFINE_VIEWS_DIALOG))
-#define GAL_IS_DEFINE_VIEWS_DIALOG_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_TYPE \
-	((cls), GAL_TYPE_DEFINE_VIEWS_DIALOG))
-#define GAL_DEFINE_VIEWS_DIALOG_GET_CLASS(obj) \
-	(G_TYPE_INSTANCE_GET_CLASS \
-	((obj), GAL_TYPE_DEFINE_VIEWS_DIALOG, GalDefineViewsDialogClass))
-
-G_BEGIN_DECLS
-
-typedef struct _GalDefineViewsDialog GalDefineViewsDialog;
-typedef struct _GalDefineViewsDialogClass GalDefineViewsDialogClass;
-
-struct _GalDefineViewsDialog {
-	GtkDialog parent;
-
-	/* item specific fields */
-	GtkBuilder *builder;
-	GtkTreeView *treeview;
-	GtkTreeModel *model;
-
-	GalViewCollection *collection;
-};
-
-struct _GalDefineViewsDialogClass {
-	GtkDialogClass parent_class;
-};
-
-GType		gal_define_views_dialog_get_type (void);
-GtkWidget *	gal_define_views_dialog_new	(GalViewCollection *collection);
-
-G_END_DECLS
-
-#endif /* GAL_DEFINE_VIEWS_DIALOG_H */
diff --git a/e-util/gal-define-views.ui b/e-util/gal-define-views.ui
deleted file mode 100644
index b3314aa4ee..0000000000
--- a/e-util/gal-define-views.ui
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0"?>
-<!--*- mode: xml -*-->
-<interface>
-  <object class="GtkDialog" id="dialog1">
-    <property name="title" translatable="yes">Define Views for "%s"</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
-        <property name="visible">True</property>
-        <property name="spacing">6</property>
-        <child>
-          <object class="GtkTable" id="table-top">
-            <property name="visible">True</property>
-            <property name="n_rows">2</property>
-            <property name="n_columns">1</property>
-            <property name="column_spacing">6</property>
-            <property name="row_spacing">6</property>
-            <child>
-              <object class="GtkLabel" id="label-views">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Define Views for %s</property>
-              </object>
-              <packing>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options"/>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkHBox" id="hbox1">
-                <property name="visible">True</property>
-                <property name="border_width">6</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkScrolledWindow" id="scrolledwindow1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="shadow_type">GTK_SHADOW_IN</property>
-                    <child>
-                      <object class="GtkTreeView" id="treeview1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="headers_clickable">True</property>
-                        <property name="reorderable">True</property>
-                        <property name="fixed_height_mode">True</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkVButtonBox" id="vbuttonbox1">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="spacing">6</property>
-                    <property name="layout_style">GTK_BUTTONBOX_START</property>
-                    <child>
-                      <object class="GtkButton" id="button-new">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="label">gtk-new</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="button-modify">
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="can_default">True</property>
-                        <child>
-                          <object class="GtkAlignment" id="alignment33">
-                            <property name="visible">True</property>
-                            <property name="xscale">0</property>
-                            <property name="yscale">0</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox224">
-                                <property name="visible">True</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <object class="GtkImage" id="image8">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-properties</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label557">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">_Edit</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="button-delete">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="label">gtk-delete</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="padding">12</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
-            <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
-            <child>
-              <object class="GtkButton" id="button7">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="label">gtk-close</property>
-                <property name="use_stock">True</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-5">button7</action-widget>
-    </action-widgets>
-  </object>
-</interface>
diff --git a/e-util/gal-view-instance.c b/e-util/gal-view-instance.c
index 2b526c1d4a..ad66773756 100644
--- a/e-util/gal-view-instance.c
+++ b/e-util/gal-view-instance.c
@@ -42,7 +42,6 @@
 
 #include "e-unicode.h"
 #include "e-xml-utils.h"
-#include "gal-define-views-dialog.h"
 #include "gal-view-instance-save-as-dialog.h"
 
 G_DEFINE_TYPE (GalViewInstance, gal_view_instance, G_TYPE_OBJECT)