From 3e634b18dae78d3cf712f9ebce336ec4cfaf17f5 Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Wed, 26 Nov 2008 16:16:23 +0000 Subject: [PATCH] Remove from/to button in compact mail header view. * Removed underline in from/to contents in msg view * Removed button for from/to pmo-drop-split-view-r6421 --- src/widgets/modest-compact-mail-header-view.c | 28 ++----------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/src/widgets/modest-compact-mail-header-view.c b/src/widgets/modest-compact-mail-header-view.c index ed349a4..84fd39f 100644 --- a/src/widgets/modest-compact-mail-header-view.c +++ b/src/widgets/modest-compact-mail-header-view.c @@ -104,7 +104,6 @@ static const GtkWidget *modest_compact_mail_header_view_add_custom_header_defaul /* internal */ static void on_notify_style (GObject *obj, GParamSpec *spec, gpointer userdata); static void on_details_button_clicked (GtkButton *button, gpointer userdata); -static void on_fromto_button_clicked (GtkButton *button, gpointer userdata); static void update_style (ModestCompactMailHeaderView *self); static void set_date_time (ModestCompactMailHeaderView *compact_mail_header, time_t date); static void fill_address (ModestCompactMailHeaderView *self); @@ -315,7 +314,7 @@ modest_compact_mail_header_view_instance_init (GTypeInstance *instance, gpointer ModestCompactMailHeaderView *self = (ModestCompactMailHeaderView *)instance; ModestCompactMailHeaderViewPriv *priv = MODEST_COMPACT_MAIL_HEADER_VIEW_GET_PRIVATE (self); GtkWidget *first_hbox, *second_hbox, *vbox, *main_vbox; - GtkWidget *details_button, *fromto_button; + GtkWidget *details_button; PangoAttrList *attr_list; priv->header = NULL; @@ -358,13 +357,6 @@ modest_compact_mail_header_view_instance_init (GTypeInstance *instance, gpointer priv->fromto_contents = gtk_label_new (NULL); gtk_misc_set_alignment (GTK_MISC (priv->fromto_contents), 0.0, 1.0); gtk_label_set_ellipsize (GTK_LABEL (priv->fromto_contents), PANGO_ELLIPSIZE_END); - attr_list = pango_attr_list_new (); - pango_attr_list_insert (attr_list, pango_attr_underline_new (PANGO_UNDERLINE_SINGLE)); - gtk_label_set_attributes (GTK_LABEL (priv->fromto_contents), attr_list); - pango_attr_list_unref (attr_list); - fromto_button = gtk_button_new (); - gtk_button_set_relief (GTK_BUTTON (fromto_button), GTK_RELIEF_NONE); - gtk_container_add (GTK_CONTAINER (fromto_button), priv->fromto_contents); priv->date_label = gtk_label_new (NULL); gtk_label_set_justify (GTK_LABEL (priv->date_label), GTK_JUSTIFY_RIGHT); @@ -372,7 +364,7 @@ modest_compact_mail_header_view_instance_init (GTypeInstance *instance, gpointer gtk_misc_set_padding (GTK_MISC (priv->date_label), MODEST_MARGIN_DEFAULT, 0); gtk_box_pack_start (GTK_BOX (second_hbox), priv->fromto_label, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (second_hbox), fromto_button, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (second_hbox), priv->fromto_contents, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (second_hbox), priv->date_label, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), first_hbox, FALSE, FALSE, 0); @@ -383,7 +375,6 @@ modest_compact_mail_header_view_instance_init (GTypeInstance *instance, gpointer g_signal_connect (G_OBJECT (self), "notify::style", G_CALLBACK (on_notify_style), (gpointer) self); g_signal_connect (G_OBJECT (details_button), "clicked", G_CALLBACK (on_details_button_clicked), instance); - g_signal_connect (G_OBJECT (fromto_button), "clicked", G_CALLBACK (on_fromto_button_clicked), instance); priv->headers_vbox = gtk_vbox_new (FALSE, 0); gtk_container_set_focus_chain (GTK_CONTAINER (priv->headers_vbox), NULL); @@ -672,21 +663,6 @@ fill_address (ModestCompactMailHeaderView *self) } static void -on_fromto_button_clicked (GtkButton *button, - gpointer userdata) -{ - ModestCompactMailHeaderViewPriv *priv; - ModestCompactMailHeaderView *self = (ModestCompactMailHeaderView *) userdata; - - g_return_if_fail (MODEST_IS_COMPACT_MAIL_HEADER_VIEW (self)); - priv = MODEST_COMPACT_MAIL_HEADER_VIEW_GET_PRIVATE (self); - - if (priv->first_address) { - g_signal_emit_by_name (G_OBJECT (self), "recpt-activated", priv->first_address); - } -} - -static void on_details_button_clicked (GtkButton *button, gpointer userdata) { -- 1.7.9.5