Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Disable VNCI plugin #1550

Merged
merged 1 commit into from
Apr 5, 2018
Merged

Disable VNCI plugin #1550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions plugins/vnc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,7 @@ install(FILES
install(FILES
22x22/emblems/remmina-vnc-ssh.png
22x22/emblems/remmina-vnc.png DESTINATION ${APPICON22_EMBLEMS_DIR})

if(WITH_VNCI)
add_definitions(-DENABLE_VNCI)
endif()
12 changes: 12 additions & 0 deletions plugins/vnc/vnc_plugin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1053,6 +1053,7 @@ static void remmina_plugin_vnc_rfb_chat(rfbClient* cl, int value, char *text)
}
}

#ifdef ENABLE_VNCI
static gboolean remmina_plugin_vnc_incoming_connection(RemminaProtocolWidget *gp, rfbClient *cl)
{
TRACE_CALL(__func__);
Expand Down Expand Up @@ -1086,6 +1087,7 @@ static gboolean remmina_plugin_vnc_incoming_connection(RemminaProtocolWidget *gp

return TRUE;
}
#endif

static gboolean remmina_plugin_vnc_main_loop(RemminaProtocolWidget *gp)
{
Expand Down Expand Up @@ -1175,6 +1177,7 @@ static gboolean remmina_plugin_vnc_main(RemminaProtocolWidget *gp)
rfbClientSetClientData(cl, NULL, gp);

if (host[0] == '\0') {
#ifdef ENABLE_VNCI
cl->serverHost = strdup(host);
cl->listenSpecified = TRUE;
if (remmina_plugin_service->file_get_int(remminafile, "ssh_enabled", FALSE)) {
Expand All @@ -1187,6 +1190,9 @@ static gboolean remmina_plugin_vnc_main(RemminaProtocolWidget *gp)
}

remmina_plugin_vnc_incoming_connection(gp, cl);
#else
return FALSE;
#endif
}else {
remmina_plugin_service->get_server_port(host, 5900, &s, &cl->serverPort);
cl->serverHost = strdup(s);
Expand Down Expand Up @@ -1857,6 +1863,7 @@ static const RemminaProtocolSetting remmina_plugin_vnc_basic_settings[] =
{ REMMINA_PROTOCOL_SETTING_TYPE_END, NULL, NULL, FALSE, NULL, NULL }
};

#ifdef ENABLE_VNCI
/* Array of RemminaProtocolSetting for basic settings.
* Each item is composed by:
* a) RemminaProtocolSettingType for setting type
Expand All @@ -1876,6 +1883,7 @@ static const RemminaProtocolSetting remmina_plugin_vnci_basic_settings[] =
{ REMMINA_PROTOCOL_SETTING_TYPE_KEYMAP, NULL, NULL, FALSE, NULL, NULL },
{ REMMINA_PROTOCOL_SETTING_TYPE_END, NULL, NULL, FALSE, NULL, NULL }
};
#endif

/* Array of RemminaProtocolSetting for advanced settings.
* Each item is composed by:
Expand Down Expand Up @@ -1936,6 +1944,7 @@ static RemminaProtocolPlugin remmina_plugin_vnc =
remmina_plugin_vnc_keystroke // Send a keystroke
};

#ifdef ENABLE_VNCI
/* Protocol plugin definition and features */
static RemminaProtocolPlugin remmina_plugin_vnci =
{
Expand All @@ -1958,6 +1967,7 @@ static RemminaProtocolPlugin remmina_plugin_vnci =
remmina_plugin_vnc_keystroke, // Send a keystroke
NULL // No screenshot support available
};
#endif

G_MODULE_EXPORT gboolean
remmina_plugin_entry(RemminaPluginService *service)
Expand All @@ -1972,9 +1982,11 @@ remmina_plugin_entry(RemminaPluginService *service)
return FALSE;
}

#ifdef ENABLE_VNCI
if (!service->register_plugin((RemminaPlugin*)&remmina_plugin_vnci)) {
return FALSE;
}
#endif

return TRUE;
}
Expand Down