DeforaOS/Panel
DeforaOS/Panel
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mark network interfaces as offline when disconnected

Browse Source
This commit is contained in:
Pierre Pronchery 2015-09-03 00:33:04 +02:00
parent 1af8ef99b4
commit 63ca81f5f4
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/applets/network.c
View File

@ -74,8 +74,8 @@ static int _networkinterface_init(NetworkInterface * ni, char const * name,
unsigned int flags); unsigned int flags);
static void _networkinterface_destroy(NetworkInterface * ni); static void _networkinterface_destroy(NetworkInterface * ni);
static void _networkinterface_update(NetworkInterface * ni, char const * icon, static void _networkinterface_update(NetworkInterface * ni, char const * icon,
GtkIconSize iconsize, unsigned int flags, gboolean updated, GtkIconSize iconsize, gboolean active, unsigned int flags,
char const * tooltip); gboolean updated, char const * tooltip);
/* public */ /* public */
@ -254,7 +254,8 @@ static void _refresh_interface_delete(Network * network, size_t i)
static void _refresh_interface_flags(Network * network, NetworkInterface * ni, static void _refresh_interface_flags(Network * network, NetworkInterface * ni,
unsigned int flags) unsigned int flags)
{ {
char const * icon = "network-idle"; gboolean active = TRUE;
char const * icon = "network-offline";
#ifdef SIOCGIFDATA #ifdef SIOCGIFDATA
struct ifdatareq ifdr; struct ifdatareq ifdr;
# if GTK_CHECK_VERSION(2, 12, 0) # if GTK_CHECK_VERSION(2, 12, 0)
@ -266,12 +267,11 @@ static void _refresh_interface_flags(Network * network, NetworkInterface * ni,
#ifdef IFF_UP #ifdef IFF_UP
if((flags & IFF_UP) != IFF_UP) if((flags & IFF_UP) != IFF_UP)
icon = "network-offline"; active = FALSE;
else else
#endif #endif
{ {
#ifdef SIOCGIFDATA #ifdef SIOCGIFDATA
icon = "network-idle";
/* XXX ignore errors */ /* XXX ignore errors */
memset(&ifdr, 0, sizeof(ifdr)); memset(&ifdr, 0, sizeof(ifdr));
strncpy(ifdr.ifdr_name, ni->name, sizeof(ifdr.ifdr_name)); strncpy(ifdr.ifdr_name, ni->name, sizeof(ifdr.ifdr_name));
@ -279,6 +279,12 @@ static void _refresh_interface_flags(Network * network, NetworkInterface * ni,
network->helper->error(NULL, "SIOCGIFDATA", 1); network->helper->error(NULL, "SIOCGIFDATA", 1);
else else
{ {
#ifdef LINK_STATE_UP
icon = (ifdr.ifdr_data.ifi_link_state == LINK_STATE_UP)
? "network-idle" : "network-offline";
#else
icon = "network-idle";
#endif
if(ifdr.ifdr_data.ifi_ipackets > ni->ipackets) if(ifdr.ifdr_data.ifi_ipackets > ni->ipackets)
icon = (ifdr.ifdr_data.ifi_opackets icon = (ifdr.ifdr_data.ifi_opackets
> ni->opackets) > ni->opackets)
@ -308,7 +314,8 @@ static void _refresh_interface_flags(Network * network, NetworkInterface * ni,
} }
_networkinterface_update(ni, icon, _networkinterface_update(ni, icon,
panel_window_get_icon_size(network->helper->window), panel_window_get_icon_size(network->helper->window),
flags, TRUE, (tooltip[0] != '\0') ? tooltip : NULL); active, flags, TRUE,
(tooltip[0] != '\0') ? tooltip : NULL);
} }
static void _refresh_purge(Network * network) static void _refresh_purge(Network * network)
@ -374,10 +381,11 @@ static void _networkinterface_destroy(NetworkInterface * ni)
/* networkinterface_update */ /* networkinterface_update */
static void _networkinterface_update(NetworkInterface * ni, char const * icon, static void _networkinterface_update(NetworkInterface * ni, char const * icon,
GtkIconSize iconsize, unsigned int flags, gboolean updated, GtkIconSize iconsize, gboolean active, unsigned int flags,
char const * tooltip) gboolean updated, char const * tooltip)
{ {
gtk_image_set_from_icon_name(GTK_IMAGE(ni->widget), icon, iconsize); gtk_image_set_from_icon_name(GTK_IMAGE(ni->widget), icon, iconsize);
gtk_widget_set_sensitive(ni->widget, active);
#if GTK_CHECK_VERSION(2, 12, 0) #if GTK_CHECK_VERSION(2, 12, 0)
if(tooltip != NULL) if(tooltip != NULL)
gtk_widget_set_tooltip_text(ni->widget, tooltip); gtk_widget_set_tooltip_text(ni->widget, tooltip);