gnome-nettool r901 - in branches/gnome-2-26: . src

[gpoo svn gnome org]

Author: gpoo
Date: Tue Mar 31 14:21:48 2009
New Revision: 901
URL: http://svn.gnome.org/viewvc/gnome-nettool?rev=901&view=rev

Log:
2009-03-31  German Poo-Caamano <gpoo gnome org>

	* src/main.c: Fix glibtop initialization order in order to
	  make it work on BSD.  Fixed #576221 (Joe Marcus Clarke)
	* configure.in: Updated to 2.26.1



Modified:
   branches/gnome-2-26/ChangeLog
   branches/gnome-2-26/NEWS
   branches/gnome-2-26/configure.in
   branches/gnome-2-26/src/main.c

Modified: branches/gnome-2-26/NEWS
==============================================================================
--- branches/gnome-2-26/NEWS	(original)
+++ branches/gnome-2-26/NEWS	Tue Mar 31 14:21:48 2009
@@ -1,3 +1,14 @@
+gnome-nettool 2.26.1, 2009-03-31
+---------------------------------
+
+ - #576221: Fix glibtop initialization order in order to
+	        make it work on BSD (Joe Marcus Clarke)
+
+ - Updated translations:
+	- ar (Abou Manal)
+	- bg (Alexander Shopov)
+	- kn (Shankar Prasad)
+
 gnome-nettool 2.26.0, 2009-03-16
 ---------------------------------
 

Modified: branches/gnome-2-26/configure.in
==============================================================================
--- branches/gnome-2-26/configure.in	(original)
+++ branches/gnome-2-26/configure.in	Tue Mar 31 14:21:48 2009
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([GNOME Nettool], [2.26.0], [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-nettool], [gnome-nettool])
+AC_INIT([GNOME Nettool], [2.26.1], [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-nettool], [gnome-nettool])
 AC_CONFIG_SRCDIR([src/ping.c])
 
 dnl Useful to call aclocal after 'make'

Modified: branches/gnome-2-26/src/main.c
==============================================================================
--- branches/gnome-2-26/src/main.c	(original)
+++ branches/gnome-2-26/src/main.c	Tue Mar 31 14:21:48 2009
@@ -120,6 +120,8 @@
 	textdomain (GETTEXT_PACKAGE);
 #endif
 
+	glibtop_init ();
+
 	if (!gtk_init_with_args (&argc, &argv, NULL, options, NULL, &error)) {
 		g_print ("%s\n\n", error->message);
 		return -1;
@@ -228,8 +230,6 @@
 
 	gtk_widget_show (window);
 
-	glibtop_init ();
-
 	gtk_main ();
 
 	glibtop_close ();