Get rid of ephy_string_[elide|double]_underscores(). Remove unnecessary

2004-12-13  Christian Persch  <chpe@cvs.gnome.org>

	* embed/ephy-encodings.c: (elide_underscores), (add_encoding):
	* embed/mozilla/FilePicker.cpp:
	* lib/ephy-dnd.c:
	* lib/ephy-node.c:
	* lib/ephy-string.c: (ephy_string_blank_chr):
	* lib/ephy-string.h:
	* lib/widgets/ephy-node-view.c:
	* src/ephy-encoding-menu.c:
	* src/ephy-notebook.c:
	* src/ephy-session.c:
	* src/ephy-statusbar.c:
	* src/ephy-tab.c: (ephy_tab_set_title):
	* src/ephy-tabs-menu.c: (connect_proxy_cb):
	* src/ppview-toolbar.c:

	Get rid of ephy_string_[elide|double]_underscores().
	Remove unnecessary ephy-string.h includes.

7 files changed, 10 insertions, 15 deletions

diff --git a/src/ephy-encoding-menu.c b/src/ephy-encoding-menu.c
index 2f5ab540e..9a31a0006 100644
--- a/src/ephy-encoding-menu.c
+++ b/src/ephy-encoding-menu.c
@@ -28,7 +28,6 @@
 #include "ephy-embed.h"
 #include "ephy-embed-shell.h"
 #include "ephy-shell.h"
-#include "ephy-string.h"
 #include "ephy-debug.h"
 
 #include <gtk/gtkaction.h>
diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
index b4d62a3f9..e37e3cb7f 100644
--- a/src/ephy-notebook.c
+++ b/src/ephy-notebook.c
@@ -35,7 +35,6 @@
 #include "ephy-debug.h"
 #include "ephy-favicon-cache.h"
 #include "ephy-spinner.h"
-#include "ephy-string.h"
 
 #include <glib-object.h>
 #include <gtk/gtkeventbox.h>
diff --git a/src/ephy-session.c b/src/ephy-session.c
index 31346004b..daf8a458f 100644
--- a/src/ephy-session.c
+++ b/src/ephy-session.c
@@ -29,7 +29,6 @@
 #include "ephy-shell.h"
 #include "ephy-history-window.h"
 #include "ephy-bookmarks-editor.h"
-#include "ephy-string.h"
 #include "ephy-file-helpers.h"
 #include "eel-gconf-extensions.h"
 #include "ephy-prefs.h"
diff --git a/src/ephy-statusbar.c b/src/ephy-statusbar.c
index 5491ea54f..b286242bc 100755
--- a/src/ephy-statusbar.c
+++ b/src/ephy-statusbar.c
@@ -24,7 +24,6 @@
 
 #include "ephy-statusbar.h"
 #include "ephy-stock-icons.h"
-#include "ephy-string.h"
 
 #include <string.h>
 #include <gtk/gtkprogressbar.h>
diff --git a/src/ephy-tab.c b/src/ephy-tab.c
index f9314f4c2..f6e20e6d4 100644
--- a/src/ephy-tab.c
+++ b/src/ephy-tab.c
@@ -1748,7 +1748,7 @@ ephy_tab_get_status_message (EphyTab *tab)
 static void
 ephy_tab_set_title (EphyTab *tab, EphyEmbed *embed, const char *new_title)
 {
-	char *title_tmp, *title = NULL;
+	char *title = NULL;
 
 	g_return_if_fail (EPHY_IS_TAB (tab));
 
@@ -1796,14 +1796,10 @@ ephy_tab_set_title (EphyTab *tab, EphyEmbed *embed, const char *new_title)
 
 	tab->priv->title = title;
 
-	title_tmp = ephy_string_double_underscores (title);
-
 	g_object_set (G_OBJECT (tab->priv->action),
-		      "label", title_tmp,
+		      "label", title,
 		      NULL);
 
-	g_free (title_tmp);
-
 	g_object_notify (G_OBJECT (tab), "title");
 }
 
diff --git a/src/ephy-tabs-menu.c b/src/ephy-tabs-menu.c
index c207f4c95..64b553ec8 100644
--- a/src/ephy-tabs-menu.c
+++ b/src/ephy-tabs-menu.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include "ephy-tabs-menu.h"
-#include "ephy-string.h"
 #include "ephy-marshal.h"
 #include "ephy-shell.h"
 #include "ephy-debug.h"
@@ -37,7 +36,7 @@
 #include <stdlib.h>
 #include <libxml/entities.h>
 
-#define MAX_LABEL_LENGTH 30
+#define LABEL_WIDTH_CHARS 32
 
 #define EPHY_TABS_MENU_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_TABS_MENU, EphyTabsMenuPrivate))
 
@@ -131,8 +130,13 @@ connect_proxy_cb (GtkActionGroup *action_group,
 {
 	if (GTK_IS_MENU_ITEM (proxy))
 	{
-		gtk_label_set_ellipsize (GTK_LABEL (GTK_BIN (proxy)->child),
-					 PANGO_ELLIPSIZE_END);
+		GtkLabel *label;
+
+		label = GTK_LABEL (GTK_BIN (proxy)->child);
+
+		gtk_label_set_use_underline (label, FALSE);
+		gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END);
+		gtk_label_set_max_width_chars (label, LABEL_WIDTH_CHARS);
 	}
 }
 
diff --git a/src/ppview-toolbar.c b/src/ppview-toolbar.c
index 2474205f8..9b2e6824b 100755
--- a/src/ppview-toolbar.c
+++ b/src/ppview-toolbar.c
@@ -22,7 +22,6 @@
 
 #include "ppview-toolbar.h"
 #include "ephy-window.h"
-#include "ephy-string.h"
 
 #include <string.h>
 #include <glib/gi18n.h>