Make edgar work with current efl+e master
This commit is contained in:
parent
381121b45d
commit
d0cb51f2ad
|
@ -21,6 +21,7 @@
|
||||||
#include "e_mod_main.h"
|
#include "e_mod_main.h"
|
||||||
#include "e_mod_edgar.h"
|
#include "e_mod_edgar.h"
|
||||||
#include "efl.eo_api.h"
|
#include "efl.eo_api.h"
|
||||||
|
#include "Efl_Ui.h"
|
||||||
|
|
||||||
|
|
||||||
#ifdef EFL_VERSION_1_21
|
#ifdef EFL_VERSION_1_21
|
||||||
|
@ -242,7 +243,7 @@ edgar_gadget_load(const char *name, const char *path)
|
||||||
{
|
{
|
||||||
Edgar_Py_Gadget *gadget;
|
Edgar_Py_Gadget *gadget;
|
||||||
E_Gadcon_Client_Class *cclass;
|
E_Gadcon_Client_Class *cclass;
|
||||||
char fname[PATH_MAX];
|
char fname[PATH_MAX + 100]; // +100 to silence warnings :/
|
||||||
const char *label;
|
const char *label;
|
||||||
PyObject *mod, *attr, *opts;
|
PyObject *mod, *attr, *opts;
|
||||||
long vapi = 0;
|
long vapi = 0;
|
||||||
|
@ -471,7 +472,7 @@ edgar_theme_object_set(Edgar_Py_Gadget *gadget, Evas_Object *obj, const char *gr
|
||||||
if (efl_isa(obj, EFL_CANVAS_LAYOUT_CLASS))
|
if (efl_isa(obj, EFL_CANVAS_LAYOUT_CLASS))
|
||||||
return edje_object_file_set(obj, gadget->edjefile, buf);
|
return edje_object_file_set(obj, gadget->edjefile, buf);
|
||||||
|
|
||||||
if (efl_isa(obj, EFL_UI_LAYOUT_OBJECT_CLASS))
|
if (efl_isa(obj, EFL_UI_LAYOUT_CLASS))
|
||||||
return elm_layout_file_set(obj, gadget->edjefile, buf);
|
return elm_layout_file_set(obj, gadget->edjefile, buf);
|
||||||
|
|
||||||
return EINA_FALSE;
|
return EINA_FALSE;
|
||||||
|
|
Loading…
Reference in New Issue