summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel-hollerbach@t-online.de>2015-02-25 22:31:11 +0100
committerFlavio Ceolin <flavio.ceolin@gmail.com>2015-03-07 18:51:03 -0300
commit5dcef203bc7be777f6d6c216f02dd820a8913766 (patch)
treee265a32c0582764039b498a1a3811e7844bc9489
parent494952e3f9ff511cf515bacb185c5c62f22d64e0 (diff)
Fixed a few warnings
Those should be in the previours commit dont know what went wrong.
-rw-r--r--src/module/e_mod_main.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/module/e_mod_main.c b/src/module/e_mod_main.c
index 3e475db..d01d48f 100644
--- a/src/module/e_mod_main.c
+++ b/src/module/e_mod_main.c
@@ -72,7 +72,7 @@ struct _Instance
72 Evas_Object *slider; 72 Evas_Object *slider;
73 Evas_Object *check; 73 Evas_Object *check;
74 74
75 int mute; 75 Eina_Bool mute;
76}; 76};
77 77
78static Context *mixer_context = NULL; 78static Context *mixer_context = NULL;
@@ -319,7 +319,7 @@ _emixer_del_cb(void *data EINA_UNUSED, int type EINA_UNUSED,
319} 319}
320 320
321static void 321static void
322_emixer_exec_cb(void *data, void *data2 EINA_UNUSED) 322_emixer_exec_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
323{ 323{
324 Instance *inst = data; 324 Instance *inst = data;
325 325
@@ -366,7 +366,7 @@ _slider_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
366} 366}
367 367
368static Evas_Object * 368static Evas_Object *
369_popup_add_slider(Instance *inst) 369_popup_add_slider(void)
370{ 370{
371 unsigned int volume, i; 371 unsigned int volume, i;
372 372
@@ -390,7 +390,7 @@ _popup_add_slider(Instance *inst)
390} 390}
391 391
392static void 392static void
393_sink_selected_cb(void *data) 393_sink_selected_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
394{ 394{
395 Emix_Sink *s = data; 395 Emix_Sink *s = data;
396 396
@@ -401,7 +401,7 @@ _sink_selected_cb(void *data)
401static void 401static void
402_popup_new(Instance *inst) 402_popup_new(Instance *inst)
403{ 403{
404 Evas_Object *button, *list; 404 Evas_Object *button, *list, *icon;
405 Emix_Sink *s; 405 Emix_Sink *s;
406 Eina_List *l; 406 Eina_List *l;
407 407
@@ -426,7 +426,7 @@ _popup_new(Instance *inst)
426 } 426 }
427 elm_box_pack_end(list, inst->list); 427 elm_box_pack_end(list, inst->list);
428 428
429 inst->slider = _popup_add_slider(inst); 429 inst->slider = _popup_add_slider();
430 elm_box_pack_end(list, inst->slider); 430 elm_box_pack_end(list, inst->slider);
431 evas_object_show(inst->slider); 431 evas_object_show(inst->slider);
432 432
@@ -440,9 +440,13 @@ _popup_new(Instance *inst)
440 elm_box_pack_end(list, inst->check); 440 elm_box_pack_end(list, inst->check);
441 evas_object_show(inst->check); 441 evas_object_show(inst->check);
442 442
443 icon = elm_icon_add(e_comp->elm);
444 elm_icon_standard_set(icon, "preferences-system");
445
443 button = elm_button_add(e_comp->elm); 446 button = elm_button_add(e_comp->elm);
444 evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL); 447 evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
445 evas_object_size_hint_weight_set(button, EVAS_HINT_EXPAND, 0.0); 448 evas_object_size_hint_weight_set(button, EVAS_HINT_EXPAND, 0.0);
449 elm_object_part_content_set(button, "icon", icon);
446 evas_object_smart_callback_add(button, "clicked", _emixer_exec_cb, inst); 450 evas_object_smart_callback_add(button, "clicked", _emixer_exec_cb, inst);
447 elm_box_pack_end(list, button); 451 elm_box_pack_end(list, button);
448 evas_object_show(button); 452 evas_object_show(button);
@@ -461,7 +465,7 @@ _popup_new(Instance *inst)
461static void 465static void
462_menu_cb(void *data, E_Menu *menu EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) 466_menu_cb(void *data, E_Menu *menu EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED)
463{ 467{
464 _emixer_exec_cb(data, NULL); 468 _emixer_exec_cb(data, NULL, NULL);
465} 469}
466 470
467static void 471static void