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 /mail | |
| parent | a3f0966a6916c502586da58867c5f79dbe88075a (diff) | |
| download | gsoc2013-evolution-60f7f10f45ca4e15ae250e7cc9533dcd959bf324.tar.gz 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 'mail')
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/mail-send-recv.c | 24 |
2 files changed, 17 insertions, 12 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 5b833199d0..0206b32815 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2007-06-15 Matthew Barnes <mbarnes@redhat.com> + + * mail-send-recv.c: + Use ellipsized GtkLabels instead of EClippedLabels (#447727). + 2007-06-13 Sankar P <psankar@novell.com> * em-folder-view.c: diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 55a0a99260..dbaee11c61 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -43,7 +43,6 @@ #include "libedataserver/e-account-list.h" -#include "misc/e-clipped-label.h" #include "em-filter-rule.h" #include "camel/camel-filter-driver.h" #include "camel/camel-folder.h" @@ -156,8 +155,8 @@ receive_cancel(GtkButton *button, struct _send_info *info) if (info->state == SEND_ACTIVE) { camel_operation_cancel(info->cancel); if (info->status_label) - e_clipped_label_set_text ( - E_CLIPPED_LABEL (info->status_label), + gtk_label_set_text ( + GTK_LABEL (info->status_label), _("Canceling...")); info->state = SEND_CANCELLED; } @@ -267,8 +266,8 @@ operation_status_timeout(void *data) GTK_PROGRESS_BAR (info->progress_bar), info->pc / 100.0); if (info->what) - e_clipped_label_set_text ( - E_CLIPPED_LABEL (info->status_label), + gtk_label_set_text ( + GTK_LABEL (info->status_label), info->what); return TRUE; } @@ -496,10 +495,11 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati cancel_button = gtk_button_new_from_stock (GTK_STOCK_CANCEL); - status_label = e_clipped_label_new ( + status_label = gtk_label_new ( (info->type == SEND_UPDATE) ? - _("Updating...") : _("Waiting..."), - PANGO_WEIGHT_NORMAL, 1.0); + _("Updating...") : _("Waiting...")); + gtk_label_set_ellipsize ( + GTK_LABEL (status_label), PANGO_ELLIPSIZE_END); /* g_object_set(data->label, "bold", TRUE, NULL); */ gtk_misc_set_alignment (GTK_MISC (label), 0, .5); @@ -566,8 +566,9 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati progress_bar = gtk_progress_bar_new (); cancel_button = gtk_button_new_from_stock (GTK_STOCK_CANCEL); - status_label = e_clipped_label_new ( - _("Waiting..."), PANGO_WEIGHT_NORMAL, 1.0); + status_label = gtk_label_new (_("Waiting...")); + gtk_label_set_ellipsize ( + GTK_LABEL (status_label), PANGO_ELLIPSIZE_END); gtk_misc_set_alignment (GTK_MISC (label), 0, .5); gtk_misc_set_alignment (GTK_MISC (status_label), 0, .5); @@ -692,8 +693,7 @@ receive_done (char *uri, void *data) info->state = SEND_COMPLETE; } - e_clipped_label_set_text ( - E_CLIPPED_LABEL (info->status_label), text); + gtk_label_set_text (GTK_LABEL (info->status_label), text); } if (info->cancel_button) |