Index: stickynotes/stickynotes_callbacks.c
===================================================================
--- stickynotes/stickynotes_callbacks.c	(revision 11140)
+++ stickynotes/stickynotes_callbacks.c	(working copy)
@@ -63,6 +63,8 @@
 		gtk_window_begin_move_drag(GTK_WINDOW(note->w_window), event->button, event->x_root, event->y_root, event->time);
 	else if (event->type == GDK_2BUTTON_PRESS && event->button == 1)
 		stickynote_change_properties(note);
+	else if (event->type == GDK_BUTTON_PRESS && event->button == 3)
+		gtk_menu_popup (GTK_MENU (note->w_menu), NULL, NULL, NULL, NULL, event->button, event->time);
 	else
 		return FALSE;
 
Index: stickynotes/stickynotes.c
===================================================================
--- stickynotes/stickynotes.c	(revision 11140)
+++ stickynotes/stickynotes.c	(working copy)
@@ -22,8 +22,6 @@
 #include <X11/Xatom.h>
 #include <gdk/gdkx.h>
 #define WNCK_I_KNOW_THIS_IS_UNSTABLE 1
-#include <libgnome/libgnome.h>
-#include <libgnomeui/libgnomeui.h>
 #include <libwnck/libwnck.h>
 #include <string.h>
 
@@ -200,11 +198,8 @@
 
 	/* gnome_popup_menu_*() are deprecated. Rewrite to use gtk_menu_popup_*()? */
 	/* Connect a popup menu to all buttons and title */
-	gnome_popup_menu_attach(note->w_menu, note->w_window, note);
-	gnome_popup_menu_attach(note->w_menu, note->w_lock, note);
-	gnome_popup_menu_attach(note->w_menu, note->w_close, note);
-	gnome_popup_menu_attach(note->w_menu, note->w_resize_se, note);
-	gnome_popup_menu_attach(note->w_menu, note->w_resize_sw, note);
+	gdk_window_set_events (gtk_widget_get_window (note->w_window), GDK_ALL_EVENTS_MASK);
+	gtk_menu_attach_to_widget (GTK_MENU (note->w_menu), note->w_window, NULL);
 
 	/* Connect a properties dialog to the note */
 	gtk_window_set_transient_for (GTK_WINDOW(note->w_properties),
@@ -354,7 +349,9 @@
 response_cb (GtkWidget *dialog, gint id, gpointer data)
 {
         if (id == GTK_RESPONSE_HELP)
-                gnome_help_display ("stickynotes_applet", "stickynotes-settings-individual", NULL);
+	{
+		gtk_show_uri (gtk_widget_get_screen (dialog), "ghelp:stickynotes_applet?stickynotes-settings-individual", gtk_get_current_event_time (), NULL);
+	}
         else
                 gtk_widget_hide (dialog);
 }
Index: trashapplet/src/trash-empty.h
===================================================================
--- trashapplet/src/trash-empty.h	(revision 11140)
+++ trashapplet/src/trash-empty.h	(working copy)
@@ -23,6 +23,7 @@
 #define _trash_empty_h_
 
 #include <gio/gio.h>
+#include <gtk/gtk.h>
 
 void trash_empty (GtkWidget *parent);
 
Index: trashapplet/src/trashapplet.c
===================================================================
--- trashapplet/src/trashapplet.c	(revision 11140)
+++ trashapplet/src/trashapplet.c	(working copy)
@@ -28,11 +28,10 @@
 #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>
 
 #include "trash-empty.h"
 #include "xstuff.h"
@@ -381,10 +380,7 @@
         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) {
         	error_dialog (applet, _("There was an error displaying help: %s"), err->message);
Index: trashapplet/src/trash-empty.c
===================================================================
--- trashapplet/src/trash-empty.c	(revision 11140)
+++ trashapplet/src/trash-empty.c	(working copy)
@@ -21,10 +21,11 @@
 
 #include <gconf/gconf-client.h>
 #include <gio/gio.h>
-#include <gnome.h>
 
 #include "trash-empty.h"
 #include "config.h"
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 /* only one concurrent trash empty operation can occur */
 static GtkDialog          *trash_empty_confirm_dialog;
Index: geyes/geyes.c
===================================================================
--- geyes/geyes.c	(revision 11140)
+++ geyes/geyes.c	(working copy)
@@ -19,7 +19,6 @@
 
 #include <config.h>
 #include <math.h>
-#include <gnome.h>
 #include <panel-applet.h>
 #include <panel-applet-gconf.h>
 #include "geyes.h"
Index: charpick/charpick.c
===================================================================
--- charpick/charpick.c	(revision 11140)
+++ charpick/charpick.c	(working copy)
@@ -5,7 +5,6 @@
 #include <config.h>
 #include <string.h>
 #include <panel-applet.h>
-#include <libgnomeui/gnome-help.h>
 #ifdef HAVE_GUCHARMAP
 #	include <gucharmap/gucharmap.h>
 #endif
@@ -148,7 +147,7 @@
   charpick_data *curr_data = data;
   
   if (curr_data->last_toggle_button)
-    gtk_toggle_button_set_state (curr_data->last_toggle_button, FALSE);
+    gtk_toggle_button_set_active (curr_data->last_toggle_button, FALSE);
 
   curr_data->last_toggle_button = NULL;
   return TRUE;
@@ -310,7 +309,7 @@
 	while (list) {
 		gchar *string = list->data;
 		menuitem = gtk_radio_menu_item_new_with_label (group, string);
-		group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
+		group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
 		gtk_widget_show (menuitem);
 		g_object_set_data (G_OBJECT (menuitem), "string", string);
 		g_signal_connect (G_OBJECT (menuitem), "activate",
@@ -495,10 +494,9 @@
     g_object_set_data (G_OBJECT (toggle_button[i]), "unichar", 
 				GINT_TO_POINTER(g_utf8_get_char (label)));
     g_signal_connect (GTK_OBJECT (toggle_button[i]), "toggled",
-                        (GtkSignalFunc) toggle_button_toggled_cb,
-                        p_curr_data);
+                        G_CALLBACK (toggle_button_toggled_cb), p_curr_data);
     g_signal_connect (GTK_OBJECT (toggle_button[i]), "button_press_event", 
-                        (GtkSignalFunc) button_press_hack, p_curr_data->applet);
+                        G_CALLBACK (button_press_hack), p_curr_data->applet);
   }
   
   if (p_curr_data->panel_vertical) {
@@ -796,10 +794,10 @@
                             utf8_atom,
 			    0);
   g_signal_connect (GTK_OBJECT (curr_data->applet), "selection_get",
-		      GTK_SIGNAL_FUNC (charpick_selection_handler),
+		      G_CALLBACK (charpick_selection_handler),
 		      curr_data);
   g_signal_connect (GTK_OBJECT (curr_data->applet), "selection_clear_event",
-		      GTK_SIGNAL_FUNC (selection_clear_cb),
+		      G_CALLBACK (selection_clear_cb),
 		      curr_data);
  
   make_applet_accessible (GTK_WIDGET (applet));
@@ -859,4 +857,3 @@
 			     "0",
 			     charpicker_applet_factory,
 			     NULL)
-
Index: battstat/battstat_applet.c
===================================================================
--- battstat/battstat_applet.c	(revision 11140)
+++ battstat/battstat_applet.c	(working copy)
@@ -39,8 +39,6 @@
 
 #include <libgnome/libgnome.h>
 
-#include <libgnomeui/libgnomeui.h>
-
 #include <panel-applet.h>
 #include <panel-applet-gconf.h>
 
Index: battstat/properties.c
===================================================================
--- battstat/properties.c	(revision 11140)
+++ battstat/properties.c	(working copy)
@@ -46,8 +46,6 @@
 
 #include <libgnome/libgnome.h>
 
-#include <libgnomeui/libgnomeui.h>
-
 #include <panel-applet.h>
 #include <panel-applet-gconf.h>
 
Index: drivemount/drivemount.c
===================================================================
--- drivemount/drivemount.c	(revision 11140)
+++ drivemount/drivemount.c	(working copy)
@@ -27,7 +27,6 @@
 #include <string.h>
 
 #include <gtk/gtk.h>
-#include <libgnomeui/gnome-help.h>
 #include <panel-applet.h>
 
 #include "drive-list.h"
@@ -129,9 +128,7 @@
     GError *error = NULL;
 
     screen = gtk_widget_get_screen (GTK_WIDGET (drive_list));
-    gnome_help_display_desktop_on_screen (
-		NULL, "drivemount", "drivemount", NULL,
-		screen, &error);
+    gtk_show_uri (screen, "ghelp:drivemount", gtk_get_current_event_time (), &error);
     if (error) {
 	GtkWidget *dialog;
 
Index: gweather/gweather-pref.c
===================================================================
--- gweather/gweather-pref.c	(revision 11140)
+++ gweather/gweather-pref.c	(working copy)
@@ -24,7 +24,6 @@
 #include <ctype.h>
 #include <locale.h>
 
-#include <gnome.h>
 #include <panel-applet.h>
 #include <gconf/gconf-client.h>
 
@@ -735,10 +734,7 @@
 {
     GError *error = NULL;
 
-    gnome_help_display_on_screen (
-		"gweather", "gweather-settings",
-		gtk_window_get_screen (GTK_WINDOW (dialog)),
-		&error);
+    gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)), "gfile:gweather", GDK_CURRENT_TIME, &error);
 
     if (error) { 
 	GtkWidget *error_dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
Index: gweather/gweather-dialog.c
===================================================================
--- gweather/gweather-dialog.c	(revision 11140)
+++ gweather/gweather-dialog.c	(working copy)
@@ -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,7 @@
 link_cb (GtkButton *button,
          gpointer data)
 {
-    gnome_url_show("http://www.weather.com/", NULL);
+    gtk_show_uri (NULL, "http://www.weather.com/", GDK_CURRENT_TIME, NULL);
 }
 
 static gchar*
Index: gweather/gweather.h
===================================================================
--- gweather/gweather.h	(revision 11140)
+++ gweather/gweather.h	(working copy)
@@ -11,7 +11,7 @@
  *
  */
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 #include <panel-applet.h>
 
 #include <libgweather/gweather-gconf.h>
Index: gweather/gweather-about.c
===================================================================
--- gweather/gweather-about.c	(revision 11140)
+++ gweather/gweather-about.c	(working copy)
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 
 #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
 
Index: gweather/main.c
===================================================================
--- gweather/main.c	(revision 11140)
+++ gweather/main.c	(working copy)
@@ -10,9 +10,9 @@
  *
  */
 
-#  include <config.h>
-
-#include <gnome.h>
+#include <glib.h>
+#include <config.h>
+#include <gtk/gtk.h>
 #include <panel-applet.h>
 
 #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
Index: gweather/gweather-applet.c
===================================================================
--- gweather/gweather-applet.c	(revision 11140)
+++ gweather/gweather-applet.c	(working copy)
@@ -19,9 +19,9 @@
 #include <assert.h>
 
 #include <gconf/gconf-client.h>
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
 #include <panel-applet.h>
-#include <libgnomeui/gnome-window-icon.h>
 #include <panel-applet-gconf.h>
 
 #ifdef HAVE_LIBNOTIFY
@@ -332,7 +332,7 @@
     g_signal_connect (G_OBJECT(gw_applet->applet), "destroy", 
                        G_CALLBACK (applet_destroy), gw_applet);
     g_signal_connect (GTK_OBJECT(gw_applet->applet), "button_press_event",
-                       GTK_SIGNAL_FUNC(clicked_cb), gw_applet);
+                       G_CALLBACK (clicked_cb), gw_applet);
     g_signal_connect (G_OBJECT(gw_applet->applet), "key_press_event",           
 			G_CALLBACK(key_press_cb), gw_applet);
                      
Index: accessx-status/applet.c
===================================================================
--- accessx-status/applet.c	(revision 11140)
+++ accessx-status/applet.c	(working copy)
@@ -412,7 +412,7 @@
 	g_object_unref (layout);
 	glyph_pixbuf = gdk_pixbuf_get_from_drawable (NULL, pixmap, 
 						     cmap, 0, 0, 0, 0, w, h);
-	gdk_pixmap_unref (pixmap);
+	g_object_unref (pixmap);
 	alpha_pixbuf = gdk_pixbuf_add_alpha (glyph_pixbuf, TRUE, bg->red >> 8, bg->green >> 8, bg->blue >> 8);
 	g_object_unref (G_OBJECT (glyph_pixbuf));
 	g_object_unref (G_OBJECT (cmap));
