"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/mail/mail-send-recv.c" between
evolution-3.32.4.tar.xz and evolution-3.34.0.tar.xz

About: Evolution is a personal information management application that provides integrated mail, calendaring and address book functionality (GNOME desktop).

mail-send-recv.c  (evolution-3.32.4.tar.xz):mail-send-recv.c  (evolution-3.34.0.tar.xz)
skipping to change at line 193 skipping to change at line 193
static void static void
receive_cancel (GtkButton *button, receive_cancel (GtkButton *button,
struct _send_info *info) struct _send_info *info)
{ {
if (info->state == SEND_ACTIVE) { if (info->state == SEND_ACTIVE) {
g_cancellable_cancel (info->cancellable); g_cancellable_cancel (info->cancellable);
if (info->progress_bar != NULL) if (info->progress_bar != NULL)
gtk_progress_bar_set_text ( gtk_progress_bar_set_text (
GTK_PROGRESS_BAR (info->progress_bar), GTK_PROGRESS_BAR (info->progress_bar),
_("Canceling...")); _("Canceling"));
info->state = SEND_CANCELLED; info->state = SEND_CANCELLED;
} }
if (info->cancel_button) if (info->cancel_button)
gtk_widget_set_sensitive (info->cancel_button, FALSE); gtk_widget_set_sensitive (info->cancel_button, FALSE);
} }
static void static void
free_send_data (void) free_send_data (void)
{ {
struct _send_data *data = send_data; struct _send_data *data = send_data;
skipping to change at line 871 skipping to change at line 871
GTK_LABEL (label), PANGO_ELLIPSIZE_END); GTK_LABEL (label), PANGO_ELLIPSIZE_END);
gtk_label_set_markup (GTK_LABEL (label), pretty_url); gtk_label_set_markup (GTK_LABEL (label), pretty_url);
g_free (pretty_url); g_free (pretty_url);
progress_bar = gtk_progress_bar_new (); progress_bar = gtk_progress_bar_new ();
gtk_progress_bar_set_show_text ( gtk_progress_bar_set_show_text (
GTK_PROGRESS_BAR (progress_bar), TRUE); GTK_PROGRESS_BAR (progress_bar), TRUE);
gtk_progress_bar_set_text ( gtk_progress_bar_set_text (
GTK_PROGRESS_BAR (progress_bar), GTK_PROGRESS_BAR (progress_bar),
(info->type == SEND_UPDATE) ? (info->type == SEND_UPDATE) ?
_("Updating...") : _("Waiting...")); _("Updating…") : _("Waiting…"));
gtk_widget_set_margin_bottom (progress_bar, 12); gtk_widget_set_margin_bottom (progress_bar, 12);
cancel_button = e_dialog_button_new_with_icon ("process-stop", _( "_Cancel")); cancel_button = e_dialog_button_new_with_icon ("process-stop", _( "_Cancel"));
gtk_widget_set_valign (cancel_button, GTK_ALIGN_END); gtk_widget_set_valign (cancel_button, GTK_ALIGN_END);
gtk_widget_set_margin_bottom (cancel_button, 12); gtk_widget_set_margin_bottom (cancel_button, 12);
/* g_object_set(data->label, "bold", TRUE, NULL); */ /* g_object_set(data->label, "bold", TRUE, NULL); */
gtk_misc_set_alignment (GTK_MISC (label), 0, .5); gtk_misc_set_alignment (GTK_MISC (label), 0, .5);
gtk_widget_set_hexpand (label, TRUE); gtk_widget_set_hexpand (label, TRUE);
skipping to change at line 952 skipping to change at line 952
label = gtk_label_new (NULL); label = gtk_label_new (NULL);
gtk_label_set_ellipsize ( gtk_label_set_ellipsize (
GTK_LABEL (label), PANGO_ELLIPSIZE_END); GTK_LABEL (label), PANGO_ELLIPSIZE_END);
gtk_label_set_markup (GTK_LABEL (label), pretty_url); gtk_label_set_markup (GTK_LABEL (label), pretty_url);
g_free (pretty_url); g_free (pretty_url);
progress_bar = gtk_progress_bar_new (); progress_bar = gtk_progress_bar_new ();
gtk_progress_bar_set_show_text ( gtk_progress_bar_set_show_text (
GTK_PROGRESS_BAR (progress_bar), TRUE); GTK_PROGRESS_BAR (progress_bar), TRUE);
gtk_progress_bar_set_text ( gtk_progress_bar_set_text (
GTK_PROGRESS_BAR (progress_bar), _("Waiting...")); GTK_PROGRESS_BAR (progress_bar), _("Waiting"));
gtk_widget_set_margin_bottom (progress_bar, 12); gtk_widget_set_margin_bottom (progress_bar, 12);
cancel_button = e_dialog_button_new_with_icon ("process-stop", _( "_Cancel")); cancel_button = e_dialog_button_new_with_icon ("process-stop", _( "_Cancel"));
gtk_widget_set_valign (cancel_button, GTK_ALIGN_END); gtk_widget_set_valign (cancel_button, GTK_ALIGN_END);
gtk_misc_set_alignment (GTK_MISC (label), 0, .5); gtk_misc_set_alignment (GTK_MISC (label), 0, .5);
gtk_widget_set_hexpand (label, TRUE); gtk_widget_set_hexpand (label, TRUE);
gtk_widget_set_halign (label, GTK_ALIGN_FILL); gtk_widget_set_halign (label, GTK_ALIGN_FILL);
skipping to change at line 1470 skipping to change at line 1470
if (!success) { if (!success) {
if (g_error_matches (local_error, CAMEL_SERVICE_ERROR, CAMEL_SERV ICE_ERROR_UNAVAILABLE)) if (g_error_matches (local_error, CAMEL_SERVICE_ERROR, CAMEL_SERV ICE_ERROR_UNAVAILABLE))
g_clear_error (&local_error); g_clear_error (&local_error);
else else
g_propagate_error (error, local_error); g_propagate_error (error, local_error);
goto exit; goto exit;
} }
get_folders (m->store, m->folders, m->finfo); get_folders (m->store, m->folders, m->finfo);
camel_operation_push_message (m->info->cancellable, _("Updating...")); camel_operation_push_message (m->info->cancellable, _("Updating"));
test_should_delete_junk_or_expunge (m->store, &delete_junk, &expunge); test_should_delete_junk_or_expunge (m->store, &delete_junk, &expunge);
if (delete_junk && !delete_junk_sync (m->store, cancellable, error)) { if (delete_junk && !delete_junk_sync (m->store, cancellable, error)) {
camel_operation_pop_message (m->info->cancellable); camel_operation_pop_message (m->info->cancellable);
goto exit; goto exit;
} }
mail_backend = E_MAIL_BACKEND (e_shell_get_backend_by_name (e_shell_get_d efault (), "mail")); mail_backend = E_MAIL_BACKEND (e_shell_get_backend_by_name (e_shell_get_d efault (), "mail"));
 End of changes. 4 change blocks. 
4 lines changed or deleted 4 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)