Remove unused tooltip support from ECanvas/ETable/EText.

7 files changed, 1 insertions, 115 deletions

diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am
index b43e1f0124..70391dacd7 100644
--- a/widgets/table/Makefile.am
+++ b/widgets/table/Makefile.am
@@ -138,7 +138,6 @@ libetableinclude_HEADERS = 			\
 	e-table-state.h				\
 	e-table-subset.h			\
 	e-table-subset-variable.h		\
-	e-table-tooltip.h			\
 	e-table-utils.h				\
 	e-table-without.h			\
 	e-table.h				\
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index 116ff0d848..24f7dc5cd8 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -58,7 +58,6 @@
 #include "e-table.h"
 #include "e-cell-text.h"
 #include "e-table-item.h"
-#include "e-table-tooltip.h"
 #define d(x)
 #define DO_SELECTION 1
 #define VIEW_TO_CELL(view) E_CELL_TEXT (((ECellView *)view)->ecell)
diff --git a/widgets/table/e-cell.h b/widgets/table/e-cell.h
index 276bc1999c..181a3143e4 100644
--- a/widgets/table/e-cell.h
+++ b/widgets/table/e-cell.h
@@ -26,7 +26,6 @@
 
 #include <gtk/gtk.h>
 #include <table/e-table-model.h>
-#include <table/e-table-tooltip.h>
 
 G_BEGIN_DECLS
 
diff --git a/widgets/table/e-table-field-chooser.h b/widgets/table/e-table-field-chooser.h
index 9d890decba..cff9384895 100644
--- a/widgets/table/e-table-field-chooser.h
+++ b/widgets/table/e-table-field-chooser.h
@@ -26,6 +26,7 @@
 
 #include <gtk/gtk.h>
 #include <table/e-table-header.h>
+#include <libgnomecanvas/gnome-canvas.h>
 
 G_BEGIN_DECLS
 
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index ae2b41f94d..8b94ad8833 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -1413,26 +1413,6 @@ eti_dispose (GObject *object)
 		g_free (eti->height_cache);
 	eti->height_cache = NULL;
 
-	if (E_CANVAS(GNOME_CANVAS_ITEM(eti)->canvas))
-		e_canvas_hide_tooltip (E_CANVAS(GNOME_CANVAS_ITEM(eti)->canvas));
-
-	if (eti->tooltip) {
-		if (eti->tooltip->background)
-			gdk_color_free (eti->tooltip->background);
-		eti->tooltip->background = NULL;
-
-		if (eti->tooltip->foreground)
-			gdk_color_free (eti->tooltip->foreground);
-		eti->tooltip->foreground = NULL;
-
-		if (eti->tooltip->timer) {
-			g_source_remove (eti->tooltip->timer);
-			eti->tooltip->timer = 0;
-		}
-		g_free (eti->tooltip);
-		eti->tooltip = NULL;
-	}
-
 	if (G_OBJECT_CLASS (eti_parent_class)->dispose)
 		(*G_OBJECT_CLASS (eti_parent_class)->dispose) (object);
 }
@@ -1597,12 +1577,6 @@ eti_init (ETableItem *eti)
 
 	eti->in_key_press              = 0;
 
-	eti->tooltip                   = g_new0 (ETableTooltip, 1);
-	eti->tooltip->timer            = 0;
-	eti->tooltip->eti              = GNOME_CANVAS_ITEM (eti);
-	eti->tooltip->background       = NULL;
-	eti->tooltip->foreground       = NULL;
-
 	eti->maybe_did_something       = TRUE;
 
 	eti->grabbed_count             = 0;
@@ -1725,22 +1699,6 @@ eti_unrealize (GnomeCanvasItem *item)
 	eti->height_cache = NULL;
 	eti->height_cache_idle_count = 0;
 
-	e_canvas_hide_tooltip (E_CANVAS(GNOME_CANVAS_ITEM(eti)->canvas));
-	if (eti->tooltip) {
-		if (eti->tooltip->background) {
-			gdk_color_free (eti->tooltip->background);
-			eti->tooltip->background = NULL;
-		}
-		if (eti->tooltip->foreground) {
-			gdk_color_free (eti->tooltip->foreground);
-			eti->tooltip->foreground = NULL;
-		}
-		if (eti->tooltip->timer) {
-			g_source_remove (eti->tooltip->timer);
-			eti->tooltip->timer = 0;
-		}
-	}
-
 	g_object_unref (eti->fill_gc);
 	eti->fill_gc = NULL;
 	g_object_unref (eti->grid_gc);
@@ -2216,11 +2174,6 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 
 		d(g_print("%s: GDK_BUTTON_PRESS received, button %d\n", __FUNCTION__, e->button.button));
 
-		if (eti->tooltip->timer) {
-			g_source_remove (eti->tooltip->timer);
-			eti->tooltip->timer = 0;
-		}
-
 		switch (e->button.button) {
 		case 1: /* Fall through. */
 		case 2:
@@ -2357,11 +2310,6 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 			}
 		}
 
-		if (eti->tooltip->timer) {
-			g_source_remove (eti->tooltip->timer);
-			eti->tooltip->timer = 0;
-		}
-		e_canvas_hide_tooltip (E_CANVAS(GNOME_CANVAS_ITEM(eti)->canvas));
 		switch (e->button.button) {
 		case 1: /* Fall through. */
 		case 2:
@@ -2515,8 +2463,6 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 			     "cursor_col", &cursor_col,
 			     NULL);
 
-		e_canvas_hide_tooltip (E_CANVAS(GNOME_CANVAS_ITEM(eti)->canvas));
-
 		flags = 0;
 		if (cursor_row == view_to_model_row(eti, row) && cursor_col == view_to_model_col(eti, col)) {
 			flags = E_CELL_EDITING | E_CELL_CURSOR;
@@ -2546,12 +2492,6 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 			     "cursor_col", &cursor_col,
 			     NULL);
 
-		if (eti->tooltip->timer) {
-			g_source_remove (eti->tooltip->timer);
-			eti->tooltip->timer = 0;
-		}
-		e_canvas_hide_tooltip (E_CANVAS(GNOME_CANVAS_ITEM(eti)->canvas));
-
 		if (cursor_row == -1 && cursor_col == -1)
 			return FALSE;
 
@@ -2769,9 +2709,6 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 		d(leave = TRUE);
 	case GDK_ENTER_NOTIFY:
 		d(g_print("%s: %s received\n", __FUNCTION__, leave ? "GDK_LEAVE_NOTIFY" : "GDK_ENTER_NOTIFY"));
-		if (eti->tooltip->timer)
-			g_source_remove (eti->tooltip->timer);
-		eti->tooltip->timer = 0;
 		if (eti->motion_row != -1 && eti->motion_col != -1)
 			return_val = eti_e_cell_event (eti, eti->cell_views [eti->motion_col],
 						       e, e->crossing.time,
diff --git a/widgets/table/e-table-item.h b/widgets/table/e-table-item.h
index 8cc4b54161..08efae6183 100644
--- a/widgets/table/e-table-item.h
+++ b/widgets/table/e-table-item.h
@@ -29,7 +29,6 @@
 #include <table/e-table-model.h>
 #include <table/e-table-header.h>
 #include <table/e-table-defines.h>
-#include <table/e-table-tooltip.h>
 #include <misc/e-selection-model.h>
 #include <misc/e-printable.h>
 
@@ -159,11 +158,6 @@ typedef struct {
 	gint grabbed_col, grabbed_row;
 	gint grabbed_count;
 
-	/*
-	 * Tooltip
-	 */
-	ETableTooltip *tooltip;
-
 } ETableItem;
 
 typedef struct {
diff --git a/widgets/table/e-table-tooltip.h b/widgets/table/e-table-tooltip.h
deleted file mode 100644
index 27dcf26db2..0000000000
--- a/widgets/table/e-table-tooltip.h
+++ /dev/null
@@ -1,43 +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)
- *
- */
-
-#ifndef _E_TABLE_TOOLTIP_H_
-#define _E_TABLE_TOOLTIP_H_
-
-#include <libgnomecanvas/gnome-canvas.h>
-
-G_BEGIN_DECLS
-
-typedef struct {
-	gint timer;
-	gint col, row;
-	gint row_height;
-	gint x, y;
-	gint cx, cy;
-	GdkColor *foreground;
-	GdkColor *background;
-	GnomeCanvasItem *eti;
-} ETableTooltip;
-
-G_END_DECLS
-
-#endif