Enlightenment CVS committal

Author  : onefang
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/e17genmenu/src/bin


Modified Files:
        main.c parse.c 


Log Message:
Doh -= 2;

===================================================================
RCS file: 
/cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/main.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- main.c      19 Feb 2006 08:59:40 -0000      1.26
+++ main.c      19 Feb 2006 09:11:11 -0000      1.27
@@ -219,7 +219,7 @@
 }
 
 double convert, icon_time = 0.0, cache_time = 0.0;
-int menu_count, item_count;
+int menu_count, item_count, reject_count;
 
 int
 main(int argc, char **argv)
@@ -267,8 +267,8 @@
    system(path);
    cache_time += ecore_time_get() - begin;
 
-  printf("\nTotal time %3.3f seconds, finding fdo paths %3.3f, converting fdo 
menus %3.3f, generating %d eaps in %d menus %3.3f, finding icons %3.3f, 
generating eap caches %3.3f.\n",
-         ecore_time_get() - start, paths, convert, item_count, menu_count, gen 
- (icon_time + cache_time), icon_time, cache_time);
+  printf("\nTotal time %3.3f seconds, finding fdo paths %3.3f, converting fdo 
menus %3.3f, generating %d (rejected %d) eaps in %d menus %3.3f, finding icons 
%3.3f, generating eap caches %3.3f.\n",
+         ecore_time_get() - start, paths, convert, item_count, reject_count, 
menu_count, gen - icon_time, icon_time, cache_time);
 
    parse_ini_shutdown();
    fdo_paths_shutdown();
===================================================================
RCS file: 
/cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/parse.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- parse.c     19 Feb 2006 08:59:40 -0000      1.15
+++ parse.c     19 Feb 2006 09:11:11 -0000      1.16
@@ -7,6 +7,7 @@
 #include "parse.h"
 
 extern double cache_time;
+extern int reject_count;
 
 static void _parse_desktop_del(Desktop *desktop);
 
@@ -143,7 +144,7 @@
       free(eap_name);
 
    desktop = parse_desktop_ini_file(app);
-   if (desktop)
+   if ((desktop) && (desktop->group))
       {
          char *value;
 
@@ -181,7 +182,10 @@
      {
         if ((!eap->icon) || (!eap->name) ||
             (!eap->exec) || (!eap->window_class))
-           return;
+           {
+             reject_count++;
+              return;
+          }
 
         FILE *f;
         char buff[MAX_PATH];
@@ -192,6 +196,7 @@
         if (!f)
           {
              fprintf(stderr, "ERROR: Cannot Open Mapping File\n");
+            reject_count++;
              return;
           }
         snprintf(buff, sizeof(buff), "%s|!%s|!%s|!%s\n",




-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to