strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS hrogtkremove (1.19.6); FILE MERGED

Browse source 
2004/12/17 16:15:47 hro 1.19.6.1: #i36989# Remove GTK references along with dead code
This commit is contained in:
Jens-Heiner Rechtien 2004-12-20 08:35:15 +00:00
parent e7f8a93453
commit 7fdfe8da7d
1 changed files with 22 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

140
crashrep/source/unx/main.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: main.cxx,v $
*
* $Revision: 1.19 $
* $Revision: 1.20 $
*
* last change: $Author: rt $ $Date: 2004-11-26 14:16:52 $
* last change: $Author: hr $ $Date: 2004-12-20 09:35:15 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -42,7 +42,6 @@
*
*
************************************************************************/
#include <interface.hxx>
#include <cstdio>
#include <sys/utsname.h>
#include <_version.h>
@ -57,6 +56,10 @@
#include <pwd.h>
#include <pthread.h>
#include <hash_map>
#include <vector>
#include <string>
#if defined (LINUX) || (FREEBSD)
#include <netinet/in.h>
#endif
@ -502,79 +505,14 @@ struct RequestParams
unsigned short uPort;
const char *pProxyServer;
unsigned short uProxyPort;
WizardDialog *pDialog;
};
extern "C" void *http_send_thread( void *arg )
{
RequestParams *request = (RequestParams *)arg;
int oldtype;
/* Killing me hardly ;-) */
pthread_setcanceltype( PTHREAD_CANCEL_ASYNCHRONOUS, &oldtype );
request->success = SendHTTPRequest(
request->fpin,
request->pServer,
request->uPort,
request->pProxyServer,
request->uProxyPort
);
request->pDialog->hide_sendingstatus();
return 0;
}
bool SendAsyncHTTPRequest(
WizardDialog &rDialog,
FILE *fp,
const char *pszServer,
unsigned short uPort = 80,
const char *pszProxyServer = NULL,
unsigned short uProxyPort = 8080 )
{
RequestParams request;
request.success = false;
request.pDialog = &rDialog;
request.fpin = fp;
request.pServer = pszServer;
request.uPort = uPort;
request.pProxyServer = pszProxyServer;
request.uProxyPort = uProxyPort;
pthread_t thread = 0;
if (
0 == pthread_create (
&thread,
NULL,
http_send_thread,
(void*)&request )
)
{
gint response = rDialog.show_sendingstatus( TRUE );
pthread_cancel( thread );
void *thread_result = NULL;
pthread_join( thread, &thread_result );
}
return request.success;
}
bool send_crash_report( WizardDialog *pDialog, const hash_map< string, string >& rSettings )
bool send_crash_report( const hash_map< string, string >& rSettings )
{
if ( 0 == strcasecmp( rSettings.find( "CONTACT" )->second.c_str(), "true" ) &&
!trim_string(rSettings.find( "EMAIL" )->second).length() )
{
if ( pDialog )
pDialog->show_messagebox( StringResource::get( "%ERROR_MSG_NOEMAILADDRESS%" ) );
return false;
}
@ -597,41 +535,15 @@ bool send_crash_report( WizardDialog *pDialog, const hash_map< string, string >&
WriteSOAPRequest( fptemp );
fseek( fptemp, 0, SEEK_SET );
if ( pDialog )
bSuccess = SendAsyncHTTPRequest(
*pDialog,
fptemp,
REPORT_SERVER, REPORT_PORT,
bUseProxy ? pProxyServer : NULL,
uProxyPort ? uProxyPort : 8080
);
else
{
bSuccess = SendHTTPRequest(
fptemp,
REPORT_SERVER, REPORT_PORT,
bUseProxy ? pProxyServer : NULL,
uProxyPort ? uProxyPort : 8080
);
}
fclose( fptemp );
if ( bSuccess )
{
if ( pDialog )
pDialog->show_sendingstatus( FALSE );
}
else
{
if ( pDialog )
pDialog->show_messagebox( StringResource::get( "%ERROR_MSG_PROXY%" ) );
}
}
else
{
if ( pDialog )
pDialog->show_messagebox( StringResource::get("%ERROR_MSG_DISK_FULL%") );
}
unlink( g_szDescriptionFile );
@ -753,11 +665,11 @@ static long setup_commandline_arguments( int argc, char** argv, int *pSignal )
"\n%s crash_report %s\n\n" \
"/?, -h[elp] %s\n\n" \
"%-20s %s\n\n",
StringResource::get( "%MSG_CMDLINE_USAGE%" ),
StringResource::get( "%MSG_PARAM_PROCESSID%" ),
StringResource::get( "%MSG_PARAM_HELP_DESCRIPTION%" ),
StringResource::get( "%MSG_PARAM_PROCESSID%" ),
StringResource::get( "%MSG_PARAM_PROCESSID_DESCRIPTION%" )
"%MSG_CMDLINE_USAGE%",
"%MSG_PARAM_PROCESSID%",
"%MSG_PARAM_HELP_DESCRIPTION%",
"%MSG_PARAM_PROCESSID%",
"%MSG_PARAM_PROCESSID_DESCRIPTION%"
);
break;
}
@ -1152,11 +1064,6 @@ int main( int argc, char** argv )
if ( setup_version() )
{
gtk_set_locale ();
gtk_init (&argc, &argv);
StringResource::init( argc, argv );
long pid = setup_commandline_arguments( argc, argv, &g_signal );
if ( g_bLoadReport )
@ -1165,34 +1072,13 @@ int main( int argc, char** argv )
}
if ( g_bSendReport )
{
if ( !get_accessibility_state() && !g_bNoUI )
{
WizardDialog aDialog;
hash_map< string, string >& rDialogSettings = aDialog.getSettings();
read_settings( rDialogSettings );
read_settings_from_environment( rDialogSettings );
aDialog.insertPage( new WelcomePage( &aDialog ) );
aDialog.insertPage( new MainPage( &aDialog ) );
aDialog.show();
gtk_main();
write_settings( rDialogSettings );
}
else
{
hash_map< string, string > aDialogSettings;
read_settings( aDialogSettings );
read_settings_from_environment( aDialogSettings );
send_crash_report( NULL, aDialogSettings );
}
send_crash_report( aDialogSettings );
}
else
{