netspeed r128 - in trunk: . help src

[mfcn svn gnome org]

Author: mfcn
Date: Sun Aug 24 18:59:16 2008
New Revision: 128
URL: http://svn.gnome.org/viewvc/netspeed?rev=128&view=rev

Log:
	* src/netspeed.c (update_applet):
	Patch by Marius Gedminas; Should fix #503518
	* help/Makefile.am:
	Remove es for now, it breaks the build



Modified:
   trunk/ChangeLog
   trunk/help/ChangeLog
   trunk/help/Makefile.am
   trunk/src/netspeed.c

Modified: trunk/help/Makefile.am
==============================================================================
--- trunk/help/Makefile.am	(original)
+++ trunk/help/Makefile.am	Sun Aug 24 18:59:16 2008
@@ -15,7 +15,7 @@
 figures/settings.png \
 figures/wavelan.png
 
-DOC_LINGUAS = de el es fr pt_BR sv
+DOC_LINGUAS = de el fr pt_BR sv
 # Migration needed (see INSTRUCTIONS http://live.gnome.org/GnomeDocUtilsTranslationMigration)
 # DOC_LINGUAS = cs ru es
 #

Modified: trunk/src/netspeed.c
==============================================================================
--- trunk/src/netspeed.c	(original)
+++ trunk/src/netspeed.c	Sun Aug 24 18:59:16 2008
@@ -698,10 +698,21 @@
 		applet->max_graph = max;
 	}
 
-	/* If the device is down, lets look for a running one */
-	if (!applet->devinfo.running && applet->auto_change_device)
-		search_for_up_if(applet);
-}	
+	/* Always follow the default route */
+	if (applet->auto_change_device) {
+		gboolean change_device_now = !applet->devinfo.running;
+		if (!change_device_now) {
+			const gchar *default_route;
+			default_route = get_default_route();
+			change_device_now = (default_route != NULL
+						&& strcmp(default_route,
+							applet->devinfo.name));
+		}
+		if (change_device_now) {
+			search_for_up_if(applet);
+		}
+	}
+}
 
 static gboolean
 timeout_function(NetspeedApplet *applet)