gnome-applets r11193 - trunk/gweather

[diegoe svn gnome org]

Author: diegoe
Date: Wed Jan 14 07:56:46 2009
New Revision: 11193
URL: http://svn.gnome.org/viewvc/gnome-applets?rev=11193&view=rev

Log:
Drop gnome_help from gweather applet

Modified:
   trunk/gweather/gweather-about.c
   trunk/gweather/gweather-applet.c
   trunk/gweather/gweather-dialog.c
   trunk/gweather/gweather-pref.c
   trunk/gweather/gweather.h
   trunk/gweather/main.c

Modified: trunk/gweather/gweather-about.c
==============================================================================
--- trunk/gweather/gweather-about.c	(original)
+++ trunk/gweather/gweather-about.c	Wed Jan 14 07:56:46 2009
@@ -18,8 +18,6 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include <gnome.h>
-
 #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
 
 #include "gweather.h"

Modified: trunk/gweather/gweather-applet.c
==============================================================================
--- trunk/gweather/gweather-applet.c	(original)
+++ trunk/gweather/gweather-applet.c	Wed Jan 14 07:56:46 2009
@@ -19,11 +19,11 @@
 #include <assert.h>
 
 #include <gconf/gconf-client.h>
-#include <gnome.h>
 #include <panel-applet.h>
-#include <libgnomeui/gnome-window-icon.h>
 #include <panel-applet-gconf.h>
 
+#include <gdk/gdkkeysyms.h>
+
 #ifdef HAVE_LIBNOTIFY
 #include <libnotify/notify.h>
 #include <libnotify/notification.h>
@@ -59,9 +59,9 @@
 {
     GError *error = NULL;
 
-    gnome_help_display_on_screen (
-		"gweather", NULL,
-		gtk_widget_get_screen (GTK_WIDGET (gw_applet->applet)),
+    gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (gw_applet->applet)),
+		"ghelp:gweather",
+		gtk_get_current_event_time (),
 		&error);
 
     if (error) { 

Modified: trunk/gweather/gweather-dialog.c
==============================================================================
--- trunk/gweather/gweather-dialog.c	(original)
+++ trunk/gweather/gweather-dialog.c	Wed Jan 14 07:56:46 2009
@@ -19,7 +19,6 @@
 #include <assert.h>
 
 #include <gconf/gconf-client.h>
-#include <gnome.h>
 
 #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
 
@@ -137,7 +136,10 @@
 link_cb (GtkButton *button,
          gpointer data)
 {
-    gnome_url_show("http://www.weather.com/";, NULL);
+    gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (button)),
+		    "http://www.weather.com/";,
+		    gtk_get_current_event_time (),
+		    NULL);
 }
 
 static gchar*

Modified: trunk/gweather/gweather-pref.c
==============================================================================
--- trunk/gweather/gweather-pref.c	(original)
+++ trunk/gweather/gweather-pref.c	Wed Jan 14 07:56:46 2009
@@ -24,7 +24,6 @@
 #include <ctype.h>
 #include <locale.h>
 
-#include <gnome.h>
 #include <panel-applet.h>
 #include <gconf/gconf-client.h>
 
@@ -735,9 +734,9 @@
 {
     GError *error = NULL;
 
-    gnome_help_display_on_screen (
-		"gweather", "gweather-settings",
-		gtk_window_get_screen (GTK_WINDOW (dialog)),
+    gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (dialog)),
+		"ghelp:gweather?gweather-settings",
+		gtk_get_current_event_time (),
 		&error);
 
     if (error) { 

Modified: trunk/gweather/gweather.h
==============================================================================
--- trunk/gweather/gweather.h	(original)
+++ trunk/gweather/gweather.h	Wed Jan 14 07:56:46 2009
@@ -11,7 +11,6 @@
  *
  */
 
-#include <gnome.h>
 #include <panel-applet.h>
 
 #include <libgweather/gweather-gconf.h>

Modified: trunk/gweather/main.c
==============================================================================
--- trunk/gweather/main.c	(original)
+++ trunk/gweather/main.c	Wed Jan 14 07:56:46 2009
@@ -12,7 +12,6 @@
 
 #  include <config.h>
 
-#include <gnome.h>
 #include <panel-applet.h>
 
 #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE