E CVS: weather englebass
Enlightenment CVS committal
Author : englebass
Project : e_modules
Module : weather
Dir : e_modules/weather
Modified Files:
e_mod_main.c e_mod_main.h
Log Message:
Revert gadcon menu change.
===
RCS file: /cvs/e/e_modules/weather/e_mod_main.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -3 -r1.61 -r1.62
--- e_mod_main.c25 Nov 2007 05:52:45 - 1.61
+++ e_mod_main.c2 Dec 2007 16:39:35 - 1.62
@@ -64,6 +64,7 @@
void *event_info);
static void _weather_menu_cb_configure (void *data, E_Menu * m,
E_Menu_Item * mi);
+static void _weather_menu_cb_post (void *data, E_Menu * m);
static int _weather_cb_check (void *data);
static Config_Item *_weather_config_item_get (const char *id);
static Weather *_weather_new (Evas * evas);
@@ -207,13 +208,15 @@
inst = data;
ev = event_info;
- if ((ev-button == 3) (!inst-gcc-menu))
+ if ((ev-button == 3) (!weather_config-menu))
{
E_Menu *mn;
E_Menu_Item *mi;
int x, y, w, h;
mn = e_menu_new ();
+ e_menu_post_deactivate_callback_set (mn, _weather_menu_cb_post, inst);
+ weather_config-menu = mn;
mi = e_menu_item_new (mn);
e_menu_item_label_set (mi, D_ (Configuration));
@@ -236,6 +239,15 @@
}
static void
+_weather_menu_cb_post (void *data, E_Menu * m)
+{
+ if (!weather_config-menu)
+return;
+ e_object_del (E_OBJECT (weather_config-menu));
+ weather_config-menu = NULL;
+}
+
+static void
_weather_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi)
{
Instance *inst;
@@ -356,6 +368,12 @@
if (weather_config-config_dialog)
e_object_del (E_OBJECT (weather_config-config_dialog));
+ if (weather_config-menu)
+{
+ e_menu_post_deactivate_callback_set (weather_config-menu, NULL, NULL);
+ e_object_del (E_OBJECT (weather_config-menu));
+ weather_config-menu = NULL;
+}
while (weather_config-items)
{
===
RCS file: /cvs/e/e_modules/weather/e_mod_main.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- e_mod_main.h25 Nov 2007 05:52:45 - 1.23
+++ e_mod_main.h2 Dec 2007 16:39:35 - 1.24
@@ -17,6 +17,7 @@
E_Config_Dialog *config_dialog;
Evas_List *instances;
Evas_List *items;
+ E_Menu *menu;
};
struct _Config_Item
-
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: weather englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : weather Dir : e_modules/weather/po Modified Files: Makevars Log Message: We might need N_, _ isn't needed. === RCS file: /cvs/e/e_modules/weather/po/Makevars,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makevars14 Nov 2007 18:10:28 - 1.2 +++ Makevars23 Nov 2007 10:06:50 - 1.3 @@ -8,7 +8,7 @@ top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=D_ --from-code=UTF-8 --foreign-user +XGETTEXT_OPTIONS = --keyword=N_ --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 - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: weather englebass
Enlightenment CVS committal
Author : englebass
Project : e_modules
Module : weather
Dir : e_modules/weather
Modified Files:
configure.in
Log Message:
Fix homedir install
===
RCS file: /cvs/e/e_modules/weather/configure.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- configure.in15 Nov 2007 19:36:57 - 1.25
+++ configure.in20 Nov 2007 06:06:14 - 1.26
@@ -47,8 +47,11 @@
AC_SUBST(e_cflags)
AC_SUBST(e_libs)
-dnl TODO: Fix better install for homedir
datadir=${e_modules}/${PACKAGE}
+AC_ARG_ENABLE(homedir-install,
+ AS_HELP_STRING([--enable-homedir-install], [Install module in homedir]),
+ [ datadir=${HOME}/.e/e/modules/${PACKAGE} ]
+)
AC_OUTPUT([
Makefile
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: weather englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : weather Dir : e_modules/weather Modified Files: configure.in Log Message: Remove --with-enlightenment-config, set E_CONFIG variable if needed. === RCS file: /cvs/e/e_modules/weather/configure.in,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- configure.in20 Nov 2007 06:06:14 - 1.26 +++ configure.in20 Nov 2007 06:23:48 - 1.27 @@ -31,16 +31,7 @@ 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]), - [ -E_CONFIG=$withval; -echo using $E_CONFIG for enlightenment-config; - ], [ -PROG=enlightenment-config; -AC_PATH_PROG(E_CONFIG, $PROG, , $PATH) - ] -) +AC_PATH_PROG(E_CONFIG, enlightenment-config, , $PATH) e_cflags=`$E_CONFIG --cflags` e_libs=`$E_CONFIG --libs` e_modules=`$E_CONFIG --module-dir` - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: weather englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : weather Dir : e_modules/weather/po Modified Files: eo.po it.po ja.po sv.po Log Message: Updated po files. - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: weather englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : weather Dir : e_modules/weather Modified Files: Makefile.am configure.in Log Message: find edje_cc in path === RCS file: /cvs/e/e_modules/weather/Makefile.am,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- Makefile.am 7 Nov 2007 19:18:30 - 1.17 +++ Makefile.am 15 Nov 2007 19:36:57 - 1.18 @@ -2,7 +2,6 @@ SUBDIRS = images po -EDJE_CC = @edje_cc@ EDJE_FLAGS = -v \ -id $(top_srcdir)/images \ -fd $(top_srcdir)/fonts @@ -30,6 +29,7 @@ pkg_LTLIBRARIES= module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ +e_mod_config.h \ e_mod_config.c module_la_LIBADD = @e_libs@ === RCS file: /cvs/e/e_modules/weather/configure.in,v retrieving revision 1.24 retrieving revision 1.25 diff -u -3 -r1.24 -r1.25 --- configure.in13 Nov 2007 06:39:04 - 1.24 +++ configure.in15 Nov 2007 19:36:57 - 1.25 @@ -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]), - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: weather englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : weather Dir : e_modules/weather/po Modified Files: Makevars Log Message: We don't use N_, we do use D_ as keyword. === RCS file: /cvs/e/e_modules/weather/po/Makevars,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makevars7 Nov 2007 21:38:31 - 1.1 +++ Makevars14 Nov 2007 18:10:28 - 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 - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: weather englebass
Enlightenment CVS committal
Author : englebass
Project : e_modules
Module : weather
Dir : e_modules/weather
Modified Files:
configure.in
Log Message:
clean up configure scripts
===
RCS file: /cvs/e/e_modules/weather/configure.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- configure.in7 Nov 2007 21:38:31 - 1.22
+++ configure.in12 Nov 2007 21:09:04 - 1.23
@@ -3,19 +3,24 @@
# get rid of that stupid cache mechanism
rm -f config.cache
-AC_INIT(configure.in)
+AC_INIT(weather, 0.2.0, [EMAIL PROTECTED])
+AC_PREREQ(2.52)
+AC_CONFIG_SRCDIR(configure.in)
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
+AC_ISC_POSIX
-AM_INIT_AUTOMAKE(weather, 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_CONFIGuse 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
E CVS: weather englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : weather Dir : e_modules/weather/po Modified Files: .cvsignore Log Message: ignore === RCS file: /cvs/e/e_modules/weather/po/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- .cvsignore 9 Nov 2007 20:09:45 - 1.4 +++ .cvsignore 12 Nov 2007 21:14:21 - 1.5 @@ -9,6 +9,7 @@ insert-header.sin quot.sed remove-potcdate.sin +remove-potcdate.sed POTFILES stamp-po *.gmo - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: weather englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : weather Dir : e_modules/weather Modified Files: configure.in Log Message: AC_HELP_STRING is deprecated === RCS file: /cvs/e/e_modules/weather/configure.in,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- configure.in12 Nov 2007 21:09:04 - 1.23 +++ configure.in13 Nov 2007 06:39:04 - 1.24 @@ -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; - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: weather englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : weather Dir : e_modules/weather Modified Files: autogen.sh Log Message: No need to create the .pot file all the time === RCS file: /cvs/e/e_modules/weather/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:54 - 1.4 +++ autogen.sh 12 Nov 2007 03:51:31 - 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 weather.pot template; \ -xgettext \ ---output weather.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 $@ - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: weather englebass
Enlightenment CVS committal
Author : englebass
Project : e_modules
Module : weather
Dir : e_modules/weather
Modified Files:
e_mod_main.c
Log Message:
Use module dir for nls, make modules relocateable.
===
RCS file: /cvs/e/e_modules/weather/e_mod_main.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- e_mod_main.c31 Oct 2007 14:48:47 - 1.59
+++ e_mod_main.c12 Nov 2007 04:15:53 - 1.60
@@ -311,7 +311,10 @@
EAPI void *
e_modapi_init (E_Module * m)
{
- bindtextdomain (PACKAGE, LOCALEDIR);
+ char buf[4096];
+
+ 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 (Weather_Config_Item, Config_Item);
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now http://get.splunk.com/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: weather englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : weather Dir : e_modules/weather/po Modified Files: .cvsignore Log Message: ignore === RCS file: /cvs/e/e_modules/weather/po/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- .cvsignore 8 Nov 2007 18:19:37 - 1.3 +++ .cvsignore 9 Nov 2007 20:09:45 - 1.4 @@ -10,5 +10,7 @@ quot.sed remove-potcdate.sin POTFILES +stamp-po +*.gmo *.pot *.mo - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: weather englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : weather Dir : e_modules/weather/po Modified Files: .cvsignore Log Message: ++ === RCS file: /cvs/e/e_modules/weather/po/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- .cvsignore 27 May 2007 16:01:38 - 1.2 +++ .cvsignore 8 Nov 2007 18:19:37 - 1.3 @@ -9,5 +9,6 @@ insert-header.sin quot.sed remove-potcdate.sin +POTFILES *.pot *.mo - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: weather englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : weather Dir : e_modules/weather Modified Files: Makefile.am Log Message: Pass make distcheck === RCS file: /cvs/e/e_modules/weather/Makefile.am,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- Makefile.am 30 Mar 2007 20:55:04 - 1.16 +++ Makefile.am 7 Nov 2007 19:18:30 - 1.17 @@ -41,6 +41,3 @@ clean-local: rm -rf weather.edj *~ -uninstall: - rm -rf $(datadir) - - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: weather englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : weather Dir : e_modules/weather/po Removed Files: Makefile.am Log Message: be gone - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: weather englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : weather Dir : e_modules/weather/po Added Files: LINGUAS Makevars POTFILES.in Log Message: fix gettext - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: weather englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : weather Dir : e_modules/weather Modified Files: configure.in Log Message: fix gettext === RCS file: /cvs/e/e_modules/weather/configure.in,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- configure.in25 Apr 2007 09:22:08 - 1.21 +++ configure.in7 Nov 2007 21:38:31 - 1.22 @@ -17,9 +17,6 @@ AM_ENABLE_SHARED AM_PROG_LIBTOOL -ALL_LINGUAS=eo it ja sv -AC_SUBST(ALL_LINGUAS) - AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION(0.14) @@ -136,7 +133,7 @@ AC_OUTPUT([ Makefile images/Makefile -po/Makefile +po/Makefile.in e_modules-weather.spec ],[ ]) - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: weather englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : weather Dir : e_modules/weather Modified Files: autogen.sh Log Message: needed for gettext === RCS file: /cvs/e/e_modules/weather/autogen.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- autogen.sh 30 Mar 2007 20:55:04 - 1.3 +++ autogen.sh 8 Nov 2007 04:56:54 - 1.4 @@ -6,7 +6,7 @@ touch README echo Running autopoint... ; autopoint -f || : -echo Running aclocal... ; aclocal $ACLOCAL_FLAGS || 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 - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: weather englebass
Enlightenment CVS committal
Author : englebass
Project : e_modules
Module : weather
Dir : e_modules/weather
Modified Files:
e_mod_config.c e_mod_main.c e_mod_main.h
Log Message:
Make module compile after gadcon update.
Still does not support new gadcon features!
===
RCS file: /cvs/e/e_modules/weather/e_mod_config.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_mod_config.c 24 Feb 2007 05:12:10 - 1.20
+++ e_mod_config.c 16 Sep 2007 00:28:42 - 1.21
@@ -147,6 +147,6 @@
ci-code = evas_stringshare_add (t);
e_config_save_queue ();
- _weather_config_updated (ci-id);
+ _weather_config_updated (ci);
return 1;
}
===
RCS file: /cvs/e/e_modules/weather/e_mod_main.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- e_mod_main.c26 Jul 2007 07:46:28 - 1.56
+++ e_mod_main.c16 Sep 2007 00:28:42 - 1.57
@@ -35,6 +35,7 @@
Ecore_Event_Handler *add_handler;
Ecore_Event_Handler *del_handler;
Ecore_Event_Handler *data_handler;
+ Config_Item *ci;
char *buffer, *location;
int bufsize, cursize;
@@ -82,11 +83,9 @@
E_Gadcon_Client *gcc;
Weather *w;
Instance *inst;
- Config_Item *ci;
inst = E_NEW (Instance, 1);
-
- ci = _weather_config_item_get (id);
+ inst-ci = _weather_config_item_get (id);
w = _weather_new (gc-evas);
w-inst = inst;
@@ -116,7 +115,7 @@
weather_config-instances =
evas_list_append (weather_config-instances, inst);
- if (ci-display == 0)
+ if (inst-ci-display == 0)
edje_object_signal_emit (inst-weather-weather_obj, set_style,
simple);
else
@@ -125,7 +124,7 @@
_weather_cb_check (inst);
inst-check_timer =
-ecore_timer_add ((double) ci-poll_time, _weather_cb_check, inst);
+ecore_timer_add (inst-ci-poll_time, _weather_cb_check, inst);
return gcc;
}
@@ -242,11 +241,9 @@
_weather_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi)
{
Instance *inst;
- Config_Item *ci;
inst = data;
- ci = _weather_config_item_get (inst-gcc-id);
- _config_weather_module (ci);
+ _config_weather_module (inst-ci);
}
static Config_Item *
@@ -372,21 +369,6 @@
EAPI int
e_modapi_save (E_Module * m)
{
- Evas_List *l;
-
- for (l = weather_config-instances; l; l = l-next)
-{
- Instance *inst;
- Config_Item *ci;
-
- inst = l-data;
- ci = _weather_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.weather, conf_edd, weather_config);
return 1;
}
@@ -469,11 +451,8 @@
_weather_cb_check (void *data)
{
Instance *inst;
- Config_Item *ci;
inst = data;
- ci = _weather_config_item_get (inst-gcc-id);
-
if (inst-server)
{
ecore_con_server_del (inst-server);
@@ -486,7 +465,7 @@
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;
}
@@ -495,7 +474,6 @@
_weather_server_add (void *data, int type, void *event)
{
Instance *inst;
- Config_Item *ci;
Ecore_Con_Event_Server_Add *ev;
char buf[1024];
char icao[1024];
@@ -504,14 +482,13 @@
if (!inst)
return 1;
- ci = _weather_config_item_get (inst-gcc-id);
ev = event;
if ((!inst-server) || (inst-server != ev-server))
return 1;
- snprintf (icao, sizeof (icao), /icao/%s/rss.php, ci-code);
+ snprintf (icao, sizeof (icao), /icao/%s/rss.php, inst-ci-code);
snprintf (buf, sizeof (buf), GET http://%s%s HTTP/1.1\r\nHost: %s\r\n\r\n,
- ci-host, icao, ci-host);
+ inst-ci-host, icao, inst-ci-host);
ecore_con_server_send (inst-server, buf, strlen (buf));
return 0;
}
@@ -642,17 +619,15 @@
_weather_convert_degrees (void *data)
{
Instance *inst;
- Config_Item *ci;
inst = data;
- ci = _weather_config_item_get (inst-gcc-id);
- if ((inst-degrees == 'F') (ci-degrees == DEGREES_C))
+ if ((inst-degrees == 'F') (inst-ci-degrees == DEGREES_C))
{
inst-temp = (inst-temp - 32) * 5.0 / 9.0;
inst-degrees = 'C';
}
- if ((inst-degrees == 'C') (ci-degrees == DEGREES_F))
+ if ((inst-degrees == 'C') (inst-ci-degrees == DEGREES_F))
{
inst-temp = (inst-temp * 9.0 / 5.0) + 32;
inst-degrees = 'F';
@@ -683,46 +658,38 @@
}
void
-_weather_config_updated (const char *id)
+_weather_config_updated (Config_Item *ci)
{
Evas_List *l;
- Config_Item *ci;
char buf[4096];
if (!weather_config)
return;
- ci = _weather_config_item_get (id);
for (l = weather_config-instances; l; l = l-next)
{
E CVS: weather englebass
Enlightenment CVS committal
Author : englebass
Project : e_modules
Module : weather
Dir : e_modules/weather
Modified Files:
e_mod_main.c
Log Message:
Implement id_new()
===
RCS file: /cvs/e/e_modules/weather/e_mod_main.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- e_mod_main.c16 Sep 2007 00:28:42 - 1.57
+++ e_mod_main.c16 Sep 2007 03:31:42 - 1.58
@@ -8,6 +8,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;
@@ -17,7 +18,7 @@
/* Define Gadcon Class */
static const E_Gadcon_Client_Class _gadcon_class = {
GADCON_CLIENT_CLASS_VERSION,
- weather, {_gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon},
+ weather, {_gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon,
_gc_id_new, NULL},
E_GADCON_CLIENT_STYLE_PLAIN
};
@@ -189,6 +190,15 @@
return o;
}
+static const char *
+_gc_id_new (void)
+{
+ Config_Item *ci;
+
+ ci = _weather_config_item_get (NULL);
+ return ci-id;
+}
+
static void
_weather_cb_mouse_down (void *data, Evas * e, Evas_Object * obj,
void *event_info)
@@ -249,28 +259,47 @@
static Config_Item *
_weather_config_item_get (const char *id)
{
- Evas_List *l;
- Config_Item *ci;
-
- for (l = weather_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);
- ci-id = evas_stringshare_add (id);
- ci-poll_time = 900.0;
- ci-display = 0;
- ci-degrees = DEGREES_F;
- ci-host = evas_stringshare_add (www.rssweather.com);
- ci-code = evas_stringshare_add (KJFK);
+ Evas_List *l;
+ Config_Item *ci;
+ char buf[128];
+
+ if (!id)
+ {
+ int num = 0;
+
+ /* Create id */
+ if (weather_config-items)
+ {
+const char *p;
+ci = evas_list_last (weather_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
+ {
+ for (l = weather_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);
+ ci-id = evas_stringshare_add (id);
+ ci-poll_time = 900.0;
+ ci-display = 0;
+ ci-degrees = DEGREES_F;
+ ci-host = evas_stringshare_add (www.rssweather.com);
+ ci-code = evas_stringshare_add (KJFK);
- weather_config-items = evas_list_append (weather_config-items, ci);
- return ci;
+ weather_config-items = evas_list_append (weather_config-items, ci);
+ return ci;
}
/* Gadman Module Setup */
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: weather englebass
Enlightenment CVS committal
Author : englebass
Project : e_modules
Module : weather
Dir : e_modules/weather
Modified Files:
e_mod_main.c
Log Message:
Fix memleak
===
RCS file: /cvs/e/e_modules/weather/e_mod_main.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- e_mod_main.c26 Jul 2007 07:39:48 - 1.54
+++ e_mod_main.c26 Jul 2007 07:43:50 - 1.55
@@ -587,15 +587,14 @@
needle = strstr (needle, );
sscanf (needle, %[^], location);
+ E_FREE(inst-location);
if (location[0])
{
char *tmp = strdup (location);
if (strstr (tmp, ,))
- {
- tmp = strtok (tmp, ,);
- inst-location = strdup (tmp);
- }
+ inst-location = strdup (strtok (tmp, ,));
+ free(tmp);
}
needle = strstr (inst-buffer, content:encoded);
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now http://get.splunk.com/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: weather englebass
Enlightenment CVS committal
Author : englebass
Project : e_modules
Module : weather
Dir : e_modules/weather
Modified Files:
e_mod_main.c
Log Message:
location isn't dynamically allocated.
===
RCS file: /cvs/e/e_modules/weather/e_mod_main.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- e_mod_main.c30 Mar 2007 20:55:04 - 1.53
+++ e_mod_main.c26 Jul 2007 07:39:48 - 1.54
@@ -573,6 +573,8 @@
char *needle, *ext;
char location[256];
+ location[0] = 0;
+
inst = data;
if (!inst)
return 0;
@@ -585,7 +587,7 @@
needle = strstr (needle, );
sscanf (needle, %[^], location);
- if (location)
+ if (location[0])
{
char *tmp = strdup (location);
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now http://get.splunk.com/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: weather englebass
Enlightenment CVS committal
Author : englebass
Project : e_modules
Module : weather
Dir : e_modules/weather
Modified Files:
e_mod_main.c
Log Message:
Formatting.
===
RCS file: /cvs/e/e_modules/weather/e_mod_main.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- e_mod_main.c26 Jul 2007 07:43:50 - 1.55
+++ e_mod_main.c26 Jul 2007 07:46:28 - 1.56
@@ -537,8 +537,7 @@
inst-bufsize = 0;
inst-cursize = 0;
- free (inst-buffer);
- inst-buffer = NULL;
+ E_FREE (inst-buffer);
return 0;
}
@@ -587,14 +586,14 @@
needle = strstr (needle, );
sscanf (needle, %[^], location);
- E_FREE(inst-location);
+ E_FREE (inst-location);
if (location[0])
{
char *tmp = strdup (location);
if (strstr (tmp, ,))
inst-location = strdup (strtok (tmp, ,));
- free(tmp);
+ free (tmp);
}
needle = strstr (inst-buffer, content:encoded);
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now http://get.splunk.com/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: weather englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : weather Dir : e_modules/weather Modified Files: e_mod_main.c Log Message: Remove name and id from e_gadcon_client_new. === RCS file: /cvs/e/e_modules/weather/e_mod_main.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -3 -r1.44 -r1.45 --- e_mod_main.c17 Sep 2006 17:20:33 - 1.44 +++ e_mod_main.c30 Dec 2006 17:56:40 - 1.45 @@ -87,7 +87,7 @@ inst-weather = w; o = w-weather_obj; - gcc = e_gadcon_client_new (gc, name, id, style, o); + gcc = e_gadcon_client_new (gc, style, o); gcc-data = inst; inst-gcc = gcc; inst-weather_obj = o; - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: weather englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : weather Dir : e_modules/weather Modified Files: e_mod_main.c Log Message: API change === RCS file: /cvs/e/e_modules/weather/e_mod_main.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -3 -r1.45 -r1.46 --- e_mod_main.c30 Dec 2006 17:56:40 - 1.45 +++ e_mod_main.c30 Dec 2006 23:34:00 - 1.46 @@ -87,7 +87,7 @@ inst-weather = w; o = w-weather_obj; - gcc = e_gadcon_client_new (gc, style, o); + gcc = e_gadcon_client_new (gc, name, id, style, o); gcc-data = inst; inst-gcc = gcc; inst-weather_obj = o; - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
