Enlightenment CVS committal
Author : dj2
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/battery
Modified Files:
e_mod_main.c
Log Message:
- move the common code to a function in the e_modules file.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/battery/e_mod_main.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- e_mod_main.c 21 Sep 2005 06:57:36 -0000 1.46
+++ e_mod_main.c 22 Sep 2005 18:17:16 -0000 1.47
@@ -73,23 +73,13 @@
/* check module api version */
if (m->api->version < E_MODULE_API_VERSION)
{
- E_Dialog *dia;
char buf[4096];
-
- dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
- if (!dia) return NULL;
-
- snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing
Module: Battery<br>"
+ snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing
Module: %s<br>"
"It requires a minimum module API version
of: %i.<br>"
"The module API advertized by
Enlightenment is: %i.<br>"),
- E_MODULE_API_VERSION, m->api->version);
+ _("Battery"), E_MODULE_API_VERSION,
m->api->version);
- e_dialog_title_set(dia, "Enlightenment Battery Module");
- e_dialog_icon_set(dia, "enlightenment/e", 64);
- e_dialog_text_set(dia, buf);
- e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
- e_win_centered_set(dia->win, 1);
- e_dialog_show(dia);
+ e_module_dialog_show(_("Enlightenment Battery Module"), buf);
return NULL;
}
/* actually init battery */
@@ -136,20 +126,12 @@
int
e_modapi_about(E_Module *m)
{
- E_Dialog *dia;
-
- dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
- if (!dia) return 0;
- e_dialog_title_set(dia, "Enlightenment Battery Module");
- e_dialog_icon_set(dia, "enlightenment/e", 64);
- e_dialog_text_set(dia, _("A basic battery meter that uses either"
- "<hilight>ACPI</hilight> or
<hilight>APM</hilight><br>"
- "on Linux to monitor your battery and AC power
adaptor<br>"
- "status. This will work under Linux and FreeBSD and
is only<br>"
- "as accurate as your BIOS or kernel drivers."));
- e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
- e_win_centered_set(dia->win, 1);
- e_dialog_show(dia);
+ e_module_dialog_show(_("Enlightenment Battery Module"),
+ _("A basic battery meter that uses either"
+ "<hilight>ACPI</hilight> or <hilight>APM</hilight><br>"
+ "on Linux to monitor your battery and AC power
adaptor<br>"
+ "status. This will work under Linux and FreeBSD and is
only<br>"
+ "as accurate as your BIOS or kernel drivers."));
return 1;
}
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
