[Commits] [SCM] claws branch, gtk3, updated. 4.0.0-127-gf2f4a99dc
jonathan at claws-mail.org
jonathan at claws-mail.org
Mon Sep 6 04:56:47 UTC 2021
The branch, gtk3 has been updated
via f2f4a99dc00d6781e3f8a1d46a87775a58b621a3 (commit)
via 275d19822f35345f7b8f5e35b31fb75aae3220a2 (commit)
via 07ced7167db4bcf16b5da7ba8222584b4fd6f3b2 (commit)
from 545cab2d8a736934dca1ea6ca66c6c2e664f57fe (commit)
Summary of changes:
src/image_viewer.c | 1 +
src/messageview.c | 1 +
src/plugins/fancy/fancy_viewer.c | 5 +++--
src/plugins/litehtml_viewer/lh_viewer.c | 1 +
src/plugins/vcalendar/day-view.c | 1 +
src/plugins/vcalendar/month-view.c | 1 +
src/plugins/vcalendar/vcalendar.c | 1 +
src/textview.c | 1 +
8 files changed, 10 insertions(+), 2 deletions(-)
- Log -----------------------------------------------------------------
commit f2f4a99dc00d6781e3f8a1d46a87775a58b621a3
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Thu Sep 2 15:41:37 2021 -0700
Add more widget names
diff --git a/src/image_viewer.c b/src/image_viewer.c
index 78ee9727e..087c96f63 100644
--- a/src/image_viewer.c
+++ b/src/image_viewer.c
@@ -297,6 +297,7 @@ static MimeViewer *image_viewer_create(void)
GtkWidget *error_msg;
notebook = gtk_notebook_new();
+ gtk_widget_set_name(GTK_WIDGET(notebook), "image_viewer");
gtk_widget_show(notebook);
gtk_widget_set_can_focus(notebook, FALSE);
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), FALSE);
diff --git a/src/plugins/fancy/fancy_viewer.c b/src/plugins/fancy/fancy_viewer.c
index f2edf4123..17572703e 100644
--- a/src/plugins/fancy/fancy_viewer.c
+++ b/src/plugins/fancy/fancy_viewer.c
@@ -1125,6 +1125,7 @@ static MimeViewer *fancy_viewer_create(void)
GTK_WIDGET(viewer->view));
viewer->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+ gtk_widget_set_name(GTK_WIDGET(viewer->vbox), "fancy_viewer");
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
viewer->progress = gtk_progress_bar_new();
gtk_widget_set_size_request(GTK_WIDGET(viewer->progress), 120, -1);
diff --git a/src/plugins/litehtml_viewer/lh_viewer.c b/src/plugins/litehtml_viewer/lh_viewer.c
index c8f331006..6d6eedc6a 100644
--- a/src/plugins/litehtml_viewer/lh_viewer.c
+++ b/src/plugins/litehtml_viewer/lh_viewer.c
@@ -184,6 +184,7 @@ MimeViewer *lh_viewer_create()
viewer->mimeviewer.scroll_one_line = lh_scroll_one_line;
viewer->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+ gtk_widget_set_name(GTK_WIDGET(viewer->vbox), "litehtml_viewer");
GtkWidget *w = lh_widget_get_widget(viewer->widget);
gtk_box_pack_start(GTK_BOX(viewer->vbox), w,
diff --git a/src/plugins/vcalendar/day-view.c b/src/plugins/vcalendar/day-view.c
index 566351f5a..0a1bd62f0 100644
--- a/src/plugins/vcalendar/day-view.c
+++ b/src/plugins/vcalendar/day-view.c
@@ -882,6 +882,7 @@ day_win *create_day_win(FolderItem *item, struct tm tmdate)
dw->startdate.tm_min = 0;
dw->startdate.tm_sec = 0;
dw->Vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+ gtk_widget_set_name(GTK_WIDGET(dw->Vbox), "vcal_day_win");
dw->item = item;
build_day_view_colours(dw);
diff --git a/src/plugins/vcalendar/month-view.c b/src/plugins/vcalendar/month-view.c
index 6d7b64120..fc13b1414 100644
--- a/src/plugins/vcalendar/month-view.c
+++ b/src/plugins/vcalendar/month-view.c
@@ -966,6 +966,7 @@ month_win *create_month_win(FolderItem *item, struct tm tmdate)
mw->startdate = tmdate;
mw->Vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+ gtk_widget_set_name(GTK_WIDGET(mw->Vbox), "vcal_month_win");
mw->item = item;
build_month_view_colours(mw);
diff --git a/src/plugins/vcalendar/vcalendar.c b/src/plugins/vcalendar/vcalendar.c
index a71410bee..0186358c4 100644
--- a/src/plugins/vcalendar/vcalendar.c
+++ b/src/plugins/vcalendar/vcalendar.c
@@ -1246,6 +1246,7 @@ MimeViewer *vcal_viewer_create(void)
TABLE_ADD_LINE(_("Action:"), vbox);
vcalviewer->scrolledwin = gtk_scrolled_window_new(NULL, NULL);
+ gtk_widget_set_name(GTK_WIDGET(vcalviewer->scrolledwin), "vcalendar_viewer");
gtk_container_add(GTK_CONTAINER(vcalviewer->scrolledwin),
vcalviewer->table);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(vcalviewer->scrolledwin),
diff --git a/src/textview.c b/src/textview.c
index e237776e1..cf33d779d 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -329,6 +329,7 @@ TextView *textview_create(void)
gtk_widget_show(scrolledwin);
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+ gtk_widget_set_name(GTK_WIDGET(vbox), "textview");
gtk_box_pack_start(GTK_BOX(vbox), scrolledwin, TRUE, TRUE, 0);
gtk_widget_show(vbox);
commit 275d19822f35345f7b8f5e35b31fb75aae3220a2
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Wed Sep 1 13:07:19 2021 -0700
Fix crashes in Fancy when printing
Fix a crash due to a race between the background initialization of the newly
created WebKitWebView and launching the print dialog.
Also fix a crash due to an allocate/free mismatch with the WebKitPrintOperation
diff --git a/src/plugins/fancy/fancy_viewer.c b/src/plugins/fancy/fancy_viewer.c
index 442f26926..f2edf4123 100644
--- a/src/plugins/fancy/fancy_viewer.c
+++ b/src/plugins/fancy/fancy_viewer.c
@@ -306,7 +306,6 @@ static gboolean fancy_set_contents(FancyViewer *viewer, gboolean use_defaults)
NULL);
g_free(contents);
}
- viewer->loading = FALSE;
return FALSE;
}
@@ -387,7 +386,7 @@ static void fancy_print(MimeViewer *_viewer)
webkit_print_operation_get_print_settings(printoperation));
}
- g_free(printoperation);
+ g_object_unref(printoperation);
}
/*static gchar *fancy_get_selection (MimeViewer *_viewer)
@@ -659,6 +658,7 @@ static void load_changed_cb(WebKitWebView *view,
break;
case WEBKIT_LOAD_FINISHED:
+ viewer->loading = FALSE;
gtk_widget_hide(viewer->progress);
gtk_widget_hide(viewer->ev_stop_loading);
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(viewer->progress),
commit 07ced7167db4bcf16b5da7ba8222584b4fd6f3b2
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Wed Sep 1 12:34:08 2021 -0700
Clear temp messageview before destroying
Avoid potential crashes when printing from a mimeview
diff --git a/src/messageview.c b/src/messageview.c
index d6ecea05d..ecc5a639e 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -2244,6 +2244,7 @@ void messageview_print(MsgInfo *msginfo, gboolean all_headers,
print_mimeview(tmpview->mimeview,
sel_start, sel_end, partnum);
}
+ messageview_clear(tmpview);
messageview_destroy(tmpview);
}
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list