Browse Source

revert bugsnag error reporting related changes

sisyphus
Dustin Falgout 9 years ago
parent
commit
9532d2395e
  1. 12
      data/lightdm-webkit2-greeter.conf
  2. 21
      src/lightdm-webkit2-greeter-ext.c
  3. 1
      themes/_vendor/js/bugsnag-2.5.0.min.js

12
data/lightdm-webkit2-greeter.conf

@ -1,22 +1,20 @@
# #
# [greeter] # [greeter]
# webkit-theme = Webkit theme to use. (Default: antergos) # webkit-theme = Webkit theme to use.
# debug_mode = Greeter theme debug mode. (Default: false) # debug_mode = Greeter theme debug mode.
# screensaver-timeout = Blank the screen after this many seconds of inactivity. (Default: 300) # screensaver-timeout = Blank the screen after this many seconds of inactivity.
# report-errors = Automatically report errors to the developers--anonymously. (Default: true)
# #
[greeter] [greeter]
webkit-theme = antergos webkit-theme = antergos
debug_mode = false debug_mode = false
screensaver-timeout = 300 screensaver-timeout = 300
report-errors = false
# #
# [branding] # [branding]
# logo = Path to logo image for use by greeter themes. # logo = Path to logo image for use by greeter themes.
# user_image = Default user image/avatar. This is used by greeter themes for users that have no .face image. # user_image = Default user image/avatar. This is used by themes for users that have no .face image.
# background_images = Path to directory that contains background images for use by greeter themes. # background_images = Path to directory that contains background images for use by themes.
# #
[branding] [branding]

21
src/lightdm-webkit2-greeter-ext.c

@ -1452,7 +1452,6 @@ window_object_cleared_callback(WebKitScriptWorld *world,
JSStringRef command; JSStringRef command;
gboolean report_errors; gboolean report_errors;
gchar *message = "LockHint"; gchar *message = "LockHint";
gchar *theme, *bugsnag, *string;;
jsContext = webkit_frame_get_javascript_context_for_script_world(frame, world); jsContext = webkit_frame_get_javascript_context_for_script_world(frame, world);
globalObject = JSContextGetGlobalObject(jsContext); globalObject = JSContextGetGlobalObject(jsContext);
@ -1498,6 +1497,7 @@ window_object_cleared_callback(WebKitScriptWorld *world,
kJSPropertyAttributeNone, kJSPropertyAttributeNone,
NULL); NULL);
/* If the greeter was started as a lock-screen, send message to our UI process. */ /* If the greeter was started as a lock-screen, send message to our UI process. */
if (lightdm_greeter_get_lock_hint(greeter)) { if (lightdm_greeter_get_lock_hint(greeter)) {
dom_document = webkit_web_page_get_dom_document(web_page); dom_document = webkit_web_page_get_dom_document(web_page);
@ -1510,25 +1510,6 @@ window_object_cleared_callback(WebKitScriptWorld *world,
} }
} }
/* If the default theme is active & error reporting is enabled, inject bugsnag script */
theme = g_key_file_get_string(keyfile, "greeter", "theme", NULL);
report_errors = g_key_file_get_boolean(keyfile, "greeter", "report-errors", NULL);
if (report_errors && strcmp("antergos", theme) == 0) {
bugsnag = "4ea62a82"
"03b5b1af"
"7c33da0d"
"c2f6a60f";
string = g_strdup_printf("window._inject_bugsnag('%s', '%s');", bugsnag, GREETER_VERSION);
command = JSStringCreateWithUTF8CString(string);
JSEvaluateScript(jsContext, command, NULL, NULL, 0, NULL);
g_free(bugsnag);
g_free(string);
}
g_free(theme);
} }

1
themes/_vendor/js/bugsnag-2.5.0.min.js vendored

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save