Adds a EPHY_NODE_VIEW_ELLIPSIZED flag and make history window and

bookmarks editor views use it to display address and title columns.
Fix bug #132808.

svn path=/trunk/; revision=7719

4 files changed, 17 insertions, 5 deletions

diff --git a/lib/widgets/ephy-node-view.c b/lib/widgets/ephy-node-view.c
index c32e1bd8e..c01ec6ec1 100644
--- a/lib/widgets/ephy-node-view.c
+++ b/lib/widgets/ephy-node-view.c
@@ -1288,6 +1288,12 @@ ephy_node_view_add_column (EphyNodeView *view,
 		gtk_tree_view_set_search_column (GTK_TREE_VIEW (view), column);
 		gtk_tree_view_set_enable_search (GTK_TREE_VIEW (view), TRUE);
 	}
+	
+	if (flags & EPHY_NODE_VIEW_ELLIPSIZED)
+	{
+		g_object_set (renderer, "ellipsize-set", TRUE,
+			      "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+	}
 
 	if (ret != NULL)
 		*ret = gcolumn;
diff --git a/lib/widgets/ephy-node-view.h b/lib/widgets/ephy-node-view.h
index 51f6b9bfb..b16c2f428 100644
--- a/lib/widgets/ephy-node-view.h
+++ b/lib/widgets/ephy-node-view.h
@@ -58,7 +58,8 @@ typedef enum
 	EPHY_NODE_VIEW_SHOW_PRIORITY = 1 << 0,
 	EPHY_NODE_VIEW_SORTABLE = 1 << 1,
 	EPHY_NODE_VIEW_EDITABLE = 1 << 2,
-	EPHY_NODE_VIEW_SEARCHABLE = 1 << 3
+	EPHY_NODE_VIEW_SEARCHABLE = 1 << 3,
+	EPHY_NODE_VIEW_ELLIPSIZED = 1 << 4
 } EphyNodeViewFlags;
 
 typedef struct
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 5ad6f0b9b..ac2159f71 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -1938,7 +1938,8 @@ ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor)
 				   G_TYPE_STRING, EPHY_NODE_BMK_PROP_TITLE,
 				   EPHY_NODE_VIEW_EDITABLE |
 				   EPHY_NODE_VIEW_SEARCHABLE |
-				   EPHY_NODE_VIEW_SORTABLE,
+				   EPHY_NODE_VIEW_SORTABLE |
+				   EPHY_NODE_VIEW_ELLIPSIZED,
 				   provide_favicon, &(editor->priv->title_col));
 	gtk_tree_view_column_set_min_width (editor->priv->title_col, 300);
 	gtk_tree_view_column_set_resizable (editor->priv->title_col, TRUE);
@@ -1946,7 +1947,9 @@ ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor)
 	url_col_id = ephy_node_view_add_column
 				  (EPHY_NODE_VIEW (bm_view), _("Address"),
 				   G_TYPE_STRING, EPHY_NODE_BMK_PROP_LOCATION,
-				   EPHY_NODE_VIEW_SORTABLE, NULL, &(editor->priv->address_col));
+				   EPHY_NODE_VIEW_SORTABLE |
+				   EPHY_NODE_VIEW_ELLIPSIZED,
+				   NULL, &(editor->priv->address_col));
 	gtk_tree_view_column_set_min_width (editor->priv->address_col, 300);
 	gtk_tree_view_column_set_resizable (editor->priv->address_col, TRUE);
 
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index 5d1de5840..f535ee6ef 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -1431,14 +1431,16 @@ ephy_history_window_construct (EphyHistoryWindow *editor)
 	title_col_id = ephy_node_view_add_column (EPHY_NODE_VIEW (pages_view), _("Title"),
 				                  G_TYPE_STRING, EPHY_NODE_PAGE_PROP_TITLE,
 				                  EPHY_NODE_VIEW_SORTABLE |
-					          EPHY_NODE_VIEW_SEARCHABLE, NULL, &col);
+					          EPHY_NODE_VIEW_SEARCHABLE |
+						  EPHY_NODE_VIEW_ELLIPSIZED, NULL, &col);
 	gtk_tree_view_column_set_min_width (col, 300);
 	gtk_tree_view_column_set_resizable (col, TRUE);
 	editor->priv->title_col = col;
 	
 	url_col_id = ephy_node_view_add_column (EPHY_NODE_VIEW (pages_view), _("Address"),
 				                G_TYPE_STRING, EPHY_NODE_PAGE_PROP_LOCATION,
-				                EPHY_NODE_VIEW_SORTABLE, NULL, &col);
+				                EPHY_NODE_VIEW_SORTABLE |
+						EPHY_NODE_VIEW_ELLIPSIZED, NULL, &col);
 	gtk_tree_view_column_set_min_width (col, 300);
 	gtk_tree_view_column_set_resizable (col, TRUE);
 	editor->priv->address_col = col;