diff -Nru gaim-2.0.0beta6.orig/gtk/gtkmain.c gaim-2.0.0beta6/gtk/gtkmain.c
--- gaim-2.0.0beta6.orig/gtk/gtkmain.c	2007-04-22 11:29:02.000000000 +1200
+++ gaim-2.0.0beta6/gtk/gtkmain.c	2007-04-22 11:29:12.000000000 +1200
@@ -72,18 +72,7 @@
 
 #include <getopt.h>
 
-#ifdef HAVE_STARTUP_NOTIFICATION
-# define SN_API_NOT_YET_FROZEN
-# include <libsn/sn-launchee.h>
-# include <gdk/gdkx.h>
-#endif
-
-
-
-#ifdef HAVE_STARTUP_NOTIFICATION
-static SnLauncheeContext *sn_context = NULL;
-static SnDisplay *sn_display = NULL;
-#endif
+#include <gdk/gdk.h>
 
 #ifdef HAVE_SIGNAL_H
 
@@ -357,42 +346,6 @@
 	g_free(text);
 }
 
-#ifdef HAVE_STARTUP_NOTIFICATION
-static void
-sn_error_trap_push(SnDisplay *display, Display *xdisplay)
-{
-	gdk_error_trap_push();
-}
-
-static void
-sn_error_trap_pop(SnDisplay *display, Display *xdisplay)
-{
-	gdk_error_trap_pop();
-}
-
-static void
-startup_notification_complete(void)
-{
-	Display *xdisplay;
-
-	xdisplay = GDK_DISPLAY();
-	sn_display = sn_display_new(xdisplay,
-								sn_error_trap_push,
-								sn_error_trap_pop);
-	sn_context =
-		sn_launchee_context_new_from_environment(sn_display,
-												 DefaultScreen(xdisplay));
-
-	if (sn_context != NULL)
-	{
-		sn_launchee_context_complete(sn_context);
-		sn_launchee_context_unref(sn_context);
-
-		sn_display_unref(sn_display);
-	}
-}
-#endif /* HAVE_STARTUP_NOTIFICATION */
-
 #ifndef _WIN32
 static char *gaim_find_binary_location(void *symbol, void *data)
 {
@@ -805,9 +758,7 @@
 		g_list_free(accounts);
 	}
 
-#ifdef HAVE_STARTUP_NOTIFICATION
-	startup_notification_complete();
-#endif
+	gdk_notify_startup_complete();
 
 #ifdef _WIN32
 	gtkwgaim_post_init();