From 7c09639e22ce2c16a6d1592a9c20976c5f073523 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sat, 30 Aug 2008 06:05:36 +0000 Subject: [PATCH] leak if we use X - fix. fix icons. SVN revision: 35748 --- src/modules/mixer/app_mixer.c | 11 +++++++++++ src/modules/mixer/e-module-mixer.edj | Bin 9041 -> 10304 bytes src/modules/mixer/e_mod_main.c | 6 ++---- src/modules/mixer/module.desktop.in | 1 + 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/modules/mixer/app_mixer.c b/src/modules/mixer/app_mixer.c index 5f7b7948e..df891acb4 100644 --- a/src/modules/mixer/app_mixer.c +++ b/src/modules/mixer/app_mixer.c @@ -506,6 +506,15 @@ _cb_dialog_dismiss(void *data, E_Dialog *dialog) _mixer_app_dialog_del(dialog, data); } +static void +_cb_dialog_del(void *obj) +{ + E_Dialog *dialog; + + dialog = obj; + _mixer_app_dialog_del(dialog, dialog->data); +} + E_Dialog * e_mixer_app_dialog_new(E_Container *con, void (*func)(E_Dialog *dialog, void *data), void *data) { @@ -534,6 +543,8 @@ e_mixer_app_dialog_new(E_Container *con, void (*func)(E_Dialog *dialog, void *da _create_ui(dialog, app); + e_object_del_attach_func_set(E_OBJECT(dialog), _cb_dialog_del); + e_dialog_button_add(dialog, _("Close"), NULL, _cb_dialog_dismiss, app); e_dialog_button_focus_num(dialog, 1); e_win_centered_set(dialog->win, 1); diff --git a/src/modules/mixer/e-module-mixer.edj b/src/modules/mixer/e-module-mixer.edj index b3db7a0319e3f490897dab28fff1aaae1e0c1167..e3bdf6f39b495d9d5dfa05c7bd9a6e41d57ce3e7 100644 GIT binary patch delta 5319 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 ZA0P*9jCk5}_V7;m!oa{F2*i`~B3^THC8huX delta 4039 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, _mixer_system_cb_update, inst); inst->ui.gadget = edje_object_add(gc->evas); - if (!e_theme_edje_object_set(inst->ui.gadget, "base/theme/modules/mixer", - "e/modules/mixer/main")) - edje_object_file_set(inst->ui.gadget, e_mixer_theme_path(), - "e/modules/mixer/main"); + e_theme_edje_object_set(inst->ui.gadget, "base/theme/modules/mixer", + "e/modules/mixer/main"); inst->gcc = e_gadcon_client_new(gc, name, id, style, inst->ui.gadget); inst->gcc->data = inst; diff --git a/src/modules/mixer/module.desktop.in b/src/modules/mixer/module.desktop.in index 67bb8d4da..cae21bab1 100644 --- a/src/modules/mixer/module.desktop.in +++ b/src/modules/mixer/module.desktop.in @@ -4,3 +4,4 @@ Name=Mixer Icon=e-module-mixer Comment=Mixer Gadget

A module to provide a mixer for changing volume. Comment[it]=Modulo Mixer

Un modulo che fornisce un mixer per regolare il volume. +X-Enlightenment-ModuleType=system