forked from enlightenment/enlightenment
whitespace: also remove trailing tabs.
SVN revision: 36557
This commit is contained in:
parent
5c341ac3fd
commit
c53c56159f
|
@ -17,7 +17,7 @@ iface_callback(Evas_List *callbacks, Interface_Event event, Interface *iface, In
|
||||||
for (l = callbacks; l; l = l->next)
|
for (l = callbacks; l; l = l->next)
|
||||||
{
|
{
|
||||||
Interface_Callback *cb;
|
Interface_Callback *cb;
|
||||||
|
|
||||||
cb = l->data;
|
cb = l->data;
|
||||||
if (cb->delete_me)
|
if (cb->delete_me)
|
||||||
{
|
{
|
||||||
|
@ -55,7 +55,7 @@ iface_ipv4_decode(DBusMessage *msg)
|
||||||
char *key, *v;
|
char *key, *v;
|
||||||
int sig;
|
int sig;
|
||||||
int type;
|
int type;
|
||||||
|
|
||||||
dbus_message_iter_recurse(&iter, &item);
|
dbus_message_iter_recurse(&iter, &item);
|
||||||
key = NULL;
|
key = NULL;
|
||||||
dbus_message_iter_get_basic(&item, &key);
|
dbus_message_iter_get_basic(&item, &key);
|
||||||
|
@ -144,7 +144,7 @@ iface_network_selection_decode(DBusMessage *msg)
|
||||||
char *key, *v;
|
char *key, *v;
|
||||||
int sig;
|
int sig;
|
||||||
int type;
|
int type;
|
||||||
|
|
||||||
dbus_message_iter_recurse(&iter, &item);
|
dbus_message_iter_recurse(&iter, &item);
|
||||||
key = NULL;
|
key = NULL;
|
||||||
dbus_message_iter_get_basic(&item, &key);
|
dbus_message_iter_get_basic(&item, &key);
|
||||||
|
@ -221,7 +221,7 @@ iface_getproperties_unmarhsall(DBusMessage *msg, DBusError *err)
|
||||||
char *key, *v;
|
char *key, *v;
|
||||||
int sig;
|
int sig;
|
||||||
int type;
|
int type;
|
||||||
|
|
||||||
dbus_message_iter_recurse(&iter, &item);
|
dbus_message_iter_recurse(&iter, &item);
|
||||||
key = NULL;
|
key = NULL;
|
||||||
dbus_message_iter_get_basic(&item, &key);
|
dbus_message_iter_get_basic(&item, &key);
|
||||||
|
@ -319,7 +319,7 @@ iface_net_add(Interface *iface, const char *essid, const char *bssid, int signal
|
||||||
if (!strcmp(bssid, net->bssid))
|
if (!strcmp(bssid, net->bssid))
|
||||||
{
|
{
|
||||||
int changes = 0;
|
int changes = 0;
|
||||||
|
|
||||||
net->last_seen_time = ecore_time_get();
|
net->last_seen_time = ecore_time_get();
|
||||||
if (((essid) && (net->essid) &&
|
if (((essid) && (net->essid) &&
|
||||||
(!strcmp(essid, net->essid))) ||
|
(!strcmp(essid, net->essid))) ||
|
||||||
|
@ -379,7 +379,7 @@ iface_sigh_network_found(void *data, DBusMessage *msg)
|
||||||
if (dbus_message_iter_get_arg_type(&array) == DBUS_TYPE_ARRAY)
|
if (dbus_message_iter_get_arg_type(&array) == DBUS_TYPE_ARRAY)
|
||||||
{
|
{
|
||||||
Interface_Network *net;
|
Interface_Network *net;
|
||||||
|
|
||||||
dbus_message_iter_recurse(&array, &iter);
|
dbus_message_iter_recurse(&array, &iter);
|
||||||
net = calloc(1, sizeof(Interface_Network));
|
net = calloc(1, sizeof(Interface_Network));
|
||||||
if (net)
|
if (net)
|
||||||
|
@ -388,7 +388,7 @@ iface_sigh_network_found(void *data, DBusMessage *msg)
|
||||||
{
|
{
|
||||||
char *key, *v;
|
char *key, *v;
|
||||||
int type;
|
int type;
|
||||||
|
|
||||||
dbus_message_iter_recurse(&iter, &item);
|
dbus_message_iter_recurse(&iter, &item);
|
||||||
key = NULL;
|
key = NULL;
|
||||||
dbus_message_iter_get_basic(&item, &key);
|
dbus_message_iter_get_basic(&item, &key);
|
||||||
|
@ -580,7 +580,7 @@ iface_system_listinterfaces_unmarhsall(DBusMessage *msg, DBusError *err)
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
char *ifpath;
|
char *ifpath;
|
||||||
|
|
||||||
ifpath = NULL;
|
ifpath = NULL;
|
||||||
dbus_message_iter_get_basic(&iter, &ifpath);
|
dbus_message_iter_get_basic(&iter, &ifpath);
|
||||||
if (ifpath)
|
if (ifpath)
|
||||||
|
@ -803,7 +803,7 @@ iface_unref(Interface *iface)
|
||||||
while (iface->networks)
|
while (iface->networks)
|
||||||
{
|
{
|
||||||
Interface_Network *net;
|
Interface_Network *net;
|
||||||
|
|
||||||
net = iface->networks->data;
|
net = iface->networks->data;
|
||||||
if (net->essid) evas_stringshare_del(net->essid);
|
if (net->essid) evas_stringshare_del(net->essid);
|
||||||
if (net->bssid) evas_stringshare_del(net->bssid);
|
if (net->bssid) evas_stringshare_del(net->bssid);
|
||||||
|
@ -837,7 +837,7 @@ iface_find(const char *ifpath)
|
||||||
for (l = interfaces; l; l = l->next)
|
for (l = interfaces; l; l = l->next)
|
||||||
{
|
{
|
||||||
Interface *iface;
|
Interface *iface;
|
||||||
|
|
||||||
iface = l->data;
|
iface = l->data;
|
||||||
if (!strcmp(iface->ifpath, ifpath)) return iface;
|
if (!strcmp(iface->ifpath, ifpath)) return iface;
|
||||||
}
|
}
|
||||||
|
@ -1010,7 +1010,7 @@ iface_callback_del(Interface *iface, Interface_Event event, void (*func) (void *
|
||||||
for (l = iface->callbacks; l; l = l->next)
|
for (l = iface->callbacks; l; l = l->next)
|
||||||
{
|
{
|
||||||
Interface_Callback *cb;
|
Interface_Callback *cb;
|
||||||
|
|
||||||
cb = l->data;
|
cb = l->data;
|
||||||
if ((cb->event == event) && (cb->func == func) && (cb->data == data))
|
if ((cb->event == event) && (cb->func == func) && (cb->data == data))
|
||||||
{
|
{
|
||||||
|
@ -1090,7 +1090,7 @@ iface_system_callback_del(Interface_Event event, void (*func) (void *data, Inter
|
||||||
for (l = callbacks; l; l = l->next)
|
for (l = callbacks; l; l = l->next)
|
||||||
{
|
{
|
||||||
Interface_Callback *cb;
|
Interface_Callback *cb;
|
||||||
|
|
||||||
cb = l->data;
|
cb = l->data;
|
||||||
if ((cb->event == event) && (cb->func == func) && (cb->data == data))
|
if ((cb->event == event) && (cb->func == func) && (cb->data == data))
|
||||||
{
|
{
|
||||||
|
@ -1276,7 +1276,7 @@ main(int argc, char **argv)
|
||||||
|
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < argc; i++)
|
for (i = 0; i < argc; i++)
|
||||||
{
|
{
|
||||||
if (!strcmp(argv[i], "-ct"))
|
if (!strcmp(argv[i], "-ct"))
|
||||||
|
|
|
@ -154,7 +154,7 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
|
||||||
for (l = conf->interfaces; l; l = l->next)
|
for (l = conf->interfaces; l; l = l->next)
|
||||||
{
|
{
|
||||||
Conf_Interface *cfif;
|
Conf_Interface *cfif;
|
||||||
|
|
||||||
cfif = l->data;
|
cfif = l->data;
|
||||||
if ((cfif->name) && (!strcmp(name, cfif->name)) &&
|
if ((cfif->name) && (!strcmp(name, cfif->name)) &&
|
||||||
(cfif->id) && (!strcmp(name, cfif->id)))
|
(cfif->id) && (!strcmp(name, cfif->id)))
|
||||||
|
@ -166,7 +166,7 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
|
||||||
if (!inst->config.cfif)
|
if (!inst->config.cfif)
|
||||||
{
|
{
|
||||||
Conf_Interface *cfif;
|
Conf_Interface *cfif;
|
||||||
|
|
||||||
cfif = E_NEW(Conf_Interface, 1);
|
cfif = E_NEW(Conf_Interface, 1);
|
||||||
cfif->name = evas_stringshare_add(name);
|
cfif->name = evas_stringshare_add(name);
|
||||||
cfif->id = evas_stringshare_add(id);
|
cfif->id = evas_stringshare_add(id);
|
||||||
|
@ -480,7 +480,7 @@ net_dialog_show(Instance *inst, Conf_Network *cfnet)
|
||||||
e_widget_min_size_set(o, mw, mh);
|
e_widget_min_size_set(o, mw, mh);
|
||||||
e_widget_table_object_append(table, o, 1, row, 1, 1, 1, 1, 0, 0);
|
e_widget_table_object_append(table, o, 1, row, 1, 1, 1, 1, 0, 0);
|
||||||
row++;
|
row++;
|
||||||
|
|
||||||
o = e_widget_check_add(evas, "Remember password", &(cfnet->remember_password));
|
o = e_widget_check_add(evas, "Remember password", &(cfnet->remember_password));
|
||||||
e_widget_table_object_append(table, o, 0, row, 2, 1, 1, 1, 0, 0);
|
e_widget_table_object_append(table, o, 0, row, 2, 1, 1, 1, 0, 0);
|
||||||
row++;
|
row++;
|
||||||
|
@ -671,7 +671,7 @@ if_ilist_update(Instance *inst)
|
||||||
char buf[256];
|
char buf[256];
|
||||||
const char *vendor, *product, *type;
|
const char *vendor, *product, *type;
|
||||||
Evas_Object *icon;
|
Evas_Object *icon;
|
||||||
|
|
||||||
iface = l->data;
|
iface = l->data;
|
||||||
vendor = iface->prop.vendor;
|
vendor = iface->prop.vendor;
|
||||||
product = iface->prop.product;
|
product = iface->prop.product;
|
||||||
|
@ -859,7 +859,7 @@ popup_ifnet_icon_adjust(Evas_Object *icon, Interface_Network *ifnet)
|
||||||
for (l = conf->networks; l; l = l->next)
|
for (l = conf->networks; l; l = l->next)
|
||||||
{
|
{
|
||||||
Conf_Network *cfnet;
|
Conf_Network *cfnet;
|
||||||
|
|
||||||
cfnet = l->data;
|
cfnet = l->data;
|
||||||
if ((cfnet->essid) && (ifnet->essid) &&
|
if ((cfnet->essid) && (ifnet->essid) &&
|
||||||
(!strcmp(cfnet->essid, ifnet->essid)))
|
(!strcmp(cfnet->essid, ifnet->essid)))
|
||||||
|
@ -889,7 +889,7 @@ popup_cb_ifnet_sel(void *data)
|
||||||
for (l = iface->networks; l; l = l->next)
|
for (l = iface->networks; l; l = l->next)
|
||||||
{
|
{
|
||||||
Interface_Network *ifnet;
|
Interface_Network *ifnet;
|
||||||
|
|
||||||
ifnet = l->data;
|
ifnet = l->data;
|
||||||
E_FREE(inst->config.sec);
|
E_FREE(inst->config.sec);
|
||||||
if (ifnet->security) inst->config.sec = strdup(ifnet->security);
|
if (ifnet->security) inst->config.sec = strdup(ifnet->security);
|
||||||
|
@ -897,7 +897,7 @@ popup_cb_ifnet_sel(void *data)
|
||||||
{
|
{
|
||||||
Conf_Network *cfnet;
|
Conf_Network *cfnet;
|
||||||
char buf[256];
|
char buf[256];
|
||||||
|
|
||||||
printf("SEL %s\n", ifnet->essid);
|
printf("SEL %s\n", ifnet->essid);
|
||||||
if (!conf)
|
if (!conf)
|
||||||
conf = E_NEW(Conf, 1);
|
conf = E_NEW(Conf, 1);
|
||||||
|
@ -998,12 +998,12 @@ popup_ifnet_nets_refresh(Instance *inst)
|
||||||
for (l = networks; l; l = l->next)
|
for (l = networks; l; l = l->next)
|
||||||
{
|
{
|
||||||
Interface_Network *ifnet;
|
Interface_Network *ifnet;
|
||||||
|
|
||||||
ifnet = l->data;
|
ifnet = l->data;
|
||||||
popup_ifnet_net_add(inst, ifnet);
|
popup_ifnet_net_add(inst, ifnet);
|
||||||
}
|
}
|
||||||
if (networks) evas_list_free(networks);
|
if (networks) evas_list_free(networks);
|
||||||
|
|
||||||
e_widget_ilist_go(ilist);
|
e_widget_ilist_go(ilist);
|
||||||
e_widget_ilist_thaw(ilist);
|
e_widget_ilist_thaw(ilist);
|
||||||
}
|
}
|
||||||
|
@ -1216,7 +1216,7 @@ cb_if_del(void *data, Interface *iface, Interface_Network *ifnet)
|
||||||
for (l = instances; l; l = l->next)
|
for (l = instances; l; l = l->next)
|
||||||
{
|
{
|
||||||
Instance *inst;
|
Instance *inst;
|
||||||
|
|
||||||
inst = l->data;
|
inst = l->data;
|
||||||
if (inst_if_matches(inst, iface))
|
if (inst_if_matches(inst, iface))
|
||||||
inst_disable(inst);
|
inst_disable(inst);
|
||||||
|
@ -1236,7 +1236,7 @@ cb_if_ipv4(void *data, Interface *iface, Interface_Network *ifnet)
|
||||||
for (l = instances; l; l = l->next)
|
for (l = instances; l; l = l->next)
|
||||||
{
|
{
|
||||||
Instance *inst;
|
Instance *inst;
|
||||||
|
|
||||||
inst = l->data;
|
inst = l->data;
|
||||||
if (inst_if_matches(inst, iface))
|
if (inst_if_matches(inst, iface))
|
||||||
inst_connected(inst);
|
inst_connected(inst);
|
||||||
|
@ -1255,7 +1255,7 @@ cb_if_net_sel(void *data, Interface *iface, Interface_Network *ifnet)
|
||||||
for (l = instances; l; l = l->next)
|
for (l = instances; l; l = l->next)
|
||||||
{
|
{
|
||||||
Instance *inst;
|
Instance *inst;
|
||||||
|
|
||||||
inst = l->data;
|
inst = l->data;
|
||||||
if (inst_if_matches(inst, iface))
|
if (inst_if_matches(inst, iface))
|
||||||
inst_associating(inst);
|
inst_associating(inst);
|
||||||
|
@ -1273,7 +1273,7 @@ cb_if_scan_net_add(void *data, Interface *iface, Interface_Network *ifnet)
|
||||||
for (l = instances; l; l = l->next)
|
for (l = instances; l; l = l->next)
|
||||||
{
|
{
|
||||||
Instance *inst;
|
Instance *inst;
|
||||||
|
|
||||||
inst = l->data;
|
inst = l->data;
|
||||||
if (inst_if_matches(inst, iface))
|
if (inst_if_matches(inst, iface))
|
||||||
popup_ifnet_add(l->data, iface, ifnet);
|
popup_ifnet_add(l->data, iface, ifnet);
|
||||||
|
@ -1282,7 +1282,7 @@ cb_if_scan_net_add(void *data, Interface *iface, Interface_Network *ifnet)
|
||||||
for (l2 = conf->networks; l2; l2 = l2->next)
|
for (l2 = conf->networks; l2; l2 = l2->next)
|
||||||
{
|
{
|
||||||
Conf_Network *cfnet;
|
Conf_Network *cfnet;
|
||||||
|
|
||||||
cfnet = l2->data;
|
cfnet = l2->data;
|
||||||
if ((ifnet->essid) && (cfnet->essid) &&
|
if ((ifnet->essid) && (cfnet->essid) &&
|
||||||
(!strcmp(ifnet->essid, cfnet->essid)))
|
(!strcmp(ifnet->essid, cfnet->essid)))
|
||||||
|
@ -1307,7 +1307,7 @@ cb_if_scan_net_del(void *data, Interface *iface, Interface_Network *ifnet)
|
||||||
for (l = instances; l; l = l->next)
|
for (l = instances; l; l = l->next)
|
||||||
{
|
{
|
||||||
Instance *inst;
|
Instance *inst;
|
||||||
|
|
||||||
inst = l->data;
|
inst = l->data;
|
||||||
if (inst_if_matches(inst, iface))
|
if (inst_if_matches(inst, iface))
|
||||||
{
|
{
|
||||||
|
@ -1327,7 +1327,7 @@ cb_if_scan_net_change(void *data, Interface *iface, Interface_Network *ifnet)
|
||||||
for (l = instances; l; l = l->next)
|
for (l = instances; l; l = l->next)
|
||||||
{
|
{
|
||||||
Instance *inst;
|
Instance *inst;
|
||||||
|
|
||||||
inst = l->data;
|
inst = l->data;
|
||||||
if (inst_if_matches(inst, iface))
|
if (inst_if_matches(inst, iface))
|
||||||
popup_ifnet_change(l->data, iface, ifnet);
|
popup_ifnet_change(l->data, iface, ifnet);
|
||||||
|
@ -1344,7 +1344,7 @@ cb_if_signal(void *data, Interface *iface, Interface_Network *ifnet)
|
||||||
for (l = instances; l; l = l->next)
|
for (l = instances; l; l = l->next)
|
||||||
{
|
{
|
||||||
Instance *inst;
|
Instance *inst;
|
||||||
|
|
||||||
inst = l->data;
|
inst = l->data;
|
||||||
if (inst_if_matches(inst, iface))
|
if (inst_if_matches(inst, iface))
|
||||||
inst_signal(inst, iface->signal_strength);
|
inst_signal(inst, iface->signal_strength);
|
||||||
|
@ -1372,7 +1372,7 @@ cb_if_state(void *data, Interface *iface, Interface_Network *ifnet)
|
||||||
for (l = instances; l; l = l->next)
|
for (l = instances; l; l = l->next)
|
||||||
{
|
{
|
||||||
Instance *inst;
|
Instance *inst;
|
||||||
|
|
||||||
inst = l->data;
|
inst = l->data;
|
||||||
if (inst_if_matches(inst, iface))
|
if (inst_if_matches(inst, iface))
|
||||||
{
|
{
|
||||||
|
@ -1413,7 +1413,7 @@ cb_if_policy(void *data, Interface *iface, Interface_Network *ifnet)
|
||||||
for (l = instances; l; l = l->next)
|
for (l = instances; l; l = l->next)
|
||||||
{
|
{
|
||||||
Instance *inst;
|
Instance *inst;
|
||||||
|
|
||||||
inst = l->data;
|
inst = l->data;
|
||||||
if (inst_if_matches(inst, iface))
|
if (inst_if_matches(inst, iface))
|
||||||
{
|
{
|
||||||
|
@ -1451,7 +1451,7 @@ cb_main_if_add(void *data, Interface *iface, Interface_Network *ifnet)
|
||||||
for (l = instances; l; l = l->next)
|
for (l = instances; l; l = l->next)
|
||||||
{
|
{
|
||||||
Instance *inst;
|
Instance *inst;
|
||||||
|
|
||||||
inst = l->data;
|
inst = l->data;
|
||||||
if (inst_if_matches(inst, iface))
|
if (inst_if_matches(inst, iface))
|
||||||
{
|
{
|
||||||
|
@ -1466,7 +1466,7 @@ cb_main_if_add(void *data, Interface *iface, Interface_Network *ifnet)
|
||||||
inst_on(inst);
|
inst_on(inst);
|
||||||
else if (!strcmp(iface->prop.policy, "ask"))
|
else if (!strcmp(iface->prop.policy, "ask"))
|
||||||
inst_on(inst);
|
inst_on(inst);
|
||||||
|
|
||||||
if (inst->config.cfif->netconf)
|
if (inst->config.cfif->netconf)
|
||||||
{
|
{
|
||||||
// FIXME: must be ethernet - bring up netconf
|
// FIXME: must be ethernet - bring up netconf
|
||||||
|
|
Loading…
Reference in New Issue