From: Enlightenment C. <no...@cv...> - 2007-03-14 05:39:04
|
Enlightenment CVS committal Author : englebass Project : e_modules Module : forecasts Dir : e_modules/forecasts Modified Files: e_mod_config.c e_mod_main.c Log Message: Remove unused variables. =================================================================== RCS file: /cvs/e/e_modules/forecasts/e_mod_config.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_mod_config.c 3 Mar 2007 18:29:20 -0000 1.4 +++ e_mod_config.c 14 Mar 2007 11:39:02 -0000 1.5 @@ -81,7 +81,7 @@ E_Config_Dialog_Data * cfdata) { Evas_Object *o, *of, *ob; - E_Radio_Group *rg, *dg; + E_Radio_Group *dg; char buf[4096]; o = e_widget_list_add(evas, 0, 0); @@ -124,7 +124,6 @@ _basic_apply_data(E_Config_Dialog * cfd, E_Config_Dialog_Data * cfdata) { Config_Item *ci; - int len; ci = cfd->data; if (!cfdata->code) =================================================================== RCS file: /cvs/e/e_modules/forecasts/e_mod_main.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_mod_main.c 3 Mar 2007 22:45:35 -0000 1.6 +++ e_mod_main.c 14 Mar 2007 11:39:02 -0000 1.7 @@ -140,8 +140,6 @@ Forecasts *w; Instance *inst; Config_Item *ci; - int pw, ph; - Popup *popup; inst = E_NEW(Instance, 1); @@ -469,7 +467,6 @@ _forecasts_new(Evas * evas) { Forecasts *w; - const char *file; char buf[4096]; w = E_NEW(Forecasts, 1); @@ -642,7 +639,7 @@ _forecasts_parse(void *data) { Instance *inst; - char *needle, *ext; + char *needle; char city[256]; char region[256]; char location[512]; |
From: Enlightenment C. <no...@cv...> - 2007-03-14 05:41:28
|
Enlightenment CVS committal Author : englebass Project : e_modules Module : forecasts Dir : e_modules/forecasts Removed Files: aclocal.m4 Log Message: This shouldn't be here. |
From: Enlightenment C. <no...@cv...> - 2007-09-15 09:04:39
|
Enlightenment CVS committal Author : englebass Project : e_modules Module : forecasts Dir : e_modules/forecasts Modified Files: e_modules-forecasts.spec.in forecasts.edc Log Message: popup is in main e theme now. =================================================================== RCS file: /cvs/e/e_modules/forecasts/e_modules-forecasts.spec.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_modules-forecasts.spec.in 24 Feb 2007 08:21:40 -0000 1.1 +++ e_modules-forecasts.spec.in 15 Sep 2007 09:04:38 -0000 1.2 @@ -1,4 +1,4 @@ -%define module_name forecasts +%define module_name forecasts Summary: %{module_name} module for the Enlightenment window manager Name: e_modules-%{module_name} =================================================================== RCS file: /cvs/e/e_modules/forecasts/forecasts.edc,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- forecasts.edc 7 Jul 2007 14:25:57 -0000 1.4 +++ forecasts.edc 15 Sep 2007 09:04:38 -0000 1.5 @@ -151,59 +151,6 @@ } } } - group { - name: "modules/forecasts/popup"; - parts { - part { - name: "border_tl"; - type: RECT; - mouse_events: 0; - description { - state: "default" 0.0; - rel1.offset: 0 0; - rel2.offset: -1 -1; - color: 253 253 253 255; - } - } - part { - name: "border_br"; - type: RECT; - mouse_events: 0; - description { - state: "default" 0.0; - rel1.offset: 1 1; - rel2.offset: -1 -1; - color: 165 165 165 255; - } - } - part { - name: "base"; - type: RECT; - mouse_events: 0; - description { - state: "default" 0.0; - rel1.offset: 1 1; - rel2.offset: -2 -2; - color: 221 221 221 255; - } - } - part { - name: "e.swallow.content"; - type: SWALLOW; - description { - state: "default" 0.0; - align: 0.5 0.5; - //color: 0 0 0 0; - rel1 { - offset: 10 10; - } - rel2 { - offset: -11 -11; - } - } - } - } - } FORECASTS_ICON(0, 40, 40, 110, 110, 1.0) FORECASTS_ICON(1, 40, 40, 110, 110, 1.0) FORECASTS_ICON(2, 40, 40, 110, 110, 1.0) |
From: Enlightenment C. <no...@cv...> - 2007-09-16 01:47:22
|
Enlightenment CVS committal Author : englebass Project : e_modules Module : forecasts Dir : e_modules/forecasts Modified Files: e_mod_config.c e_mod_main.c e_mod_main.h Log Message: Fix for gadcon update. Not added new gadcon functions. =================================================================== RCS file: /cvs/e/e_modules/forecasts/e_mod_config.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_mod_config.c 14 Mar 2007 11:39:02 -0000 1.5 +++ e_mod_config.c 16 Sep 2007 01:46:50 -0000 1.6 @@ -144,6 +144,6 @@ ci->show_text = cfdata->show_text; e_config_save_queue(); - _forecasts_config_updated(ci->id); + _forecasts_config_updated(ci); return 1; } =================================================================== RCS file: /cvs/e/e_modules/forecasts/e_mod_main.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_mod_main.c 25 Aug 2007 09:40:05 -0000 1.10 +++ e_mod_main.c 16 Sep 2007 01:46:50 -0000 1.11 @@ -87,6 +87,7 @@ int bufsize, cursize; E_Gadcon_Popup *popup; + Config_Item *ci; }; struct _Forecasts @@ -139,12 +140,11 @@ E_Gadcon_Client *gcc; Forecasts *w; Instance *inst; - Config_Item *ci; inst = E_NEW(Instance, 1); - ci = _forecasts_config_item_get(id); - inst->area = evas_stringshare_add(ci->code); + inst->ci = _forecasts_config_item_get(id); + inst->area = evas_stringshare_add(inst->ci->code); w = _forecasts_new(gc->evas); w->inst = inst; @@ -162,7 +162,7 @@ evas_object_event_callback_add(inst->forecasts_obj, EVAS_CALLBACK_MOUSE_OUT, _cb_mouse_out, inst); - if (!ci->show_text) + if (!inst->ci->show_text) edje_object_signal_emit(inst->forecasts_obj, "e,state,description,hide", "e"); else edje_object_signal_emit(inst->forecasts_obj, "e,state,description,show", "e"); @@ -187,7 +187,7 @@ _forecasts_cb_check(inst); inst->check_timer = - ecore_timer_add((double) ci->poll_time, _forecasts_cb_check, inst); + ecore_timer_add(inst->ci->poll_time, _forecasts_cb_check, inst); return gcc; } @@ -306,11 +306,9 @@ _forecasts_menu_cb_configure(void *data, E_Menu * m, E_Menu_Item * mi) { Instance *inst; - Config_Item *ci; inst = data; - ci = _forecasts_config_item_get(inst->gcc->id); - _config_forecasts_module(ci); + _config_forecasts_module(inst->ci); } static Config_Item * @@ -436,21 +434,6 @@ EAPI int e_modapi_save(E_Module * m) { - Evas_List *l; - - for (l = forecasts_config->instances; l; l = l->next) - { - Instance *inst; - Config_Item *ci; - - inst = l->data; - ci = _forecasts_config_item_get(inst->gcc->id); - - if (ci->id) - evas_stringshare_del(ci->id); - ci->id = evas_stringshare_add(inst->gcc->id); - } - e_config_domain_save("module.forecasts", conf_edd, forecasts_config); return 1; } @@ -532,10 +515,8 @@ _forecasts_cb_check(void *data) { Instance *inst; - Config_Item *ci; inst = data; - ci = _forecasts_config_item_get(inst->gcc->id); if (inst->server) { @@ -548,7 +529,7 @@ proxy.host, proxy.port, inst); else inst->server = - ecore_con_server_connect(ECORE_CON_REMOTE_SYSTEM, ci->host, 80, inst); + ecore_con_server_connect(ECORE_CON_REMOTE_SYSTEM, inst->ci->host, 80, inst); return 1; } @@ -557,7 +538,6 @@ _forecasts_server_add(void *data, int type, void *event) { Instance *inst; - Config_Item *ci; Ecore_Con_Event_Server_Add *ev; char buf[1024]; char forecast[1024]; @@ -567,19 +547,18 @@ if (!inst) return 1; - ci = _forecasts_config_item_get(inst->gcc->id); ev = event; if ((!inst->server) || (inst->server != ev->server)) return 1; - if (ci->degrees == DEGREES_F) + if (inst->ci->degrees == DEGREES_F) degrees = 'f'; else degrees = 'c'; - snprintf(forecast, sizeof(forecast), "/forecastrss?p=%s&u=%c", ci->code, degrees); + snprintf(forecast, sizeof(forecast), "/forecastrss?p=%s&u=%c", inst->ci->code, degrees); snprintf(buf, sizeof(buf), "GET http://%s%s HTTP/1.1\r\nHost: %s\r\n\r\n", - ci->host, forecast, ci->host); + inst->ci->host, forecast, inst->ci->host); DEBUG("Server: %s", buf); ecore_con_server_send(inst->server, buf, strlen(buf)); return 0; @@ -790,11 +769,9 @@ void _forecasts_converter(Instance *inst) { - Config_Item *ci; int i, dir = -1; - ci = _forecasts_config_item_get(inst->gcc->id); - if ((inst->units.temp == 'F') && (ci->degrees == DEGREES_C)) + if ((inst->units.temp == 'F') && (inst->ci->degrees == DEGREES_C)) { dir = DEGREES_C; inst->units.temp = 'C'; @@ -802,7 +779,7 @@ snprintf(inst->units.pressure, 3, "mb"); snprintf(inst->units.speed, 4, "kph"); } - else if ((inst->units.temp == 'C') && (ci->degrees == DEGREES_F)) + else if ((inst->units.temp == 'C') && (inst->ci->degrees == DEGREES_F)) { dir = DEGREES_F; inst->units.temp = 'F'; @@ -885,54 +862,46 @@ } void -_forecasts_config_updated(const char *id) +_forecasts_config_updated(Config_Item *ci) { Evas_List *l; - Config_Item *ci; char buf[4096]; if (!forecasts_config) return; - ci = _forecasts_config_item_get(id); for (l = forecasts_config->instances; l; l = l->next) { Instance *inst; inst = l->data; - if (!inst->gcc->id) - continue; - if (!strcmp(inst->gcc->id, ci->id)) - { - int area_changed = 0; - - if (inst->area && strcmp(inst->area, ci->code)) - area_changed = 1; - - if (inst->area) evas_stringshare_del(inst->area); - inst->area = evas_stringshare_add(ci->code); - _forecasts_converter(inst); - _forecasts_popup_content_create(inst); - - snprintf(buf, sizeof(buf), "%d°%c", inst->condition.temp, inst->units.temp); - edje_object_part_text_set(inst->forecasts->forecasts_obj, "e.text.temp", buf); - - if (!ci->show_text) - edje_object_signal_emit(inst->forecasts_obj, "e,state,description,hide", "e"); - else - edje_object_signal_emit(inst->forecasts_obj, "e,state,description,show", "e"); - - if (area_changed) - _forecasts_cb_check(inst); - if (!inst->check_timer) - inst->check_timer = - ecore_timer_add((double) ci->poll_time, _forecasts_cb_check, - inst); - else - ecore_timer_interval_set(inst->check_timer, - (double) ci->poll_time); + if (inst->ci != ci) continue; + int area_changed = 0; - break; - } + if (inst->area && strcmp(inst->area, inst->ci->code)) + area_changed = 1; + + if (inst->area) evas_stringshare_del(inst->area); + inst->area = evas_stringshare_add(inst->ci->code); + _forecasts_converter(inst); + _forecasts_popup_content_create(inst); + + snprintf(buf, sizeof(buf), "%d°%c", inst->condition.temp, inst->units.temp); + edje_object_part_text_set(inst->forecasts->forecasts_obj, "e.text.temp", buf); + + if (!inst->ci->show_text) + edje_object_signal_emit(inst->forecasts_obj, "e,state,description,hide", "e"); + else + edje_object_signal_emit(inst->forecasts_obj, "e,state,description,show", "e"); + + if (area_changed) + _forecasts_cb_check(inst); + if (!inst->check_timer) + inst->check_timer = + ecore_timer_add(inst->ci->poll_time, _forecasts_cb_check, + inst); + else + ecore_timer_interval_set(inst->check_timer, + inst->ci->poll_time); } } @@ -1093,8 +1062,7 @@ _cb_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info) { Instance *inst; - int ww, wh; - + if (!(inst = data)) return; e_gadcon_popup_show(inst->popup); } =================================================================== RCS file: /cvs/e/e_modules/forecasts/e_mod_main.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_mod_main.h 20 Aug 2007 18:54:46 -0000 1.4 +++ e_mod_main.h 16 Sep 2007 01:46:50 -0000 1.5 @@ -37,7 +37,7 @@ EAPI int e_modapi_about(E_Module *m); void _config_forecasts_module(Config_Item *ci); -void _forecasts_config_updated(const char *id); +void _forecasts_config_updated(Config_Item *ci); extern Config *forecasts_config; |
From: Enlightenment C. <no...@cv...> - 2007-09-16 03:32:11
|
Enlightenment CVS committal Author : englebass Project : e_modules Module : forecasts Dir : e_modules/forecasts Modified Files: e_mod_main.c Log Message: Implement id_new() =================================================================== RCS file: /cvs/e/e_modules/forecasts/e_mod_main.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- e_mod_main.c 16 Sep 2007 01:46:50 -0000 1.11 +++ e_mod_main.c 16 Sep 2007 03:31:40 -0000 1.12 @@ -21,6 +21,7 @@ static void _gc_orient(E_Gadcon_Client * gcc); static char *_gc_label(void); static Evas_Object *_gc_icon(Evas * evas); +static const char *_gc_id_new(void); static E_Config_DD *conf_edd = NULL; static E_Config_DD *conf_item_edd = NULL; @@ -30,7 +31,7 @@ /* Define Gadcon Class */ static const E_Gadcon_Client_Class _gadcon_class = { GADCON_CLIENT_CLASS_VERSION, - "forecasts", {_gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon}, + "forecasts", {_gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new, NULL}, E_GADCON_CLIENT_STYLE_PLAIN }; @@ -254,6 +255,15 @@ return o; } +static const char * +_gc_id_new(void) +{ + Config_Item *ci; + + ci = _forecasts_config_item_get(NULL); + return ci->id; +} + static void _forecasts_cb_mouse_down(void *data, Evas * e, Evas_Object * obj, void *event_info) @@ -316,14 +326,33 @@ { Evas_List *l; Config_Item *ci; + char buf[128]; - for (l = forecasts_config->items; l; l = l->next) + if (!id) + { + int num = 0; + + /* Create id */ + if (forecasts_config->items) + { + const char *p; + ci = evas_list_last(forecasts_config->items)->data; + p = strrchr(ci->id, '.'); + if (p) num = atoi(p + 1) + 1; + } + snprintf(buf, sizeof(buf), "%s.%d", _gadcon_class.name, num); + id = buf; + } + else { - ci = l->data; - if (!ci->id) - continue; - if (!strcmp(ci->id, id)) - return ci; + for (l = forecasts_config->items; l; l = l->next) + { + ci = l->data; + if (!ci->id) + continue; + if (!strcmp(ci->id, id)) + return ci; + } } ci = E_NEW(Config_Item, 1); |
From: Enlightenment C. <no...@cv...> - 2007-11-07 19:53:32
|
Enlightenment CVS committal Author : englebass Project : e_modules Module : forecasts Dir : e_modules/forecasts Modified Files: Makefile.am Log Message: Don't have own uninstall =================================================================== RCS file: /cvs/e/e_modules/forecasts/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 31 Mar 2007 09:06:30 -0000 1.2 +++ Makefile.am 7 Nov 2007 19:52:59 -0000 1.3 @@ -41,6 +41,3 @@ clean-local: rm -rf forecasts.edj *~ -uninstall: - rm -rf $(datadir) - |
From: Enlightenment C. <no...@cv...> - 2007-11-07 19:56:57
|
Enlightenment CVS committal Author : englebass Project : e_modules Module : forecasts Dir : e_modules/forecasts/po Added Files: LINGUAS Makevars POTFILES.in Log Message: Fix gettext |
From: Enlightenment C. <no...@cv...> - 2007-11-07 19:57:27
|
Enlightenment CVS committal Author : englebass Project : e_modules Module : forecasts Dir : e_modules/forecasts Modified Files: configure.in Log Message: Fix gettext =================================================================== RCS file: /cvs/e/e_modules/forecasts/configure.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- configure.in 25 Apr 2007 09:14:01 -0000 1.5 +++ configure.in 7 Nov 2007 19:56:55 -0000 1.6 @@ -17,9 +17,6 @@ AM_ENABLE_SHARED AM_PROG_LIBTOOL -ALL_LINGUAS="bg eo it ja sv" -AC_SUBST(ALL_LINGUAS) - AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION(0.14) @@ -140,7 +137,7 @@ AC_OUTPUT([ Makefile images/Makefile -po/Makefile +po/Makefile.in e_modules-forecasts.spec ],[ ]) |
From: Enlightenment C. <no...@cv...> - 2007-11-07 20:04:49
|
Enlightenment CVS committal Author : englebass Project : e_modules Module : forecasts Dir : e_modules/forecasts/po Modified Files: bg.po eo.po it.po ja.po sv.po Removed Files: Makefile.am Log Message: Not needed |
From: Enlightenment C. <no...@cv...> - 2007-11-07 20:08:00
|
Enlightenment CVS committal Author : englebass Project : e_modules Module : forecasts Dir : e_modules/forecasts Modified Files: configure.in Log Message: po must be in SUBDIRS =================================================================== RCS file: /cvs/e/e_modules/forecasts/configure.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- configure.in 7 Nov 2007 19:56:55 -0000 1.6 +++ configure.in 7 Nov 2007 20:07:53 -0000 1.7 @@ -3,6 +3,8 @@ # get rid of that stupid cache mechanism rm -f config.cache +SUBDIRS = po + AC_INIT(configure.in) AC_CANONICAL_BUILD AC_CANONICAL_HOST |
From: Enlightenment C. <no...@cv...> - 2007-11-07 20:19:02
|
Enlightenment CVS committal Author : englebass Project : e_modules Module : forecasts Dir : e_modules/forecasts/po Modified Files: bg.po eo.po it.po ja.po sv.po Log Message: Fix gettext |
From: Enlightenment C. <no...@cv...> - 2007-11-07 20:19:35
|
Enlightenment CVS committal Author : englebass Project : e_modules Module : forecasts Dir : e_modules/forecasts Modified Files: Makefile.am autogen.sh Log Message: Fix gettext =================================================================== RCS file: /cvs/e/e_modules/forecasts/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 7 Nov 2007 19:52:59 -0000 1.3 +++ Makefile.am 7 Nov 2007 20:18:58 -0000 1.4 @@ -30,7 +30,8 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ - e_mod_config.c + e_mod_config.c \ + e_mod_config.h module_la_LIBADD = @e_libs@ module_la_LDFLAGS = -module -avoid-version =================================================================== RCS file: /cvs/e/e_modules/forecasts/autogen.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- autogen.sh 31 Mar 2007 09:06:30 -0000 1.2 +++ autogen.sh 7 Nov 2007 20:18:58 -0000 1.3 @@ -6,7 +6,7 @@ touch README echo "Running autopoint..." ; autopoint -f || : -echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS || exit 1 +echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1 echo "Running autoheader..." ; autoheader || exit 1 echo "Running autoconf..." ; autoconf || exit 1 echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1 |
From: Enlightenment C. <no...@cv...> - 2007-11-07 20:20:17
|
Enlightenment CVS committal Author : englebass Project : e_modules Module : forecasts Dir : e_modules/forecasts/po Modified Files: .cvsignore Log Message: ignore =================================================================== RCS file: /cvs/e/e_modules/forecasts/po/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- .cvsignore 27 May 2007 16:01:35 -0000 1.2 +++ .cvsignore 7 Nov 2007 20:20:14 -0000 1.3 @@ -9,5 +9,9 @@ insert-header.sin quot.sed remove-potcdate.sin +stamp-po +remove-potcdate.sed +POTFILES *.pot *.mo +*.gmo |
From: Enlightenment C. <no...@cv...> - 2007-11-07 20:31:00
|
Enlightenment CVS committal Author : englebass Project : e_modules Module : forecasts Dir : e_modules/forecasts Modified Files: configure.in Log Message: No need for subdirs =================================================================== RCS file: /cvs/e/e_modules/forecasts/configure.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- configure.in 7 Nov 2007 20:07:53 -0000 1.7 +++ configure.in 7 Nov 2007 20:30:28 -0000 1.8 @@ -3,8 +3,6 @@ # get rid of that stupid cache mechanism rm -f config.cache -SUBDIRS = po - AC_INIT(configure.in) AC_CANONICAL_BUILD AC_CANONICAL_HOST |
From: Enlightenment C. <no...@cv...> - 2007-11-08 04:57:26
|
Enlightenment CVS committal Author : englebass Project : e_modules Module : forecasts Dir : e_modules/forecasts Modified Files: autogen.sh Log Message: needed for gettext =================================================================== RCS file: /cvs/e/e_modules/forecasts/autogen.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- autogen.sh 7 Nov 2007 20:18:58 -0000 1.3 +++ autogen.sh 8 Nov 2007 04:56:52 -0000 1.4 @@ -6,7 +6,7 @@ touch README echo "Running autopoint..." ; autopoint -f || : -echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1 +echo "Running aclocal..." ; aclocal -I m4 $ACLOCAL_FLAGS || exit 1 echo "Running autoheader..." ; autoheader || exit 1 echo "Running autoconf..." ; autoconf || exit 1 echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1 |
From: Enlightenment C. <no...@cv...> - 2007-11-11 19:50:46
|
Enlightenment CVS committal Author : englebass Project : e_modules Module : forecasts Dir : e_modules/forecasts Modified Files: configure.in Log Message: Remove useless subst =================================================================== RCS file: /cvs/e/e_modules/forecasts/configure.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- configure.in 7 Nov 2007 20:30:28 -0000 1.8 +++ configure.in 11 Nov 2007 19:50:42 -0000 1.9 @@ -101,10 +101,6 @@ #AC_SUBST(dlopen_libs) PKG_CHECK_MODULES(EDJE, [edje >= 0.5.0]) -edje_cflags=$EDJE_CFLAGS -edje_libs=$EDJE_LIBS -AC_SUBST(edje_cflags) -AC_SUBST(edje_libs) edje_cc="$(pkg-config --variable=prefix edje)/bin/edje_cc" AC_ARG_WITH(edje-cc, |
From: Enlightenment C. <no...@cv...> - 2007-11-12 03:52:55
|
Enlightenment CVS committal Author : englebass Project : e_modules Module : forecasts Dir : e_modules/forecasts Modified Files: autogen.sh Log Message: No need to create the .pot file all the time =================================================================== RCS file: /cvs/e/e_modules/forecasts/autogen.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- autogen.sh 8 Nov 2007 04:56:52 -0000 1.4 +++ autogen.sh 12 Nov 2007 03:51:29 -0000 1.5 @@ -11,17 +11,6 @@ echo "Running autoconf..." ; autoconf || exit 1 echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1 echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1 -echo "Generating gettext forecasts.pot template"; \ -xgettext \ ---output forecasts.pot \ ---output-dir=po \ ---language=C \ ---add-location \ ---keyword=D_ \ ---sort-by-file \ ---copyright-holder="TODO" \ ---foreign-user \ -`find . -name "*.[ch]" -print` || exit 1 if [ -z "$NOCONFIGURE" ]; then ./configure "$@" |
From: Enlightenment C. <no...@cv...> - 2007-11-12 04:16:30
|
Enlightenment CVS committal Author : englebass Project : e_modules Module : forecasts Dir : e_modules/forecasts Modified Files: e_mod_main.c Log Message: Use module dir for nls, make modules relocateable. =================================================================== RCS file: /cvs/e/e_modules/forecasts/e_mod_main.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- e_mod_main.c 1 Nov 2007 10:41:41 -0000 1.13 +++ e_mod_main.c 12 Nov 2007 04:15:51 -0000 1.14 @@ -376,7 +376,10 @@ EAPI void * e_modapi_init(E_Module * m) { - bindtextdomain(PACKAGE, LOCALEDIR); + char buf[4095]; + + snprintf(buf, sizeof(buf), "%s/locale", e_module_dir_get(m)); + bindtextdomain(PACKAGE, buf); bind_textdomain_codeset(PACKAGE, "UTF-8"); conf_item_edd = E_CONFIG_DD_NEW("Forecasts_Config_Item", Config_Item); |
From: Enlightenment C. <no...@cv...> - 2007-11-12 08:14:29
|
Enlightenment CVS committal Author : englebass Project : e_modules Module : forecasts Dir : e_modules/forecasts Modified Files: e_mod_config.c Log Message: get text from module locale =================================================================== RCS file: /cvs/e/e_modules/forecasts/e_mod_config.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_mod_config.c 7 Oct 2007 21:26:47 -0000 1.7 +++ e_mod_config.c 12 Nov 2007 08:14:24 -0000 1.8 @@ -92,7 +92,7 @@ e_widget_slider_add(evas, 1, 0, D_("%2.0f minutes"), 15.0, 60.0, 1.0, 0, &(cfdata->poll_time), NULL, 40); e_widget_framelist_object_append(of, ob); - ob = e_widget_check_add(evas, _("Show Description"), &(cfdata->show_text)); + ob = e_widget_check_add(evas, D_("Show Description"), &(cfdata->show_text)); e_widget_framelist_object_append(of, ob); e_widget_list_object_append(o, of, 1, 1, 0.5); |
From: Enlightenment C. <no...@cv...> - 2007-11-12 21:09:37
|
Enlightenment CVS committal Author : englebass Project : e_modules Module : forecasts Dir : e_modules/forecasts Modified Files: configure.in Log Message: clean up configure scripts =================================================================== RCS file: /cvs/e/e_modules/forecasts/configure.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- configure.in 11 Nov 2007 19:50:42 -0000 1.9 +++ configure.in 12 Nov 2007 21:09:03 -0000 1.10 @@ -3,19 +3,24 @@ # get rid of that stupid cache mechanism rm -f config.cache -AC_INIT(configure.in) +AC_INIT(forecasts, 0.2.0, enl...@li...) +AC_PREREQ(2.52) +AC_CONFIG_SRCDIR(configure.in) AC_CANONICAL_BUILD AC_CANONICAL_HOST +AC_ISC_POSIX -AM_INIT_AUTOMAKE(forecasts, 0.2.0) +AM_INIT_AUTOMAKE(1.6) AM_CONFIG_HEADER(config.h) -AC_ISC_POSIX + AC_PROG_CC AM_PROG_CC_STDC AC_HEADER_STDC AC_C_CONST -AM_ENABLE_SHARED -AM_PROG_LIBTOOL + +define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl +define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl +AC_PROG_LIBTOOL AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION(0.14) @@ -24,117 +29,40 @@ AC_SUBST(MODULE_ARCH) AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture") -if test "x${bindir}" = 'x${exec_prefix}/bin'; then - if test "x${exec_prefix}" = "xNONE"; then - if test "x${prefix}" = "xNONE"; then - bindir="${ac_default_prefix}/bin"; - else - bindir="${prefix}/bin"; - fi - else - if test "x${prefix}" = "xNONE"; then - bindir="${ac_default_prefix}/bin"; - else - bindir="${prefix}/bin"; - fi - fi -fi - -if test "x${libdir}" = 'x${exec_prefix}/lib'; then - if test "x${exec_prefix}" = "xNONE"; then - if test "x${prefix}" = "xNONE"; then - libdir="${ac_default_prefix}/lib"; - else - libdir="${prefix}/lib"; - fi - else - if test "x${prefix}" = "xNONE"; then - libdir="${ac_default_prefix}/lib"; - else - libdir="${prefix}/lib"; - fi - fi -fi - -dnl Set PACKAGE_BIN_DIR in config.h. -if test "x${bindir}" = 'xNONE'; then - if test "x${prefix}" = "xNONE"; then - AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${ac_default_prefix}/bin", "Package installed binaries destination") - else - AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin", "Package installed binaries destination") - fi -else - AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}", "Package installed binaries destination") -fi - -dnl Set PACKAGE_LIB_DIR in config.h. -if test "x${libdir}" = 'xNONE'; then - if test "x${prefix}" = "xNONE"; then - AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${ac_default_prefix}/lib", "Package installed libraries destination") - else - AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib", "Package installed libraries destination") - fi -else - AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}", "Package installed libraries destination") -fi - -dnl Set PACKAGE_DATA_DIR in config.h. -if test "x${prefix}" = "xNONE"; then - AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${HOME}/.e/e/modules/${PACKAGE}", "Package installed data destination") - datadir="${HOME}/.e/e/modules/${PACKAGE}" -else - AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${libdir}/enlightenment/modules/${PACKAGE}", "Package installed data destination") - datadir="${libdir}/enlightenment/modules/${PACKAGE}" -fi - -AC_PREFIX_DEFAULT(${HOME}/.e/e) -if test "x$prefix" = "xNONE"; then - datarootdir=${ac_default_prefix} -else - datarootdir=${prefix}/share -fi -localedir=${datarootdir}/locale -AC_SUBST(LOCALEDIR, "${localedir}") -AC_DEFINE_UNQUOTED(LOCALEDIR, "${localedir}", [Module Locale Directory]) - -#AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl) -#AC_SUBST(dlopen_libs) - -PKG_CHECK_MODULES(EDJE, [edje >= 0.5.0]) - edje_cc="$(pkg-config --variable=prefix edje)/bin/edje_cc" AC_ARG_WITH(edje-cc, -[ --with-edje-cc=PATH specify a specific path to edje_cc], -[ - v=$withval; - edje_cc=$v - echo " Enlightenment edje_cc explicitly set to "$edje_cc; -],[ - edje_cc="$(pkg-config --variable=prefix edje)/bin/edje_cc" -]) + AC_HELP_STRING([--with-edje-cc=PATH], [specify a specific path to edje_cc]), + [ + edje_cc=$withval; + echo " Enlightenment edje_cc explicitly set to "$edje_cc; + ] +) AC_SUBST(edje_cc) AC_ARG_WITH(enlightenment-config, -[ --with-enlightenment-config=E_CONFIG use enlightenment-config specified ], -[ - E_CONFIG=$withval; - echo "using "$E_CONFIG" for enlightenment-config"; -],[ - PROG="enlightenment-config"; - AC_PATH_PROG(E_CONFIG, $PROG, "", $PATH) -]) + AC_HELP_STRING([--with-enlightenment-config=E_CONFIG], [use enlightenment-config specified]), + [ + E_CONFIG=$withval; + echo "using "$E_CONFIG" for enlightenment-config"; + ], [ + PROG="enlightenment-config"; + AC_PATH_PROG(E_CONFIG, $PROG, "", $PATH) + ] +) e_cflags=`$E_CONFIG --cflags` e_libs=`$E_CONFIG --libs` e_modules=`$E_CONFIG --module-dir` AC_SUBST(e_cflags) AC_SUBST(e_libs) -AC_SUBST(e_modules) + +dnl TODO: Fix better install for homedir +datadir="${e_modules}/${PACKAGE}" AC_OUTPUT([ Makefile images/Makefile po/Makefile.in e_modules-forecasts.spec -],[ +], [ ]) |
From: Enlightenment C. <no...@cv...> - 2007-11-13 06:21:10
|
Enlightenment CVS committal Author : englebass Project : e_modules Module : forecasts Dir : e_modules/forecasts Modified Files: configure.in Log Message: Fix author e-mail, taken from AUTHORS file. =================================================================== RCS file: /cvs/e/e_modules/forecasts/configure.in,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- configure.in 12 Nov 2007 21:09:03 -0000 1.10 +++ configure.in 13 Nov 2007 06:20:37 -0000 1.11 @@ -3,7 +3,7 @@ # get rid of that stupid cache mechanism rm -f config.cache -AC_INIT(forecasts, 0.2.0, enl...@li...) +AC_INIT(forecasts, 0.2.0, vi...@bl...) AC_PREREQ(2.52) AC_CONFIG_SRCDIR(configure.in) AC_CANONICAL_BUILD |
From: Enlightenment C. <no...@cv...> - 2007-11-13 06:39:37
|
Enlightenment CVS committal Author : englebass Project : e_modules Module : forecasts Dir : e_modules/forecasts Modified Files: configure.in Log Message: AC_HELP_STRING is deprecated =================================================================== RCS file: /cvs/e/e_modules/forecasts/configure.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- configure.in 13 Nov 2007 06:20:37 -0000 1.11 +++ configure.in 13 Nov 2007 06:39:02 -0000 1.12 @@ -31,7 +31,7 @@ edje_cc="$(pkg-config --variable=prefix edje)/bin/edje_cc" AC_ARG_WITH(edje-cc, - AC_HELP_STRING([--with-edje-cc=PATH], [specify a specific path to edje_cc]), + AS_HELP_STRING([--with-edje-cc=PATH], [specify a specific path to edje_cc]), [ edje_cc=$withval; echo " Enlightenment edje_cc explicitly set to "$edje_cc; @@ -40,7 +40,7 @@ AC_SUBST(edje_cc) AC_ARG_WITH(enlightenment-config, - AC_HELP_STRING([--with-enlightenment-config=E_CONFIG], [use enlightenment-config specified]), + AS_HELP_STRING([--with-enlightenment-config=E_CONFIG], [use enlightenment-config specified]), [ E_CONFIG=$withval; echo "using "$E_CONFIG" for enlightenment-config"; |
From: Enlightenment C. <no...@cv...> - 2007-11-14 18:10:58
|
Enlightenment CVS committal Author : englebass Project : e_modules Module : forecasts Dir : e_modules/forecasts/po Modified Files: Makevars Log Message: We don't use N_, we do use D_ as keyword. =================================================================== RCS file: /cvs/e/e_modules/forecasts/po/Makevars,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makevars 7 Nov 2007 19:56:55 -0000 1.1 +++ Makevars 14 Nov 2007 18:10:26 -0000 1.2 @@ -8,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --from-code=UTF-8 --foreign-user +XGETTEXT_OPTIONS = --keyword=_ --keyword=D_ --from-code=UTF-8 --foreign-user # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding |
From: Enlightenment C. <no...@cv...> - 2007-11-15 19:37:36
|
Enlightenment CVS committal Author : englebass Project : e_modules Module : forecasts Dir : e_modules/forecasts Modified Files: Makefile.am configure.in Log Message: find edje_cc in path =================================================================== RCS file: /cvs/e/e_modules/forecasts/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Makefile.am 7 Nov 2007 20:18:58 -0000 1.4 +++ Makefile.am 15 Nov 2007 19:36:54 -0000 1.5 @@ -2,7 +2,6 @@ SUBDIRS = images po -EDJE_CC = @edje_cc@ EDJE_FLAGS = -v \ -id $(top_srcdir)/images \ -fd $(top_srcdir)/fonts =================================================================== RCS file: /cvs/e/e_modules/forecasts/configure.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- configure.in 13 Nov 2007 06:39:02 -0000 1.12 +++ configure.in 15 Nov 2007 19:36:54 -0000 1.13 @@ -29,15 +29,7 @@ AC_SUBST(MODULE_ARCH) AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture") -edje_cc="$(pkg-config --variable=prefix edje)/bin/edje_cc" -AC_ARG_WITH(edje-cc, - AS_HELP_STRING([--with-edje-cc=PATH], [specify a specific path to edje_cc]), - [ - edje_cc=$withval; - echo " Enlightenment edje_cc explicitly set to "$edje_cc; - ] -) -AC_SUBST(edje_cc) +AC_PATH_PROG(EDJE_CC, "edje_cc", "", $PATH) AC_ARG_WITH(enlightenment-config, AS_HELP_STRING([--with-enlightenment-config=E_CONFIG], [use enlightenment-config specified]), |
From: Enlightenment C. <no...@cv...> - 2007-11-15 19:43:12
|
Enlightenment CVS committal Author : englebass Project : e_modules Module : forecasts Dir : e_modules/forecasts/po Modified Files: bg.po eo.po it.po ja.po sv.po Log Message: Updated po files |