summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlavio Ceolin <flavio.ceolin@gmail.com>2015-01-16 00:11:54 -0200
committerFlavio Ceolin <flavio.ceolin@gmail.com>2015-01-16 00:12:06 -0200
commitf97e72fecdafa8ebc35ddf11fccf82ab0df7ec56 (patch)
tree186b1ca34d591f18ce7d3baa281cdbb66176180e
parent49aea10d7d49f00230a5e4a56b9c3736f12efe0f (diff)
Following the enlightenment changes
-rw-r--r--src/module/e_mod_config.c2
-rw-r--r--src/module/e_mod_config.h2
-rw-r--r--src/module/e_mod_main.c6
3 files changed, 6 insertions, 4 deletions
diff --git a/src/module/e_mod_config.c b/src/module/e_mod_config.c
index 3446a71..00055e2 100644
--- a/src/module/e_mod_config.c
+++ b/src/module/e_mod_config.c
@@ -179,7 +179,7 @@ _basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED,
179} 179}
180 180
181E_Config_Dialog* 181E_Config_Dialog*
182emix_config_popup_new(E_Comp *comp, const char *p EINA_UNUSED) 182emix_config_popup_new(Evas_Object *comp, const char *p EINA_UNUSED)
183{ 183{
184 E_Config_Dialog *cfd; 184 E_Config_Dialog *cfd;
185 E_Config_Dialog_View *v; 185 E_Config_Dialog_View *v;
diff --git a/src/module/e_mod_config.h b/src/module/e_mod_config.h
index 5d019aa..c725753 100644
--- a/src/module/e_mod_config.h
+++ b/src/module/e_mod_config.h
@@ -13,6 +13,6 @@ void emix_config_backend_set(const char *backend);
13Eina_Bool emix_config_desklock_mute_get(void); 13Eina_Bool emix_config_desklock_mute_get(void);
14Eina_Bool emix_config_meter_get(void); 14Eina_Bool emix_config_meter_get(void);
15Eina_Bool emix_config_notify_get(void); 15Eina_Bool emix_config_notify_get(void);
16E_Config_Dialog* emix_config_popup_new(E_Comp *comp, const char*p); 16E_Config_Dialog* emix_config_popup_new(Evas_Object *comp, const char*p);
17 17
18#endif 18#endif
diff --git a/src/module/e_mod_main.c b/src/module/e_mod_main.c
index 1dd5121..b530d28 100644
--- a/src/module/e_mod_main.c
+++ b/src/module/e_mod_main.c
@@ -66,6 +66,7 @@ struct _Instance
66 E_Gadcon_Orient orient; 66 E_Gadcon_Orient orient;
67 67
68 E_Gadcon_Popup *popup; 68 E_Gadcon_Popup *popup;
69 Evas *evas;
69 Evas_Object *gadget; 70 Evas_Object *gadget;
70 Evas_Object *list; 71 Evas_Object *list;
71 Evas_Object *slider; 72 Evas_Object *slider;
@@ -368,7 +369,7 @@ static Evas_Object *
368_popup_add_slider(Instance *inst) 369_popup_add_slider(Instance *inst)
369{ 370{
370 unsigned int volume, i; 371 unsigned int volume, i;
371 Evas_Object *slider = e_slider_add(e_comp_get(inst->popup)->evas); 372 Evas_Object *slider = e_slider_add(inst->evas);
372 373
373 for (volume = 0, i = 0; i < 374 for (volume = 0, i = 0; i <
374 mixer_context->sink_default->volume.channel_count; i++) 375 mixer_context->sink_default->volume.channel_count; i++)
@@ -409,7 +410,7 @@ _popup_new(Instance *inst)
409 EINA_SAFETY_ON_NULL_RETURN(mixer_context->sink_default); 410 EINA_SAFETY_ON_NULL_RETURN(mixer_context->sink_default);
410 411
411 inst->popup = e_gadcon_popup_new(inst->gcc, 0); 412 inst->popup = e_gadcon_popup_new(inst->gcc, 0);
412 evas = e_comp_get(inst->gcc)->evas; 413 evas = inst->evas;
413 414
414 list = e_widget_list_add(evas, 0, 0); 415 list = e_widget_list_add(evas, 0, 0);
415 416
@@ -544,6 +545,7 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
544 inst = E_NEW(Instance, 1); 545 inst = E_NEW(Instance, 1);
545 546
546 inst->gadget = edje_object_add(gc->evas); 547 inst->gadget = edje_object_add(gc->evas);
548 inst->evas = gc->evas;
547 edje_object_file_set(inst->gadget, mixer_context->theme, 549 edje_object_file_set(inst->gadget, mixer_context->theme,
548 "e/modules/mixer/main"); 550 "e/modules/mixer/main");
549 551