Merge branch 'backport'

This commit is contained in:
Dana Jansens 2008-01-20 01:36:43 -05:00
commit 98dda05c4a

View file

@ -58,10 +58,14 @@ static void sn_event_func(SnMonitorEvent *event, gpointer data);
void sn_startup(gboolean reconfig)
{
gchar *s;
if (reconfig) return;
/* unset this so we don't pass it on unknowingly */
putenv("DESKTOP_STARTUP_ID");
s = g_strdup("DESKTOP_STARTUP_ID");
putenv(s);
g_free(s);
sn_display = sn_display_new(ob_display, NULL, NULL);
sn_context = sn_monitor_context_new(sn_display, ob_screen,