[evolution/webkit: 150/177] Revert "Add a GtkLabel to EAttachmentButton to display name of the attachment."



commit 4f9f04d065f0027e544448a97edbd9d8787567dd
Author: Dan VrÃtil <dvratil redhat com>
Date:   Fri Feb 10 20:02:56 2012 +0100

    Revert "Add a GtkLabel to EAttachmentButton to display name of the attachment."
    
    This reverts commit a1cc22ca6da79bdf53d1a4fe3784967658716d41.

 widgets/misc/e-attachment-button.c |   17 -----------------
 1 files changed, 0 insertions(+), 17 deletions(-)
---
diff --git a/widgets/misc/e-attachment-button.c b/widgets/misc/e-attachment-button.c
index 16d4e35..ead563c 100644
--- a/widgets/misc/e-attachment-button.c
+++ b/widgets/misc/e-attachment-button.c
@@ -27,8 +27,6 @@
 
 #include "e-attachment-button.h"
 
-#include <glib/gi18n.h>
-
 #define E_ATTACHMENT_BUTTON_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_ATTACHMENT_BUTTON, EAttachmentButtonPrivate))
@@ -46,7 +44,6 @@ struct _EAttachmentButtonPrivate {
 	GtkWidget *toggle_button;
 	GtkWidget *cell_view;
 	GtkWidget *popup_menu;
-	GtkWidget *label;
 
 	guint expandable : 1;
 	guint expanded   : 1;
@@ -597,11 +594,6 @@ e_attachment_button_init (EAttachmentButton *button)
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	gtk_widget_show (widget);
 
-	widget = gtk_label_new ("");
-	gtk_box_pack_start (GTK_BOX (button), widget, FALSE, FALSE, 10);
-	gtk_widget_show (widget);
-	button->priv->label = widget;
-
 	/* Configure Renderers */
 
 	cell_layout = GTK_CELL_LAYOUT (button->priv->cell_view);
@@ -762,8 +754,6 @@ e_attachment_button_set_attachment (EAttachmentButton *button,
 	if (attachment != NULL) {
 		GBinding *binding;
 		gulong handler_id;
-		GFileInfo *finfo;
-		const gchar *name;
 
 		binding = g_object_bind_property (
 			attachment, "can-show",
@@ -787,13 +777,6 @@ e_attachment_button_set_attachment (EAttachmentButton *button,
 
 		attachment_button_update_cell_view (button);
 		attachment_button_update_pixbufs (button);
-
-   		finfo = e_attachment_get_file_info (attachment);
-   		name = g_file_info_get_display_name (finfo);
-		if (name &&  *name)
-			gtk_label_set_text (GTK_LABEL (button->priv->label), name);
-		else
-			gtk_label_set_text (GTK_LABEL (button->priv->label), _("attachment.dat"));
 	}
 
 	/* update drag sources */



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]