summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlukefromdc <[email protected]>2018-07-22 01:47:10 -0400
committerlukefromdc <[email protected]>2018-07-23 00:08:45 -0400
commitb37f24ea4aabd954b7c7810a681ec8fc62c65631 (patch)
tree290198218fe783cd717bd87ffaa6c1c341a7b1f8
parenta130fb0379a270f6ed80fa21ba2a69e184b4cc2a (diff)
downloadmate-panel-b37f24ea4aabd954b7c7810a681ec8fc62c65631.tar.bz2
mate-panel-b37f24ea4aabd954b7c7810a681ec8fc62c65631.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
-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 def9b4b5..e298b875 100644
--- a/libmate-panel-applet/mate-panel-applet.c
+++ b/libmate-panel-applet/mate-panel-applet.c
@@ -2302,10 +2302,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);