diff --git a/data/heartbeat.js b/data/heartbeat.js index 60bd2d4..c916391 100644 --- a/data/heartbeat.js +++ b/data/heartbeat.js @@ -27,10 +27,13 @@ /** - * Singleton class for the greeter theme heartbeat. Once instantiated, the instance will - * begin sending a heartbeat message to the greeter every 5 seconds. Upon receiving the first - * heartbeat message, the greeter will schedule checks to ensure that subsequent heartbeat - * messages are received. If a heartbeat message is not received by the time any of the greeter's + * Singleton class for the greeter theme heartbeat. + * + * Once instantiated, the instance will begin sending a heartbeat message to the greeter + * every 5 seconds. Upon receiving the first heartbeat message, the greeter will schedule checks + * to ensure that subsequent heartbeat messages are received. + * + * If a heartbeat message is not received by the time any of the greeter's * subsequent checks run, it will assume that there has been an error in the theme's script * execution and fall back to the simple theme. */ @@ -42,6 +45,7 @@ class LightDMGreeterHeartbeat { } window._heartbeat = this; + this.heartbeat = ''; this.initialize_theme_heartbeat(); } diff --git a/src/gresource/greeter-resources.c b/src/gresource/greeter-resources.c index 3d7e607..dae9394 100644 --- a/src/gresource/greeter-resources.c +++ b/src/gresource/greeter-resources.c @@ -6,7 +6,7 @@ # define SECTION #endif -static const SECTION union { const guint8 data[2684]; const double alignment; void * const ptr;} greeter_resources_resource_data = { { +static const SECTION union { const guint8 data[2716]; const double alignment; void * const ptr;} greeter_resources_resource_data = { { 0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, @@ -23,27 +23,27 @@ static const SECTION union { const guint8 data[2684]; const double alignment; vo 0x0c, 0x01, 0x00, 0x00, 0x10, 0x01, 0x00, 0x00, 0x73, 0xf8, 0xf6, 0x72, 0x00, 0x00, 0x00, 0x00, 0x10, 0x01, 0x00, 0x00, 0x0c, 0x00, 0x76, 0x00, - 0x20, 0x01, 0x00, 0x00, 0xf0, 0x09, 0x00, 0x00, + 0x20, 0x01, 0x00, 0x00, 0x10, 0x0a, 0x00, 0x00, 0xd4, 0xb5, 0x02, 0x00, 0xff, 0xff, 0xff, 0xff, - 0xf0, 0x09, 0x00, 0x00, 0x01, 0x00, 0x4c, 0x00, - 0xf4, 0x09, 0x00, 0x00, 0xf8, 0x09, 0x00, 0x00, + 0x10, 0x0a, 0x00, 0x00, 0x01, 0x00, 0x4c, 0x00, + 0x14, 0x0a, 0x00, 0x00, 0x18, 0x0a, 0x00, 0x00, 0x8c, 0x77, 0x10, 0x71, 0x07, 0x00, 0x00, 0x00, - 0xf8, 0x09, 0x00, 0x00, 0x09, 0x00, 0x76, 0x00, - 0x08, 0x0a, 0x00, 0x00, 0x44, 0x0a, 0x00, 0x00, + 0x18, 0x0a, 0x00, 0x00, 0x09, 0x00, 0x76, 0x00, + 0x28, 0x0a, 0x00, 0x00, 0x64, 0x0a, 0x00, 0x00, 0xb4, 0xae, 0x96, 0xdb, 0x01, 0x00, 0x00, 0x00, - 0x44, 0x0a, 0x00, 0x00, 0x09, 0x00, 0x4c, 0x00, - 0x50, 0x0a, 0x00, 0x00, 0x54, 0x0a, 0x00, 0x00, + 0x64, 0x0a, 0x00, 0x00, 0x09, 0x00, 0x4c, 0x00, + 0x70, 0x0a, 0x00, 0x00, 0x74, 0x0a, 0x00, 0x00, 0x0c, 0xa6, 0xd8, 0x48, 0x05, 0x00, 0x00, 0x00, - 0x54, 0x0a, 0x00, 0x00, 0x18, 0x00, 0x4c, 0x00, - 0x6c, 0x0a, 0x00, 0x00, 0x74, 0x0a, 0x00, 0x00, + 0x74, 0x0a, 0x00, 0x00, 0x18, 0x00, 0x4c, 0x00, + 0x8c, 0x0a, 0x00, 0x00, 0x94, 0x0a, 0x00, 0x00, 0xc4, 0x0d, 0xcd, 0xb1, 0x06, 0x00, 0x00, 0x00, - 0x74, 0x0a, 0x00, 0x00, 0x04, 0x00, 0x4c, 0x00, - 0x78, 0x0a, 0x00, 0x00, 0x7c, 0x0a, 0x00, 0x00, + 0x94, 0x0a, 0x00, 0x00, 0x04, 0x00, 0x4c, 0x00, + 0x98, 0x0a, 0x00, 0x00, 0x9c, 0x0a, 0x00, 0x00, 0x6a, 0x73, 0x2f, 0x00, 0x02, 0x00, 0x00, 0x00, 0x63, 0x6f, 0x6d, 0x2f, 0x05, 0x00, 0x00, 0x00, 0x68, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x2e, 0x6a, 0x73, 0x00, 0x00, 0x00, 0x00, - 0xc0, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xe0, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2f, 0x2a, 0x0a, 0x20, 0x2a, 0x20, 0x68, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x2e, 0x6a, 0x73, 0x0a, 0x20, 0x2a, 0x0a, 0x20, 0x2a, @@ -185,82 +185,86 @@ static const SECTION union { const guint8 data[2684]; const double alignment; vo 0x68, 0x65, 0x20, 0x67, 0x72, 0x65, 0x65, 0x74, 0x65, 0x72, 0x20, 0x74, 0x68, 0x65, 0x6d, 0x65, 0x20, 0x68, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, - 0x61, 0x74, 0x2e, 0x20, 0x4f, 0x6e, 0x63, 0x65, - 0x20, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, - 0x69, 0x61, 0x74, 0x65, 0x64, 0x2c, 0x20, 0x74, - 0x68, 0x65, 0x20, 0x69, 0x6e, 0x73, 0x74, 0x61, - 0x6e, 0x63, 0x65, 0x20, 0x77, 0x69, 0x6c, 0x6c, - 0x0a, 0x20, 0x2a, 0x20, 0x62, 0x65, 0x67, 0x69, - 0x6e, 0x20, 0x73, 0x65, 0x6e, 0x64, 0x69, 0x6e, - 0x67, 0x20, 0x61, 0x20, 0x68, 0x65, 0x61, 0x72, - 0x74, 0x62, 0x65, 0x61, 0x74, 0x20, 0x6d, 0x65, - 0x73, 0x73, 0x61, 0x67, 0x65, 0x20, 0x74, 0x6f, - 0x20, 0x74, 0x68, 0x65, 0x20, 0x67, 0x72, 0x65, - 0x65, 0x74, 0x65, 0x72, 0x20, 0x65, 0x76, 0x65, - 0x72, 0x79, 0x20, 0x35, 0x20, 0x73, 0x65, 0x63, - 0x6f, 0x6e, 0x64, 0x73, 0x2e, 0x20, 0x55, 0x70, - 0x6f, 0x6e, 0x20, 0x72, 0x65, 0x63, 0x65, 0x69, - 0x76, 0x69, 0x6e, 0x67, 0x20, 0x74, 0x68, 0x65, - 0x20, 0x66, 0x69, 0x72, 0x73, 0x74, 0x0a, 0x20, - 0x2a, 0x20, 0x68, 0x65, 0x61, 0x72, 0x74, 0x62, + 0x61, 0x74, 0x2e, 0x0a, 0x20, 0x2a, 0x0a, 0x20, + 0x2a, 0x20, 0x4f, 0x6e, 0x63, 0x65, 0x20, 0x69, + 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x69, 0x61, + 0x74, 0x65, 0x64, 0x2c, 0x20, 0x74, 0x68, 0x65, + 0x20, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, + 0x65, 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x62, + 0x65, 0x67, 0x69, 0x6e, 0x20, 0x73, 0x65, 0x6e, + 0x64, 0x69, 0x6e, 0x67, 0x20, 0x61, 0x20, 0x68, + 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, + 0x20, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, + 0x20, 0x74, 0x6f, 0x20, 0x74, 0x68, 0x65, 0x20, + 0x67, 0x72, 0x65, 0x65, 0x74, 0x65, 0x72, 0x0a, + 0x20, 0x2a, 0x20, 0x65, 0x76, 0x65, 0x72, 0x79, + 0x20, 0x35, 0x20, 0x73, 0x65, 0x63, 0x6f, 0x6e, + 0x64, 0x73, 0x2e, 0x20, 0x55, 0x70, 0x6f, 0x6e, + 0x20, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x69, + 0x6e, 0x67, 0x20, 0x74, 0x68, 0x65, 0x20, 0x66, + 0x69, 0x72, 0x73, 0x74, 0x20, 0x68, 0x65, 0x61, + 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x20, 0x6d, + 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2c, 0x20, + 0x74, 0x68, 0x65, 0x20, 0x67, 0x72, 0x65, 0x65, + 0x74, 0x65, 0x72, 0x20, 0x77, 0x69, 0x6c, 0x6c, + 0x20, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, + 0x65, 0x20, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, + 0x0a, 0x20, 0x2a, 0x20, 0x74, 0x6f, 0x20, 0x65, + 0x6e, 0x73, 0x75, 0x72, 0x65, 0x20, 0x74, 0x68, + 0x61, 0x74, 0x20, 0x73, 0x75, 0x62, 0x73, 0x65, + 0x71, 0x75, 0x65, 0x6e, 0x74, 0x20, 0x68, 0x65, + 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x20, + 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, + 0x20, 0x61, 0x72, 0x65, 0x20, 0x72, 0x65, 0x63, + 0x65, 0x69, 0x76, 0x65, 0x64, 0x2e, 0x0a, 0x20, + 0x2a, 0x0a, 0x20, 0x2a, 0x20, 0x49, 0x66, 0x20, + 0x61, 0x20, 0x68, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x20, 0x6d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x65, 0x2c, 0x20, 0x74, 0x68, 0x65, - 0x20, 0x67, 0x72, 0x65, 0x65, 0x74, 0x65, 0x72, - 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x73, 0x63, - 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x20, 0x63, - 0x68, 0x65, 0x63, 0x6b, 0x73, 0x20, 0x74, 0x6f, - 0x20, 0x65, 0x6e, 0x73, 0x75, 0x72, 0x65, 0x20, - 0x74, 0x68, 0x61, 0x74, 0x20, 0x73, 0x75, 0x62, - 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x74, 0x20, + 0x61, 0x67, 0x65, 0x20, 0x69, 0x73, 0x20, 0x6e, + 0x6f, 0x74, 0x20, 0x72, 0x65, 0x63, 0x65, 0x69, + 0x76, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, + 0x68, 0x65, 0x20, 0x74, 0x69, 0x6d, 0x65, 0x20, + 0x61, 0x6e, 0x79, 0x20, 0x6f, 0x66, 0x20, 0x74, + 0x68, 0x65, 0x20, 0x67, 0x72, 0x65, 0x65, 0x74, + 0x65, 0x72, 0x27, 0x73, 0x0a, 0x20, 0x2a, 0x20, + 0x73, 0x75, 0x62, 0x73, 0x65, 0x71, 0x75, 0x65, + 0x6e, 0x74, 0x20, 0x63, 0x68, 0x65, 0x63, 0x6b, + 0x73, 0x20, 0x72, 0x75, 0x6e, 0x2c, 0x20, 0x69, + 0x74, 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x61, + 0x73, 0x73, 0x75, 0x6d, 0x65, 0x20, 0x74, 0x68, + 0x61, 0x74, 0x20, 0x74, 0x68, 0x65, 0x72, 0x65, + 0x20, 0x68, 0x61, 0x73, 0x20, 0x62, 0x65, 0x65, + 0x6e, 0x20, 0x61, 0x6e, 0x20, 0x65, 0x72, 0x72, + 0x6f, 0x72, 0x20, 0x69, 0x6e, 0x20, 0x74, 0x68, + 0x65, 0x20, 0x74, 0x68, 0x65, 0x6d, 0x65, 0x27, + 0x73, 0x20, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, + 0x0a, 0x20, 0x2a, 0x20, 0x65, 0x78, 0x65, 0x63, + 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x61, 0x6e, + 0x64, 0x20, 0x66, 0x61, 0x6c, 0x6c, 0x20, 0x62, + 0x61, 0x63, 0x6b, 0x20, 0x74, 0x6f, 0x20, 0x74, + 0x68, 0x65, 0x20, 0x73, 0x69, 0x6d, 0x70, 0x6c, + 0x65, 0x20, 0x74, 0x68, 0x65, 0x6d, 0x65, 0x2e, + 0x0a, 0x20, 0x2a, 0x2f, 0x0a, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x20, 0x4c, 0x69, 0x67, 0x68, 0x74, + 0x44, 0x4d, 0x47, 0x72, 0x65, 0x65, 0x74, 0x65, + 0x72, 0x48, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, + 0x61, 0x74, 0x20, 0x7b, 0x0a, 0x0a, 0x09, 0x63, + 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, + 0x6f, 0x72, 0x28, 0x29, 0x20, 0x7b, 0x0a, 0x09, + 0x09, 0x69, 0x66, 0x20, 0x28, 0x20, 0x27, 0x5f, 0x68, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, - 0x74, 0x0a, 0x20, 0x2a, 0x20, 0x6d, 0x65, 0x73, - 0x73, 0x61, 0x67, 0x65, 0x73, 0x20, 0x61, 0x72, - 0x65, 0x20, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, - 0x65, 0x64, 0x2e, 0x20, 0x49, 0x66, 0x20, 0x61, - 0x20, 0x68, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, - 0x61, 0x74, 0x20, 0x6d, 0x65, 0x73, 0x73, 0x61, - 0x67, 0x65, 0x20, 0x69, 0x73, 0x20, 0x6e, 0x6f, - 0x74, 0x20, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, - 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x68, - 0x65, 0x20, 0x74, 0x69, 0x6d, 0x65, 0x20, 0x61, - 0x6e, 0x79, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, - 0x65, 0x20, 0x67, 0x72, 0x65, 0x65, 0x74, 0x65, - 0x72, 0x27, 0x73, 0x0a, 0x20, 0x2a, 0x20, 0x73, - 0x75, 0x62, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, - 0x74, 0x20, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, - 0x20, 0x72, 0x75, 0x6e, 0x2c, 0x20, 0x69, 0x74, - 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x61, 0x73, - 0x73, 0x75, 0x6d, 0x65, 0x20, 0x74, 0x68, 0x61, - 0x74, 0x20, 0x74, 0x68, 0x65, 0x72, 0x65, 0x20, - 0x68, 0x61, 0x73, 0x20, 0x62, 0x65, 0x65, 0x6e, - 0x20, 0x61, 0x6e, 0x20, 0x65, 0x72, 0x72, 0x6f, - 0x72, 0x20, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, - 0x20, 0x74, 0x68, 0x65, 0x6d, 0x65, 0x27, 0x73, - 0x20, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x0a, - 0x20, 0x2a, 0x20, 0x65, 0x78, 0x65, 0x63, 0x75, - 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x61, 0x6e, 0x64, - 0x20, 0x66, 0x61, 0x6c, 0x6c, 0x20, 0x62, 0x61, - 0x63, 0x6b, 0x20, 0x74, 0x6f, 0x20, 0x74, 0x68, - 0x65, 0x20, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, - 0x20, 0x74, 0x68, 0x65, 0x6d, 0x65, 0x2e, 0x0a, - 0x20, 0x2a, 0x2f, 0x0a, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x20, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x44, - 0x4d, 0x47, 0x72, 0x65, 0x65, 0x74, 0x65, 0x72, - 0x48, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, - 0x74, 0x20, 0x7b, 0x0a, 0x0a, 0x09, 0x63, 0x6f, - 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x6f, - 0x72, 0x28, 0x29, 0x20, 0x7b, 0x0a, 0x09, 0x09, - 0x69, 0x66, 0x20, 0x28, 0x20, 0x27, 0x5f, 0x68, + 0x74, 0x27, 0x20, 0x69, 0x6e, 0x20, 0x77, 0x69, + 0x6e, 0x64, 0x6f, 0x77, 0x20, 0x29, 0x20, 0x7b, + 0x0a, 0x09, 0x09, 0x09, 0x72, 0x65, 0x74, 0x75, + 0x72, 0x6e, 0x20, 0x5f, 0x68, 0x65, 0x61, 0x72, + 0x74, 0x62, 0x65, 0x61, 0x74, 0x3b, 0x0a, 0x09, + 0x09, 0x7d, 0x0a, 0x0a, 0x09, 0x09, 0x77, 0x69, + 0x6e, 0x64, 0x6f, 0x77, 0x2e, 0x5f, 0x68, 0x65, + 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x20, + 0x3d, 0x20, 0x74, 0x68, 0x69, 0x73, 0x3b, 0x0a, + 0x09, 0x09, 0x74, 0x68, 0x69, 0x73, 0x2e, 0x68, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, - 0x27, 0x20, 0x69, 0x6e, 0x20, 0x77, 0x69, 0x6e, - 0x64, 0x6f, 0x77, 0x20, 0x29, 0x20, 0x7b, 0x0a, - 0x09, 0x09, 0x09, 0x72, 0x65, 0x74, 0x75, 0x72, - 0x6e, 0x20, 0x5f, 0x68, 0x65, 0x61, 0x72, 0x74, - 0x62, 0x65, 0x61, 0x74, 0x3b, 0x0a, 0x09, 0x09, - 0x7d, 0x0a, 0x0a, 0x09, 0x09, 0x77, 0x69, 0x6e, - 0x64, 0x6f, 0x77, 0x2e, 0x5f, 0x68, 0x65, 0x61, - 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x20, 0x3d, - 0x20, 0x74, 0x68, 0x69, 0x73, 0x3b, 0x0a, 0x0a, + 0x20, 0x3d, 0x20, 0x27, 0x27, 0x3b, 0x0a, 0x0a, 0x09, 0x09, 0x74, 0x68, 0x69, 0x73, 0x2e, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x5f, 0x74, 0x68, 0x65, 0x6d, 0x65, 0x5f,