systray - allow multiple
now we no longer have xmbed, allow multiple instances. fixes T8370
This commit is contained in:
parent
fca53bbd3f
commit
b3e7009d65
|
@ -7,7 +7,6 @@ static const char _sig_source[] = "e";
|
||||||
|
|
||||||
static E_Module *systray_mod = NULL;
|
static E_Module *systray_mod = NULL;
|
||||||
static Systray_Context *ctx = NULL;
|
static Systray_Context *ctx = NULL;
|
||||||
EINTERN Instance *instance = NULL; /* only one systray ever possible */
|
|
||||||
static char tmpbuf[4096]; /* general purpose buffer, just use immediately */
|
static char tmpbuf[4096]; /* general purpose buffer, just use immediately */
|
||||||
|
|
||||||
#define SYSTRAY_MIN_W 16
|
#define SYSTRAY_MIN_W 16
|
||||||
|
@ -213,14 +212,6 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
|
||||||
|
|
||||||
if (!systray_mod)
|
if (!systray_mod)
|
||||||
return NULL;
|
return NULL;
|
||||||
if ((!id) || (instance))
|
|
||||||
{
|
|
||||||
e_util_dialog_internal
|
|
||||||
(_("Another systray exists"),
|
|
||||||
_("There can be only one systray gadget and "
|
|
||||||
"another one already exists."));
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
inst = E_NEW(Instance, 1);
|
inst = E_NEW(Instance, 1);
|
||||||
if (!inst)
|
if (!inst)
|
||||||
|
@ -254,7 +245,6 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
|
||||||
|
|
||||||
inst->notifier = systray_notifier_host_new(inst, inst->gcc->gadcon);
|
inst->notifier = systray_notifier_host_new(inst, inst->gcc->gadcon);
|
||||||
|
|
||||||
instance = inst;
|
|
||||||
return inst->gcc;
|
return inst->gcc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -273,9 +263,6 @@ _gc_shutdown(E_Gadcon_Client *gcc)
|
||||||
|
|
||||||
evas_object_del(inst->ui.gadget);
|
evas_object_del(inst->ui.gadget);
|
||||||
|
|
||||||
if (instance == inst)
|
|
||||||
instance = NULL;
|
|
||||||
|
|
||||||
if (inst->job.size_apply)
|
if (inst->job.size_apply)
|
||||||
ecore_job_del(inst->job.size_apply);
|
ecore_job_del(inst->job.size_apply);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue