From: <enl...@li...> - 2006-01-05 23:42:38
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/src/bin/e17setroot Modified Files: e17setroot.c Log Message: Remove some not needed includes. Formatting. Make fake transparency an option rather than calling it every time. Fake transparency is bad, mmmkay =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17setroot/e17setroot.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- e17setroot.c 8 Nov 2005 23:13:38 -0000 1.29 +++ e17setroot.c 5 Jan 2006 23:42:31 -0000 1.30 @@ -5,12 +5,9 @@ #include <string.h> #include <unistd.h> #include <limits.h> -#include <X11/Xatom.h> -#include <X11/Xlib.h> #include <Imlib2.h> #include <E_Lib.h> #include <Engrave.h> -#include <Ecore.h> #include <Ecore_X.h> #include <Ecore_File.h> @@ -25,6 +22,7 @@ static int e_bg_type = 0; static int e_bg_no_load = 0; +static int e_bg_fake = 0; static char *e_bg_img_file = NULL; static char *esetroot_opt = NULL; @@ -36,10 +34,10 @@ E_BG_FIT = 4, E_BG_GET = 5, E_BG_NO_LOAD = 6, + E_BG_FAKE = 7, }; typedef enum E_Bg_Types E_Bg_Types; - void _e_bg_bg_help() { printf("e17setroot - Manipulate Enlightenment DR17's background\n"); printf("Usage: e17setroot <imagename> | <edj>\n"); @@ -48,6 +46,7 @@ printf(" -s | --scale <imagename> Scale the supplied image to the screen.\n"); printf(" -n | --noload <imagename> Create .edj without setting it.\n"); printf(" -g | --get Get current E17 background.\n"); + printf(" -k | --fake Use Esetroot for fake transparency. (Not Supported)\n"); printf(" -h Show this help screen.\n"); } @@ -63,7 +62,7 @@ void _e_bg_bg_parseargs(int argc, char **argv) { int c; - static char *options = "tscfghn"; + static char *options = "tscfghnk"; static struct option long_options[] = { {"tile", 0, 0, E_BG_TILE}, {"scale", 0, 0, E_BG_SCALE}, @@ -71,6 +70,7 @@ {"fit", 0, 0, E_BG_FIT}, {"get", 0, 0, E_BG_GET}, {"noload", 0, 0, E_BG_NO_LOAD}, + {"fake", 0, 0, E_BG_FAKE}, {0, 0, 0, 0} }; @@ -118,7 +118,10 @@ case 'n': e_bg_no_load = 1; break; - + case E_BG_FAKE: + case 'k': + e_bg_fake = 1; + break; /* show help screen */ case 'h': default: @@ -128,7 +131,7 @@ } if (optind < argc) - e_bg_img_file = argv[optind]; + e_bg_img_file = argv[optind]; } /* strip extention from a file */ @@ -172,11 +175,11 @@ /* make sure we got a file name */ if (!filename || strlen(filename) <= 4) return; - file = ecore_file_get_file(filename); + file = (char *)ecore_file_get_file(filename); dir = ecore_file_get_dir(filename); filenoext = _e_bg_bg_file_stripext(filename); - filenoext = ecore_file_get_file(filenoext); + filenoext = (char *)ecore_file_get_file(filenoext); if (strcmp(filename + strlen(filename) - 4, ".edj") == 0) { int w, h, num; @@ -195,8 +198,11 @@ system(static_bg); _e_bg_bg_set(filename); - snprintf(esetroot_s, PATH_MAX, "Esetroot %s %s ", esetroot_opt, filename_s); - system(esetroot_s); + if (e_bg_fake) + { + snprintf(esetroot_s, PATH_MAX, "Esetroot %s %s ", esetroot_opt, filename_s); + system(esetroot_s); + } ecore_main_loop_quit(); return; } @@ -274,16 +280,25 @@ return; /* If we're using pseudo-trans for eterm, then this will help */ - esetroot = malloc(strlen("Esetroot ") + strlen(esetroot_opt) + strlen(filename) + 1); - strcpy(esetroot, "Esetroot "); - strcat(esetroot, esetroot_opt); - strcat(esetroot, filename); - system(esetroot); - free(esetroot); + if (e_bg_fake) + { + esetroot = malloc(strlen("Esetroot ") + strlen(esetroot_opt) + strlen(filename) + 1); + strcpy(esetroot, "Esetroot "); + strcat(esetroot, esetroot_opt); + strcat(esetroot, filename); + system(esetroot); + free(esetroot); + } } int main(int argc, char **argv) { + if (argc == 1) + { + _e_bg_bg_help(); + return 0; + } + _e_bg_bg_parseargs(argc, argv); if (!e_bg_no_load) { @@ -299,8 +314,6 @@ e_lib_background_get(); ecore_main_loop_begin(); ecore_shutdown(); - } else if(!e_bg_type) { - _e_bg_bg_help(); } else _e_bg_bg_edj_gen(e_bg_img_file); |
From: <enl...@li...> - 2006-01-06 09:17:59
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/src/bin/e17setroot Modified Files: e17setroot.c Log Message: Reverse the fake transparency patch as per CodeWarrior. e17setroot will try to use Esetroot unless specifically told not to =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17setroot/e17setroot.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- e17setroot.c 5 Jan 2006 23:42:31 -0000 1.30 +++ e17setroot.c 6 Jan 2006 09:17:53 -0000 1.31 @@ -22,7 +22,7 @@ static int e_bg_type = 0; static int e_bg_no_load = 0; -static int e_bg_fake = 0; +static int e_bg_no_fake = 0; static char *e_bg_img_file = NULL; static char *esetroot_opt = NULL; @@ -34,7 +34,7 @@ E_BG_FIT = 4, E_BG_GET = 5, E_BG_NO_LOAD = 6, - E_BG_FAKE = 7, + E_BG_NO_FAKE = 7, }; typedef enum E_Bg_Types E_Bg_Types; @@ -46,7 +46,7 @@ printf(" -s | --scale <imagename> Scale the supplied image to the screen.\n"); printf(" -n | --noload <imagename> Create .edj without setting it.\n"); printf(" -g | --get Get current E17 background.\n"); - printf(" -k | --fake Use Esetroot for fake transparency. (Not Supported)\n"); + printf(" -k | --nofake Do not use Esetroot for fake transparency. (Not Supported)\n"); printf(" -h Show this help screen.\n"); } @@ -70,7 +70,7 @@ {"fit", 0, 0, E_BG_FIT}, {"get", 0, 0, E_BG_GET}, {"noload", 0, 0, E_BG_NO_LOAD}, - {"fake", 0, 0, E_BG_FAKE}, + {"nofake", 0, 0, E_BG_NO_FAKE}, {0, 0, 0, 0} }; @@ -118,9 +118,9 @@ case 'n': e_bg_no_load = 1; break; - case E_BG_FAKE: + case E_BG_NO_FAKE: case 'k': - e_bg_fake = 1; + e_bg_no_fake = 1; break; /* show help screen */ case 'h': @@ -198,7 +198,7 @@ system(static_bg); _e_bg_bg_set(filename); - if (e_bg_fake) + if (!e_bg_no_fake) { snprintf(esetroot_s, PATH_MAX, "Esetroot %s %s ", esetroot_opt, filename_s); system(esetroot_s); @@ -280,7 +280,7 @@ return; /* If we're using pseudo-trans for eterm, then this will help */ - if (e_bg_fake) + if (!e_bg_no_fake) { esetroot = malloc(strlen("Esetroot ") + strlen(esetroot_opt) + strlen(filename) + 1); strcpy(esetroot, "Esetroot "); |
From: <enl...@li...> - 2006-01-31 19:02:24
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/src/bin/e17genmenu Log Message: Directory /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu added to the repository |
From: <enl...@li...> - 2006-01-31 19:02:47
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/src/bin/e17genmenu/icons Log Message: Directory /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/icons added to the repository |
From: <enl...@li...> - 2006-01-31 19:02:48
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/src/bin/e17genmenu/m4 Log Message: Directory /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/m4 added to the repository |
From: <enl...@li...> - 2006-01-31 19:02:49
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/src/bin/e17genmenu/src Log Message: Directory /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src added to the repository |
From: <enl...@li...> - 2006-01-31 19:06:55
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/src/bin/e17genmenu/src/bin Log Message: Directory /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin added to the repository |
From: <enl...@li...> - 2006-01-31 19:10:41
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/src/bin/e17genmenu/src/bin Added Files: Makefile.am category.c category.h eaps.c eaps.h global.c global.h icons.c icons.h main.c menus.c menus.h order.c order.h parse.c parse.h sort.c sort.h Log Message: Adding e17genmenu to e_utils. Purposely left out of the e_utils configure.in as this is going to be in flux while onefang and I hash out the automated menu business for E. |
From: <enl...@li...> - 2006-01-31 19:10:41
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/src/bin/e17genmenu Added Files: AUTHORS COPYING COPYING-PLAIN ChangeLog INSTALL Makefile.am NEWS README TODO autogen.sh configure.in Log Message: Adding e17genmenu to e_utils. Purposely left out of the e_utils configure.in as this is going to be in flux while onefang and I hash out the automated menu business for E. |
From: <enl...@li...> - 2006-01-31 19:10:42
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/src/bin/e17genmenu/src Added Files: Makefile.am Log Message: Adding e17genmenu to e_utils. Purposely left out of the e_utils configure.in as this is going to be in flux while onefang and I hash out the automated menu business for E. |
From: <enl...@li...> - 2006-01-31 19:10:42
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/src/bin/e17genmenu/icons Added Files: Makefile.am e.png package_applications.png package_development.png package_editors.png package_edutainment.png package_favourite.png package_games.png package_graphics.png package_multimedia.png package_network.png package_settings.png package_system.png package_toys.png package_utilities.png package_wordprocessing.png Log Message: Adding e17genmenu to e_utils. Purposely left out of the e_utils configure.in as this is going to be in flux while onefang and I hash out the automated menu business for E. |
From: <enl...@li...> - 2006-01-31 19:10:47
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/src/bin/e17genmenu/m4 Added Files: ac_attribute.m4 ac_expand_dir.m4 ac_path_generic.m4 Log Message: Adding e17genmenu to e_utils. Purposely left out of the e_utils configure.in as this is going to be in flux while onefang and I hash out the automated menu business for E. |
From: <enl...@li...> - 2006-01-31 19:12:19
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/src/bin/e17genmenu Added Files: .cvsignore Log Message: Add missing .cvsignore and .indent.pro |
From: <enl...@li...> - 2006-01-31 19:12:20
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/src/bin/e17genmenu/src/bin Added Files: .cvsignore .indent.pro Log Message: Add missing .cvsignore and .indent.pro |
From: <enl...@li...> - 2006-01-31 22:04:32
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/src/bin/e17genmenu/src/bin Modified Files: category.c category.h eaps.c eaps.h global.c global.h icons.c icons.h main.c menus.c menus.h order.c order.h parse.c parse.h sort.c sort.h Log Message: Make this compile =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/category.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- category.c 31 Jan 2006 19:10:34 -0000 1.1 +++ category.c 31 Jan 2006 22:04:17 -0000 1.2 @@ -1,100 +1,125 @@ -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <limits.h> -#include "config.h" -#include "global.h" -#include "category.h" - -char * -find_category(const char *category) -{ - char cats[MAX_PATH]; - char *token, *cat; - - cat = NULL; - snprintf(cats, sizeof(cats), "%s", CATEGORIES); - token = strtok(cats, ":"); - while (token) - { - /* Check If this token is in supplied $t */ - if (strstr(category, token) != NULL) - { - if (strstr(token, "Development") != NULL) - { - cat = "Programming"; - } - else if ((strstr(token, "Game") != NULL) || - (strstr(token, "Games") != NULL)) - { - cat = "Games"; - } - else if ((strstr(token, "AudioVideo") != NULL) || - (strstr(token, "Sound") != NULL) || - (strstr(token, "Video") != NULL) || - (strstr(token, "Multimedia") != NULL)) - { - cat = "Multimedia"; - } - else if ((strstr(token, "Network") != NULL) || - (strstr(token, "Net") != NULL)) - { - cat = "Internet"; - } - else if (strstr(token, "Education") != NULL) - { - cat = "Edutainment"; - } - else if (strstr(token, "Amusement") != NULL) - { - cat = "Toys"; - } - else if (strstr(token, "System") != NULL) - { - cat = "System"; - } - else if ((strstr(token, "Shells") != NULL) || - (strstr(token, "XShells") != NULL) || - (strstr(token, "Utility") != NULL) || - (strstr(token, "Tools") != NULL)) - { - cat = "Utilities"; - } - else if ((strstr(token, "Viewers") != NULL) || - (strstr(token, "Editors") != NULL) || - (strstr(token, "TextEditor") != NULL) || - (strstr(token, "Text") != NULL)) - { - cat = "Editors"; - } - else if (strstr(token, "Graphics") != NULL) - { - cat = "Graphics"; - } - else if ((strstr(token, "WindowManagers") != NULL) || - (strstr(token, "Core") != NULL)) - { - cat = "Core"; - } - else if ((strstr(token, "Settings") != NULL) || - (strstr(token, "Accessibility") != NULL)) - { - cat = "Settings"; - } - else if (strstr(token, "Office") != NULL) - { - cat = "Office"; - } - else - { - cat = "Core"; - } - } - token = strtok(NULL, ":"); - } - if (token) - free(token); - if (!cat) - cat = "Core"; - return strdup(cat); -} +/* Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ + +/* + * category.c + * Copyright (C) Christopher Michael 2005 <dev...@co...> + * + * e17genmenu is free software copyrighted by Christopher Michael. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name ``Christopher Michael'' nor the name of any other + * contributor may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * e17genmenu IS PROVIDED BY Christopher Michael ``AS IS'' AND ANY EXPRESS + * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL Christopher Michael OR ANY OTHER CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include "config.h" +#include "global.h" +#include "category.h" + +char *find_category(char *category) +{ + char cats[MAX_PATH]; + char *token, *cat; + + cat = NULL; + snprintf(cats, sizeof(cats), "%s", CATEGORIES); + token = strtok(cats,":"); + while (token) + { + /* Check If this token is in supplied $t */ + if (strstr(category, token) != NULL) + { + if (strstr(token,"Development") != NULL) + { + cat = "Programming"; + } + else if ((strstr(token,"Game") != NULL) || + (strstr(token, "Games") != NULL)) + { + cat = "Games"; + } + else if ((strstr(token,"AudioVideo") != NULL) || + (strstr(token, "Sound") != NULL) || + (strstr(token, "Video") != NULL) || + (strstr(token, "Multimedia") != NULL)) + { + cat = "Multimedia"; + } + else if ((strstr(token,"Network") != NULL) || + (strstr(token, "Net") != NULL)) + { + cat = "Internet"; + } + else if (strstr(token,"Education") != NULL) + { + cat = "Edutainment"; + } + else if (strstr(token,"Amusement") != NULL) + { + cat = "Toys"; + } + else if (strstr(token,"System") != NULL) + { + cat = "System"; + } + else if ((strstr(token,"Shells") != NULL) || + (strstr(token, "XShells") != NULL) || + (strstr(token, "Utility") != NULL) || + (strstr(token, "Tools") != NULL)) + { + cat = "Utilities"; + } + else if ((strstr(token,"Viewers") != NULL) || + (strstr(token, "Editors") != NULL) || + (strstr(token, "TextEditor") != NULL) || + (strstr(token, "Text") != NULL)) + { + cat = "Editors"; + } + else if (strstr(token,"Graphics") != NULL) + { + cat = "Graphics"; + } + else if ((strstr(token,"WindowManagers") != NULL) || + (strstr(token, "Core") != NULL)) + { + cat = "Core"; + } + else if ((strstr(token,"Settings") != NULL) || + (strstr(token, "Accessibility") != NULL)) + { + cat = "Settings"; + } + else if (strstr(token,"Office") != NULL) + { + cat = "Office"; + } + else + { + cat = "Core"; + } + } + token = strtok(NULL, ":"); + } + if (!cat) cat = "Core"; + return strdup(cat); +} =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/category.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- category.h 31 Jan 2006 19:10:34 -0000 1.1 +++ category.h 31 Jan 2006 22:04:17 -0000 1.2 @@ -1,8 +1,12 @@ #ifndef CATEGORY_H #define CATEGORY_H +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> + #define CATEGORIES "Accessibility:Accessories:Amusement:AudioVideo:Core:Development:Education:Game:Graphics:Multimedia:Network:Office:Programming:Settings:System:TextEditor:Utility:Video" -char *find_category(const char *category); +char *find_category(char *category); #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/eaps.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eaps.c 31 Jan 2006 19:10:34 -0000 1.1 +++ eaps.c 31 Jan 2006 22:04:17 -0000 1.2 @@ -1,17 +1,43 @@ -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <limits.h> -#include <Eet.h> -#include <Engrave.h> +/* Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ + +/* + * eaps.c + * Copyright (C) Christopher Michael 2005 <dev...@co...> + * + * e17genmenu is free software copyrighted by Christopher Michael. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name ``Christopher Michael'' nor the name of any other + * contributor may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * e17genmenu IS PROVIDED BY Christopher Michael ``AS IS'' AND ANY EXPRESS + * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL Christopher Michael OR ANY OTHER CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + #include "global.h" #include "config.h" #include "icons.h" #include "eaps.h" /* Create a .directory.eap for this dir */ -void -create_dir_eap(char *path, char *cat) +void create_dir_eap(char *path, char *cat) { char path2[MAX_PATH]; char *icon; @@ -19,39 +45,33 @@ snprintf(path2, sizeof(path2), "%s/.directory.eap", path); if (!ecore_file_exists(path2)) { - icon = set_icon(cat); - if (!icon) - { - fprintf(stderr, "ERROR: Cannot Find Icon For %s\n", cat); - return; - } - write_icon(path2, icon); - write_eap(path2, "app/info/name", cat); + icon = set_icon(cat); + if (!icon) + { + fprintf(stderr, "ERROR: Cannot Find Icon For %s\n", cat); + return; + } + write_icon(path2, icon); + write_eap(path2, "app/info/name", cat); } - if (icon) - free(icon); } -char * -get_window_class(char *file) +char *get_window_class(char *file) { char *tmp, *cls; int i; Eet_File *ef; - if (!ecore_file_exists(file)) - return NULL; + if (!ecore_file_exists(file)) return NULL; ef = eet_open(file, EET_FILE_MODE_READ); - if (!ef) - return NULL; + if (!ef) return NULL; tmp = eet_read(ef, "app/window/class", &i); if (!tmp) { - if (ef) - eet_close(ef); - return NULL; + if (ef) eet_close(ef); + return NULL; } /* Allocate string for window class */ @@ -59,51 +79,43 @@ memcpy(cls, tmp, i); cls[i] = 0; - if (tmp) - free(tmp); - + free(tmp); eet_close(ef); - if (cls != NULL) - return strdup(cls); - + if (cls != NULL) return strdup(cls); return NULL; } -void -write_icon(char *f, char *i) +void write_icon(char *f, char *i) { Engrave_File *eet; Engrave_Image *image; Engrave_Group *grp; Engrave_Part *part; Engrave_Part_State *ps; + char *idir, *ifile, *icomp; #ifdef DEBUG fprintf(stderr, "\tWriting Icon %s\n", i); #endif - - if (!i) - ifile = (char *)ecore_file_get_file(DEFAULTICON); - else - ifile = (char *)ecore_file_get_file(i); - - if (ifile == NULL) - return; + if (!i) ifile = ecore_file_get_file(DEFAULTICON); + if (i) ifile = ecore_file_get_file(i); idir = ecore_file_get_dir(i); - + eet = engrave_file_new(); engrave_file_image_dir_set(eet, idir); - /* Get Lossy Options */ icomp = get_icon_compression(); if (!strcmp(icomp, "COMP")) - image = engrave_image_new(ifile, ENGRAVE_IMAGE_TYPE_COMP, 1.0); + { + image = engrave_image_new(ifile, ENGRAVE_IMAGE_TYPE_COMP, 0); + } else - image = engrave_image_new(ifile, ENGRAVE_IMAGE_TYPE_LOSSY, 90.0); - + { + image = engrave_image_new(ifile, ENGRAVE_IMAGE_TYPE_LOSSY, 0); + } engrave_file_image_add(eet, image); grp = engrave_group_new(); @@ -124,17 +136,9 @@ engrave_edj_output(eet, f); engrave_file_free(eet); - - if (idir) - free(idir); - if (ifile) - free(ifile); - if (icomp) - free(icomp); } -void -write_eap(char *file, char *section, char *value) +void write_eap(char *file, char *section, char *value) { int i; Eet_File *ef; @@ -144,31 +148,25 @@ #endif ef = eet_open(file, EET_FILE_MODE_READ_WRITE); - if (!ef) - return; + if (!ef) return; if (!strcmp(section, "app/info/startup_notify")) { - if (!value) - eet_delete(ef, section); - if (value) - { - i = atoi(value); - eet_write(ef, strdup(section), &i, 1, 0); - } + if (!value) eet_delete(ef, section); + if (value) + { + i = atoi(value); + eet_write(ef, strdup(section), &i, 1, 0); + } } else { - if (!value) - eet_delete(ef, section); - if (value) - { - i = eet_write(ef, strdup(section), strdup(value), strlen(value), - 0); - if (i == 0) - fprintf(stderr, "Failed To Write %s To %s Of %s\n", value, - section, file); - } + if (!value) eet_delete(ef, section); + if (value) + { + i = eet_write(ef, strdup(section), strdup(value), strlen(value), 0); + if (i == 0) fprintf(stderr, "Failed To Write %s To %s Of %s\n", value, section, file); + } } eet_close(ef); } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/eaps.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eaps.h 31 Jan 2006 19:10:34 -0000 1.1 +++ eaps.h 31 Jan 2006 22:04:17 -0000 1.2 @@ -1,6 +1,12 @@ #ifndef EAPS_H #define EAPS_H +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <Eet.h> +#include <Engrave.h> + void create_dir_eap(char *path, char *cat); char *get_window_class(char *file); void write_icon(char *f, char *i); =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/global.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- global.c 31 Jan 2006 19:10:34 -0000 1.1 +++ global.c 31 Jan 2006 22:04:17 -0000 1.2 @@ -1,179 +1,178 @@ -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> -#include <limits.h> -#include <Ecore.h> -#include <Ecore_File.h> +/* Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ + +/* + * global.c + * Copyright (C) Christopher Michael 2005 <dev...@co...> + * + * e17genmenu is free software copyrighted by Christopher Michael. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name ``Christopher Michael'' nor the name of any other + * contributor may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * e17genmenu IS PROVIDED BY Christopher Michael ``AS IS'' AND ANY EXPRESS + * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL Christopher Michael OR ANY OTHER CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + #include "global.h" #include "config.h" /* Functions */ -char * -get_home() +char *get_home() { char *d; int length; - char home[PATH_MAX]; + char home[MAX_PATH]; - /* Get Home Dir, check for trailing '/', strip it */ + /* Get Home Dir, check for trailing '/', strip it */ snprintf(home, sizeof(home), "%s", getenv("HOME")); d = strrchr(home, '/'); if (d) { - if (strlen(d) == 1) - { - if (home[(length = strlen(home) - 1)] == '/') - home[length] = '\0'; - } + if (strlen(d) == 1) + { + if (home[(length = strlen(home) - 1)] == '/') home[length] = '\0'; + } } - if (d) - free(d); return strdup(home); } -char * -get_desktop_dir() +char *get_desktop_dir() { int i, argc; char **argv; char *c; ecore_app_args_get(&argc, &argv); - for (i = 1; i < argc; i++) + for(i = 1; i < argc; i++) { - if ((!strncmp(argv[i], "-d", 2)) || - (!strncmp(argv[i], "--desktop-dir", 13))) - { - c = strstr(argv[i], "="); - c = strtok(c, "="); - if (c) - return strdup(c); - fprintf(stderr, - "You must specify a directory for the %s argument\n", - argv[i]); - exit(-1); - } - } - if (c) - free(c); - + if ((strncmp(argv[i], "-d", 2) == 0) || + (strncmp(argv[i], "--desktop-dir", 13) == 0)) + { + c = strstr(argv[i], "="); + c = strtok(c, "="); + if (c) return strdup(c); + fprintf(stderr, "You must specify a directory for the %s argument\n", argv[i]); + exit(1); + } + } return NULL; } -int -get_overwrite() +int get_overwrite() { int i, argc; char **argv; ecore_app_args_get(&argc, &argv); - for (i = 1; i < argc; i++) + for(i = 1; i < argc; i++) { - if ((!strcmp(argv[i], "-o")) || (!strcmp(argv[i], "--overwrite"))) - return 1; + if ((!strcmp(argv[i], "-o")) || (!strcmp(argv[i], "--overwrite"))) return 1; } return 0; } -char * -get_icon_compression() +char *get_icon_compression() { int i, argc; char **argv; ecore_app_args_get(&argc, &argv); - for (i = 1; i < argc; i++) + for(i = 1; i < argc; i++) { - if ((!strncmp(argv[i], "--COMP", 6)) || (!strncmp(argv[i], "-c", 2))) - return strdup("COMP"); + if ((strncmp(argv[i], "--lossy", 11) == 0) || (strncmp(argv[i], "-l", 2) == 0)) + return strdup("LOSSY"); } - return strdup("LOSSY"); + return strdup("COMP"); } -char * -get_eap_name(char *file) +char *get_eap_name(char *file) { char *tmp, *tmp2; char eap[MAX_PATH]; - tmp2 = (char *)ecore_file_get_file(strdup(file)); - if (!tmp2) - return NULL; + tmp2 = ecore_file_get_file(strdup(file)); + if (!tmp2) return NULL; tmp = strdup(tmp2); if (strrchr(tmp2, '.') != NULL) - tmp = strtok(tmp2, "."); - - snprintf(eap, sizeof(eap), "%s.eap", tmp); - return strdup(eap); + { + tmp = strtok(tmp2, "."); + snprintf(eap, sizeof(eap), "%s.eap", tmp); + return strdup(eap); + } + return NULL; } -char * -get_icon_size() +char *get_icon_size() { int i, argc; char **argv; char *c; ecore_app_args_get(&argc, &argv); - for (i = 1; i < argc; i++) + for(i = 1; i < argc; i++) { - if ((!strncmp(argv[i], "--icon-size", 11)) - || (!strncmp(argv[i], "-s", 2))) - { - c = strstr(argv[i], "="); - c = strtok(c, "="); - return strdup(c); - } - } - if (c) - free(c); - + if ((strncmp(argv[i], "--icon-size", 11) == 0) || (strncmp(argv[i], "-s", 2) == 0)) + { + c = strstr(argv[i], "="); + c = strtok(c, "="); + return strdup(c); + } + } return "48x48"; } -char * -get_icon_theme() +char *get_icon_theme() { int i, argc; char **argv; char *c; ecore_app_args_get(&argc, &argv); - for (i = 1; i < argc; i++) + for(i = 1; i < argc; i++) { - if ((!strncmp(argv[i], "--icon-theme", 12)) - || (!strncmp(argv[i], "-t", 2))) - { - c = strstr(argv[i], "="); - c = strtok(c, "="); - return strdup(c); - } - } - if (c) - free(c); - + if ((strncmp(argv[i], "--icon-theme", 12) == 0) || (strncmp(argv[i], "-t", 2) == 0)) + { + c = strstr(argv[i], "="); + c = strtok(c, "="); + return strdup(c); + } + } return NULL; } -int -get_mapping() +int get_mapping() { int i, argc; char **argv; ecore_app_args_get(&argc, &argv); - for (i = 1; i < argc; i++) + for(i = 1; i < argc; i++) { - if ((!strcmp(argv[i], "--mapping")) || (!strcmp(argv[i], "-m"))) - return 1; + if ((!strcmp(argv[i], "--mapping")) || (!strcmp(argv[i], "-m"))) return 1; } return 0; } -void -backup_eaps() +void backup_eaps() { int result; char *file; @@ -181,63 +180,56 @@ Ecore_List *eaps = NULL; /* Check That Dir All Exists */ - snprintf(path, sizeof(path), "%s" EAPPDIR, get_home()); + snprintf(path, sizeof(path), "%s"EAPPDIR, get_home()); if (!ecore_file_exists(path)) { - fprintf(stderr, "ERROR: %s doesn't exist. Where are the eapps ?\n", - path); - return; + fprintf(stderr, "ERROR: %s doesn't exist. Where are the eapps ?\n", path); + return; } - if (ecore_file_is_dir(path)) - eaps = ecore_file_ls(path); - if (!eaps) - return; + if (ecore_file_is_dir(path)) eaps = ecore_file_ls(path); + if (!eaps) return; ecore_list_goto_first(eaps); while ((file = ecore_list_next(eaps)) != NULL) { - if (!strcmp(file, ".") || !strcmp(file, "..")) - continue; - if (!ecore_file_is_dir(file)) - { - snprintf(tmp, sizeof(tmp), "%s/%s", path, file); - snprintf(dest, sizeof(dest), "%s/EapBackup", get_home()); - if (!ecore_file_exists(dest)) - { - if (!ecore_file_mkdir(dest)) - return; - } - - /* Copy The File */ - snprintf(dest, sizeof(dest), "%s/EapBackup/%s", get_home(), file); - result = ecore_file_cp(tmp, dest); - if (!result) - break; - } + if (!strcmp(file, ".") || !strcmp(file, "..")) continue; + if (!ecore_file_is_dir(file)) + { + snprintf(tmp, sizeof(tmp), "%s/%s", path, file); +#ifdef DEBUG + fprintf(stderr, "Backing Up %s\n", tmp); +#endif + snprintf(dest, sizeof(dest), "%s/EapBackup", get_home()); + if (!ecore_file_exists(dest)) + { + if (!ecore_file_mkdir(dest)) return; + } + + /* Copy The File */ + snprintf(dest, sizeof(dest), "%s/EapBackup/%s", get_home(), file); + result = ecore_file_cp(tmp, dest); + if (!result) break; + } } - if (eaps) - ecore_list_destroy(eaps); + if (eaps) ecore_list_destroy(eaps); } -void -write_mapping_file(G_Eap *eap) +void write_mapping_file(G_Eap *eap) { FILE *f; - char buff[PATH_MAX], path[PATH_MAX]; + char buff[MAX_PATH], path[MAX_PATH]; - if ((!eap->icon) || (!eap->name) || (!eap->exec) || (!eap->window_class)) - return; + if ((!eap->icon) || (!eap->name) || (!eap->exec) || (!eap->window_class)) return; snprintf(path, sizeof(path), "%s/MAPPING", get_home()); f = fopen(path, "a+"); if (!f) { - fprintf(stderr, "ERROR: Cannot Open Mapping File\n"); - return; + fprintf(stderr, "ERROR: Cannot Open Mapping File\n"); + return; } - snprintf(buff, sizeof(buff), "%s|!%s|!%s|!%s\n", eap->icon, eap->name, - eap->window_class, eap->exec); + snprintf(buff, sizeof(buff), "%s|!%s|!%s|!%s\n", eap->icon, eap->name, eap->window_class, eap->exec); fwrite(buff, sizeof(char), strlen(buff), f); fclose(f); } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/global.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- global.h 31 Jan 2006 19:10:34 -0000 1.1 +++ global.h 31 Jan 2006 22:04:17 -0000 1.2 @@ -1,6 +1,14 @@ #ifndef GLOBAL_H #define GLOBAL_H +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <unistd.h> +#include <Ecore.h> +#include <Ecore_File.h> + +#define MAX_PATH 4096 #define EFAVDIR "/.e/e/applications/favorite" #define EAPPDIR "/.e/e/applications/all" #define DEFAULTICON PACKAGE_DATA_DIR"/icons/e.png" @@ -8,16 +16,16 @@ typedef struct _G_Eap G_Eap; struct _G_Eap { - char *eap_name; - char *name; - char *generic; - char *comment; - char *categories; - char *exec; - char *icon; - char *startup; - char *type; - char *window_class; + char *eap_name; + char *name; + char *generic; + char *comment; + char *categories; + char *exec; + char *icon; + char *startup; + char *type; + char *window_class; }; /* Function Prototypes */ =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/icons.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- icons.c 31 Jan 2006 19:10:34 -0000 1.1 +++ icons.c 31 Jan 2006 22:04:17 -0000 1.2 @@ -1,58 +1,77 @@ -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> +/* Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ + +/* + * icons.c + * Copyright (C) Christopher Michael 2005 <dev...@co...> + * + * e17genmenu is free software copyrighted by Christopher Michael. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name ``Christopher Michael'' nor the name of any other + * contributor may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * e17genmenu IS PROVIDED BY Christopher Michael ``AS IS'' AND ANY EXPRESS + * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL Christopher Michael OR ANY OTHER CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + #include "global.h" #include "config.h" #include "icons.h" -char * -set_icon(char *token) +char *set_icon(char *token) { #ifdef DEBUG fprintf(stderr, "Setting Icon: %s\n", token); #endif - if (!strcmp(token, "Core")) - return COREICON; - if (!strcmp(token, "Development")) - return PROGRAMMINGICON; - if (!strcmp(token, "Editors")) - return EDITORICON; - if (!strcmp(token, "Edutainment")) - return EDUTAINMENTICON; - if (!strcmp(token, "Games")) - return GAMESICON; - if (!strcmp(token, "Graphics")) - return GRAPHICSICON; - if (!strcmp(token, "Internet")) - return INTERNETICON; - if (!strcmp(token, "Office")) - return OFFICEICON; - if (!strcmp(token, "Programming")) - return PROGRAMMINGICON; - if (!strcmp(token, "Toys")) - return TOYSICON; - if (!strcmp(token, "Utilities")) - return UTILITYICON; - if ((!strcmp(token, "Accessories")) || (!strcmp(token, "Applications"))) - return APPLICATIONICON; - if ((!strcmp(token, "Multimedia")) || (!strcmp(token, "Sound_Video"))) - return MULTIMEDIAICON; - if ((!strcmp(token, "Preferences")) || (!strcmp(token, "Settings"))) - return SETTINGSICON; - if ((!strcmp(token, "System")) || (!strcmp(token, "System_Tools"))) - return SYSTEMICON; - - return DEFAULTICON; + if (strstr(token, "Core") != NULL) return COREICON; + if (strstr(token, "Development") != NULL) return PROGRAMMINGICON; + if (strstr(token, "Editors") != NULL) return EDITORICON; + if (strstr(token, "Edutainment") != NULL) return EDUTAINMENTICON; + if (strstr(token, "Games") != NULL) return GAMESICON; + if (strstr(token, "Graphics") != NULL) return GRAPHICSICON; + if (strstr(token, "Internet") != NULL) return INTERNETICON; + if (strstr(token, "Office") != NULL) return OFFICEICON; + if (strstr(token, "Programming") != NULL) return PROGRAMMINGICON; + if (strstr(token, "Toys") != NULL) return TOYSICON; + if (strstr(token, "Utilities") != NULL) return UTILITYICON; + if ((strstr(token, "Accessories") != NULL) || + (strstr(token, "Applications") != NULL)) + return APPLICATIONICON; + if ((strstr(token, "Multimedia") != NULL) || + (strstr(token, "Sound_Video") != NULL)) + return MULTIMEDIAICON; + if ((strstr(token, "Preferences") != NULL) || + (strstr(token, "Settings") != NULL)) + return SETTINGSICON; + if ((strstr(token, "System") != NULL) || + (strstr(token, "System_Tools") != NULL)) + return SYSTEMICON; + return token; } -char * -find_icon(char *icon) +char *find_icon(char *icon) { - char icn[PATH_MAX], path[PATH_MAX]; + char icn[MAX_PATH], path[MAX_PATH]; char *dir, *icon_size, *icon_theme, *home; - if (icon == NULL) - return DEFAULTICON; + if (icon == NULL) return DEFAULTICON; home = get_home(); @@ -62,27 +81,23 @@ #endif /* Check For Unsupported Extension */ - if ((!strcmp(icon + strlen(icon) - 4, ".svg")) - || (!strcmp(icon + strlen(icon) - 4, ".ico"))) - return DEFAULTICON; - - /* Check For An Extension, Append PNG If Missing */ - if (strrchr(icon, '.') == NULL) - snprintf(icn, sizeof(icn), "%s.png", icon); + if ((!strcmp(icon + strlen(icon) - 4, ".svg")) || (!strcmp(icon + strlen(icon) - 4, ".ico"))) + return DEFAULTICON; + + /* Check For An Extension, Append PNG If Missing */ + if (strrchr(icon, '.') == NULL) snprintf(icn, sizeof(icn), "%s.png", icon); - /* Check If Dir Supplied In Desktop File */ + /* Check If Dir Supplied In Desktop File */ dir = ecore_file_get_dir(icn); - if (!strcmp(dir, icn)) + if (!strcmp(dir, icn) == 0) { - snprintf(path, sizeof(path), "%s", icn); - /* Check Supplied Dir For Icon */ - if (ecore_file_exists(path)) - return strdup(icn); + snprintf(path, MAX_PATH, "%s", icn); + /* Check Supplied Dir For Icon */ + if (ecore_file_exists(path)) return strdup(icn); } - snprintf(path, sizeof(path), PIXMAPDIR "/%s", icn); - if (ecore_file_exists(path)) - return strdup(path); + snprintf(path, MAX_PATH, PIXMAPDIR"/%s", icn); + if (ecore_file_exists(path)) return strdup(path); /* Get Icon Options */ icon_size = get_icon_size(); @@ -91,45 +106,30 @@ /* Check User Supplied Icon Theme */ if (icon_theme != NULL) { - fprintf(stderr, "\tUsing Icon Theme: %s\n", icon_theme); - snprintf(path, sizeof(path), "%s/%s/apps/%s", icon_theme, icon_size, - icn); - if (ecore_file_exists(path)) - return strdup(path); - snprintf(path, sizeof(path), "%s/%s/devices/%s", icon_theme, icon_size, - icn); - if (ecore_file_exists(path)) - return strdup(path); - snprintf(path, sizeof(path), "%s/%s/filesystems/%s", icon_theme, - icon_size, icn); - if (ecore_file_exists(path)) - return strdup(path); + fprintf(stderr, "\tUsing Icon Theme: %s\n", icon_theme); + snprintf(path, MAX_PATH, "%s/%s/apps/%s", icon_theme, icon_size, icn); + if (ecore_file_exists(path)) return strdup(path); + snprintf(path, MAX_PATH, "%s/%s/devices/%s", icon_theme, icon_size, icn); + if (ecore_file_exists(path)) return strdup(path); + snprintf(path, MAX_PATH, "%s/%s/filesystems/%s", icon_theme, icon_size, icn); + if (ecore_file_exists(path)) return strdup(path); } - snprintf(path, sizeof(path), CRYSTALSVGDIR "/%s/apps/%s", icon_size, icn); - if (ecore_file_exists(path)) - return strdup(path); - snprintf(path, sizeof(path), CRYSTALSVGDIR "/%s/devices/%s", icon_size, icn); - if (ecore_file_exists(path)) - return strdup(path); - snprintf(path, sizeof(path), CRYSTALSVGDIR "/%s/filesystems/%s", icon_size, - icn); - if (ecore_file_exists(path)) - return strdup(path); - - /* We Did Not Find the icon in theme dir, - * check default theme before setting a default icon */ - snprintf(path, sizeof(path), ICONDIR "/hicolor/%s/apps/%s", icon_size, icn); - if (ecore_file_exists(path)) - return strdup(path); - snprintf(path, sizeof(path), ICONDIR "/hicolor/%s/devices/%s", icon_size, - icn); - if (ecore_file_exists(path)) - return strdup(path); - snprintf(path, sizeof(path), ICONDIR "/hicolor/%s/filesystems/%s", icon_size, - icn); - if (ecore_file_exists(path)) - return strdup(path); + snprintf(path, MAX_PATH, CRYSTALSVGDIR"/%s/apps/%s", icon_size, icn); + if (ecore_file_exists(path)) return strdup(path); + snprintf(path, MAX_PATH, CRYSTALSVGDIR"/%s/devices/%s", icon_size, icn); + if (ecore_file_exists(path)) return strdup(path); + snprintf(path, MAX_PATH, CRYSTALSVGDIR"/%s/filesystems/%s", icon_size, icn); + if (ecore_file_exists(path)) return strdup(path); + + /* We Did Not Find the icon in theme dir, + check default theme before setting a default icon */ + snprintf(path, MAX_PATH, ICONDIR"/hicolor/%s/apps/%s", icon_size, icn); + if (ecore_file_exists(path)) return strdup(path); + snprintf(path, MAX_PATH, ICONDIR"/hicolor/%s/devices/%s", icon_size, icn); + if (ecore_file_exists(path)) return strdup(path); + snprintf(path, MAX_PATH, ICONDIR"/hicolor/%s/filesystems/%s", icon_size, icn); + if (ecore_file_exists(path)) return strdup(path); return DEFAULTICON; } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/icons.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- icons.h 31 Jan 2006 19:10:34 -0000 1.1 +++ icons.h 31 Jan 2006 22:04:17 -0000 1.2 @@ -1,6 +1,11 @@ #ifndef ICONS_H #define ICONS_H +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include "config.h" + #define PIXMAPDIR "/usr/share/pixmaps" #define ICONDIR "/usr/share/icons" #define CRYSTALSVGDIR "/usr/share/icons/crystalsvg" =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/main.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- main.c 31 Jan 2006 19:10:34 -0000 1.1 +++ main.c 31 Jan 2006 22:04:17 -0000 1.2 @@ -1,12 +1,41 @@ -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> -#include <limits.h> -#include "config.h" +/* Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ + +/* + * main.c + * Copyright (C) Christopher Michael 2005 <dev...@co...> + * + * e17genmenu is free software copyrighted by Christopher Michael. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name ``Christopher Michael'' nor the name of any other + * contributor may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * e17genmenu IS PROVIDED BY Christopher Michael ``AS IS'' AND ANY EXPRESS + * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL Christopher Michael OR ANY OTHER CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + #include "global.h" +#include "config.h" #include "menus.h" #include "sort.h" +#include "E_Menu.h" /* Function Prototypes */ void _e17genmenu_backup(void); @@ -16,14 +45,15 @@ void _e17genmenu_shutdown(void); /* Functions */ -void -_e17genmenu_backup() +void _e17genmenu_backup() { +#ifdef DEBUG + fprintf(stderr, "Backing up Existing Eaps...\n"); +#endif backup_eaps(); } -void -_e17genmenu_help() +void _e17genmenu_help() { printf("e17genmenu - Generate Enlightenment DR17 Menus\n"); printf("Usage: e17genmenu <-options>\n"); @@ -31,7 +61,7 @@ printf(" -b | --backup\tBackup Existing Eaps First\n"); printf(" -s=<size> | --icon-size=<size>\tUse <size> icons. (48x48)\n"); printf(" -t=<theme> | --icon-theme=<theme>\tUse <theme> for icons\n"); - printf(" -c | --comp\tUse Compression For Eap Icons\n"); + printf(" -l | --lossy\tUse Lossy Compression For Eaps\n"); printf(" -d=<dir> | --desktop-dir=<dir>\tCreate eaps for .desktop files in <dir>\n"); printf(" -o | --overwrite\tOverwrite Eaps\n"); printf(" -m | --mapping\tGenerate Mapping File\n"); @@ -43,67 +73,63 @@ exit(0); } -void -_e17genmenu_parseargs(int argc, char **argv) +void _e17genmenu_parseargs(int argc, char **argv) { int i; for (i = 1; i < argc; i++) { - if (argv[i]) - { - if ((!strcmp(argv[i], "--help")) || (!strcmp(argv[i], "-h"))) - _e17genmenu_help(); - if ((!strcmp(argv[i], "--backup")) || (!strcmp(argv[i], "-b"))) - _e17genmenu_backup(); - } + if (argv[i]) + { + if ((strstr(argv[i], "--help")) || (strstr(argv[i], "-h"))) + _e17genmenu_help(); + if ((strstr(argv[i], "--backup")) || (strstr(argv[i], "-b"))) + _e17genmenu_backup(); + } } } -void -_e17genmenu_init() +void _e17genmenu_init() { - char path[PATH_MAX]; + char path[MAX_PATH]; - /* Setup Ecore */ + /* Setup Ecore */ if (!ecore_init()) { - fprintf(stderr, "ERROR: Unable to init ecore, exiting\n"); - exit(-1); + fprintf(stderr, "ERROR: Unable to init ecore, exiting\n"); + exit(-1); } - /* Setup Ecore_File */ + /* Setup Ecore_File */ if (!ecore_file_init()) { - fprintf(stderr, "ERROR: Unable to init ecore_file, exiting\n"); - ecore_shutdown(); - exit(-1); + fprintf(stderr, "ERROR: Unable to init ecore_file, exiting\n"); + ecore_shutdown(); + exit(-1); } /* Setup Eet */ if (!eet_init()) { - fprintf(stderr, "ERROR: Unable To Init Eet !\n"); - ecore_file_shutdown(); - ecore_shutdown(); - exit(-1); + fprintf(stderr, "ERROR: Unable To Init Eet !\n"); + ecore_file_shutdown(); + ecore_shutdown(); + exit(-1); } - /* Check That Dir All Exists */ - snprintf(path, sizeof(path), "%s" EAPPDIR, get_home()); + /* Check That Dir All Exists */ + snprintf(path, sizeof(path), "%s"EAPPDIR, get_home()); if (!ecore_file_exists(path)) { - fprintf(stderr, "ERROR: %s doesn't exist. Where are the eapps?\n", - path); - eet_shutdown(); - ecore_file_shutdown(); - ecore_shutdown(); - exit(-1); + fprintf(stderr, "ERROR: %s doesn't exist. Where are the eapps?\n", path); + eet_shutdown(); + ecore_file_shutdown(); + ecore_shutdown(); + exit(-1); } } -void -_e17genmenu_shutdown() +void _e17genmenu_shutdown() { #ifdef DEBUG fprintf(stderr, "Finished\n"); @@ -114,18 +140,27 @@ return; } -int -main(int argc, char **argv) +int main(int argc, char **argv) { - char path[PATH_MAX]; + char path[MAX_PATH]; + char *tmp; + int ret; + + //tmp = e_gen_menu_category_get("System"); + //fprintf(stderr, "Tmp: %s\n", tmp); + ret = e_menu_generate("/usr/share/applications"); + fprintf(stderr, "Ret: %d\n", ret); + exit(0); + + /* Init E Stuff */ _e17genmenu_init(); - /* Parse Arguments */ + /* Parse Arguments */ _e17genmenu_parseargs(argc, argv); - /* Set App Args */ + /* Set App Args */ ecore_app_args_set(argc, (const char **)argv); /* Start Making Menus */ @@ -136,12 +171,14 @@ sort_menus(); /* Update E Cache */ - snprintf(path, sizeof(path), "enlightenment_eapp_cache_gen %s" EAPPDIR " -r", - get_home()); +#ifdef DEBUG + fprintf(stderr, "Regenerating Eapp Cache...\n"); +#endif + snprintf(path, sizeof(path), "enlightenment_eapp_cache_gen %s"EAPPDIR" -r", get_home()); system(path); /* Shutdown */ _e17genmenu_shutdown(); - return (0); + return(0); } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/menus.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- menus.c 31 Jan 2006 19:10:34 -0000 1.1 +++ menus.c 31 Jan 2006 22:04:17 -0000 1.2 @@ -1,97 +1,113 @@ -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <limits.h> +/* Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ + +/* + * menus.c + * Copyright (C) Christopher Michael 2005 <dev...@co...> + * + * e17genmenu is free software copyrighted by Christopher Michael. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name ``Christopher Michael'' nor the name of any other + * contributor may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * e17genmenu IS PROVIDED BY Christopher Michael ``AS IS'' AND ANY EXPRESS + * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL Christopher Michael OR ANY OTHER CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + #include "global.h" #include "config.h" #include "parse.h" #include "menus.h" -void -make_menus() +void make_menus() { char *d; d = get_desktop_dir(); - if (d) - check_for_dirs(strdup(d)); - else + if (d) check_for_dirs(strdup(d)); + + if (!d) { - /* Check desktop files in these directories */ - check_for_dirs(GNOME_DIRS); - check_for_dirs(KDE_DIRS); - check_for_dirs(DEBIAN_DIRS); + /* Check desktop files in these directories */ + check_for_dirs(GNOME_DIRS); + check_for_dirs(KDE_DIRS); + check_for_dirs(DEBIAN_DIRS); } - if (d) - free(d); } -void -check_for_dirs(char *path) +void check_for_dirs(char *path) { char *dir; - char dirs[PATH_MAX]; + char dirs[MAX_PATH]; snprintf(dirs, sizeof(dirs), path); dir = strdup(path); if (dirs) { - if (strstr(dirs, ":")) - dir = strtok(dirs, ":"); + if (strstr(dirs, ":")) dir = strtok(dirs, ":"); } - if (!dir) - return; + if (!dir) return; while (dir) { - fprintf(stderr, "\nChecking For %s...\n", dir); - if (ecore_file_exists(dir)) - check_for_files(strdup(dir)); - if (!strstr(dirs, ":")) - break; - dir = strtok(NULL, ":"); +#ifdef DEBUG + fprintf(stderr, "\nChecking For %s...\n", dir); +#endif + if (ecore_file_exists(dir)) + check_for_files(strdup(dir)); + + if (!strstr(dirs, ":")) break; + dir = strtok(NULL, ":"); } - if (dir) - free(dir); } -void -check_for_files(char *dir) +void check_for_files(char *dir) { char *file; - char path[PATH_MAX]; + char path[MAX_PATH]; Ecore_List *files = NULL; +#ifdef DEBUG fprintf(stderr, "Checking For Files In %s\n", dir); +#endif files = ecore_file_ls(dir); ecore_list_goto_first(files); while ((file = ecore_list_next(files)) != NULL) { - snprintf(path, sizeof(path), "%s/%s", dir, file); - if (!ecore_file_is_dir(path)) - { - if (!strcmp(file + strlen(file) - 8, ".desktop")) - { - if (!strcmp(file, "panel_appearance.desktop")) - return; - if (!strcmp(file, "ktip.desktop")) - return; - if (!strcmp(file, "kalarm.desktop")) - return; - /* Parse Desktop File */ - parse_desktop_file(strdup(path)); - } - else if (strstr(DEBIAN_DIRS, dir) != NULL) - { - /* Parse Debian File */ - if (strstr(file, "README") == NULL) - parse_debian_file(strdup(path)); - } - } + snprintf(path, sizeof(path), "%s/%s", dir, file); + if (!ecore_file_is_dir(path)) + { + if (!strcmp(file + strlen(file) - 8, ".desktop")) + { + if (!strcmp(file, "panel_appearance.desktop")) return; + if (!strcmp(file, "ktip.desktop")) return; + if (!strcmp(file, "kalarm.desktop")) return; + /* Parse Desktop File */ + parse_desktop_file(strdup(path)); + } + else if (strstr(DEBIAN_DIRS, dir) != NULL) + { + /* Parse Debian File */ + if (strstr(file, "README") == NULL) parse_debian_file(strdup(path)); + } + } } - if (file) - free(file); - - if (files) - ecore_list_destroy(files); + if (files) ecore_list_destroy(files); } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/menus.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- menus.h 31 Jan 2006 19:10:34 -0000 1.1 +++ menus.h 31 Jan 2006 22:04:17 -0000 1.2 @@ -1,10 +1,14 @@ #ifndef MENUS_H #define MENUS_H +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> + /* Desktop File Locations */ #define GNOME_DIRS "/usr/share/applications:/usr/share/gnome/apps" #define KDE_DIRS "/usr/share/applications/kde:/usr/share/applnk" -#define DEBIAN_DIRS "/usr/share/menu:/usr/lib/menu:/etc/menu" +#define DEBIAN_DIRS "/usr/share/menu:/usr/lib/menu:/usr/share/menu/default:/etc/menu" /* Function Prototypes */ void make_menus(void); =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/order.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- order.c 31 Jan 2006 19:10:34 -0000 1.1 +++ order.c 31 Jan 2006 22:04:17 -0000 1.2 @@ -1,33 +1,54 @@ -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <limits.h> +/* Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ + +/* + * order.c + * Copyright (C) Christopher Michael 2005 <dev...@co...> + * + * e17genmenu is free software copyrighted by Christopher Michael. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name ``Christopher Michael'' nor the name of any other + * contributor may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * e17genmenu IS PROVIDED BY Christopher Michael ``AS IS'' AND ANY EXPRESS + * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL Christopher Michael OR ANY OTHER CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + #include "config.h" #include "global.h" #include "eaps.h" #include "order.h" -int -search_list(Ecore_List *list, char *search) +int search_list(Ecore_List *list, char *search) { char *tmp; - if (!search) - return 0; - if (search == NULL) - return 0; - ecore_list_goto_first(list); while ((tmp = (char *)ecore_list_next(list)) != NULL) { - if (!strcmp(tmp, search)) - return 1; + if (!strcmp(tmp, search)) return 1; } return 0; } -void -create_order(char *path) +void create_order(char *path) { FILE *f; @@ -38,39 +59,33 @@ f = fopen(path, "w"); if (!f) { - fprintf(stderr, "ERROR: Cannot Create Order File %s\n", path); - exit(-1); + fprintf(stderr, "ERROR: Cannot Create Order File %s\n", path); + exit(-1); } fclose(f); } -void -modify_order(char *path, char *entry) +void modify_order(char *path, char *entry) { int length, i; char *buff, *cat; - char buffer[PATH_MAX], path2[PATH_MAX], t[PATH_MAX]; + char buffer[MAX_PATH], path2[MAX_PATH], t[MAX_PATH]; FILE *f; Ecore_List *list = NULL; - if (!entry) - return; - if (entry == NULL) - return; - if (!ecore_file_exists(path)) { - ecore_file_mkpath(path); - cat = strrchr(path, '/'); - snprintf(t, sizeof(t), "%s", cat); - if (t[0] == '/') - { - for (i = 0; i < strlen(t); i++) - { - t[i] = t[i + 1]; - } - } - create_dir_eap(path, t); + ecore_file_mkpath(path); + cat = strrchr(path, '/'); + snprintf(t, sizeof(t), "%s", cat); + if (t[0] == '/') + { + for (i = 0; i < strlen(t); i++) + { + t[i] = t[i+1]; + } + } + create_dir_eap(path, t); } snprintf(path2, sizeof(path2), "%s/.order", path); @@ -79,57 +94,56 @@ fprintf(stderr, "Modifying Order File %s\n", path2); #endif - entry = (char *)ecore_file_get_file(entry); + entry = ecore_file_get_file(entry); list = ecore_list_new(); - /* Stat .order; Create If Not Found */ + /* Stat .order; Create If Not Found */ if (!ecore_file_exists(path2)) { - create_order(path2); - /* If We Had To Create This Order Then Just Add The Entry */ - if (!ecore_list_append(list, entry)) - { - fprintf(stderr, "ERROR: Ecore List Append Failed !!\n"); - return; - } + create_order(path2); + /* If We Had To Create This Order Then Just Add The Entry */ + if (!ecore_list_append(list, entry)) + { + fprintf(stderr, "ERROR: Ecore List Append Failed !!\n"); + return; + } } else { - /* Open .order File For Parsing */ - f = fopen(path2, "r"); - if (!f) - { - fprintf(stderr, "ERROR: Cannot Open Order File %s \n", path2); - exit(-1); - } - - /* Read All Entries From Existing Order File, Store In List For Sorting */ - while (fgets(buffer, sizeof(buffer), f) != NULL) - { - /* Strip New Line Char */ - if (buffer[(length = strlen(buffer) - 1)] == '\n') - buffer[length] = '\0'; - if (!search_list(list, strdup(buffer))) - { - if (!ecore_list_append(list, strdup(buffer))) - { - fprintf(stderr, "ERROR: Ecore List Append Failed !!\n"); - return; - } - } - } - fclose(f); - buffer[0] = (char)0; - - /* Add This Entry To List Of Existing ? */ - if (!search_list(list, entry)) - { - if (!ecore_list_append(list, entry)) - { - fprintf(stderr, "ERROR: Ecore List Append Failed !!\n"); - return; - } - } + /* Open .order File For Parsing */ + f=fopen(path2, "r"); + if (!f) + { + fprintf(stderr, "ERROR: Cannot Open Order File %s \n", path2); + exit(-1); + } + + /* Read All Entries From Existing Order File, Store In List For Sorting*/ + while (fgets(buffer, sizeof(buffer), f) != NULL) + { + /* Strip New Line Char */ + if (buffer[(length = strlen(buffer) - 1)] == '\n') buffer[length] = '\0'; + if (!search_list(list, strdup(buffer))) + { + if (!ecore_list_append(list, strdup(buffer))) + { + fprintf(stderr, "ERROR: Ecore List Append Failed !!\n"); + return; + } + } + } + fclose(f); + buffer[0] = (char) 0; + + /* Add This Entry To List Of Existing ? */ + if (!search_list(list, entry)) + { + if (!ecore_list_append(list, entry)) + { + fprintf(stderr, "ERROR: Ecore List Append Failed !!\n"); + return; + } + } } #ifdef DEBUG @@ -139,22 +153,19 @@ f = fopen(path2, "w"); if (!f) { - fprintf(stderr, "ERROR: Cannot Open Order File %s \n", path2); - if (list) - ecore_list_destroy(list); - return; + fprintf(stderr, "ERROR: Cannot Open Order File %s \n", path2); + if (list) ecore_list_destroy(list); + return; } ecore_list_goto_first(list); while ((buff = ecore_list_next(list)) != NULL) { - snprintf(buffer, sizeof(buffer), "%s\n", buff); - if (buffer != NULL) - fwrite(buffer, sizeof(char), strlen(buffer), f); + snprintf(buffer, sizeof(buffer), "%s\n", buff); + if (buffer != NULL) fwrite(buffer, sizeof(char), strlen(buffer), f); } fclose(f); - if (list) - ecore_list_destroy(list); + if (list) ecore_list_destroy(list); return; } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/order.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- order.h 31 Jan 2006 19:10:34 -0000 1.1 +++ order.h 31 Jan 2006 22:04:17 -0000 1.2 @@ -1,8 +1,12 @@ #ifndef ORDER_H #define ORDER_H +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> + int search_list(Ecore_List *list, char *search); void create_order(char *path); -void modify_order(char *path, char *entry); +void modify_order (char *path, char *entry); #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/parse.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- parse.c 31 Jan 2006 19:10:34 -0000 1.1 +++ parse.c 31 Jan 2006 22:04:17 -0000 1.2 @@ -1,7 +1,36 @@ -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <limits.h> +/* Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ + +/* + * parse.c + * Copyright (C) Christopher Michael 2005 <dev...@co...> + * + * e17genmenu is free software copyrighted by Christopher Michael. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name ``Christopher Michael'' nor the name of any other + * contributor may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * e17genmenu IS PROVIDED BY Christopher Michael ``AS IS'' AND ANY EXPRESS + * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY... [truncated message content] |
From: <enl...@li...> - 2006-02-01 09:13:13
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/src/bin/e17genmenu/src/bin Modified Files: category.c eaps.c global.c icons.c main.c menus.c order.c parse.c sort.c Log Message: Remove old license info from tops of C files. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/category.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- category.c 31 Jan 2006 22:04:17 -0000 1.2 +++ category.c 1 Feb 2006 09:13:05 -0000 1.3 @@ -1,36 +1,3 @@ -/* Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ - -/* - * category.c - * Copyright (C) Christopher Michael 2005 <dev...@co...> - * - * e17genmenu is free software copyrighted by Christopher Michael. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name ``Christopher Michael'' nor the name of any other - * contributor may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * e17genmenu IS PROVIDED BY Christopher Michael ``AS IS'' AND ANY EXPRESS - * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL Christopher Michael OR ANY OTHER CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - #include "config.h" #include "global.h" #include "category.h" =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/eaps.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- eaps.c 31 Jan 2006 22:04:17 -0000 1.2 +++ eaps.c 1 Feb 2006 09:13:05 -0000 1.3 @@ -1,36 +1,3 @@ -/* Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ - -/* - * eaps.c - * Copyright (C) Christopher Michael 2005 <dev...@co...> - * - * e17genmenu is free software copyrighted by Christopher Michael. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name ``Christopher Michael'' nor the name of any other - * contributor may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * e17genmenu IS PROVIDED BY Christopher Michael ``AS IS'' AND ANY EXPRESS - * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL Christopher Michael OR ANY OTHER CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - #include "global.h" #include "config.h" #include "icons.h" =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/global.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- global.c 31 Jan 2006 22:04:17 -0000 1.2 +++ global.c 1 Feb 2006 09:13:05 -0000 1.3 @@ -1,36 +1,3 @@ -/* Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ - -/* - * global.c - * Copyright (C) Christopher Michael 2005 <dev...@co...> - * - * e17genmenu is free software copyrighted by Christopher Michael. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name ``Christopher Michael'' nor the name of any other - * contributor may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * e17genmenu IS PROVIDED BY Christopher Michael ``AS IS'' AND ANY EXPRESS - * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL Christopher Michael OR ANY OTHER CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - #include "global.h" #include "config.h" =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/icons.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- icons.c 31 Jan 2006 22:04:17 -0000 1.2 +++ icons.c 1 Feb 2006 09:13:05 -0000 1.3 @@ -1,36 +1,3 @@ -/* Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ - -/* - * icons.c - * Copyright (C) Christopher Michael 2005 <dev...@co...> - * - * e17genmenu is free software copyrighted by Christopher Michael. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name ``Christopher Michael'' nor the name of any other - * contributor may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * e17genmenu IS PROVIDED BY Christopher Michael ``AS IS'' AND ANY EXPRESS - * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL Christopher Michael OR ANY OTHER CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - #include "global.h" #include "config.h" #include "icons.h" =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/main.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- main.c 31 Jan 2006 22:04:17 -0000 1.2 +++ main.c 1 Feb 2006 09:13:05 -0000 1.3 @@ -1,41 +1,7 @@ -/* Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ - -/* - * main.c - * Copyright (C) Christopher Michael 2005 <dev...@co...> - * - * e17genmenu is free software copyrighted by Christopher Michael. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name ``Christopher Michael'' nor the name of any other - * contributor may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * e17genmenu IS PROVIDED BY Christopher Michael ``AS IS'' AND ANY EXPRESS - * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL Christopher Michael OR ANY OTHER CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - #include "global.h" #include "config.h" #include "menus.h" #include "sort.h" -#include "E_Menu.h" /* Function Prototypes */ void _e17genmenu_backup(void); @@ -145,14 +111,7 @@ char path[MAX_PATH]; char *tmp; - int ret; - - //tmp = e_gen_menu_category_get("System"); - //fprintf(stderr, "Tmp: %s\n", tmp); - ret = e_menu_generate("/usr/share/applications"); - fprintf(stderr, "Ret: %d\n", ret); - exit(0); - + int ret; /* Init E Stuff */ _e17genmenu_init(); =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/menus.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- menus.c 31 Jan 2006 22:04:17 -0000 1.2 +++ menus.c 1 Feb 2006 09:13:05 -0000 1.3 @@ -1,36 +1,3 @@ -/* Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ - -/* - * menus.c - * Copyright (C) Christopher Michael 2005 <dev...@co...> - * - * e17genmenu is free software copyrighted by Christopher Michael. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name ``Christopher Michael'' nor the name of any other - * contributor may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * e17genmenu IS PROVIDED BY Christopher Michael ``AS IS'' AND ANY EXPRESS - * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL Christopher Michael OR ANY OTHER CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - #include "global.h" #include "config.h" #include "parse.h" =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/order.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- order.c 31 Jan 2006 22:04:17 -0000 1.2 +++ order.c 1 Feb 2006 09:13:05 -0000 1.3 @@ -1,36 +1,3 @@ -/* Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ - -/* - * order.c - * Copyright (C) Christopher Michael 2005 <dev...@co...> - * - * e17genmenu is free software copyrighted by Christopher Michael. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name ``Christopher Michael'' nor the name of any other - * contributor may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * e17genmenu IS PROVIDED BY Christopher Michael ``AS IS'' AND ANY EXPRESS - * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL Christopher Michael OR ANY OTHER CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - #include "config.h" #include "global.h" #include "eaps.h" =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/parse.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- parse.c 31 Jan 2006 22:04:17 -0000 1.2 +++ parse.c 1 Feb 2006 09:13:05 -0000 1.3 @@ -1,36 +1,3 @@ -/* Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ - -/* - * parse.c - * Copyright (C) Christopher Michael 2005 <dev...@co...> - * - * e17genmenu is free software copyrighted by Christopher Michael. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name ``Christopher Michael'' nor the name of any other - * contributor may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * e17genmenu IS PROVIDED BY Christopher Michael ``AS IS'' AND ANY EXPRESS - * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL Christopher Michael OR ANY OTHER CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - #include "global.h" #include "config.h" #include "category.h" =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/sort.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- sort.c 31 Jan 2006 22:04:17 -0000 1.2 +++ sort.c 1 Feb 2006 09:13:05 -0000 1.3 @@ -1,36 +1,3 @@ -/* Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ - -/* - * sort.c - * Copyright (C) Christopher Michael 2005 <dev...@co...> - * - * e17genmenu is free software copyrighted by Christopher Michael. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name ``Christopher Michael'' nor the name of any other - * contributor may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * e17genmenu IS PROVIDED BY Christopher Michael ``AS IS'' AND ANY EXPRESS - * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL Christopher Michael OR ANY OTHER CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - #include "config.h" #include "global.h" #include "order.h" |
From: <enl...@li...> - 2006-02-01 09:41:30
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/src/bin/e17genmenu/src/bin Modified Files: category.c eaps.c global.c icons.c main.c menus.c order.c parse.c sort.c Log Message: Code formatting. Some added frees. Cleanup of some strstr sutffs. Full rewrite/rework starts tomorrow :) =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/category.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- category.c 1 Feb 2006 09:13:05 -0000 1.3 +++ category.c 1 Feb 2006 09:41:25 -0000 1.4 @@ -1,92 +1,120 @@ #include "config.h" #include "global.h" #include "category.h" + char * +find_category(char *category) +{ + char *token, *cat; + + cat = NULL; + token = strtok(strdup(CATEGORIES), ":"); + while (token) + + { + + /* Check If this token is in supplied $t */ + if (strstr(category, token) != NULL) + + { + if (strstr(token, "Development") != NULL) + + { + cat = "Programming"; + } + + else if (strstr(token, "Game") != NULL) + + { + cat = "Games"; + } + + else if ((strstr(token, "AudioVideo") != NULL) || + (strstr(token, "Sound") != NULL) || + (strstr(token, "Video") != NULL) || + (strstr(token, "Multimedia") != NULL)) + + { + cat = "Multimedia"; + } + + else if (strstr(token, "Net") != NULL) + + { + cat = "Internet"; + } + + else if (strstr(token, "Education") != NULL) + + { + cat = "Edutainment"; + } + + else if (strstr(token, "Amusement") != NULL) + + { + cat = "Toys"; + } + + else if (strstr(token, "System") != NULL) + + { + cat = "System"; + } + + else if ((strstr(token, "Shells") != NULL) || + (strstr(token, "Utility") != NULL) || + (strstr(token, "Tools") != NULL)) + + { + cat = "Utilities"; + } + + else if ((strstr(token, "Viewers") != NULL) || + (strstr(token, "Editors") != NULL) || + (strstr(token, "Text") != NULL)) + + { + cat = "Editors"; + } + + else if (strstr(token, "Graphics") != NULL) + + { + cat = "Graphics"; + } + + else if ((strstr(token, "WindowManagers") != NULL) || + (strstr(token, "Core") != NULL)) + + { + cat = "Core"; + } + + else if ((strstr(token, "Settings") != NULL) || + (strstr(token, "Accessibility") != NULL)) + + { + cat = "Settings"; + } + + else if (strstr(token, "Office") != NULL) + + { + cat = "Office"; + } + + else + + { + cat = "Core"; + } + } + token = strtok(NULL, ":"); + } + if (token) + free(token); + if (!cat) + cat = "Core"; + return strdup(cat); + } -char *find_category(char *category) -{ - char cats[MAX_PATH]; - char *token, *cat; - - cat = NULL; - snprintf(cats, sizeof(cats), "%s", CATEGORIES); - token = strtok(cats,":"); - while (token) - { - /* Check If this token is in supplied $t */ - if (strstr(category, token) != NULL) - { - if (strstr(token,"Development") != NULL) - { - cat = "Programming"; - } - else if ((strstr(token,"Game") != NULL) || - (strstr(token, "Games") != NULL)) - { - cat = "Games"; - } - else if ((strstr(token,"AudioVideo") != NULL) || - (strstr(token, "Sound") != NULL) || - (strstr(token, "Video") != NULL) || - (strstr(token, "Multimedia") != NULL)) - { - cat = "Multimedia"; - } - else if ((strstr(token,"Network") != NULL) || - (strstr(token, "Net") != NULL)) - { - cat = "Internet"; - } - else if (strstr(token,"Education") != NULL) - { - cat = "Edutainment"; - } - else if (strstr(token,"Amusement") != NULL) - { - cat = "Toys"; - } - else if (strstr(token,"System") != NULL) - { - cat = "System"; - } - else if ((strstr(token,"Shells") != NULL) || - (strstr(token, "XShells") != NULL) || - (strstr(token, "Utility") != NULL) || - (strstr(token, "Tools") != NULL)) - { - cat = "Utilities"; - } - else if ((strstr(token,"Viewers") != NULL) || - (strstr(token, "Editors") != NULL) || - (strstr(token, "TextEditor") != NULL) || - (strstr(token, "Text") != NULL)) - { - cat = "Editors"; - } - else if (strstr(token,"Graphics") != NULL) - { - cat = "Graphics"; - } - else if ((strstr(token,"WindowManagers") != NULL) || - (strstr(token, "Core") != NULL)) - { - cat = "Core"; - } - else if ((strstr(token,"Settings") != NULL) || - (strstr(token, "Accessibility") != NULL)) - { - cat = "Settings"; - } - else if (strstr(token,"Office") != NULL) - { - cat = "Office"; - } - else - { - cat = "Core"; - } - } - token = strtok(NULL, ":"); - } - if (!cat) cat = "Core"; - return strdup(cat); -} =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/eaps.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- eaps.c 1 Feb 2006 09:13:05 -0000 1.3 +++ eaps.c 1 Feb 2006 09:41:25 -0000 1.4 @@ -4,7 +4,8 @@ #include "eaps.h" /* Create a .directory.eap for this dir */ -void create_dir_eap(char *path, char *cat) +void +create_dir_eap(char *path, char *cat) { char path2[MAX_PATH]; char *icon; @@ -12,33 +13,37 @@ snprintf(path2, sizeof(path2), "%s/.directory.eap", path); if (!ecore_file_exists(path2)) { - icon = set_icon(cat); - if (!icon) - { - fprintf(stderr, "ERROR: Cannot Find Icon For %s\n", cat); - return; - } - write_icon(path2, icon); - write_eap(path2, "app/info/name", cat); + icon = set_icon(cat); + if (!icon) + { + fprintf(stderr, "ERROR: Cannot Find Icon For %s\n", cat); + return; + } + write_icon(path2, icon); + write_eap(path2, "app/info/name", cat); } } -char *get_window_class(char *file) +char * +get_window_class(char *file) { char *tmp, *cls; int i; Eet_File *ef; - if (!ecore_file_exists(file)) return NULL; + if (!ecore_file_exists(file)) + return NULL; ef = eet_open(file, EET_FILE_MODE_READ); - if (!ef) return NULL; + if (!ef) + return NULL; tmp = eet_read(ef, "app/window/class", &i); if (!tmp) { - if (ef) eet_close(ef); - return NULL; + if (ef) + eet_close(ef); + return NULL; } /* Allocate string for window class */ @@ -46,14 +51,17 @@ memcpy(cls, tmp, i); cls[i] = 0; - free(tmp); + if (tmp) + free(tmp); eet_close(ef); - if (cls != NULL) return strdup(cls); + if (cls != NULL) + return strdup(cls); return NULL; } -void write_icon(char *f, char *i) +void +write_icon(char *f, char *i) { Engrave_File *eet; Engrave_Image *image; @@ -66,23 +74,22 @@ #ifdef DEBUG fprintf(stderr, "\tWriting Icon %s\n", i); #endif - if (!i) ifile = ecore_file_get_file(DEFAULTICON); - if (i) ifile = ecore_file_get_file(i); + if (!i) + ifile = ecore_file_get_file(DEFAULTICON); + if (i) + ifile = ecore_file_get_file(i); idir = ecore_file_get_dir(i); - + eet = engrave_file_new(); engrave_file_image_dir_set(eet, idir); icomp = get_icon_compression(); if (!strcmp(icomp, "COMP")) - { - image = engrave_image_new(ifile, ENGRAVE_IMAGE_TYPE_COMP, 0); - } + image = engrave_image_new(ifile, ENGRAVE_IMAGE_TYPE_COMP, 0); else - { - image = engrave_image_new(ifile, ENGRAVE_IMAGE_TYPE_LOSSY, 0); - } + image = engrave_image_new(ifile, ENGRAVE_IMAGE_TYPE_LOSSY, 0); + engrave_file_image_add(eet, image); grp = engrave_group_new(); @@ -103,9 +110,17 @@ engrave_edj_output(eet, f); engrave_file_free(eet); + + if (icomp) + free(icomp); + if (idir) + free(idir); + if (ifile) + free(ifile); } -void write_eap(char *file, char *section, char *value) +void +write_eap(char *file, char *section, char *value) { int i; Eet_File *ef; @@ -115,25 +130,31 @@ #endif ef = eet_open(file, EET_FILE_MODE_READ_WRITE); - if (!ef) return; + if (!ef) + return; if (!strcmp(section, "app/info/startup_notify")) { - if (!value) eet_delete(ef, section); - if (value) - { - i = atoi(value); - eet_write(ef, strdup(section), &i, 1, 0); - } + if (!value) + eet_delete(ef, section); + if (value) + { + i = atoi(value); + eet_write(ef, strdup(section), &i, 1, 0); + } } else { - if (!value) eet_delete(ef, section); - if (value) - { - i = eet_write(ef, strdup(section), strdup(value), strlen(value), 0); - if (i == 0) fprintf(stderr, "Failed To Write %s To %s Of %s\n", value, section, file); - } + if (!value) + eet_delete(ef, section); + if (value) + { + i = eet_write(ef, strdup(section), strdup(value), strlen(value), + 0); + if (i == 0) + fprintf(stderr, "Failed To Write %s To %s Of %s\n", value, + section, file); + } } eet_close(ef); } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/global.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- global.c 1 Feb 2006 09:13:05 -0000 1.3 +++ global.c 1 Feb 2006 09:41:25 -0000 1.4 @@ -2,144 +2,165 @@ #include "config.h" /* Functions */ -char *get_home() +char * +get_home() { char *d; int length; char home[MAX_PATH]; - /* Get Home Dir, check for trailing '/', strip it */ + /* Get Home Dir, check for trailing '/', strip it */ snprintf(home, sizeof(home), "%s", getenv("HOME")); d = strrchr(home, '/'); if (d) { - if (strlen(d) == 1) - { - if (home[(length = strlen(home) - 1)] == '/') home[length] = '\0'; - } + if (strlen(d) == 1) + { + if (home[(length = strlen(home) - 1)] == '/') + home[length] = '\0'; + } } + if (d) + free(d); return strdup(home); } -char *get_desktop_dir() +char * +get_desktop_dir() { int i, argc; char **argv; char *c; ecore_app_args_get(&argc, &argv); - for(i = 1; i < argc; i++) + for (i = 1; i < argc; i++) { - if ((strncmp(argv[i], "-d", 2) == 0) || - (strncmp(argv[i], "--desktop-dir", 13) == 0)) - { - c = strstr(argv[i], "="); - c = strtok(c, "="); - if (c) return strdup(c); - fprintf(stderr, "You must specify a directory for the %s argument\n", argv[i]); - exit(1); - } + if ((strncmp(argv[i], "-d", 2) == 0) || + (strncmp(argv[i], "--desktop-dir", 13) == 0)) + { + c = strstr(argv[i], "="); + c = strtok(c, "="); + if (c) + return strdup(c); + fprintf(stderr, + "You must specify a directory for the %s argument\n", + argv[i]); + exit(1); + } } return NULL; } -int get_overwrite() +int +get_overwrite() { int i, argc; char **argv; ecore_app_args_get(&argc, &argv); - for(i = 1; i < argc; i++) + for (i = 1; i < argc; i++) { - if ((!strcmp(argv[i], "-o")) || (!strcmp(argv[i], "--overwrite"))) return 1; + if ((!strcmp(argv[i], "-o")) || (!strcmp(argv[i], "--overwrite"))) + return 1; } return 0; } -char *get_icon_compression() +char * +get_icon_compression() { int i, argc; char **argv; ecore_app_args_get(&argc, &argv); - for(i = 1; i < argc; i++) + for (i = 1; i < argc; i++) { - if ((strncmp(argv[i], "--lossy", 11) == 0) || (strncmp(argv[i], "-l", 2) == 0)) - return strdup("LOSSY"); + if ((strncmp(argv[i], "--lossy", 11) == 0) + || (strncmp(argv[i], "-l", 2) == 0)) + return strdup("LOSSY"); } return strdup("COMP"); } -char *get_eap_name(char *file) +char * +get_eap_name(char *file) { char *tmp, *tmp2; char eap[MAX_PATH]; tmp2 = ecore_file_get_file(strdup(file)); - if (!tmp2) return NULL; + if (!tmp2) + return NULL; tmp = strdup(tmp2); if (strrchr(tmp2, '.') != NULL) { - tmp = strtok(tmp2, "."); - snprintf(eap, sizeof(eap), "%s.eap", tmp); - return strdup(eap); + tmp = strtok(tmp2, "."); + snprintf(eap, sizeof(eap), "%s.eap", tmp); + return strdup(eap); } return NULL; } -char *get_icon_size() +char * +get_icon_size() { int i, argc; char **argv; char *c; ecore_app_args_get(&argc, &argv); - for(i = 1; i < argc; i++) + for (i = 1; i < argc; i++) { - if ((strncmp(argv[i], "--icon-size", 11) == 0) || (strncmp(argv[i], "-s", 2) == 0)) - { - c = strstr(argv[i], "="); - c = strtok(c, "="); - return strdup(c); - } + if ((strncmp(argv[i], "--icon-size", 11) == 0) + || (strncmp(argv[i], "-s", 2) == 0)) + { + c = strstr(argv[i], "="); + c = strtok(c, "="); + return strdup(c); + } } return "48x48"; } -char *get_icon_theme() +char * +get_icon_theme() { int i, argc; char **argv; char *c; ecore_app_args_get(&argc, &argv); - for(i = 1; i < argc; i++) + for (i = 1; i < argc; i++) { - if ((strncmp(argv[i], "--icon-theme", 12) == 0) || (strncmp(argv[i], "-t", 2) == 0)) - { - c = strstr(argv[i], "="); - c = strtok(c, "="); - return strdup(c); - } + if ((strncmp(argv[i], "--icon-theme", 12) == 0) + || (strncmp(argv[i], "-t", 2) == 0)) + { + c = strstr(argv[i], "="); + c = strtok(c, "="); + return strdup(c); + } } return NULL; } -int get_mapping() +int +get_mapping() { int i, argc; char **argv; ecore_app_args_get(&argc, &argv); - for(i = 1; i < argc; i++) + for (i = 1; i < argc; i++) { - if ((!strcmp(argv[i], "--mapping")) || (!strcmp(argv[i], "-m"))) return 1; + if ((!strcmp(argv[i], "--mapping")) || (!strcmp(argv[i], "-m"))) + return 1; } return 0; } -void backup_eaps() +void +backup_eaps() { int result; char *file; @@ -147,56 +168,66 @@ Ecore_List *eaps = NULL; /* Check That Dir All Exists */ - snprintf(path, sizeof(path), "%s"EAPPDIR, get_home()); + snprintf(path, sizeof(path), "%s" EAPPDIR, get_home()); if (!ecore_file_exists(path)) { - fprintf(stderr, "ERROR: %s doesn't exist. Where are the eapps ?\n", path); - return; + fprintf(stderr, "ERROR: %s doesn't exist. Where are the eapps ?\n", + path); + return; } - if (ecore_file_is_dir(path)) eaps = ecore_file_ls(path); - if (!eaps) return; + if (ecore_file_is_dir(path)) + eaps = ecore_file_ls(path); + if (!eaps) + return; ecore_list_goto_first(eaps); while ((file = ecore_list_next(eaps)) != NULL) { - if (!strcmp(file, ".") || !strcmp(file, "..")) continue; - if (!ecore_file_is_dir(file)) - { - snprintf(tmp, sizeof(tmp), "%s/%s", path, file); + if (!strcmp(file, ".") || !strcmp(file, "..")) + continue; + if (!ecore_file_is_dir(file)) + { + snprintf(tmp, sizeof(tmp), "%s/%s", path, file); #ifdef DEBUG - fprintf(stderr, "Backing Up %s\n", tmp); + fprintf(stderr, "Backing Up %s\n", tmp); #endif - snprintf(dest, sizeof(dest), "%s/EapBackup", get_home()); - if (!ecore_file_exists(dest)) - { - if (!ecore_file_mkdir(dest)) return; - } - - /* Copy The File */ - snprintf(dest, sizeof(dest), "%s/EapBackup/%s", get_home(), file); - result = ecore_file_cp(tmp, dest); - if (!result) break; - } + snprintf(dest, sizeof(dest), "%s/EapBackup", get_home()); + if (!ecore_file_exists(dest)) + { + if (!ecore_file_mkdir(dest)) + return; + } + + /* Copy The File */ + snprintf(dest, sizeof(dest), "%s/EapBackup/%s", get_home(), file); + result = ecore_file_cp(tmp, dest); + if (!result) + break; + } } - if (eaps) ecore_list_destroy(eaps); + if (eaps) + ecore_list_destroy(eaps); } -void write_mapping_file(G_Eap *eap) +void +write_mapping_file(G_Eap *eap) { FILE *f; char buff[MAX_PATH], path[MAX_PATH]; - if ((!eap->icon) || (!eap->name) || (!eap->exec) || (!eap->window_class)) return; + if ((!eap->icon) || (!eap->name) || (!eap->exec) || (!eap->window_class)) + return; snprintf(path, sizeof(path), "%s/MAPPING", get_home()); f = fopen(path, "a+"); if (!f) { - fprintf(stderr, "ERROR: Cannot Open Mapping File\n"); - return; + fprintf(stderr, "ERROR: Cannot Open Mapping File\n"); + return; } - snprintf(buff, sizeof(buff), "%s|!%s|!%s|!%s\n", eap->icon, eap->name, eap->window_class, eap->exec); + snprintf(buff, sizeof(buff), "%s|!%s|!%s|!%s\n", eap->icon, eap->name, + eap->window_class, eap->exec); fwrite(buff, sizeof(char), strlen(buff), f); fclose(f); } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/icons.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- icons.c 1 Feb 2006 09:13:05 -0000 1.3 +++ icons.c 1 Feb 2006 09:41:25 -0000 1.4 @@ -2,43 +2,56 @@ #include "config.h" #include "icons.h" -char *set_icon(char *token) +char * +set_icon(char *token) { #ifdef DEBUG fprintf(stderr, "Setting Icon: %s\n", token); #endif - if (strstr(token, "Core") != NULL) return COREICON; - if (strstr(token, "Development") != NULL) return PROGRAMMINGICON; - if (strstr(token, "Editors") != NULL) return EDITORICON; - if (strstr(token, "Edutainment") != NULL) return EDUTAINMENTICON; - if (strstr(token, "Games") != NULL) return GAMESICON; - if (strstr(token, "Graphics") != NULL) return GRAPHICSICON; - if (strstr(token, "Internet") != NULL) return INTERNETICON; - if (strstr(token, "Office") != NULL) return OFFICEICON; - if (strstr(token, "Programming") != NULL) return PROGRAMMINGICON; - if (strstr(token, "Toys") != NULL) return TOYSICON; - if (strstr(token, "Utilities") != NULL) return UTILITYICON; + if (strstr(token, "Core") != NULL) + return COREICON; + if (strstr(token, "Development") != NULL) + return PROGRAMMINGICON; + if (strstr(token, "Editors") != NULL) + return EDITORICON; + if (strstr(token, "Edutainment") != NULL) + return EDUTAINMENTICON; + if (strstr(token, "Game") != NULL) + return GAMESICON; + if (strstr(token, "Graphics") != NULL) + return GRAPHICSICON; + if (strstr(token, "Internet") != NULL) + return INTERNETICON; + if (strstr(token, "Office") != NULL) + return OFFICEICON; + if (strstr(token, "Programming") != NULL) + return PROGRAMMINGICON; + if (strstr(token, "Toys") != NULL) + return TOYSICON; + if (strstr(token, "Utilities") != NULL) + return UTILITYICON; if ((strstr(token, "Accessories") != NULL) || (strstr(token, "Applications") != NULL)) - return APPLICATIONICON; + return APPLICATIONICON; if ((strstr(token, "Multimedia") != NULL) || (strstr(token, "Sound_Video") != NULL)) - return MULTIMEDIAICON; + return MULTIMEDIAICON; if ((strstr(token, "Preferences") != NULL) || (strstr(token, "Settings") != NULL)) - return SETTINGSICON; - if ((strstr(token, "System") != NULL) || - (strstr(token, "System_Tools") != NULL)) - return SYSTEMICON; + return SETTINGSICON; + if (strstr(token, "System") != NULL) + return SYSTEMICON; return token; } -char *find_icon(char *icon) +char * +find_icon(char *icon) { char icn[MAX_PATH], path[MAX_PATH]; char *dir, *icon_size, *icon_theme, *home; - if (icon == NULL) return DEFAULTICON; + if (icon == NULL) + return DEFAULTICON; home = get_home(); @@ -48,23 +61,27 @@ #endif /* Check For Unsupported Extension */ - if ((!strcmp(icon + strlen(icon) - 4, ".svg")) || (!strcmp(icon + strlen(icon) - 4, ".ico"))) - return DEFAULTICON; + if ((!strcmp(icon + strlen(icon) - 4, ".svg")) + || (!strcmp(icon + strlen(icon) - 4, ".ico"))) + return DEFAULTICON; + + /* Check For An Extension, Append PNG If Missing */ + if (strrchr(icon, '.') == NULL) + snprintf(icn, sizeof(icn), "%s.png", icon); - /* Check For An Extension, Append PNG If Missing */ - if (strrchr(icon, '.') == NULL) snprintf(icn, sizeof(icn), "%s.png", icon); - - /* Check If Dir Supplied In Desktop File */ + /* Check If Dir Supplied In Desktop File */ dir = ecore_file_get_dir(icn); if (!strcmp(dir, icn) == 0) { - snprintf(path, MAX_PATH, "%s", icn); - /* Check Supplied Dir For Icon */ - if (ecore_file_exists(path)) return strdup(icn); + snprintf(path, MAX_PATH, "%s", icn); + /* Check Supplied Dir For Icon */ + if (ecore_file_exists(path)) + return strdup(icn); } - snprintf(path, MAX_PATH, PIXMAPDIR"/%s", icn); - if (ecore_file_exists(path)) return strdup(path); + snprintf(path, MAX_PATH, PIXMAPDIR "/%s", icn); + if (ecore_file_exists(path)) + return strdup(path); /* Get Icon Options */ icon_size = get_icon_size(); @@ -73,30 +90,42 @@ /* Check User Supplied Icon Theme */ if (icon_theme != NULL) { - fprintf(stderr, "\tUsing Icon Theme: %s\n", icon_theme); - snprintf(path, MAX_PATH, "%s/%s/apps/%s", icon_theme, icon_size, icn); - if (ecore_file_exists(path)) return strdup(path); - snprintf(path, MAX_PATH, "%s/%s/devices/%s", icon_theme, icon_size, icn); - if (ecore_file_exists(path)) return strdup(path); - snprintf(path, MAX_PATH, "%s/%s/filesystems/%s", icon_theme, icon_size, icn); - if (ecore_file_exists(path)) return strdup(path); + fprintf(stderr, "\tUsing Icon Theme: %s\n", icon_theme); + snprintf(path, MAX_PATH, "%s/%s/apps/%s", icon_theme, icon_size, icn); + if (ecore_file_exists(path)) + return strdup(path); + snprintf(path, MAX_PATH, "%s/%s/devices/%s", icon_theme, icon_size, + icn); + if (ecore_file_exists(path)) + return strdup(path); + snprintf(path, MAX_PATH, "%s/%s/filesystems/%s", icon_theme, icon_size, + icn); + if (ecore_file_exists(path)) + return strdup(path); } - snprintf(path, MAX_PATH, CRYSTALSVGDIR"/%s/apps/%s", icon_size, icn); - if (ecore_file_exists(path)) return strdup(path); - snprintf(path, MAX_PATH, CRYSTALSVGDIR"/%s/devices/%s", icon_size, icn); - if (ecore_file_exists(path)) return strdup(path); - snprintf(path, MAX_PATH, CRYSTALSVGDIR"/%s/filesystems/%s", icon_size, icn); - if (ecore_file_exists(path)) return strdup(path); - - /* We Did Not Find the icon in theme dir, - check default theme before setting a default icon */ - snprintf(path, MAX_PATH, ICONDIR"/hicolor/%s/apps/%s", icon_size, icn); - if (ecore_file_exists(path)) return strdup(path); - snprintf(path, MAX_PATH, ICONDIR"/hicolor/%s/devices/%s", icon_size, icn); - if (ecore_file_exists(path)) return strdup(path); - snprintf(path, MAX_PATH, ICONDIR"/hicolor/%s/filesystems/%s", icon_size, icn); - if (ecore_file_exists(path)) return strdup(path); + snprintf(path, MAX_PATH, CRYSTALSVGDIR "/%s/apps/%s", icon_size, icn); + if (ecore_file_exists(path)) + return strdup(path); + snprintf(path, MAX_PATH, CRYSTALSVGDIR "/%s/devices/%s", icon_size, icn); + if (ecore_file_exists(path)) + return strdup(path); + snprintf(path, MAX_PATH, CRYSTALSVGDIR "/%s/filesystems/%s", icon_size, icn); + if (ecore_file_exists(path)) + return strdup(path); + + /* We Did Not Find the icon in theme dir, + * check default theme before setting a default icon */ + snprintf(path, MAX_PATH, ICONDIR "/hicolor/%s/apps/%s", icon_size, icn); + if (ecore_file_exists(path)) + return strdup(path); + snprintf(path, MAX_PATH, ICONDIR "/hicolor/%s/devices/%s", icon_size, icn); + if (ecore_file_exists(path)) + return strdup(path); + snprintf(path, MAX_PATH, ICONDIR "/hicolor/%s/filesystems/%s", icon_size, + icn); + if (ecore_file_exists(path)) + return strdup(path); return DEFAULTICON; } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/main.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- main.c 1 Feb 2006 09:13:05 -0000 1.3 +++ main.c 1 Feb 2006 09:41:25 -0000 1.4 @@ -11,7 +11,8 @@ void _e17genmenu_shutdown(void); /* Functions */ -void _e17genmenu_backup() +void +_e17genmenu_backup() { #ifdef DEBUG fprintf(stderr, "Backing up Existing Eaps...\n"); @@ -19,7 +20,8 @@ backup_eaps(); } -void _e17genmenu_help() +void +_e17genmenu_help() { printf("e17genmenu - Generate Enlightenment DR17 Menus\n"); printf("Usage: e17genmenu <-options>\n"); @@ -28,7 +30,8 @@ printf(" -s=<size> | --icon-size=<size>\tUse <size> icons. (48x48)\n"); printf(" -t=<theme> | --icon-theme=<theme>\tUse <theme> for icons\n"); printf(" -l | --lossy\tUse Lossy Compression For Eaps\n"); - printf(" -d=<dir> | --desktop-dir=<dir>\tCreate eaps for .desktop files in <dir>\n"); + printf + (" -d=<dir> | --desktop-dir=<dir>\tCreate eaps for .desktop files in <dir>\n"); printf(" -o | --overwrite\tOverwrite Eaps\n"); printf(" -m | --mapping\tGenerate Mapping File\n"); printf(" -h | --help\t\tShow this help screen\n"); @@ -39,63 +42,67 @@ exit(0); } -void _e17genmenu_parseargs(int argc, char **argv) +void +_e17genmenu_parseargs(int argc, char **argv) { int i; for (i = 1; i < argc; i++) { - if (argv[i]) - { - if ((strstr(argv[i], "--help")) || (strstr(argv[i], "-h"))) - _e17genmenu_help(); - if ((strstr(argv[i], "--backup")) || (strstr(argv[i], "-b"))) - _e17genmenu_backup(); - } + if (argv[i]) + { + if ((strstr(argv[i], "--help")) || (strstr(argv[i], "-h"))) + _e17genmenu_help(); + if ((strstr(argv[i], "--backup")) || (strstr(argv[i], "-b"))) + _e17genmenu_backup(); + } } } -void _e17genmenu_init() +void +_e17genmenu_init() { char path[MAX_PATH]; - /* Setup Ecore */ + /* Setup Ecore */ if (!ecore_init()) { - fprintf(stderr, "ERROR: Unable to init ecore, exiting\n"); - exit(-1); + fprintf(stderr, "ERROR: Unable to init ecore, exiting\n"); + exit(-1); } - /* Setup Ecore_File */ + /* Setup Ecore_File */ if (!ecore_file_init()) { - fprintf(stderr, "ERROR: Unable to init ecore_file, exiting\n"); - ecore_shutdown(); - exit(-1); + fprintf(stderr, "ERROR: Unable to init ecore_file, exiting\n"); + ecore_shutdown(); + exit(-1); } /* Setup Eet */ if (!eet_init()) { - fprintf(stderr, "ERROR: Unable To Init Eet !\n"); - ecore_file_shutdown(); - ecore_shutdown(); - exit(-1); + fprintf(stderr, "ERROR: Unable To Init Eet !\n"); + ecore_file_shutdown(); + ecore_shutdown(); + exit(-1); } - /* Check That Dir All Exists */ - snprintf(path, sizeof(path), "%s"EAPPDIR, get_home()); + /* Check That Dir All Exists */ + snprintf(path, sizeof(path), "%s" EAPPDIR, get_home()); if (!ecore_file_exists(path)) { - fprintf(stderr, "ERROR: %s doesn't exist. Where are the eapps?\n", path); - eet_shutdown(); - ecore_file_shutdown(); - ecore_shutdown(); - exit(-1); + fprintf(stderr, "ERROR: %s doesn't exist. Where are the eapps?\n", + path); + eet_shutdown(); + ecore_file_shutdown(); + ecore_shutdown(); + exit(-1); } } -void _e17genmenu_shutdown() +void +_e17genmenu_shutdown() { #ifdef DEBUG fprintf(stderr, "Finished\n"); @@ -106,20 +113,21 @@ return; } -int main(int argc, char **argv) +int +main(int argc, char **argv) { char path[MAX_PATH]; char *tmp; - int ret; - + int ret; + /* Init E Stuff */ _e17genmenu_init(); - /* Parse Arguments */ + /* Parse Arguments */ _e17genmenu_parseargs(argc, argv); - /* Set App Args */ + /* Set App Args */ ecore_app_args_set(argc, (const char **)argv); /* Start Making Menus */ @@ -133,11 +141,12 @@ #ifdef DEBUG fprintf(stderr, "Regenerating Eapp Cache...\n"); #endif - snprintf(path, sizeof(path), "enlightenment_eapp_cache_gen %s"EAPPDIR" -r", get_home()); + snprintf(path, sizeof(path), "enlightenment_eapp_cache_gen %s" EAPPDIR " -r", + get_home()); system(path); /* Shutdown */ _e17genmenu_shutdown(); - return(0); + return (0); } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/menus.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- menus.c 1 Feb 2006 09:13:05 -0000 1.3 +++ menus.c 1 Feb 2006 09:41:25 -0000 1.4 @@ -3,23 +3,28 @@ #include "parse.h" #include "menus.h" -void make_menus() +void +make_menus() { char *d; d = get_desktop_dir(); - if (d) check_for_dirs(strdup(d)); - + if (d) + check_for_dirs(strdup(d)); + if (!d) { - /* Check desktop files in these directories */ - check_for_dirs(GNOME_DIRS); - check_for_dirs(KDE_DIRS); - check_for_dirs(DEBIAN_DIRS); + /* Check desktop files in these directories */ + check_for_dirs(GNOME_DIRS); + check_for_dirs(KDE_DIRS); + check_for_dirs(DEBIAN_DIRS); } + if (d) + free(d); } -void check_for_dirs(char *path) +void +check_for_dirs(char *path) { char *dir; char dirs[MAX_PATH]; @@ -28,23 +33,29 @@ dir = strdup(path); if (dirs) { - if (strstr(dirs, ":")) dir = strtok(dirs, ":"); + if (strstr(dirs, ":")) + dir = strtok(dirs, ":"); } - if (!dir) return; + if (!dir) + return; while (dir) { #ifdef DEBUG - fprintf(stderr, "\nChecking For %s...\n", dir); + fprintf(stderr, "\nChecking For %s...\n", dir); #endif - if (ecore_file_exists(dir)) - check_for_files(strdup(dir)); - - if (!strstr(dirs, ":")) break; - dir = strtok(NULL, ":"); + if (ecore_file_exists(dir)) + check_for_files(strdup(dir)); + + if (!strstr(dirs, ":")) + break; + dir = strtok(NULL, ":"); } + if (dir) + free(dir); } -void check_for_files(char *dir) +void +check_for_files(char *dir) { char *file; char path[MAX_PATH]; @@ -58,23 +69,30 @@ ecore_list_goto_first(files); while ((file = ecore_list_next(files)) != NULL) { - snprintf(path, sizeof(path), "%s/%s", dir, file); - if (!ecore_file_is_dir(path)) - { - if (!strcmp(file + strlen(file) - 8, ".desktop")) - { - if (!strcmp(file, "panel_appearance.desktop")) return; - if (!strcmp(file, "ktip.desktop")) return; - if (!strcmp(file, "kalarm.desktop")) return; - /* Parse Desktop File */ - parse_desktop_file(strdup(path)); - } - else if (strstr(DEBIAN_DIRS, dir) != NULL) - { - /* Parse Debian File */ - if (strstr(file, "README") == NULL) parse_debian_file(strdup(path)); - } - } + snprintf(path, sizeof(path), "%s/%s", dir, file); + if (!ecore_file_is_dir(path)) + { + if (!strcmp(file + strlen(file) - 8, ".desktop")) + { + if (!strcmp(file, "panel_appearance.desktop")) + return; + if (!strcmp(file, "ktip.desktop")) + return; + if (!strcmp(file, "kalarm.desktop")) + return; + /* Parse Desktop File */ + parse_desktop_file(strdup(path)); + } + else if (strstr(DEBIAN_DIRS, dir) != NULL) + { + /* Parse Debian File */ + if (strstr(file, "README") == NULL) + parse_debian_file(strdup(path)); + } + } } - if (files) ecore_list_destroy(files); + if (files) + ecore_list_destroy(files); + if (file) + free(file); } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/order.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- order.c 1 Feb 2006 09:13:05 -0000 1.3 +++ order.c 1 Feb 2006 09:41:25 -0000 1.4 @@ -3,19 +3,22 @@ #include "eaps.h" #include "order.h" -int search_list(Ecore_List *list, char *search) +int +search_list(Ecore_List *list, char *search) { char *tmp; ecore_list_goto_first(list); while ((tmp = (char *)ecore_list_next(list)) != NULL) { - if (!strcmp(tmp, search)) return 1; + if (!strcmp(tmp, search)) + return 1; } return 0; } -void create_order(char *path) +void +create_order(char *path) { FILE *f; @@ -26,13 +29,14 @@ f = fopen(path, "w"); if (!f) { - fprintf(stderr, "ERROR: Cannot Create Order File %s\n", path); - exit(-1); + fprintf(stderr, "ERROR: Cannot Create Order File %s\n", path); + exit(-1); } fclose(f); } -void modify_order(char *path, char *entry) +void +modify_order(char *path, char *entry) { int length, i; char *buff, *cat; @@ -42,17 +46,15 @@ if (!ecore_file_exists(path)) { - ecore_file_mkpath(path); - cat = strrchr(path, '/'); - snprintf(t, sizeof(t), "%s", cat); - if (t[0] == '/') - { - for (i = 0; i < strlen(t); i++) - { - t[i] = t[i+1]; - } - } - create_dir_eap(path, t); + ecore_file_mkpath(path); + cat = strrchr(path, '/'); + snprintf(t, sizeof(t), "%s", cat); + if (t[0] == '/') + { + for (i = 0; i < strlen(t); i++) + t[i] = t[i + 1]; + } + create_dir_eap(path, t); } snprintf(path2, sizeof(path2), "%s/.order", path); @@ -64,53 +66,54 @@ entry = ecore_file_get_file(entry); list = ecore_list_new(); - /* Stat .order; Create If Not Found */ + /* Stat .order; Create If Not Found */ if (!ecore_file_exists(path2)) { - create_order(path2); - /* If We Had To Create This Order Then Just Add The Entry */ - if (!ecore_list_append(list, entry)) - { - fprintf(stderr, "ERROR: Ecore List Append Failed !!\n"); - return; - } + create_order(path2); + /* If We Had To Create This Order Then Just Add The Entry */ + if (!ecore_list_append(list, entry)) + { + fprintf(stderr, "ERROR: Ecore List Append Failed !!\n"); + return; + } } else { - /* Open .order File For Parsing */ - f=fopen(path2, "r"); - if (!f) - { - fprintf(stderr, "ERROR: Cannot Open Order File %s \n", path2); - exit(-1); - } - - /* Read All Entries From Existing Order File, Store In List For Sorting*/ - while (fgets(buffer, sizeof(buffer), f) != NULL) - { - /* Strip New Line Char */ - if (buffer[(length = strlen(buffer) - 1)] == '\n') buffer[length] = '\0'; - if (!search_list(list, strdup(buffer))) - { - if (!ecore_list_append(list, strdup(buffer))) - { - fprintf(stderr, "ERROR: Ecore List Append Failed !!\n"); - return; - } - } - } - fclose(f); - buffer[0] = (char) 0; - - /* Add This Entry To List Of Existing ? */ - if (!search_list(list, entry)) - { - if (!ecore_list_append(list, entry)) - { - fprintf(stderr, "ERROR: Ecore List Append Failed !!\n"); - return; - } - } + /* Open .order File For Parsing */ + f = fopen(path2, "r"); + if (!f) + { + fprintf(stderr, "ERROR: Cannot Open Order File %s \n", path2); + exit(-1); + } + + /* Read All Entries From Existing Order File, Store In List For Sorting */ + while (fgets(buffer, sizeof(buffer), f) != NULL) + { + /* Strip New Line Char */ + if (buffer[(length = strlen(buffer) - 1)] == '\n') + buffer[length] = '\0'; + if (!search_list(list, strdup(buffer))) + { + if (!ecore_list_append(list, strdup(buffer))) + { + fprintf(stderr, "ERROR: Ecore List Append Failed !!\n"); + return; + } + } + } + fclose(f); + buffer[0] = (char)0; + + /* Add This Entry To List Of Existing ? */ + if (!search_list(list, entry)) + { + if (!ecore_list_append(list, entry)) + { + fprintf(stderr, "ERROR: Ecore List Append Failed !!\n"); + return; + } + } } #ifdef DEBUG @@ -120,19 +123,21 @@ f = fopen(path2, "w"); if (!f) { - fprintf(stderr, "ERROR: Cannot Open Order File %s \n", path2); - if (list) ecore_list_destroy(list); - return; + fprintf(stderr, "ERROR: Cannot Open Order File %s \n", path2); + if (list) + ecore_list_destroy(list); + return; } ecore_list_goto_first(list); while ((buff = ecore_list_next(list)) != NULL) { - snprintf(buffer, sizeof(buffer), "%s\n", buff); - if (buffer != NULL) fwrite(buffer, sizeof(char), strlen(buffer), f); + snprintf(buffer, sizeof(buffer), "%s\n", buff); + if (buffer != NULL) + fwrite(buffer, sizeof(char), strlen(buffer), f); } fclose(f); - if (list) ecore_list_destroy(list); - return; + if (list) + ecore_list_destroy(list); } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/parse.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- parse.c 1 Feb 2006 09:13:05 -0000 1.3 +++ parse.c 1 Feb 2006 09:41:25 -0000 1.4 @@ -6,7 +6,8 @@ #include "order.h" #include "parse.h" -char *get_t(char *icon) +char * +get_t(char *icon) { char *ptr; char *d; @@ -15,20 +16,26 @@ ptr = icon; d = strrchr(ptr, '"'); - if (!d) return NULL; + if (!d) + return NULL; dir = malloc(strlen(icon) + 1); while (ptr != d) { - dir[i] = *ptr; - ptr++; - i++; + dir[i] = *ptr; + ptr++; + i++; } dir[i] = '\0'; + if (d) + free(d); + if (ptr) + free(ptr); return strdup(dir); } -char *parse_buffer(char *b, char *section) +char * +parse_buffer(char *b, char *section) { char *oldtoken, *token, *d; char t[MAX_PATH], p[MAX_PATH]; @@ -37,7 +44,8 @@ oldtoken = strdup(b); token = strstr(oldtoken, section); - if (token == NULL) return NULL; + if (token == NULL) + return NULL; token = strstr(token, "="); token = strtok(token, "="); @@ -46,61 +54,70 @@ d = strrchr(t, '\\'); if (d) { - if (t[(length = strlen(t) - 1)] == '\\') t[length] = '\0'; + if (t[(length = strlen(t) - 1)] == '\\') + t[length] = '\0'; } d = strrchr(t, '\"'); if (d) { - if (t[(length = strlen(t) - 1)] == '\"') t[length] = '\0'; + if (t[(length = strlen(t) - 1)] == '\"') + t[length] = '\0'; } d = strchr(t, '"'); if (d) { - if (t[0] == '"') - { - for (i = 0; i < strlen(t); i++) - { - t[i] = t[i+1]; - } - } + if (t[0] == '"') + { + for (i = 0; i < strlen(t); i++) + t[i] = t[i + 1]; + } } if (strrchr(t, '"')) { - d = get_t(t); - snprintf(p, sizeof(p), "%s", d); + d = get_t(t); + snprintf(p, sizeof(p), "%s", d); } else { - snprintf(p, sizeof(p), "%s", t); + snprintf(p, sizeof(p), "%s", t); } + + if (token) + free(token); + if (oldtoken) + free(oldtoken); + if (d) + free(d); return strdup(p); } -char *parse_exec(char *exec) +char * +parse_exec(char *exec) { char *token; token = strdup(exec); - /* Strip Caption From Exec */ + /* Strip Caption From Exec */ if (strstr(token, "caption") != NULL) { - token = strdup(token); - token = strtok(token, " "); + token = strdup(token); + token = strtok(token, " "); } - /* Strip %U from Exec */ + /* Strip %U from Exec */ if (strstr(token, "%") != NULL) { - token = strdup(token); - token = strtok(token, " "); + token = strdup(token); + token = strtok(token, " "); } return strdup(token); } -void parse_desktop_file(char *path) +void +parse_desktop_file(char *path) { char *home, *eap_name, *key, *value; char buffer[MAX_PATH]; @@ -119,83 +136,100 @@ file = fopen(path, "r"); if (!file) { - fprintf(stderr, "ERROR: Cannot Open File %s \n", path); - return; + fprintf(stderr, "ERROR: Cannot Open File %s \n", path); + return; } eap = calloc(1, sizeof(G_Eap)); eap->eap_name = strdup(eap_name); - if (eap_name) free(eap_name); + if (eap_name) + free(eap_name); key = NULL; value = NULL; *buffer = 0; - /* Read All Entries, Store In Struct */ + /* Read All Entries, Store In Struct */ while (fgets(buffer, sizeof(buffer), file) != NULL) { - /* Skip Blank Lines */ - if (!(*buffer) || (*buffer == '\n')) continue; - /* Strip New Line Char */ - if (buffer[(length = strlen(buffer) - 1)] == '\n') buffer[length] = '\0'; - key = strtok(buffer, "="); - value = strstr(buffer, "="); - value = strtok(value, "="); - if ((value != NULL) && (key != NULL)) - { - if (!strcmp(key, "Name")) eap->name = strdup(value); - if (!strcmp(key, "GenericName")) eap->generic = strdup(value); - if (!strcmp(key, "Comment")) eap->comment = strdup(value); - if (!strcmp(key, "Categories")) eap->categories = strdup(value); - if (!strcmp(key, "Exec")) eap->exec = strdup(value); - if (!strcmp(key, "Icon")) eap->icon = strdup(value); - if (!strcmp(key, "StartupNotify")) eap->startup = (!strcmp(value, "true")) ? "1" : "0"; - if (!strcmp(key, "X-KDE-StartupNotify")) eap->startup = (!strcmp(value, "true")) ? "1" : "0"; - if (!strcmp(key, "Type")) eap->type = strdup(value); - } - value = NULL; - key = NULL; + /* Skip Blank Lines */ + if (!(*buffer) || (*buffer == '\n')) + continue; + /* Strip New Line Char */ + if (buffer[(length = strlen(buffer) - 1)] == '\n') + buffer[length] = '\0'; + key = strtok(buffer, "="); + value = strstr(buffer, "="); + value = strtok(value, "="); + if ((value != NULL) && (key != NULL)) + { + if (!strcmp(key, "Name")) + eap->name = strdup(value); + if (!strcmp(key, "GenericName")) + eap->generic = strdup(value); + if (!strcmp(key, "Comment")) + eap->comment = strdup(value); + if (!strcmp(key, "Categories")) + eap->categories = strdup(value); + if (!strcmp(key, "Exec")) + eap->exec = strdup(value); + if (!strcmp(key, "Icon")) + eap->icon = strdup(value); + if (!strcmp(key, "StartupNotify")) + eap->startup = (!strcmp(value, "true")) ? "1" : "0"; + if (!strcmp(key, "X-KDE-StartupNotify")) + eap->startup = (!strcmp(value, "true")) ? "1" : "0"; + if (!strcmp(key, "Type")) + eap->type = strdup(value); + } + value = NULL; + key = NULL; } fclose(file); - /* Check If We Process */ - if (!eap->type) process_file(path, eap); + /* Check If We Process */ + if (!eap->type) + process_file(path, eap); if (eap->type) { - if (!strcmp(eap->type, "Application")) process_file(path, eap); + if (!strcmp(eap->type, "Application")) + process_file(path, eap); } /* Write Out Mapping File ? */ if (get_mapping()) { - if ((!eap->icon) || (!eap->name) || - (!eap->exec) || (!eap->window_class)) return; - - FILE *f; - char buff[MAX_PATH]; - - snprintf(path, sizeof(path), "%s/MAPPING", home); - f = fopen(path, "a+"); - if (!f) - { - fprintf(stderr, "ERROR: Cannot Open Mapping File\n"); - return; - } - snprintf(buff, sizeof(buff), "%s|!%s|!%s|!%s\n", - eap->icon, eap->name, eap->window_class, eap->exec); - fwrite(buff, sizeof(char), strlen(buff), f); - fclose(f); + if ((!eap->icon) || (!eap->name) || + (!eap->exec) || (!eap->window_class)) + return; + + FILE *f; + char buff[MAX_PATH]; + + snprintf(path, sizeof(path), "%s/MAPPING", home); + f = fopen(path, "a+"); + if (!f) + { + fprintf(stderr, "ERROR: Cannot Open Mapping File\n"); + return; + } + snprintf(buff, sizeof(buff), "%s|!%s|!%s|!%s\n", + eap->icon, eap->name, eap->window_class, eap->exec); + fwrite(buff, sizeof(char), strlen(buff), f); + fclose(f); } free(eap); } -void process_file(char *file, G_Eap *eap) +void +process_file(char *file, G_Eap *eap) { char *home, *window_class, *exec, *category, *icon; char path[MAX_PATH], order_path[MAX_PATH], buffer[MAX_PATH]; int overwrite; - if (!eap) return; + if (!eap) + return; #ifdef DEBUG fprintf(stderr, "Processing File %s\n", file); @@ -204,77 +238,86 @@ home = get_home(); overwrite = get_overwrite(); - snprintf(path, sizeof(path), "%s"EAPPDIR"/%s", home, eap->eap_name); + snprintf(path, sizeof(path), "%s" EAPPDIR "/%s", home, eap->eap_name); window_class = get_window_class(path); if ((ecore_file_exists(path)) && (!overwrite)) { - category = NULL; - if (eap->categories != NULL) - { - category = find_category(eap->categories); - if (category != NULL) - { - snprintf(order_path, sizeof(order_path), "%s"EFAVDIR"/%s", home, category); - modify_order(order_path, eap->eap_name); - } - } - return; - } - - if (eap->icon != NULL) icon = find_icon(strdup(eap->icon)); - if (eap->icon == NULL) icon = strdup(DEFAULTICON); + category = NULL; + if (eap->categories != NULL) + { + category = find_category(eap->categories); + if (category != NULL) + { + snprintf(order_path, sizeof(order_path), "%s" EFAVDIR "/%s", + home, category); + modify_order(order_path, eap->eap_name); + } + } + return; + } + + if (eap->icon != NULL) + icon = find_icon(strdup(eap->icon)); + if (eap->icon == NULL) + icon = strdup(DEFAULTICON); /* Start Making The Eap */ write_icon(path, icon); /* Set Eap Values. Trap For Name Not Being Set */ if (eap->name != NULL) - { - write_eap(path, "app/info/name", eap->name); - } + write_eap(path, "app/info/name", eap->name); else if (eap->eap_name != NULL) - { - write_eap(path, "app/info/name", eap->eap_name); - } + write_eap(path, "app/info/name", eap->eap_name); - if (eap->generic != NULL) write_eap(path, "app/info/generic", eap->generic); - if (eap->comment != NULL) write_eap(path, "app/info/comments", eap->comment); + if (eap->generic != NULL) + write_eap(path, "app/info/generic", eap->generic); + if (eap->comment != NULL) + write_eap(path, "app/info/comments", eap->comment); /* Parse Exec string for %'s that messup eap write */ exec = NULL; if (eap->exec != NULL) { - exec = parse_exec(eap->exec); - if (exec != NULL) - { - write_eap(path, "app/info/exe", exec); - write_eap(path, "app/icon/class", exec); - } - } - - if (eap->startup != NULL) write_eap(path, "app/info/startup_notify", eap->startup); - if (window_class != NULL) write_eap(path, "app/window/class", window_class); - - snprintf(buffer, sizeof(buffer), "enlightenment_eapp_cache_gen /home/shad/.e/e/applications/all -r"); + exec = parse_exec(eap->exec); + if (exec != NULL) + { + write_eap(path, "app/info/exe", exec); + write_eap(path, "app/icon/class", exec); + } + } + + if (eap->startup != NULL) + write_eap(path, "app/info/startup_notify", eap->startup); + if (window_class != NULL) + write_eap(path, "app/window/class", window_class); + + snprintf(buffer, sizeof(buffer), + "enlightenment_eapp_cache_gen %s/.e/e/applications/all -r", + getenv("HOME")); system(buffer); category = NULL; if (eap->categories != NULL) { - category = find_category(eap->categories); - if (category != NULL) - { - snprintf(buffer, sizeof(buffer), "enlightenment_eapp_cache_gen /home/shad/.e/e/applications/favorite/%s -r", category); - system(buffer); - snprintf(order_path, sizeof(order_path), "%s"EFAVDIR"/%s", home, category); - modify_order(order_path, eap->eap_name); - } + category = find_category(eap->categories); + if (category != NULL) + { + snprintf(buffer, sizeof(buffer), + "enlightenment_eapp_cache_gen %s/.e/e/applications/favorite/%s -r", + getenv("HOME"), category); + system(buffer); + snprintf(order_path, sizeof(order_path), "%s" EFAVDIR "/%s", home, + category); + modify_order(order_path, eap->eap_name); + } } return; } -void parse_debian_file(char *file) +void +parse_debian_file(char *file) { char *eap_name, *name, *generic, *comment, *exec, *category, *icon; char buffer[MAX_PATH]; @@ -282,7 +325,8 @@ FILE *f; G_Eap *eap; - if (ecore_file_is_dir(file)) return; + if (ecore_file_is_dir(file)) + return; overwrite = get_overwrite(); eap_name = get_eap_name(file); @@ -294,8 +338,8 @@ f = fopen(file, "r"); if (!f) { - fprintf(stderr, "ERROR: Cannot Open File %s\n", file); - return; + fprintf(stderr, "ERROR: Cannot Open File %s\n", file); + return; } eap = calloc(1, sizeof(G_Eap)); @@ -303,42 +347,44 @@ *buffer = 0; while (fgets(buffer, sizeof(buffer), f) != NULL) { - /* Skip Blank Lines */ - if (!(*buffer) || (*buffer == '\n')) continue; - /* Strip New Line Chars */ - if (buffer[(length = strlen(buffer) - 1)] == '\n') buffer[length] = '\0'; - if (strstr(buffer, "title")) - { - name = parse_buffer(strdup(buffer), "title="); - eap->name = strdup(name); - } - if (strstr(buffer, "longtitle")) - { - generic = parse_buffer(strdup(buffer), "longtitle="); - eap->generic = strdup(generic); - } - if (strstr(buffer, "description")) - { - comment = parse_buffer(strdup(buffer), "description="); - eap->comment = strdup(comment); - } - if (strstr(buffer, "section")) - { - category = parse_buffer(strdup(buffer), "section="); - eap->categories = strdup(category); - } - if (strstr(buffer, "command")) - { - exec = parse_buffer(strdup(buffer), "command="); - eap->exec = strdup(exec); - } - if (strstr(buffer, "icon")) - { - icon = parse_buffer(strdup(buffer), "icon="); - eap->icon = strdup(icon); - } + /* Skip Blank Lines */ + if (!(*buffer) || (*buffer == '\n')) + continue; + /* Strip New Line Chars */ + if (buffer[(length = strlen(buffer) - 1)] == '\n') + buffer[length] = '\0'; + if (strstr(buffer, "title")) + { + name = parse_buffer(strdup(buffer), "title="); + eap->name = strdup(name); + } + if (strstr(buffer, "longtitle")) + { + generic = parse_buffer(strdup(buffer), "longtitle="); + eap->generic = strdup(generic); + } + if (strstr(buffer, "description")) + { + comment = parse_buffer(strdup(buffer), "description="); + eap->comment = strdup(comment); + } + if (strstr(buffer, "section")) + { + category = parse_buffer(strdup(buffer), "section="); + eap->categories = strdup(category); + } + if (strstr(buffer, "command")) + { + exec = parse_buffer(strdup(buffer), "command="); + eap->exec = strdup(exec); + } + if (strstr(buffer, "icon")) + { + icon = parse_buffer(strdup(buffer), "icon="); + eap->icon = strdup(icon); + } } - buffer[0] = (char) 0; + buffer[0] = (char)0; fclose(f); =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/sort.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- sort.c 1 Feb 2006 09:13:05 -0000 1.3 +++ sort.c 1 Feb 2006 09:41:25 -0000 1.4 @@ -3,41 +3,49 @@ #include "order.h" #include "sort.h" -Ecore_List *add_list(Ecore_List *list, char *tmp) +Ecore_List * +add_list(Ecore_List *list, char *tmp) { int i, r; char *name; i = 0; r = 0; - if (!ecore_list_nodes(list)) ecore_list_prepend(list, tmp); + if (!ecore_list_nodes(list)) + ecore_list_prepend(list, tmp); ecore_list_goto_first(list); if (ecore_list_nodes(list) >= 1) { - for (i = 0; i < ecore_list_nodes(list); i++) - { - name = ecore_list_goto_index(list, i); - r = strcmp(tmp, name); - if (r < 0) break; - if (r == 0) return list; - } - if (r < 0) ecore_list_insert(list, tmp); - if (r >= 0) ecore_list_append(list, tmp); + for (i = 0; i < ecore_list_nodes(list); i++) + { + name = ecore_list_goto_index(list, i); + r = strcmp(tmp, name); + if (r < 0) + break; + if (r == 0) + return list; + } + if (r < 0) + ecore_list_insert(list, tmp); + if (r >= 0) + ecore_list_append(list, tmp); } return list; } -char *get_name(char *path) +char * +get_name(char *path) { int ret; char *n, *nbuff, *name; Eet_File *ef; ef = eet_open(path, EET_FILE_MODE_READ); - if (!ef) return NULL; + if (!ef) + return NULL; - n = (char *) eet_read(ef, "app/info/name", &ret); - nbuff = (char *) malloc(ret + 1); + n = (char *)eet_read(ef, "app/info/name", &ret); + nbuff = (char *)malloc(ret + 1); snprintf(nbuff, ret + 1, "%s", n); name = strdup(nbuff); @@ -45,7 +53,8 @@ return strdup(name); } -void sort_menu(char *path) +void +sort_menu(char *path) { char *home, *name, *v, *token; char path2[MAX_PATH], buffer[MAX_PATH]; @@ -59,55 +68,66 @@ home = get_home(); snprintf(path2, sizeof(path2), "%s/.order", path); - if (!ecore_file_exists(path2)) create_order(path2); + if (!ecore_file_exists(path2)) + create_order(path2); f = fopen(path2, "r"); - if (!f) return; + if (!f) + return; - /* Sort Names */ + /* Sort Names */ eaps = ecore_list_new(); *buffer = 0; while (fgets(buffer, MAX_PATH, f) != NULL) { - if (!(*buffer) || (*buffer == '\n')) continue; - if (buffer[(length = strlen(buffer) -1)] == '\n') buffer[length] = '\0'; - snprintf(path2, sizeof(path2), "%s"EAPPDIR"/%s", home, buffer); - name = get_name(strdup(path2)); - if (name != NULL) - { - snprintf(path2, sizeof(path2), "%s:%s", strdup(name), strdup(buffer)); - if (!search_list(eaps, strdup(path2))) eaps = add_list(eaps, strdup(path2)); - } + if (!(*buffer) || (*buffer == '\n')) + continue; + if (buffer[(length = strlen(buffer) - 1)] == '\n') + buffer[length] = '\0'; + snprintf(path2, sizeof(path2), "%s" EAPPDIR "/%s", home, buffer); + name = get_name(strdup(path2)); + if (name != NULL) + { + snprintf(path2, sizeof(path2), "%s:%s", strdup(name), + strdup(buffer)); + if (!search_list(eaps, strdup(path2))) + eaps = add_list(eaps, strdup(path2)); + } } fclose(f); - /* Order File Empty */ - if (!ecore_list_nodes(eaps)) return; + /* Order File Empty */ + if (!ecore_list_nodes(eaps)) + return; ecore_list_goto_first(eaps); - /* Rewrite Order File */ + /* Rewrite Order File */ snprintf(path2, sizeof(path2), "%s/.order", path); f = fopen(path2, "w"); - if (!f) return; + if (!f) + return; for (j = 0; j < ecore_list_nodes(eaps); j++) { - v = ecore_list_goto_index(eaps, j); - /* Split eaps */ - token = strstr(v, ":"); - token = strtok(token, ":"); - snprintf(buffer, sizeof(buffer), "%s\n", token); - if (buffer != NULL) fwrite(buffer, sizeof(char), strlen(buffer), f); + v = ecore_list_goto_index(eaps, j); + /* Split eaps */ + token = strstr(v, ":"); + token = strtok(token, ":"); + snprintf(buffer, sizeof(buffer), "%s\n", token); + if (buffer != NULL) + fwrite(buffer, sizeof(char), strlen(buffer), f); } fclose(f); - if (eaps) ecore_list_destroy(eaps); + if (eaps) + ecore_list_destroy(eaps); return; } -void sort_menus() +void +sort_menus() { char *home, *file; char path[MAX_PATH]; @@ -118,22 +138,27 @@ #endif home = get_home(); - snprintf(path, sizeof(path), "%s"EFAVDIR, home); + snprintf(path, sizeof(path), "%s" EFAVDIR, home); list = (Ecore_List *)ecore_file_ls(path); - if (!list) return; + if (!list) + return; ecore_list_goto_first(list); while ((file = ecore_list_next(list)) != NULL) { - if (!strcmp(file, ".") || !strcmp(file, "..")) continue; - snprintf(path, sizeof(path), "%s"EFAVDIR"/%s", home, file); - if (ecore_file_is_dir(path)) sort_menu(path); + if (!strcmp(file, ".") || !strcmp(file, "..")) + continue; + snprintf(path, sizeof(path), "%s" EFAVDIR "/%s", home, file); + if (ecore_file_is_dir(path)) + sort_menu(path); } - if (list) ecore_list_destroy(list); + if (list) + ecore_list_destroy(list); } -void sort_favorites() +void +sort_favorites() { int length; char *home, *file; @@ -147,51 +172,62 @@ home = get_home(); - snprintf(path, sizeof(path), "%s"EFAVDIR"/.order", home);... [truncated message content] |
From: <enl...@li...> - 2006-02-16 09:19:31
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/src/bin/e17genmenu/src/bin Modified Files: icons.c global.c Log Message: Make supplied theme have priority. Some comments =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/icons.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- icons.c 7 Feb 2006 16:34:55 -0000 1.17 +++ icons.c 16 Feb 2006 09:19:25 -0000 1.18 @@ -83,20 +83,24 @@ if (strrchr(icon, '.') == NULL) snprintf(icn, sizeof(icn), "%s.png", icon); - /* Check If Dir Supplied In Desktop File */ - dir = ecore_file_get_dir(icn); - if (!strcmp(dir, icn) == 0) - { - snprintf(path, MAX_PATH, "%s", icn); - /* Check Supplied Dir For Icon */ - if (ecore_file_exists(path)) - return strdup(icn); - } - /* Get Icon Options */ icon_size = get_icon_size(); icon_theme = get_icon_theme(); + if (!icon_theme) + { + + /* Check If Dir Supplied In Desktop File */ + dir = ecore_file_get_dir(icn); + if (!strcmp(dir, icn) == 0) + { + snprintf(path, MAX_PATH, "%s", icn); + /* Check Supplied Dir For Icon */ + if (ecore_file_exists(path)) + return strdup(icn); + } + } + return strdup(find_fdo_icon(icon, icon_size, icon_theme)); } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/global.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- global.c 9 Feb 2006 09:34:11 -0000 1.7 +++ global.c 16 Feb 2006 09:19:25 -0000 1.8 @@ -154,6 +154,7 @@ return strdup(c); } } + /* Doesn't this tie us specifically to KDE ? */ return "crystalsvg"; } |
From: <enl...@li...> - 2006-03-08 01:00:08
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/src/bin/e17genmenu Modified Files: configure.in Log Message: Bump the version so as not to conflict with what is up at sourceforge.net. Don't try to create Makefiles for empty directories. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/configure.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- configure.in 31 Jan 2006 19:10:34 -0000 1.1 +++ configure.in 8 Mar 2006 01:00:05 -0000 1.2 @@ -7,7 +7,7 @@ AC_CANONICAL_BUILD AC_CANONICAL_HOST -AM_INIT_AUTOMAKE(e17genmenu, 4.2.0) +AM_INIT_AUTOMAKE(e17genmenu, 4.2.1) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE @@ -123,9 +123,6 @@ AC_OUTPUT([ Makefile -src/Makefile -src/bin/Makefile -icons/Makefile ]) echo |
From: <enl...@li...> - 2006-03-08 01:05:38
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/data/e17genmenu/icons Modified Files: Makefile.am Log Message: Fix Icons install location to match rest of e_utils =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/data/e17genmenu/icons/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 7 Mar 2006 22:03:58 -0000 1.1 +++ Makefile.am 8 Mar 2006 01:05:34 -0000 1.2 @@ -1,5 +1,5 @@ MAINTAINERCLEANFILES = Makefile.in -iconsdir = $(pkgdatadir)/icons +iconsdir = $(pkgdatadir)/data/e17genmenu/icons icons_DATA = \ e.png \ package_applications.png \ |
From: <enl...@li...> - 2006-03-08 01:06:22
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/src/bin/e17genmenu Modified Files: icons.h Log Message: Fix icons install location =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/icons.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- icons.h 7 Mar 2006 21:58:24 -0000 1.1 +++ icons.h 8 Mar 2006 01:06:16 -0000 1.2 @@ -6,20 +6,20 @@ #include <unistd.h> #include "config.h" -#define APPLICATIONICON PACKAGE_DATA_DIR"/icons/package_applications.png" -#define COREICON PACKAGE_DATA_DIR"/icons/package_applications.png" -#define EDITORICON PACKAGE_DATA_DIR"/icons/package_editors.png" -#define EDUTAINMENTICON PACKAGE_DATA_DIR"/icons/package_edutainment.png" -#define GAMESICON PACKAGE_DATA_DIR"/icons/package_games.png" -#define GRAPHICSICON PACKAGE_DATA_DIR"/icons/package_graphics.png" -#define INTERNETICON PACKAGE_DATA_DIR"/icons/package_network.png" -#define MULTIMEDIAICON PACKAGE_DATA_DIR"/icons/package_multimedia.png" -#define OFFICEICON PACKAGE_DATA_DIR"/icons/package_wordprocessing.png" -#define PROGRAMMINGICON PACKAGE_DATA_DIR"/icons/package_development.png" -#define SETTINGSICON PACKAGE_DATA_DIR"/icons/package_settings.png" -#define SYSTEMICON PACKAGE_DATA_DIR"/icons/package_system.png" -#define TOYSICON PACKAGE_DATA_DIR"/icons/package_toys.png" -#define UTILITYICON PACKAGE_DATA_DIR"/icons/package_utilities.png" +#define APPLICATIONICON PACKAGE_DATA_DIR"/data/e17genmenu/icons/package_applications.png" +#define COREICON PACKAGE_DATA_DIR"/data/e17genmenu/icons/package_applications.png" +#define EDITORICON PACKAGE_DATA_DIR"/data/e17genmenu/icons/package_editors.png" +#define EDUTAINMENTICON PACKAGE_DATA_DIR"/data/e17genmenu/icons/package_edutainment.png" +#define GAMESICON PACKAGE_DATA_DIR"/data/e17genmenu/icons/package_games.png" +#define GRAPHICSICON PACKAGE_DATA_DIR"/data/e17genmenu/icons/package_graphics.png" +#define INTERNETICON PACKAGE_DATA_DIR"/data/e17genmenu/icons/package_network.png" +#define MULTIMEDIAICON PACKAGE_DATA_DIR"/data/e17genmenu/icons/package_multimedia.png" +#define OFFICEICON PACKAGE_DATA_DIR"/data/e17genmenu/icons/package_wordprocessing.png" +#define PROGRAMMINGICON PACKAGE_DATA_DIR"/data/e17genmenu/icons/package_development.png" +#define SETTINGSICON PACKAGE_DATA_DIR"/data/e17genmenu/icons/package_settings.png" +#define SYSTEMICON PACKAGE_DATA_DIR"/data/e17genmenu/icons/package_system.png" +#define TOYSICON PACKAGE_DATA_DIR"/data/e17genmenu/icons/package_toys.png" +#define UTILITYICON PACKAGE_DATA_DIR"/data/e17genmenu/icons/package_utilities.png" /* Function Prototypes */ char *set_icon(char *token); |
From: <enl...@li...> - 2006-03-09 00:31:34
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils Modified Files: configure.in Log Message: Fix e_utils to build e17genmenu. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/configure.in,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- configure.in 7 Mar 2006 21:58:23 -0000 1.20 +++ configure.in 9 Mar 2006 00:31:32 -0000 1.21 @@ -173,8 +173,8 @@ build_ethemes="yes" fi -AM_CONDITIONAL(BUILD_E17GENMENU, test $build_e17genmenu = "yes") -AM_CONDITIONAL(BUILD_EAPP_EDIT, test $build_eapp_edit = "yes") +AM_CONDITIONAL(BUILD_E17GENMENU, test $build_e17genmenu = "xyes") +AM_CONDITIONAL(BUILD_EAPP_EDIT, test $build_eapp_edit = "xyes") AM_CONDITIONAL(BUILD_E17SETROOT, test "x$build_e17setroot" = "xyes") AM_CONDITIONAL(BUILD_ENTANGLE, test "x$build_entangle" = "xyes") AM_CONDITIONAL(BUILD_EMBLEM, test "x$build_emblem" = "xyes") |
From: <enl...@li...> - 2006-03-09 00:42:08
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils Modified Files: configure.in Log Message: Ok, now this should build e17genmenu =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/configure.in,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- configure.in 9 Mar 2006 00:31:32 -0000 1.21 +++ configure.in 9 Mar 2006 00:42:04 -0000 1.22 @@ -173,8 +173,8 @@ build_ethemes="yes" fi -AM_CONDITIONAL(BUILD_E17GENMENU, test $build_e17genmenu = "xyes") -AM_CONDITIONAL(BUILD_EAPP_EDIT, test $build_eapp_edit = "xyes") +AM_CONDITIONAL(BUILD_E17GENMENU, test $xbuild_e17genmenu = "xyes") +AM_CONDITIONAL(BUILD_EAPP_EDIT, test $xbuild_eapp_edit = "xyes") AM_CONDITIONAL(BUILD_E17SETROOT, test "x$build_e17setroot" = "xyes") AM_CONDITIONAL(BUILD_ENTANGLE, test "x$build_entangle" = "xyes") AM_CONDITIONAL(BUILD_EMBLEM, test "x$build_emblem" = "xyes") |
From: <enl...@li...> - 2006-03-09 01:14:21
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils Modified Files: configure.in Log Message: Ok, this one actually fixes the e_utils genmenu build problem. - set = "yes" to = "xyes" - make the am_conditional tests correct =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e_utils/configure.in,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- configure.in 9 Mar 2006 00:42:04 -0000 1.22 +++ configure.in 9 Mar 2006 01:14:09 -0000 1.23 @@ -173,8 +173,8 @@ build_ethemes="yes" fi -AM_CONDITIONAL(BUILD_E17GENMENU, test $xbuild_e17genmenu = "xyes") -AM_CONDITIONAL(BUILD_EAPP_EDIT, test $xbuild_eapp_edit = "xyes") +AM_CONDITIONAL(BUILD_E17GENMENU, test "x$build_e17genmenu" = "xyes") +AM_CONDITIONAL(BUILD_EAPP_EDIT, test "x$build_eapp_edit" = "xyes") AM_CONDITIONAL(BUILD_E17SETROOT, test "x$build_e17setroot" = "xyes") AM_CONDITIONAL(BUILD_ENTANGLE, test "x$build_entangle" = "xyes") AM_CONDITIONAL(BUILD_EMBLEM, test "x$build_emblem" = "xyes") |
From: Enlightenment C. <no...@cv...> - 2006-05-25 17:00:06
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/src/bin/entangle Modified Files: entangle_apps.c Log Message: Minor Fix for handling new ibar location. Currently only supports the ibar/default directory. =================================================================== RCS file: /cvs/e/e17/apps/e_utils/src/bin/entangle/entangle_apps.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- entangle_apps.c 24 Oct 2005 10:51:19 -0000 1.6 +++ entangle_apps.c 25 May 2006 16:58:24 -0000 1.7 @@ -42,7 +42,7 @@ ecore_list_set_free_cb(entangle_apps_startup, entangle_apps_free_cb); ecore_list_set_free_cb(entangle_apps_deleted_dirs, entangle_apps_free_cb); - entangle_apps_dir_init(entangle_apps_bar, "bar"); + entangle_apps_dir_init(entangle_apps_bar, "bar/default"); entangle_apps_dir_init(entangle_apps_engage, "engage"); entangle_apps_dir_init(entangle_apps_favorite, "favorite"); entangle_apps_dir_init(entangle_apps_restart, "restart"); @@ -74,7 +74,7 @@ entangle_apps_dir_delete(app->eapp->path); } - entangle_apps_dir_save(entangle_apps_bar, "bar"); + entangle_apps_dir_save(entangle_apps_bar, "bar/default"); entangle_apps_dir_save(entangle_apps_engage, "engage"); entangle_apps_dir_save(entangle_apps_favorite, "favorite"); entangle_apps_dir_save(entangle_apps_restart, "restart"); |