mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libfreerdp-core: fix decoupling of rdpSettings* from rdpContext*

Browse Source
This commit is contained in:
Marc-André Moreau 2013-10-12 22:58:09 -04:00
parent 59eccac4e7
commit 69345954b8
2 changed files with 8 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
libfreerdp/common/settings.c
View File

@ -802,9 +802,6 @@ BOOL freerdp_get_param_bool(rdpSettings* settings, int id)
int freerdp_set_param_bool(rdpSettings* settings, int id, BOOL param)
{
ParamChangeEventArgs e;
rdpContext* context = ((freerdp*) settings->instance)->context;
switch (id)
{
case FreeRDP_ServerMode:
@ -1260,13 +1257,9 @@ int freerdp_set_param_bool(rdpSettings* settings, int id, BOOL param)
break;
}
// Mark field as modified
/* Mark field as modified */
settings->settings_modified[id] = 1;
EventArgsInit(&e, "freerdp");
e.id = id;
PubSub_OnParamChange(context->pubSub, context, &e);
return -1;
}
@ -1292,9 +1285,6 @@ int freerdp_get_param_int(rdpSettings* settings, int id)
int freerdp_set_param_int(rdpSettings* settings, int id, int param)
{
ParamChangeEventArgs e;
rdpContext* context = ((freerdp*) settings->instance)->context;
switch (id)
{
case FreeRDP_XPan:
@ -1312,10 +1302,6 @@ int freerdp_set_param_int(rdpSettings* settings, int id, int param)
settings->settings_modified[id] = 1;
EventArgsInit(&e, "freerdp");
e.id = id;
PubSub_OnParamChange(context->pubSub, context, &e);
return 0;
}
@ -1641,9 +1627,6 @@ UINT32 freerdp_get_param_uint32(rdpSettings* settings, int id)
int freerdp_set_param_uint32(rdpSettings* settings, int id, UINT32 param)
{
ParamChangeEventArgs e;
rdpContext* context = ((freerdp*) settings->instance)->context;
switch (id)
{
case FreeRDP_ShareId:
@ -1959,12 +1942,8 @@ int freerdp_set_param_uint32(rdpSettings* settings, int id, UINT32 param)
break;
}
// Mark field as modified
/* Mark field as modified */
settings->settings_modified[id] = 1;
EventArgsInit(&e, "freerdp");
e.id = id;
PubSub_OnParamChange(context->pubSub, context, &e);
return 0;
}
@ -1987,9 +1966,6 @@ UINT64 freerdp_get_param_uint64(rdpSettings* settings, int id)
int freerdp_set_param_uint64(rdpSettings* settings, int id, UINT64 param)
{
ParamChangeEventArgs e;
rdpContext* context = ((freerdp*) settings->instance)->context;
switch (id)
{
case FreeRDP_ParentWindowId:
@ -2001,12 +1977,8 @@ int freerdp_set_param_uint64(rdpSettings* settings, int id, UINT64 param)
break;
}
// Mark field as modified
/* Mark field as modified */
settings->settings_modified[id] = 1;
EventArgsInit(&e, "freerdp");
e.id = id;
PubSub_OnParamChange(context->pubSub, context, &e);
return 0;
}
@ -2177,9 +2149,6 @@ char* freerdp_get_param_string(rdpSettings* settings, int id)
int freerdp_set_param_string(rdpSettings* settings, int id, const char* param)
{
ParamChangeEventArgs e;
rdpContext* context = ((freerdp*) settings->instance)->context;
switch (id)
{
case FreeRDP_ServerHostname:
@ -2339,13 +2308,9 @@ int freerdp_set_param_string(rdpSettings* settings, int id, const char* param)
break;
}
// Mark field as modified
/* Mark field as modified */
settings->settings_modified[id] = 1;
EventArgsInit(&e, "freerdp");
e.id = id;
PubSub_OnParamChange(context->pubSub, context, &e);
return 0;
}
@ -2367,9 +2332,6 @@ double freerdp_get_param_double(rdpSettings* settings, int id)
int freerdp_set_param_double(rdpSettings* settings, int id, double param)
{
ParamChangeEventArgs e;
rdpContext* context = ((freerdp*) settings->instance)->context;
switch (id)
{
case FreeRDP_ScalingFactor:
@ -2381,12 +2343,9 @@ int freerdp_set_param_double(rdpSettings* settings, int id, double param)
break;
}
/* Mark field as modified */
settings->settings_modified[id] = 1;
EventArgsInit(&e, "freerdp");
e.id = id;
PubSub_OnParamChange(context->pubSub, context, &e);
return 0;
}

5
libfreerdp/core/rdp.c
View File

@ -1003,9 +1003,10 @@ rdpRdp* rdp_new(rdpContext* context)
if (context->ServerMode)
flags |= FREERDP_SETTINGS_SERVER_MODE;
if (!rdp->settings)
rdp->settings = freerdp_settings_new(flags);
if (!context->settings)
context->settings = freerdp_settings_new(flags);
rdp->settings = context->settings;
rdp->settings->instance = context->instance;
if (context->instance)