summaryrefslogtreecommitdiff
path: root/libmate-panel-applet
diff options
context:
space:
mode:
authorlukefromdc <[email protected]>2018-07-22 01:47:10 -0400
committerraveit65 <[email protected]>2018-07-28 11:27:28 +0200
commitae885fb09c175a26a1a8abcb29df79b7d2134807 (patch)
tree4e9075910496d475d8ec071669994fd44b5267ef /libmate-panel-applet
parenta6733367ce2d9b81370d5a7e198c72a4dfea9d5b (diff)
downloadmate-panel-ae885fb09c175a26a1a8abcb29df79b7d2134807.tar.bz2
mate-panel-ae885fb09c175a26a1a8abcb29df79b7d2134807.tar.xz
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
Diffstat (limited to 'libmate-panel-applet')
-rw-r--r--libmate-panel-applet/mate-panel-applet.c10
1 files 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);