gnome-netstatus r738 - in trunk: . src

[diegoe svn gnome org]

Author: diegoe
Date: Wed Nov 26 20:33:11 2008
New Revision: 738
URL: http://svn.gnome.org/viewvc/gnome-netstatus?rev=738&view=rev

Log:
Use gtk_show_uri instead of gnome_help.

libgnome* must die.

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/netstatus-applet.c
   trunk/src/netstatus-dialog.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Nov 26 20:33:11 2008
@@ -46,7 +46,7 @@
 PKG_CHECK_MODULES(NETSTATUS, libgnomeui-2.0 >= 2.5.2
 			     libglade-2.0 >= 2.0.0
 			     libpanelapplet-2.0 >= 2.0.0
-			     gtk+-2.0 >= 2.3.1)
+			     gtk+-2.0 >= 2.14.0)
 
 AC_CHECK_HEADERS(sys/sockio.h)
 

Modified: trunk/src/netstatus-applet.c
==============================================================================
--- trunk/src/netstatus-applet.c	(original)
+++ trunk/src/netstatus-applet.c	Wed Nov 26 20:33:11 2008
@@ -30,7 +30,6 @@
 #include <libgnomeui/gnome-about.h>
 #include <gconf/gconf-client.h>
 #include <gdk/gdkkeysyms.h>
-#include <libgnomeui/gnome-help.h>
 
 #include "netstatus-icon.h"
 #include "netstatus-iface.h"
@@ -249,9 +248,10 @@
 {
   GError *error = NULL;
   
-  gnome_help_display_on_screen ("gnome-netstatus", NULL,
-				gtk_widget_get_screen (GTK_WIDGET (applet)),
-				&error);
+  gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (applet)),
+		"ghelp:gnome-netstatus",
+		gtk_get_current_event_time (),
+		&error);
   if (error)
     {
       GtkWidget *message_dialog;

Modified: trunk/src/netstatus-dialog.c
==============================================================================
--- trunk/src/netstatus-dialog.c	(original)
+++ trunk/src/netstatus-dialog.c	Wed Nov 26 20:33:11 2008
@@ -28,7 +28,6 @@
 #include <string.h>
 #include <glade/glade-xml.h>
 #include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-help.h>
 #include <gconf/gconf-client.h>
 
 #include "netstatus-icon.h"
@@ -373,11 +372,11 @@
     case GTK_RESPONSE_HELP:
       {
 	GError    *error = NULL;
-	GdkScreen *screen;
 
-	screen = gtk_window_get_screen (GTK_WINDOW (dialog));
-
-	gnome_help_display_on_screen ("gnome-netstatus", "gnome-netstatus-props", screen, &error);
+	gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (dialog)),
+			"ghelp:gnome-netstatus?gnome-netstatus-props",
+			gtk_get_current_event_time (),
+			&error);
 
 	if (error)
 	  {
@@ -391,7 +390,8 @@
 						     error->message);
 
 	    gtk_window_set_resizable (GTK_WINDOW (message_dialog), FALSE);
-	    gtk_window_set_screen (GTK_WINDOW (message_dialog), screen);
+	    gtk_window_set_screen (GTK_WINDOW (message_dialog),
+			    gtk_widget_get_screen (GTK_WIDGET (dialog)));
 	    
 	    g_signal_connect (message_dialog, "response",
 			      G_CALLBACK (gtk_widget_destroy),