R lib/widgets/ephy-ellipsizing-label.c: R

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

	* lib/ephy-marshal.list:
	* lib/widgets/Makefile.am:
	R lib/widgets/ephy-ellipsizing-label.c:
	R lib/widgets/ephy-ellipsizing-label.h:
	A lib/widgets/ephy-label.c:
	A lib/widgets/ephy-label.h:
	* src/ephy-notebook.c: (sync_label), (build_tab_label):
	* src/pdm-dialog.c: (show_cookies_properties):
	* src/prefs-dialog.c: (create_download_path_label),
	(download_path_response_cb):

	Kill our ellipsizing label implementation, and import GtkLabel
	into our prefix.

	* configure.in:

	 Depend on pango 1.5.1 for ellipsisation support.

3 files changed, 15 insertions, 16 deletions

diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
index 4eef9fcaa..475c2f9ae 100644
--- a/src/ephy-notebook.c
+++ b/src/ephy-notebook.c
@@ -35,7 +35,7 @@
 #include "ephy-shell.h"
 #include "ephy-debug.h"
 #include "ephy-favicon-cache.h"
-#include "ephy-ellipsizing-label.h"
+#include "ephy-label.h"
 #include "ephy-spinner.h"
 #include "ephy-string.h"
 
@@ -793,7 +793,7 @@ sync_label (EphyTab *tab, GParamSpec *pspec, GtkWidget *proxy)
 
 	if (title)
 	{
-		ephy_ellipsizing_label_set_text (EPHY_ELLIPSIZING_LABEL (label), title);
+		ephy_label_set_text (EPHY_LABEL (label), title);
 		gtk_tooltips_set_tip (tips, ebox, title, NULL);
 	}
 }
@@ -885,9 +885,8 @@ build_tab_label (EphyNotebook *nb, EphyTab *tab)
 	gtk_box_pack_start (GTK_BOX (label_hbox), icon, FALSE, FALSE, 0);
 
 	/* setup label */
-        label = ephy_ellipsizing_label_new ("");
-	ephy_ellipsizing_label_set_mode (EPHY_ELLIPSIZING_LABEL (label),
-					 EPHY_ELLIPSIZE_START);
+        label = ephy_label_new ("");
+	ephy_label_set_ellipsize (EPHY_LABEL (label), PANGO_ELLIPSIZE_END);
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
         gtk_misc_set_padding (GTK_MISC (label), 0, 0);
 	gtk_box_pack_start (GTK_BOX (label_hbox), label, TRUE, TRUE, 0);
diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c
index 60ec410a3..c718681b9 100755
--- a/src/pdm-dialog.c
+++ b/src/pdm-dialog.c
@@ -30,10 +30,11 @@
 #include "ephy-file-helpers.h"
 #include "ephy-password-manager.h"
 #include "ephy-gui.h"
-#include "ephy-ellipsizing-label.h"
+#include "ephy-label.h"
 #include "ephy-debug.h"
 #include "ephy-state.h"
 
+#include <gtk/gtklabel.h>
 #include <gtk/gtkbox.h>
 #include <gtk/gtkstock.h>
 #include <gtk/gtktable.h>
@@ -895,16 +896,16 @@ show_cookies_properties (PdmDialog *dialog,
 	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
 			  GTK_FILL, GTK_FILL, 0, 0);
 
-	label = ephy_ellipsizing_label_new (info->value);
-	gtk_label_set_selectable (GTK_LABEL (label), TRUE);
+	label = ephy_label_new (info->value);
+	ephy_label_set_selectable (EPHY_LABEL (label), TRUE);
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
 	gtk_widget_show (label);
 	gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 0, 1);
 
 	str = g_strconcat ("<b>", _("Path:"), "</b>", NULL);
-	label = ephy_ellipsizing_label_new (str);
+	label = ephy_label_new (str);
 	g_free (str);
-	gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+	ephy_label_set_use_markup (EPHY_LABEL (label), TRUE);
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
 	gtk_widget_show (label);
 	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index 4d0eff0f1..560989675 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -37,13 +37,14 @@
 #include "ephy-langs.h"
 #include "ephy-encodings.h"
 #include "ephy-debug.h"
-#include "ephy-ellipsizing-label.h"
+#include "ephy-label.h"
 #include "ephy-file-chooser.h"
 #include "ephy-file-helpers.h"
 #include "ephy-tree-model-node.h"
 #include "ephy-tree-model-sort.h"
 
 #include <glib/gi18n.h>
+#include <gtk/gtklabel.h>
 #include <gtk/gtkcellrenderertext.h>
 #include <gtk/gtkcelllayout.h>
 #include <gtk/gtktreeselection.h>
@@ -1133,9 +1134,8 @@ create_download_path_label (EphyDialog *dialog)
 	button = ephy_dialog_get_control (dialog, properties[DOWNLOAD_PATH_BUTTON_PROP].id);
 	
 	dir = get_download_button_label ();
-	label = ephy_ellipsizing_label_new (dir);
-	ephy_ellipsizing_label_set_mode ((EphyEllipsizingLabel*)label,
-					  EPHY_ELLIPSIZE_START);
+	label = ephy_label_new (dir);
+	ephy_label_set_ellipsize (EPHY_LABEL (label), PANGO_ELLIPSIZE_START);
 	gtk_container_add (GTK_CONTAINER (button), label);
 	g_free (dir);
 	gtk_widget_show (label);
@@ -1296,8 +1296,7 @@ download_path_response_cb (GtkDialog *fc, gint response, EphyDialog *dialog)
 
 			button = ephy_dialog_get_control (dialog, properties[DOWNLOAD_PATH_BUTTON_PROP].id);
 			label = get_download_button_label ();
-			ephy_ellipsizing_label_set_text ((EphyEllipsizingLabel*) GTK_BIN (button)->child,
-							  label);
+			ephy_label_set_text (EPHY_LABEL (GTK_BIN (button)->child), label);
 
 			g_free (dir);
 			g_free (label);