--- rxvt-unicode/src/init.C	2011/08/19 17:49:08	1.299
+++ rxvt-unicode/src/init.C	2011/12/03 11:47:31	1.303
@@ -57,6 +57,11 @@
 # include <langinfo.h>
 #endif
 
+#ifdef HAVE_STARTUP_NOTIFICATION
+# define SN_API_NOT_YET_FROZEN
+# include <libsn/sn-launchee.h>
+#endif
+
 #ifdef DISPLAY_IS_IP
 /* On Solaris link with -lsocket and -lnsl */
 #include <sys/types.h>
@@ -607,10 +612,7 @@
   get_options (r_argc, r_argv);
 
   if (!(display = displays.get (rs[Rs_display_name])))
-    {
-      free (r_argv);
-      rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
-    }
+    rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
 
   // using a local pointer decreases code size a lot
   xa = display->xa;
@@ -642,6 +644,10 @@
     }
 #endif
 
+  // must be called after initialising the perl interpreter as it
+  // may invoke the `on_register_command' hook
+  extract_keysym_resources ();
+
   /*
    * set any defaults not already set
    */
@@ -786,7 +792,7 @@
       }
 
   if (option (Opt_scrollBar))
-    scrollBar.state = STATE_IDLE;    /* set existence for size calculations */
+    scrollBar.state = SB_STATE_IDLE;    /* set existence for size calculations */
 
   pty = ptytty::create ();
 
@@ -872,9 +878,33 @@
     }
 #endif
 
+#if HAVE_STARTUP_NOTIFICATION
+  SnDisplay *snDisplay;
+  SnLauncheeContext *snContext;
+
+  snDisplay = sn_display_new (dpy, NULL, NULL);
+  snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
+
+  /* Tell the window manager that this window is part of the startup context */
+  if (snContext)
+    sn_launchee_context_setup_window (snContext, parent);
+#endif
+
   XMapWindow (dpy, vt);
   XMapWindow (dpy, parent);
 
+#if HAVE_STARTUP_NOTIFICATION
+  if (snContext)
+    {
+      /* Mark the startup process as complete */
+      sn_launchee_context_complete (snContext);
+
+      sn_launchee_context_unref (snContext);
+    }
+
+  sn_display_unref (snDisplay);
+#endif
+
   refresh_check ();
 }