gnome-applets r11198 - trunk/trashapplet/src

[diegoe svn gnome org]

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

Log:
Drop gnome_help from trashapplet

Modified:
   trunk/trashapplet/src/trash-empty.c
   trunk/trashapplet/src/trash-empty.h
   trunk/trashapplet/src/trashapplet.c

Modified: trunk/trashapplet/src/trash-empty.c
==============================================================================
--- trunk/trashapplet/src/trash-empty.c	(original)
+++ trunk/trashapplet/src/trash-empty.c	Wed Jan 14 07:57:46 2009
@@ -21,7 +21,7 @@
 
 #include <gconf/gconf-client.h>
 #include <gio/gio.h>
-#include <gnome.h>
+#include <glib/gi18n.h>
 
 #include "trash-empty.h"
 #include "config.h"

Modified: trunk/trashapplet/src/trash-empty.h
==============================================================================
--- trunk/trashapplet/src/trash-empty.h	(original)
+++ trunk/trashapplet/src/trash-empty.h	Wed Jan 14 07:57:46 2009
@@ -22,7 +22,7 @@
 #ifndef _trash_empty_h_
 #define _trash_empty_h_
 
-#include <gio/gio.h>
+#include <gtk/gtk.h>
 
 void trash_empty (GtkWidget *parent);
 

Modified: trunk/trashapplet/src/trashapplet.c
==============================================================================
--- trunk/trashapplet/src/trashapplet.c	(original)
+++ trunk/trashapplet/src/trashapplet.c	Wed Jan 14 07:57:46 2009
@@ -28,8 +28,8 @@
 #include <string.h>
 
 #include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
 #include <gconf/gconf-client.h>
-#include <libgnome/gnome-help.h>
 #include <gio/gio.h>
 #include <panel-applet.h>
 #include <gnome.h>
@@ -396,10 +396,10 @@
   GError *err = NULL;
 
   /* FIXME - Actually, we need a user guide */
-  gnome_help_display_desktop_on_screen (NULL,
-                                        "trashapplet", "trashapplet", NULL,
-                                        gtk_widget_get_screen (GTK_WIDGET (applet)),
-                                        &err);
+  gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (applet)),
+                "ghelp:trashapplet",
+                gtk_get_current_event_time (),
+                &err);
 
   if (err)
     {