Commit 5767b1ca authored by Giovanni Panozzo's avatar Giovanni Panozzo

Undo commit 5b4e7f15 and change VNCI plugin description

parent d4be212f
......@@ -52,7 +52,3 @@ 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()
......@@ -1053,7 +1053,6 @@ 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__);
......@@ -1087,7 +1086,6 @@ static gboolean remmina_plugin_vnc_incoming_connection(RemminaProtocolWidget *gp
return TRUE;
}
#endif
static gboolean remmina_plugin_vnc_main_loop(RemminaProtocolWidget *gp)
{
......@@ -1177,7 +1175,6 @@ 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)) {
......@@ -1190,9 +1187,6 @@ 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);
......@@ -1863,7 +1857,6 @@ 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
......@@ -1883,7 +1876,6 @@ 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:
......@@ -1927,7 +1919,7 @@ static RemminaProtocolPlugin remmina_plugin_vnc =
{
REMMINA_PLUGIN_TYPE_PROTOCOL, // Type
"VNC", // Name
N_("VNC - Virtual Network Computing"), // Description
N_("VNC - VNC viewer"), // Description
GETTEXT_PACKAGE, // Translation domain
VERSION, // Version number
"remmina-vnc", // Icon for normal connection
......@@ -1944,13 +1936,12 @@ 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 =
{
REMMINA_PLUGIN_TYPE_PROTOCOL, // Type
"VNCI", // Name
N_("VNC - Incoming Connection"), // Description
N_("VNCI - VNC viewer listen mode"), // Description
GETTEXT_PACKAGE, // Translation domain
VERSION, // Version number
"remmina-vnc", // Icon for normal connection
......@@ -1967,7 +1958,6 @@ 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)
......@@ -1982,11 +1972,9 @@ remmina_plugin_entry(RemminaPluginService *service)
return FALSE;
}
#ifdef ENABLE_VNCI
if (!service->register_plugin((RemminaPlugin*)&remmina_plugin_vnci)) {
return FALSE;
}
#endif
return TRUE;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment