Enlightenment CVS committal
Author : pfritz
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/lib
Modified Files:
emotion_private.h emotion_smart.c
Log Message:
following the api changes of ecore
===================================================================
RCS file: /cvs/e/e17/libs/emotion/src/lib/emotion_private.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- emotion_private.h 31 Oct 2007 19:34:39 -0000 1.15
+++ emotion_private.h 6 Nov 2007 16:59:49 -0000 1.16
@@ -123,7 +123,7 @@
const char * (*meta_get) (void *ef, int meta);
Ecore_Plugin *plugin;
- int group_id;
+ Ecore_Path_Group *path_group;
};
EAPI void *_emotion_video_get(Evas_Object *obj);
===================================================================
RCS file: /cvs/e/e17/libs/emotion/src/lib/emotion_smart.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- emotion_smart.c 6 Nov 2007 06:56:53 -0000 1.37
+++ emotion_smart.c 6 Nov 2007 16:59:50 -0000 1.38
@@ -85,7 +85,7 @@
/* Globals for the E Video Object */
/**********************************/
static Evas_Smart *smart = NULL;
-static int group_id = -1;
+static Ecore_Path_Group *path_group = NULL;
static unsigned char
_emotion_module_open(const char *name, Evas_Object *obj, Emotion_Video_Module
**mod, void **video)
@@ -95,13 +95,13 @@
Smart_Data *sd;
E_SMART_OBJ_GET_RETURN(sd, obj, E_OBJ_NAME, 0);
- if (group_id < 0)
- group_id = ecore_path_group_new("emotion_module");
+ if (!path_group)
+ path_group = ecore_path_group_new();
tmp = getenv("EMOTION_MODULES_DIR");
if (tmp)
- ecore_path_group_add(group_id, tmp);
- ecore_path_group_add(group_id, PACKAGE_LIB_DIR"/emotion/");
- plugin = ecore_plugin_load(group_id, name, NULL);
+ ecore_path_group_add(path_group, tmp);
+ ecore_path_group_add(path_group, PACKAGE_LIB_DIR"/emotion/");
+ plugin = ecore_plugin_load(path_group, name, NULL);
if (plugin)
{
unsigned char (*func_module_open)(Evas_Object *, Emotion_Video_Module
**, void **, Emotion_Module_Options *);
@@ -114,7 +114,7 @@
if (*mod)
{
(*mod)->plugin = plugin;
- (*mod)->group_id = group_id;
+ (*mod)->path_group = path_group;
return 1;
}
}
@@ -124,8 +124,8 @@
else
printf ("Unable to load module %s\n", name);
- if (group_id > 0)
- ecore_path_group_del(group_id);
+ if (path_group)
+ ecore_path_group_del(path_group);
return 0;
}
@@ -147,7 +147,7 @@
/*
ecore_plugin_unload(plugin);
*/
- ecore_path_group_del(group_id);
+ ecore_path_group_del(path_group);
}
/*******************************/
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
