mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-19 16:25:38 +00:00
bug 518244 move LoadProxyinfo to the main thread r=ted
--HG-- extra : rebase_source : 402d4a53ec72b8b9037e187dccbfbc8ecdb6300b
This commit is contained in:
parent
2be9a70462
commit
48f0d247ca
@ -275,10 +275,6 @@ static gpointer SendThread(gpointer args)
|
||||
{
|
||||
string response, error;
|
||||
|
||||
#ifdef MOZ_ENABLE_GCONF
|
||||
LoadProxyinfo();
|
||||
#endif
|
||||
|
||||
bool success = google_breakpad::HTTPUpload::SendRequest
|
||||
(gSendURL,
|
||||
gQueryParameters,
|
||||
@ -297,7 +293,7 @@ static gpointer SendThread(gpointer args)
|
||||
SendCompleted(success, response);
|
||||
// Apparently glib is threadsafe, and will schedule this
|
||||
// on the main thread, see:
|
||||
// http://library.gnome.org/devel/gtk-faq/stable/x500.html
|
||||
// http://library.gnome.org/devel/gtk-faq/stable/x499.html
|
||||
g_idle_add(ReportCompleted, (gpointer)success);
|
||||
|
||||
return NULL;
|
||||
@ -320,6 +316,10 @@ static void SendReport()
|
||||
gtk_label_set_text(GTK_LABEL(gProgressLabel),
|
||||
gStrings[ST_REPORTDURINGSUBMIT].c_str());
|
||||
|
||||
#ifdef MOZ_ENABLE_GCONF
|
||||
LoadProxyinfo();
|
||||
#endif
|
||||
|
||||
// and spawn a thread to do the sending
|
||||
GError* err;
|
||||
gSendThreadID = g_thread_create(SendThread, NULL, TRUE, &err);
|
||||
|
Loading…
Reference in New Issue
Block a user