forked from enlightenment/enlightenment
dont add collection plugin config each start
SVN revision: 49257
This commit is contained in:
parent
1a818e8ac8
commit
49b152519c
|
@ -396,9 +396,9 @@ _config_init()
|
|||
/* setup defaults */
|
||||
IFMODCFG(0x0001);
|
||||
evry_conf->rel_x = 0.5;
|
||||
evry_conf->rel_y = 0.33;
|
||||
evry_conf->width = 435;
|
||||
evry_conf->height = 385;
|
||||
evry_conf->rel_y = 0.43;
|
||||
evry_conf->width = 455;
|
||||
evry_conf->height = 430;
|
||||
evry_conf->scroll_animate = 1;
|
||||
evry_conf->scroll_speed = 10.0;
|
||||
evry_conf->hide_input = 0;
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#include "e.h"
|
||||
#include "evry_api.h"
|
||||
|
||||
#define MOD_CONFIG_FILE_EPOCH 0x0004
|
||||
#define MOD_CONFIG_FILE_EPOCH 0x0005
|
||||
#define MOD_CONFIG_FILE_GENERATION 0x0001
|
||||
#define MOD_CONFIG_FILE_VERSION \
|
||||
((MOD_CONFIG_FILE_EPOCH << 16) | MOD_CONFIG_FILE_GENERATION)
|
||||
|
|
|
@ -158,18 +158,17 @@ evry_plugin_register(Evry_Plugin *p, int type, int priority)
|
|||
conf[1] = evry_conf->conf_actions;
|
||||
conf[2] = evry_conf->conf_objects;
|
||||
|
||||
/* collection plugin sets its own config */
|
||||
if (p->config)
|
||||
{
|
||||
conf[type] = eina_list_append(conf[type], p->config);
|
||||
}
|
||||
else
|
||||
{
|
||||
EINA_LIST_FOREACH(conf[type], l, pc)
|
||||
if (pc->name && p->name && !strcmp(pc->name, p->name))
|
||||
break;
|
||||
|
||||
if (!pc)
|
||||
/* collection plugin sets its own config */
|
||||
if (!pc && p->config)
|
||||
{
|
||||
conf[type] = eina_list_append(conf[type], p->config);
|
||||
pc = p->config;
|
||||
}
|
||||
else if (!pc)
|
||||
{
|
||||
new_conf = 1;
|
||||
pc = E_NEW(Plugin_Config, 1);
|
||||
|
@ -195,7 +194,6 @@ evry_plugin_register(Evry_Plugin *p, int type, int priority)
|
|||
|
||||
/* EINA_LIST_FOREACH(conf[type], l, pc)
|
||||
* pc->priority = i++; */
|
||||
}
|
||||
|
||||
evry_conf->conf_subjects = conf[0];
|
||||
evry_conf->conf_actions = conf[1];
|
||||
|
|
|
@ -397,7 +397,7 @@ _e_smart_reconfigure_do(void *data)
|
|||
{
|
||||
size = 192;
|
||||
col = width / size;
|
||||
aspect_w = width * (sd->h / size);
|
||||
aspect_w = width * (1 + (sd->h / size));
|
||||
}
|
||||
|
||||
if (col < 1) col = 1;
|
||||
|
|
Loading…
Reference in New Issue