summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-10-14 10:21:11 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-10-14 10:21:43 +0100
commitb3e7009d65889f61c62f0126343da56e9da88297 (patch)
tree99be25b0e678fedd1c18476ceac222c0318d819d /src/modules
parentfca53bbd3f53709b8303aa5012cbdbcc030ed8e7 (diff)
systray - allow multiple
now we no longer have xmbed, allow multiple instances. fixes T8370
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/systray/e_mod_main.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/modules/systray/e_mod_main.c b/src/modules/systray/e_mod_main.c
index 3d600bc..1a94cd3 100644
--- a/src/modules/systray/e_mod_main.c
+++ b/src/modules/systray/e_mod_main.c
@@ -7,7 +7,6 @@ static const char _sig_source[] = "e";
7 7
8static E_Module *systray_mod = NULL; 8static E_Module *systray_mod = NULL;
9static Systray_Context *ctx = NULL; 9static Systray_Context *ctx = NULL;
10EINTERN Instance *instance = NULL; /* only one systray ever possible */
11static char tmpbuf[4096]; /* general purpose buffer, just use immediately */ 10static char tmpbuf[4096]; /* general purpose buffer, just use immediately */
12 11
13#define SYSTRAY_MIN_W 16 12#define SYSTRAY_MIN_W 16
@@ -213,14 +212,6 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
213 212
214 if (!systray_mod) 213 if (!systray_mod)
215 return NULL; 214 return NULL;
216 if ((!id) || (instance))
217 {
218 e_util_dialog_internal
219 (_("Another systray exists"),
220 _("There can be only one systray gadget and "
221 "another one already exists."));
222 return NULL;
223 }
224 215
225 inst = E_NEW(Instance, 1); 216 inst = E_NEW(Instance, 1);
226 if (!inst) 217 if (!inst)
@@ -254,7 +245,6 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
254 245
255 inst->notifier = systray_notifier_host_new(inst, inst->gcc->gadcon); 246 inst->notifier = systray_notifier_host_new(inst, inst->gcc->gadcon);
256 247
257 instance = inst;
258 return inst->gcc; 248 return inst->gcc;
259} 249}
260 250
@@ -273,9 +263,6 @@ _gc_shutdown(E_Gadcon_Client *gcc)
273 263
274 evas_object_del(inst->ui.gadget); 264 evas_object_del(inst->ui.gadget);
275 265
276 if (instance == inst)
277 instance = NULL;
278
279 if (inst->job.size_apply) 266 if (inst->job.size_apply)
280 ecore_job_del(inst->job.size_apply); 267 ecore_job_del(inst->job.size_apply);
281 268