void sn_startup(gboolean reconfig) {}
void sn_shutdown(gboolean reconfig) {}
gboolean sn_app_starting() { return FALSE; }
-void sn_app_started(gchar *wmclass) {}
+Time sn_app_started(const gchar *id, const gchar *wmclass)
+{
+ return CurrentTime;
+}
gboolean sn_get_desktop(gchar *id, guint *desktop) { return FALSE; }
#else
case SN_MONITOR_EVENT_INITIATED:
d = wait_data_new(seq);
sn_waits = g_slist_prepend(sn_waits, d);
- /* 30 second timeout for apps to start */
- ob_main_loop_timeout_add(ob_main_loop, 30 * G_USEC_PER_SEC,
+ /* 15 second timeout for apps to start */
+ ob_main_loop_timeout_add(ob_main_loop, 15 * G_USEC_PER_SEC,
sn_wait_timeout, d, sn_wait_destroy);
change = TRUE;
break;
case SN_MONITOR_EVENT_CANCELED:
if ((d = wait_find(sn_startup_sequence_get_id(seq)))) {
d->feedback = FALSE;
- ob_main_loop_timeout_remove_data(ob_main_loop, sn_wait_timeout, d, FALSE);
+ ob_main_loop_timeout_remove_data(ob_main_loop, sn_wait_timeout,
+ d, FALSE);
change = TRUE;
}
break;
screen_set_root_cursor();
}
-void sn_app_started(gchar *wmclass)
+Time sn_app_started(const gchar *id, const gchar *wmclass)
{
GSList *it;
+ Time t = CurrentTime;
for (it = sn_waits; it; it = g_slist_next(it)) {
ObWaitData *d = it->data;
- if (sn_startup_sequence_get_wmclass(d->seq) &&
- !strcmp(sn_startup_sequence_get_wmclass(d->seq), wmclass))
+ const gchar *seqid, *seqclass;
+ seqid = sn_startup_sequence_get_id(d->seq);
+ seqclass = sn_startup_sequence_get_wmclass(d->seq);
+ if ((seqid && id && !strcmp(seqid, id)) ||
+ (seqclass && wmclass && !strcmp(seqclass, wmclass)))
{
sn_startup_sequence_complete(d->seq);
+ t = sn_startup_sequence_get_timestamp(d->seq);
break;
}
}
+ return t;
}
gboolean sn_get_desktop(gchar *id, guint *desktop)