Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src
Modified Files:
entropy_config.c
Log Message:
* Cofnig version bump
* Move config directory to ~/.e/entropy/ (rather than apps/)
* Remove last of pthread junk
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/entropy_config.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- entropy_config.c 28 Mar 2006 10:31:14 -0000 1.15
+++ entropy_config.c 30 Mar 2006 04:02:03 -0000 1.16
@@ -7,7 +7,7 @@
#include <Eet.h>
#include <stdarg.h>
-#define ENTROPY_CONFIG_VERSION 10
+#define ENTROPY_CONFIG_VERSION 11
static Entropy_Config* _Entropy_Config = NULL;
@@ -251,7 +251,7 @@
}
Entropy_Config_Mime_Binding*
-entropy_config_binding_new(char* mime_type,
Entropy_Config_Mime_Binding_Action* action1, ...)
+entropy_config_binding_new(char* mime_type, char* description,
Entropy_Config_Mime_Binding_Action* action1, ...)
{
va_list args;
Entropy_Config_Mime_Binding_Action* action;
@@ -299,9 +299,9 @@
mimes = entropy_malloc(sizeof(Entropy_Config_Loaded));
- i = strlen(entropy_core_home_dir_get()) + strlen("/.e/apps/entropy") +
2;
+ i = strlen(entropy_core_home_dir_get()) + strlen("/.e/entropy") + 2;
_Entropy_Config->config_dir = entropy_malloc(i * sizeof(char));
- snprintf(_Entropy_Config->config_dir, i, "%s/%s",
entropy_core_home_dir_get(), "/.e/apps/entropy");
+ snprintf(_Entropy_Config->config_dir, i, "%s/%s",
entropy_core_home_dir_get(), "/.e/entropy");
printf("Config dir is: '%s'\n", _Entropy_Config->config_dir);
@@ -495,46 +495,46 @@
config->config_version = ENTROPY_CONFIG_VERSION;
config->mime_bindings = evas_list_append(config->mime_bindings,
- entropy_config_binding_new("image/jpeg",
+ entropy_config_binding_new("image/jpeg", "JPEG
Image",
entropy_config_binding_action_new("Exhibit (Single File)", "exhibit", "\%pf"),
entropy_config_binding_action_new("Exhibit (Directory)", "exhibit", "\%p"),
NULL
));
config->mime_bindings = evas_list_append(config->mime_bindings,
- entropy_config_binding_new("image/png",
+ entropy_config_binding_new("image/png", "PNG
Image",
entropy_config_binding_action_new("Exhibit (Single File)", "exhibit", "\%pf"),
entropy_config_binding_action_new("Exhibit (Directory)", "exhibit", "\%p"),
NULL
));
config->mime_bindings = evas_list_append(config->mime_bindings,
- entropy_config_binding_new("image/gif",
+ entropy_config_binding_new("image/gif", "GIF
Image",
entropy_config_binding_action_new("Exhibit (Single File)", "exhibit", "\%pf"),
entropy_config_binding_action_new("Exhibit (Directory)", "exhibit", "\%p"),
NULL
));
config->mime_bindings = evas_list_append(config->mime_bindings,
- entropy_config_binding_new("text/csrc",
+ entropy_config_binding_new("text/csrc", "C
Source File",
entropy_config_binding_action_new("Gvim", "gvim", "\%pf"),
NULL
));
config->mime_bindings = evas_list_append(config->mime_bindings,
- entropy_config_binding_new("text/html",
+ entropy_config_binding_new("text/html", "HTML
Document",
entropy_config_binding_action_new("Firefox", "firefox", "\%pf"),
NULL
));
config->mime_bindings = evas_list_append(config->mime_bindings,
- entropy_config_binding_new("audio/x-mp3",
+ entropy_config_binding_new("audio/x-mp3", "MP3
Audio",
entropy_config_binding_action_new("Xmms", "xmms", "\%pf"),
entropy_config_binding_action_new("Mpg123 (via eVFS)", "evfscat \%u | mpg123
-", ""),
NULL
));
config->mime_bindings = evas_list_append(config->mime_bindings,
- entropy_config_binding_new("video/x-ms-wmv",
+ entropy_config_binding_new("video/x-ms-wmv",
"WMV Video",
entropy_config_binding_action_new("MPlayer", "mplayer", "\%pf"),
entropy_config_binding_action_new("MPlayer (via evfs)", "evfscat \%u | mplayer
-cache 4096 -", ""),
entropy_config_binding_action_new("Xine", "xine", "%pf"),
@@ -542,7 +542,7 @@
));
config->mime_bindings = evas_list_append(config->mime_bindings,
- entropy_config_binding_new("video/mpeg",
+ entropy_config_binding_new("video/mpeg", "MPEG
Video",
entropy_config_binding_action_new("MPlayer", "mplayer", "\%pf"),
entropy_config_binding_action_new("MPlayer (via evfs)", "evfscat \%u | mplayer
-cache 4096 -", ""),
entropy_config_binding_action_new("Xine", "xine", "%pf"),
@@ -550,7 +550,7 @@
));
config->mime_bindings = evas_list_append(config->mime_bindings,
- entropy_config_binding_new("video/x-msvideo",
+ entropy_config_binding_new("video/x-msvideo",
"AVI Video",
entropy_config_binding_action_new("MPlayer", "mplayer", "\%pf"),
entropy_config_binding_action_new("MPlayer (via evfs)", "evfscat \%u | mplayer
-cache 4096 -", ""),
entropy_config_binding_action_new("Xine", "xine", "%pf"),
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
