Enlightenment CVS committal Author : kiwi Project : e_modules Module : devian
Dir : e_modules/devian/src/module Modified Files: e_mod_config.c e_mod_config_dialog_devian.c e_mod_config_dialog_theme.c e_mod_container.c e_mod_data_file.c e_mod_data_picture.c e_mod_data_rss.c e_mod_devian.c e_mod_source_file.c e_mod_source_picture.c e_mod_source_rss.c Log Message: make devian work with the new e_module_dialog_show function chages =================================================================== RCS file: /cvs/e/e_modules/devian/src/module/e_mod_config.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_mod_config.c 2 May 2006 14:24:23 -0000 1.6 +++ e_mod_config.c 2 Jul 2006 19:53:55 -0000 1.7 @@ -100,7 +100,7 @@ "has been upgraded<br>" "Your settings were removed<br>" "Sorry for the inconvenience<br><br>" "(%d -> %d)"), cfg_main->conf_version, CONFIG_VERSION); - e_module_dialog_show(_(MODULE_NAME " Module version " MODULE_VERSION), buf); + e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module version " MODULE_VERSION), buf); cfg_main = NULL; } @@ -116,7 +116,7 @@ "has been downgraded<br>" "Your settings were removed<br>" "Sorry for the inconvenience<br><br>" "(%d ->%d)"), cfg_main->conf_version, CONFIG_VERSION); - e_module_dialog_show(_(MODULE_NAME " Module version " MODULE_VERSION), buf); + e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module version " MODULE_VERSION), buf); cfg_main = NULL; } } =================================================================== RCS file: /cvs/e/e_modules/devian/src/module/e_mod_config_dialog_devian.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_mod_config_dialog_devian.c 2 May 2006 14:24:23 -0000 1.7 +++ e_mod_config_dialog_devian.c 2 Jul 2006 19:53:55 -0000 1.8 @@ -789,7 +789,7 @@ snprintf(buf, sizeof(buf), _("<hilight>Rss '%s' is in use !</hilight><br><br>" "You can't delete it while its in use.<br><br>" "Owner is %s"), doc->name, doc->user->source->devian->id); - e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); + e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); } } #endif =================================================================== RCS file: /cvs/e/e_modules/devian/src/module/e_mod_config_dialog_theme.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_mod_config_dialog_theme.c 2 May 2006 14:24:23 -0000 1.4 +++ e_mod_config_dialog_theme.c 2 Jul 2006 19:53:55 -0000 1.5 @@ -636,7 +636,7 @@ if (!ecore_file_is_dir(themes_path)) { snprintf(buf, sizeof(buf), _("<hilight>Directory %s doesnt exists.</hilight><br><br>" "No themes found !!!"), themes_path); - e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); + e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); return NULL; } @@ -644,7 +644,7 @@ if (ecore_list_is_empty(list) || !list) { snprintf(buf, sizeof(buf), _("<hilight>Directory %s is empty !</hilight><br><br>" "No themes found !!!"), themes_path); - e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); + e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); return NULL; } @@ -701,5 +701,5 @@ snprintf(buf, sizeof(buf), _("<hilight>Invalid theme</hilight><br><br>" "You have selected an invalid theme.<br>" "A valid theme has a dEvian icon in front of it.")); - e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); + e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); } =================================================================== RCS file: /cvs/e/e_modules/devian/src/module/e_mod_container.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_mod_container.c 2 May 2006 14:24:23 -0000 1.5 +++ e_mod_container.c 2 Jul 2006 19:53:55 -0000 1.6 @@ -248,7 +248,7 @@ char buf[4096]; snprintf(buf, sizeof(buf), _("<hilight>Invalid theme !</hilight><br><br>" "Failed to switch to %s theme"), *theme); - e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); + e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); evas_stringshare_del(*theme); *theme = evas_stringshare_add(DEVIAN_THEME_DEFAULT); DEVIANF(container_change) (devian, devian->conf->container_type); @@ -272,7 +272,7 @@ snprintf(buf, sizeof(buf), _("<hilight>Invalid theme !</hilight><br><br>" "Failed to switch to %s theme"), *theme); - e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); + e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); evas_stringshare_del(*theme); *theme = evas_stringshare_add(DEVIAN_THEME_DEFAULT); DEVIANF(container_change) (devian, devian->conf->container_type); =================================================================== RCS file: /cvs/e/e_modules/devian/src/module/e_mod_data_file.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- e_mod_data_file.c 2 May 2006 14:24:23 -0000 1.8 +++ e_mod_data_file.c 2 Jul 2006 19:53:55 -0000 1.9 @@ -33,7 +33,7 @@ snprintf(buf, sizeof(buf), _("<hilight>Can't open file %s</hilight><br><br>" "You can change the file in the dEvian's config panel"), source->devian->conf->file_path); - e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); + e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); } /* create the textblock */ =================================================================== RCS file: /cvs/e/e_modules/devian/src/module/e_mod_data_picture.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_mod_data_picture.c 12 May 2006 14:30:04 -0000 1.7 +++ e_mod_data_picture.c 2 Jul 2006 19:53:55 -0000 1.8 @@ -402,7 +402,7 @@ "They can be jpeg or png<br><br>" "After import, if you can remove these files and the pictures still can<br>" "be viewed, but you wont be able to set them as wallpaper anymore<br><br>"), dir); - e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); + e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); return 0; } @@ -1199,7 +1199,7 @@ DEVIANM->conf->sources_picture_data_import_thumbs_warn) { DEVIANM->conf->sources_picture_data_import_thumbs_warn = 0; - e_module_dialog_show(_(MODULE_NAME " Module Information"), + e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Information"), _("<hilight>Creating thumbs</hilight><br><br>" "Some pictures are being thumbed in a <hilight>background task</hilight>.<br>" "It can take a while, but after, loading will be faster :)<br><br>" =================================================================== RCS file: /cvs/e/e_modules/devian/src/module/e_mod_data_rss.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_mod_data_rss.c 12 May 2006 14:30:04 -0000 1.7 +++ e_mod_data_rss.c 2 Jul 2006 19:53:55 -0000 1.8 @@ -280,7 +280,7 @@ snprintf(buf, sizeof(buf), _("<hilight>Rss '%s' is aready in use !</hilight><br><br>" "You can't set a rss document to more than one dEvian<br><br>" "Url: %s"), doc->name, doc->url); - e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); + e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); return -1; } @@ -561,7 +561,7 @@ "<underline=on underline_color=#000>Url :</> %s<br>" "<underline=on underline_color=#000>Begining of the document dEvian get :</><br>%100.100s"), doc->name, doc->url, feed->buffer); - e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); + e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); } else { @@ -572,7 +572,7 @@ "<underline=on underline_color=#000>Url :</> %s<br>" "<underline=on underline_color=#000>Begining of the document dEvian get :</><br>%100.100s<br>" "%100.100s"), doc->name, doc->url, feed->buffer, p); - e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); + e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); } } DEVIANF(container_loading_state_change) (feed->source->devian, 0); @@ -1009,7 +1009,7 @@ { snprintf(buf, sizeof(buf), _("<hilight>Unable to open link</hilight><br><br>" "Article '%s' has no link associated !"), article->title); - e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); + e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); return; } @@ -1029,7 +1029,7 @@ _("<hilight>Viewer %s not found !</hilight><br><br>" "You can change the viewer for http in dEvian configuration panel\ (Advanced view)"), DEVIANM->conf->viewer_http); - e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); + e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); return; } =================================================================== RCS file: /cvs/e/e_modules/devian/src/module/e_mod_devian.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_mod_devian.c 2 May 2006 14:24:23 -0000 1.5 +++ e_mod_devian.c 2 Jul 2006 19:53:55 -0000 1.6 @@ -443,7 +443,7 @@ snprintf(buf, sizeof(buf), _("<hilight>Error !</hilight><br>" "Did not find <hilight>theme</hilight> %s group %s"), path, part); - e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); + e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); return NULL; } DMAIN(("Edje loaded %s group %s", path, part)); =================================================================== RCS file: /cvs/e/e_modules/devian/src/module/e_mod_source_file.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_mod_source_file.c 2 May 2006 14:24:23 -0000 1.7 +++ e_mod_source_file.c 2 Jul 2006 19:53:55 -0000 1.8 @@ -24,7 +24,7 @@ snprintf(buf, sizeof(buf), _("<hilight>dEvian's Log feature isn't stable yet !</hilight><br><br>" "It's disabled for now")); - e_module_dialog_show(_(MODULE_NAME " Module error"), buf); + e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module error"), buf); return 0; } #endif =================================================================== RCS file: /cvs/e/e_modules/devian/src/module/e_mod_source_picture.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_mod_source_picture.c 2 May 2006 14:24:23 -0000 1.7 +++ e_mod_source_picture.c 2 Jul 2006 19:53:55 -0000 1.8 @@ -174,7 +174,7 @@ _("<hilight>File %s doesnt exists.</hilight><br><br>" "This file is in dEvian's picture list, but it seems you removed it from the disk<br>" "It cant be set as background, sorry."), file); - e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); + e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); return 0; } @@ -201,7 +201,7 @@ "%s is not an edje file !<br>" "dEvian need e17setroot util from e_utils package to set you're picture as background" "Please install it and try again"), file); - e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); + e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); return 0; } } @@ -261,7 +261,7 @@ _("<hilight>File %s doesnt exists !</hilight><br><br>" "This file is in dEvian's picture list, but it seems you removed it from the disk.<br>" "It cant be set opened in a viewer, sorry."), file); - e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); + e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); return 0; } @@ -281,7 +281,7 @@ _("<hilight>Viewer %s not found !</hilight><br><br>" "You can change the viewer for images in dEvian configuration panel (Advanced view)"), DEVIANM->conf->viewer_image); - e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); + e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); return 0; } =================================================================== RCS file: /cvs/e/e_modules/devian/src/module/e_mod_source_rss.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_mod_source_rss.c 2 May 2006 14:24:23 -0000 1.5 +++ e_mod_source_rss.c 2 Jul 2006 19:53:55 -0000 1.6 @@ -108,7 +108,7 @@ snprintf(buf, sizeof(buf), _("<hilight>Unable to open link</hilight><br><br>" "Feed '%s' has no link associated !"), source->devian->conf->rss_doc->name); - e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); + e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); return 0; } @@ -128,7 +128,7 @@ _("<hilight>Viewer %s not found !</hilight><br><br>" "You can change the viewer for http in DEVIANN configuration panel (Advanced view)"), DEVIANM->conf->viewer_http); - e_module_dialog_show(_(MODULE_NAME " Module Error"), buf); + e_module_dialog_show(DEVIANM->module, _(MODULE_NAME " Module Error"), buf); return 0; } Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs