gnome-nettool r807 - in trunk: . src

[gpoo svn gnome org]

Author: gpoo
Date: Thu Dec  4 02:56:05 2008
New Revision: 807
URL: http://svn.gnome.org/viewvc/gnome-nettool?rev=807&view=rev

Log:
2008-12-03  German Poo-Caamano <gpoo gnome org>

	* src/finger.c: Fixed #549588.  Try to use pinky instead of finger. Use
	  finger as fallback. It reduces one dependency on Linux systems.



Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/src/finger.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Thu Dec  4 02:56:05 2008
@@ -2,10 +2,13 @@
 ---------------------------------
 
  - Removed warnings from the Glade UI (Diego Escalante)
+ - #549588. Use pinky instead of finger to reduce one dependency in
+            Linux systems (GermÃn PÃo-CaamaÃo)
  - #560435: Removed deprecated symbols from glib (Maxim Ermilov)
  - #559852: Fixed unlocalized string in copyright (Claude Paroz)
  - #551754: Fixed unlocalized string in port scan (Takao Fujiwara)
- - #500773: Improved documentation metadata for library.gnome.org.
+ - #500773: Improved documentation metadata for library.gnome.org
+            (GermÃn PÃo-CaamaÃo)
  - #561229: Clean up Gtk+ includes (Maxim Ermilov)
 
 gnome-nettool 2.22.1, 2008-09-23

Modified: trunk/src/finger.c
==============================================================================
--- trunk/src/finger.c	(original)
+++ trunk/src/finger.c	Thu Dec  4 02:56:05 2008
@@ -43,6 +43,7 @@
 	const gchar *user = NULL;
 	gchar *command = NULL;
 	gchar *program = NULL;
+	gchar *program_name = NULL;
 	GtkWidget *parent;
 
 	gchar **command_line;
@@ -79,7 +80,14 @@
 
 	parent = gtk_widget_get_toplevel (netinfo->output);
 	
-	program = util_find_program_dialog ("finger", parent);
+	program = util_find_program_in_path ("pinky", NULL);
+
+	if (program != NULL) {
+		program_name = g_strdup ("pinky");
+	} else {
+		program = util_find_program_dialog ("finger", parent);
+		program_name = g_strdup ("finger");
+	}
 
 	if (program != NULL) {
 		/* possible arguments are:
@@ -108,7 +116,7 @@
 		command_line = g_new (gchar *, num_terms + 1);
 		i = 0;
 		command_line[i++] = g_strdup (program);
-		command_line[i++] = g_strdup ("finger");
+		command_line[i++] = g_strdup (program_name);
 		if (command_options != NULL) {
 			for (j = 0; command_options[j] != NULL; j++)
 				command_line[i++] = g_strdup (command_options[j]);