diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2007-06-15 21:58:34 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2007-06-15 21:58:34 +0800 |
| commit | 60f7f10f45ca4e15ae250e7cc9533dcd959bf324 (patch) | |
| tree | 0be42abb77e1a2a1ecf391d1f08a6a4e639bddd3 /widgets/misc/e-task-bar.c | |
| parent | a3f0966a6916c502586da58867c5f79dbe88075a (diff) | |
| download | gsoc2013-evolution-60f7f10f45ca4e15ae250e7cc9533dcd959bf324.tar gsoc2013-evolution-60f7f10f45ca4e15ae250e7cc9533dcd959bf324.tar.gz gsoc2013-evolution-60f7f10f45ca4e15ae250e7cc9533dcd959bf324.tar.bz2 gsoc2013-evolution-60f7f10f45ca4e15ae250e7cc9533dcd959bf324.tar.lz gsoc2013-evolution-60f7f10f45ca4e15ae250e7cc9533dcd959bf324.tar.xz gsoc2013-evolution-60f7f10f45ca4e15ae250e7cc9533dcd959bf324.tar.zst gsoc2013-evolution-60f7f10f45ca4e15ae250e7cc9533dcd959bf324.zip | |
** Fixes bug #447727
2007-06-15 Matthew Barnes <mbarnes@redhat.com>
** Fixes bug #447727
* po/POTFILES.in: Remove e-clipped-label.c
* mail/mail-send-recv.c:
* shell/e-shell-folder-title-bar.c:
* widgets/misc/e-info-label.c:
* widgets/misc/e-multi-config-dialog.c:
* widgets/misc/e-task-bar.c:
Use ellipsized GtkLabels instead of EClippedLabels.
* widgets/misc/e-clipped-label.[ch]:
Remove these files. GTK+ provides this functionality now.
* widgets/misc/Makefile.am:
Remove e-clipped-label.[ch].
svn path=/trunk/; revision=33680
Diffstat (limited to 'widgets/misc/e-task-bar.c')
| -rw-r--r-- | widgets/misc/e-task-bar.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/widgets/misc/e-task-bar.c b/widgets/misc/e-task-bar.c index 2e28a6c76a..c80c4e16b3 100644 --- a/widgets/misc/e-task-bar.c +++ b/widgets/misc/e-task-bar.c @@ -26,11 +26,12 @@ #include "e-task-bar.h" -#include "misc/e-clipped-label.h" +#include <gtk/gtklabel.h> +#include <gtk/gtkmisc.h> struct _ETaskBarPrivate { - EClippedLabel *message_label; + GtkWidget *message_label; GtkHBox *hbox; }; @@ -96,11 +97,12 @@ e_task_bar_init (ETaskBar *task_bar) task_bar->priv = g_new (ETaskBarPrivate, 1); gtk_box_set_spacing (GTK_BOX (task_bar), 10); - - label = e_clipped_label_new ("", PANGO_WEIGHT_NORMAL, 1.0); + + label = gtk_label_new (NULL); + gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); gtk_box_pack_start (GTK_BOX (task_bar), label, TRUE, TRUE, 0); gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); - task_bar->priv->message_label = E_CLIPPED_LABEL (label); + task_bar->priv->message_label = label; hbox = gtk_hbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (task_bar), hbox); @@ -133,9 +135,9 @@ e_task_bar_set_message (ETaskBar *task_bar, const char *message) { if (message) { - gtk_widget_show (GTK_WIDGET (task_bar->priv->message_label)); - e_clipped_label_set_text (task_bar->priv->message_label, - message); + gtk_label_set_text ( + GTK_LABEL (task_bar->priv->message_label), message); + gtk_widget_show (task_bar->priv->message_label); } else { e_task_bar_unset_message (task_bar); } @@ -144,7 +146,7 @@ e_task_bar_set_message (ETaskBar *task_bar, void e_task_bar_unset_message (ETaskBar *task_bar) { - gtk_widget_hide (GTK_WIDGET (task_bar->priv->message_label)); + gtk_widget_hide (task_bar->priv->message_label); } void |