enlightenment
/
enlightenment-module-net
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make net compile again. 

SVN revision: 45262
This commit is contained in:
Christopher Michael 2010-01-17 15:59:00 +00:00
parent 68179df494
commit 817925d225
4 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/e_mod_config.c
View File

@ -4,7 +4,7 @@
#include "e_mod_net.h"
#include "e_mod_gadcon.h"
EAPI Config_Item *
Config_Item *
_config_item_get(const char *id)
{
Eina_List *l;
@ -46,10 +46,10 @@ _config_item_get(const char *id)
return ci;
}
EAPI Ecore_List *
Eina_List *
_config_devices_get(void)
{
Ecore_List *devs = NULL;
Eina_List *devs = NULL;
#ifndef __FreeBSD__
FILE *f;
char buf[256];
@ -59,8 +59,6 @@ _config_devices_get(void)
f = fopen("/proc/net/dev", "r");
if (!f) return NULL;
devs = ecore_list_new();
ecore_list_free_cb_set(devs, free);
while (fgets(buf, 256, f))
{
int i = 0;
@ -73,7 +71,7 @@ _config_devices_get(void)
&dummy, &dummy, &dummy, &dummy, &dummy, &dummy, &dummy,
&dummy, &dummy, &dummy, &dummy, &dummy, &dummy) < 17)
continue;
ecore_list_append(devs, strdup(dev));
devs = eina_list_append(devs, strdup(dev));
}
fclose(f);
#else
@ -83,21 +81,18 @@ _config_devices_get(void)
d = opendir("/dev/net");
if (!d) return NULL;
devs = ecore_list_new();
ecore_list_free_cb_set(devs, free);
while ((dentry = readdir(d)) != NULL)
{
if (strstr(dentry->d_name,".") == NULL)
ecore_list_append(devs, strdup(dentry->d_name));
devs = eina_list_append(devs, strdup(dentry->d_name));
}
closedir(d);
#endif
if (devs) ecore_list_first_goto(devs);
return devs;
}
EAPI void
void
_config_updated(Config_Item *ci)
{
Eina_List *l;

6
src/e_mod_config.h
View File

@ -22,9 +22,9 @@ struct _Config_Item
int show_popup;
};
EAPI Config_Item *_config_item_get(const char *id);
EAPI Ecore_List *_config_devices_get(void);
EAPI void _config_updated(Config_Item *ci);
Config_Item *_config_item_get(const char *id);
Eina_List *_config_devices_get(void);
void _config_updated(Config_Item *ci);
extern Config *net_cfg;

15
src/e_mod_configure.c
View File

@ -10,7 +10,7 @@ struct _E_Config_Dialog_Data
int limit, show_text;
int show_popup;
Ecore_List *devs;
Eina_List *devs;
int num;
};
@ -20,7 +20,7 @@ static void _fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata);
static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
static int _apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
EAPI void
void
_configure_net_module(void *data)
{
E_Config_Dialog *cfd;
@ -61,7 +61,7 @@ _create_data(E_Config_Dialog *cfd)
static void
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
if (cfdata->devs) ecore_list_destroy(cfdata->devs);
if (cfdata->devs) eina_list_free(cfdata->devs);
E_FREE(cfdata->device);
E_FREE(cfdata->app);
E_FREE(cfdata);
@ -72,6 +72,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
static void
_fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata)
{
Eina_List *l;
char *tmp;
int i = 0;
@ -89,7 +90,7 @@ _fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata)
cfdata->devs = _config_devices_get();
if (!cfdata->devs) return;
while ((tmp = ecore_list_next(cfdata->devs)) != NULL)
EINA_LIST_FOREACH(cfdata->devs, l, tmp)
{
if (!cfdata->device) continue;
if (!strcmp(cfdata->device, tmp))
@ -106,6 +107,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *ob, *of;
E_Radio_Group *rg;
Eina_List *l;
char *tmp;
int i = 0;
@ -136,8 +138,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
of = e_widget_framelist_add(evas, D_("Device Settings"), 0);
rg = e_widget_radio_group_new(&(cfdata->num));
ecore_list_first_goto(cfdata->devs);
while ((tmp = ecore_list_next(cfdata->devs)) != NULL)
EINA_LIST_FOREACH(cfdata->devs, l, tmp)
{
ob = e_widget_radio_add(evas, tmp, i, rg);
e_widget_framelist_object_append(of, ob);
@ -155,7 +156,7 @@ _apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
Config_Item *ci;
ci = cfd->data;
tmp = ecore_list_index_goto(cfdata->devs, cfdata->num);
tmp = eina_list_nth(cfdata->devs, cfdata->num);
if (tmp != NULL)
{
eina_stringshare_del(ci->device);

2
src/e_mod_configure.h
View File

@ -1,6 +1,6 @@
#ifndef E_MOD_CONFIGURE_H
#define E_MOD_CONFIGURE_H
EAPI void _configure_net_module(void *data);
void _configure_net_module(void *data);
#endif