If we are passed a zone, use it rather than regetting zone.

Fix some formatting.



SVN revision: 44908
This commit is contained in:
Christopher Michael 2010-01-05 05:32:39 +00:00
parent 56178c136b
commit d877b90de5
2 changed files with 14 additions and 13 deletions

View File

@ -173,12 +173,12 @@ _e_mod_action_conf_cb(E_Object *obj, const char *params)
else if (obj->type == E_CONTAINER_TYPE)
zone = e_util_zone_current_get(((E_Container *)obj)->manager);
else if (obj->type == E_ZONE_TYPE)
zone = e_util_zone_current_get(((E_Zone *)obj)->container->manager);
zone = ((E_Zone *)obj);
else
zone = e_util_zone_current_get(e_manager_current_get());
}
if (!zone) zone = e_util_zone_current_get(e_manager_current_get());
if (zone && params)
if ((zone) && (params))
e_configure_registry_call(params, zone->container, params);
else if (zone)
e_configure_show(zone->container);
@ -235,6 +235,7 @@ static E_Menu *
_e_mod_submenu_modes_get(void)
{
E_Menu *m = e_menu_new();
if (!m) return NULL;
e_menu_pre_activate_callback_set(m, _e_mod_submenu_modes_fill, NULL);
return m;