From ae885fb09c175a26a1a8abcb29df79b7d2134807 Mon Sep 17 00:00:00 2001 From: lukefromdc Date: Sun, 22 Jul 2018 01:47:10 -0400 Subject: mate-panel-applet: setup_x_error_handler for in-process applets too This is for the tray: GtkPlug/GtkSocket widgets are used to embed tray icons (GtkStatusIcons) in the tray even if the tray is in-process and does not use the plug/socket widgets to be itself embedded in the panel --- libmate-panel-applet/mate-panel-applet.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libmate-panel-applet/mate-panel-applet.c b/libmate-panel-applet/mate-panel-applet.c index 8d2751a7..ec8ef6ef 100644 --- a/libmate-panel-applet/mate-panel-applet.c +++ b/libmate-panel-applet/mate-panel-applet.c @@ -2299,10 +2299,12 @@ _mate_panel_applet_factory_main_internal (const gchar *factory_id, g_return_val_if_fail(callback != NULL, 1); g_assert(g_type_is_a(applet_type, PANEL_TYPE_APPLET)); - if (out_process) - { - _mate_panel_applet_setup_x_error_handler(); - } + /*Use this both in and out of process as the tray applet always uses GtkSocket + *to handle GtkStatusIcons whether the tray itself is built in or out of process + */ + + _mate_panel_applet_setup_x_error_handler(); + closure = g_cclosure_new(G_CALLBACK(callback), user_data, NULL); factory = mate_panel_applet_factory_new(factory_id, out_process, applet_type, closure); -- cgit v1.2.1