Enlightenment CVS committal

Author  : onefang
Project : e17
Module  : apps/e_utils

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


Modified Files:
        dumb_tree.c dumb_tree.h fdo_menus.c fdo_paths.c fdo_paths.h 
        icons.c 


Log Message:
Formatting.

===================================================================
RCS file: 
/cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/dumb_tree.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- dumb_tree.c 1 Mar 2006 05:16:41 -0000       1.5
+++ dumb_tree.c 1 Mar 2006 16:20:02 -0000       1.6
@@ -223,7 +223,8 @@
 }
 
 int
-dumb_tree_foreach(Dumb_Tree * tree, int level, int (*func) (const void *data, 
Dumb_Tree * tree, int element, int level), const void *data)
+dumb_tree_foreach(Dumb_Tree * tree, int level, int (*func) (const void *data, 
Dumb_Tree * tree, int element, int level),
+                  const void *data)
 {
    int result = 0;
    int i;
===================================================================
RCS file: 
/cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/dumb_tree.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- dumb_tree.h 22 Feb 2006 20:25:14 -0000      1.4
+++ dumb_tree.h 1 Mar 2006 16:20:02 -0000       1.5
@@ -51,7 +51,8 @@
    Dumb_Tree *dumb_tree_add_hash(Dumb_Tree * tree, Ecore_Hash * element);
    void dumb_tree_remove(Dumb_Tree * tree, int element);
    int dumb_tree_exist(Dumb_Tree * tree, char *element);
-   int dumb_tree_foreach(Dumb_Tree * tree, int level, int (*func) (const void 
*data, Dumb_Tree * tree, int element, int level), const void *data);
+   int dumb_tree_foreach(Dumb_Tree * tree, int level, int (*func) (const void 
*data, Dumb_Tree * tree, int element, int level),
+                         const void *data);
    void dumb_tree_dump(Dumb_Tree * tree, int level);
    void dumb_tree_del(Dumb_Tree * tree);
 
===================================================================
RCS file: 
/cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/fdo_menus.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- fdo_menus.c 1 Mar 2006 16:15:13 -0000       1.22
+++ fdo_menus.c 1 Mar 2006 16:20:02 -0000       1.23
@@ -57,10 +57,9 @@
    Dumb_Tree *current;
    char *prefix;
    char *path;
-   int   length;
+   int length;
 };
 
-
 static int _fdo_menus_unxml(const void *data, Dumb_Tree * tree, int element, 
int level);
 static int _fdo_menus_check_directory(const void *data, char *path);
 static int _fdo_menus_check_menu(const void *data, char *path);
@@ -343,7 +342,8 @@
                                              {
                                                 char temp[MAX_PATH];
 
-                                                sprintf(temp, "%s %s", (char 
*)sub->elements[0].element, (char *)sub->elements[1].element);
+                                                sprintf(temp, "%s %s", (char 
*)sub->elements[0].element,
+                                                        (char 
*)sub->elements[1].element);
                                                 dumb_tree_extend(menu, temp);
                                                 result = 1;
                                              }
@@ -482,7 +482,8 @@
                {
                   _fdo_menus_unxml_rules(rules, (Dumb_Tree *) tree->elements[i 
+ 1].element, type, sub_type);
                }
-             else if ((strcmp((char *)tree->elements[i].element, "<And") == 0) 
|| (strcmp((char *)tree->elements[i].element, "<Not") == 0))
+             else if ((strcmp((char *)tree->elements[i].element, "<And") == 0)
+                      || (strcmp((char *)tree->elements[i].element, "<Not") == 
0))
                {
                   char this_type;
                   Dumb_Tree *sub;
@@ -654,12 +655,12 @@
              struct _fdo_menus_legacy_data legacy_data;
 
              string += 11;
-            legacy_data.prefix = NULL;
-            legacy_data.merge = merge;
+             legacy_data.prefix = NULL;
+             legacy_data.merge = merge;
              if (strncmp(string, "prefix=\"", 8) == 0)
                {
                   string += 8;
-                 legacy_data.prefix = string;
+                  legacy_data.prefix = string;
                   while ((*string != '"') && (*string != '\0'))
                      string++;
                   if (*string != '\0')
@@ -671,9 +672,9 @@
                 sprintf(merge_path, "%s", string);
              else
                 sprintf(merge_path, "%s%s", unxml_data->path, string);
-            legacy_data.path = merge_path;
-            legacy_data.length = strlen(merge_path);
-            printf("<LEGACYDIR> - %s - %s\n", legacy_data.prefix, merge_path);
+             legacy_data.path = merge_path;
+             legacy_data.length = strlen(merge_path);
+             printf("<LEGACYDIR> - %s - %s\n", legacy_data.prefix, merge_path);
              fdo_paths_recursive_search(merge_path, NULL, 
_fdo_menus_legacy_menu_dir, _fdo_menus_legacy_menu, &legacy_data);
              result = 1;
           }
===================================================================
RCS file: 
/cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/fdo_paths.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- fdo_paths.c 1 Mar 2006 16:15:13 -0000       1.20
+++ fdo_paths.c 1 Mar 2006 16:20:02 -0000       1.21
@@ -23,7 +23,8 @@
    int done;
 };
 
-static Dumb_Tree *_fdo_paths_get(char *before, char *env_home, char *env, char 
*env_home_default, char *env_default, char *type, char *gnome_extra, char *kde);
+static Dumb_Tree *_fdo_paths_get(char *before, char *env_home, char *env, char 
*env_home_default, char *env_default, char *type,
+                                 char *gnome_extra, char *kde);
 static void _fdo_paths_massage_path(char *path, char *home, char *first, char 
*second);
 static void _fdo_paths_check_and_add(Dumb_Tree * paths, char *path);
 static void _fdo_paths_exec_config(char *home, Dumb_Tree * extras, char *cmd);
@@ -36,7 +37,8 @@
    if (!fdo_paths_config)
       fdo_paths_config = _fdo_paths_get(NULL, "XDG_CONFIG_HOME", 
"XDG_CONFIG_DIRS", "~/.config", "/etc/xdg", "", NULL, NULL);
    if (!fdo_paths_menus)
-      fdo_paths_menus = _fdo_paths_get(NULL, "XDG_CONFIG_HOME", 
"XDG_CONFIG_DIRS", "~/.config", "/etc/xdg", "menus", NULL, "xdgconf-menu");
+      fdo_paths_menus =
+         _fdo_paths_get(NULL, "XDG_CONFIG_HOME", "XDG_CONFIG_DIRS", 
"~/.config", "/etc/xdg", "menus", NULL, "xdgconf-menu");
    if (!fdo_paths_directories)
       fdo_paths_directories =
          _fdo_paths_get(NULL, "XDG_DATA_HOME", "XDG_DATA_DIRS",
@@ -44,7 +46,8 @@
    if (!fdo_paths_desktops)
       fdo_paths_desktops =
          _fdo_paths_get(NULL, "XDG_DATA_HOME", "XDG_DATA_DIRS",
-                        "~/.local/share", "/usr/local/share:/usr/share", 
"applications", "dist/desktop-files:dist/short-menu:gnome/apps", 
"xdgdata-apps:apps");
+                        "~/.local/share", "/usr/local/share:/usr/share", 
"applications",
+                        "dist/desktop-files:dist/short-menu:gnome/apps", 
"xdgdata-apps:apps");
    if (!fdo_paths_kde_legacy)
       fdo_paths_kde_legacy = _fdo_paths_get(NULL, NULL, NULL, NULL, NULL, 
NULL, NULL, "apps");
    if (!fdo_paths_icons)
@@ -52,7 +55,8 @@
         char *gnome;
 
         fdo_paths_icons =
-           _fdo_paths_get("~/.icons", "XDG_DATA_HOME", "XDG_DATA_DIRS", 
"~/.local/share", "/usr/local/share:/usr/share", "icons", "dist/icons", 
"icon:pixmap");
+           _fdo_paths_get("~/.icons", "XDG_DATA_HOME", "XDG_DATA_DIRS", 
"~/.local/share", "/usr/local/share:/usr/share", "icons",
+                          "dist/icons", "icon:pixmap");
         _fdo_paths_check_and_add(fdo_paths_icons, "/usr/share/pixmaps/");
         gnome = getenv("$GNOME_ICON_PATH");
         if (gnome)
@@ -135,7 +139,8 @@
 */
 
 static Dumb_Tree *
-_fdo_paths_get(char *before, char *env_home, char *env, char 
*env_home_default, char *env_default, char *type, char *gnome_extra, char *kde)
+_fdo_paths_get(char *before, char *env_home, char *env, char 
*env_home_default, char *env_default, char *type, char *gnome_extra,
+               char *kde)
 {
    char *home;
    Dumb_Tree *paths = NULL;
@@ -347,7 +352,8 @@
 }
 
 char *
-fdo_paths_recursive_search(char *path, char *file, int (*dir_func) (const void 
*data, char *path), int (*func) (const void *data, char *path), const void 
*data)
+fdo_paths_recursive_search(char *path, char *file, int (*dir_func) (const void 
*data, char *path),
+                           int (*func) (const void *data, char *path), const 
void *data)
 {
    char *fpath = NULL;
    DIR *dir = NULL;
@@ -447,7 +453,8 @@
                          {
                             for (j = 0; j < ced->types->size; j++)
                               {
-                                 _fdo_paths_massage_path(path, ced->home, 
config_list->elements[i].element, ced->types->elements[j].element);
+                                 _fdo_paths_massage_path(path, ced->home, 
config_list->elements[i].element,
+                                                         
ced->types->elements[j].element);
                                  _fdo_paths_check_and_add(paths, path);
                               }
                          }
===================================================================
RCS file: 
/cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/fdo_paths.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- fdo_paths.h 1 Mar 2006 16:15:13 -0000       1.13
+++ fdo_paths.h 1 Mar 2006 16:20:02 -0000       1.14
@@ -26,8 +26,10 @@
 # endif
 
    void fdo_paths_init(void);
-   char *fdo_paths_search_for_file(Fdo_Paths_Type type, char *file, int sub, 
int (*func) (const void *data, char *path), const void *data);
-   char *fdo_paths_recursive_search(char *path, char *d, int (*dir_func) 
(const void *data, char *path), int (*func) (const void *data, char *path), 
const void *data);
+   char *fdo_paths_search_for_file(Fdo_Paths_Type type, char *file, int sub, 
int (*func) (const void *data, char *path),
+                                   const void *data);
+   char *fdo_paths_recursive_search(char *path, char *d, int (*dir_func) 
(const void *data, char *path),
+                                    int (*func) (const void *data, char 
*path), const void *data);
    void fdo_paths_shutdown(void);
 
 # ifdef __cplusplus
===================================================================
RCS file: 
/cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/icons.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- icons.c     22 Feb 2006 04:30:53 -0000      1.21
+++ icons.c     1 Mar 2006 16:20:02 -0000       1.22
@@ -71,7 +71,8 @@
 #endif
 
    /* Check For Unsupported Extension */
-   if ((!strcmp(icon + strlen(icon) - 4, ".svg")) || (!strcmp(icon + 
strlen(icon) - 4, ".ico")) || (!strcmp(icon + strlen(icon) - 4, ".xpm")))
+   if ((!strcmp(icon + strlen(icon) - 4, ".svg")) || (!strcmp(icon + 
strlen(icon) - 4, ".ico"))
+       || (!strcmp(icon + strlen(icon) - 4, ".xpm")))
       return strdup(DEFAULTICON);
 
    /* Check For An Extension, Append PNG If Missing */
@@ -253,7 +254,8 @@
                                                 }
                                              default:  /* Threshold. */
                                                 {
-                                                   match = (((this_size - 
thresh_size) <= wanted_size) && (wanted_size <= (this_size + thresh_size)));
+                                                   match = (((this_size - 
thresh_size) <= wanted_size)
+                                                            && (wanted_size <= 
(this_size + thresh_size)));
                                                    if (wanted_size < 
(this_size - thresh_size))
                                                       result_size = min_size - 
wanted_size;
                                                    if (wanted_size > 
(this_size + thresh_size))
@@ -265,7 +267,8 @@
                                            /* Look for icon with all 
extensions. */
                                            for (j = 0; ext[j] != NULL; j++)
                                              {
-                                                snprintf(path, MAX_PATH, 
"%s/%s/%s%s", icon_theme, (char *)directory_paths->elements[i].element, icon, 
ext[j]);
+                                                snprintf(path, MAX_PATH, 
"%s/%s/%s%s", icon_theme,
+                                                         (char 
*)directory_paths->elements[i].element, icon, ext[j]);
 #ifdef DEBUG
                                                 printf("FDO icon = %s\n", 
path);
 #endif




-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to