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

Removed survey to clean up the code - API CHANGE #1065

Merged
merged 1 commit into from
Dec 16, 2016
Merged

Removed survey to clean up the code - API CHANGE #1065

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
11 changes: 0 additions & 11 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,22 +158,11 @@ find_required_package(PTHREAD)
find_suggested_package(GCRYPT)
find_suggested_package(AVAHI)

# Survey URI
set(REMMINA_SURVEY_URI "http://www.remmina.org/survey/survey.tpl")

if(WITH_TRACE_CALLS)
message(STATUS "Enabling trace calls.")
add_definitions(-DWITH_TRACE_CALLS)
endif()

option(WITH_SURVEY "Build with SURVEY" ON)
if(WITH_SURVEY)
message(STATUS "Enabling Survey.")
add_definitions(-DWITH_SURVEY)
else()
message(STATUS "Survey disabled")
endif()

option(WITH_MANPAGES "Build with MANPAGES" ON)
if(WITH_MANPAGES)
message(STATUS "Enabling man pages.")
Expand Down
2 changes: 0 additions & 2 deletions config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,4 @@
#define REMMINA_PLUGINDIR "${REMMINA_PLUGINDIR}"
#define REMMINA_UIDIR "${REMMINA_UIDIR}"

#define REMMINA_SURVEY_URI "${REMMINA_SURVEY_URI}"

#endif
30 changes: 0 additions & 30 deletions remmina/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,40 +109,10 @@ list(APPEND REMMINA_SRCS
"src/remmina_connection_window.h"
)

if(WITH_SURVEY)
# either of webkitpackages would do
pkg_search_module(WEBKIT2
webkit2gtk-4.0
webkit2gtk-3.0
)
if(WEBKIT2_FOUND)
list(APPEND REMMINA_SRCS
"src/remmina_survey.c"
"src/remmina_survey.h"
)
else(WEBKIT2_FOUND)
message(FATAL_ERROR "Either webkit2gtk-4.0 or webkit2gtk-3.0 is required")
endif(WEBKIT2_FOUND)
endif(WITH_SURVEY)

add_executable(remmina ${REMMINA_SRCS})
include_directories(${GTK_INCLUDE_DIRS})
target_link_libraries(remmina ${GTK_LIBRARIES})

if(WITH_SURVEY)
if(WEBKIT2_FOUND)
message(STATUS "Found Webkit2gtk ${WEBKIT2_VERSION}")
include_directories(
${WEBKIT2_INCLUDE_DIRS}
)
link_directories(
${WEBKIT2_LIBRARY_DIRS}
)
add_definitions(${WEBKIT2_CFLAGS_OTHER})
target_link_libraries(remmina ${WEBKIT2_LIBRARIES})
endif(WEBKIT2_FOUND)
endif(WITH_SURVEY)

if(WITH_MANPAGES)
install (FILES src/remmina.1 DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1)
endif(WITH_MANPAGES)
Expand Down
102 changes: 50 additions & 52 deletions remmina/po/POTFILES.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,64 +1,62 @@
remmina/src/remmina_ftp_client.c
remmina/src/remmina_crypt.c
remmina/src/remmina_avahi.c
remmina/src/remmina_survey.c
remmina/src/remmina_applet_menu_item.c
remmina/src/remmina_key_chooser.c
remmina/src/remmina_plugin_manager.c
remmina/src/remmina_exec.c
remmina/src/remmina_public.c
remmina/src/remmina_connection_window.c
remmina/src/remmina_external_tools.c
remmina/src/remmina_string_list.c
remmina/src/remmina_plugin_cmdexec.c
remmina/src/remmina_ssh.c
remmina-plugins/spice/spice_plugin_usb.c
remmina-plugins/spice/spice_plugin.c
remmina-plugins/spice/spice_plugin_file_transfer.c
remmina-plugins/telepathy/telepathy_handler.c
remmina-plugins/telepathy/telepathy_plugin.c
remmina-plugins/telepathy/telepathy_channel_handler.c
remmina-plugins/xdmcp/xdmcp_plugin.c
remmina-plugins/rdp/rdp_settings.c
remmina-plugins/rdp/rdp_cliprdr.c
remmina-plugins/rdp/rdp_plugin.c
remmina-plugins/rdp/rdp_graphics.c
remmina-plugins/rdp/rdp_channels.c
remmina-plugins/rdp/rdp_event.c
remmina-plugins/rdp/rdp_file.c
remmina-plugins/tool_hello_world/plugin.c
remmina-plugins/nx/nx_plugin.c
remmina-plugins/nx/nx_session.c
remmina-plugins/nx/nx_session_manager.c
remmina-plugins/vnc/vnc_plugin.c
remmina-plugins-gnome/src/glibsecret_plugin.c
remmina/src/remmina_chat_window.c
remmina/src/remmina_marshals.c
remmina/src/remmina_pref.c
remmina/src/remmina_plugin_manager.c
remmina/src/remmina_about.c
remmina/src/remmina.c
remmina/src/remmina_sftp_client.c
remmina/src/remmina_sftp_plugin.c
remmina/src/remmina_ssh_plugin.c
remmina/src/remmina_main.c
remmina/src/remmina_applet_menu.c
remmina/src/remmina_file_manager.c
remmina/src/remmina_string_array.c
remmina/src/remmina_chat_window.c
remmina/src/remmina_about.c
remmina/src/remmina_icon.c
remmina/src/remmina_key_chooser.c
remmina/src/remmina_init_dialog.c
remmina/src/remmina_scrolled_viewport.c
remmina/src/remmina_masterthread_exec.c
remmina/src/remmina_log.c
remmina/src/remmina_protocol_widget.c
remmina/src/remmina_file_editor.c
remmina/src/remmina_sftp_client.c
remmina/src/remmina_ssh.c
remmina/src/remmina_scrolled_viewport.c
remmina/src/remmina_file_manager.c
remmina/src/remmina_pref_dialog.c
remmina/src/remmina_masterthread_exec.c
remmina/src/remmina_log.c
remmina/src/remmina_sftp_plugin.c
remmina/src/remmina_file.c
remmina/src/remmina_ssh_plugin.c
remmina/src/remmina_external_tools.c
remmina/src/remmina_crypt.c
remmina/src/remmina_icon.c
remmina/src/remmina_sysinfo.c
remmina/src/remmina.c
remmina/src/remmina_public.c
remmina/src/remmina_applet_menu.c
remmina/src/remmina_file.c
remmina/src/remmina_widget_pool.c
remmina-plugins-gnome/src/glibsecret_plugin.c
remmina-plugins/tool_hello_world/plugin.c
remmina-plugins/vnc/vnc_plugin.c
remmina-plugins/xdmcp/xdmcp_plugin.c
remmina-plugins/nx/nx_plugin.c
remmina-plugins/nx/nx_session_manager.c
remmina-plugins/nx/nx_session.c
remmina-plugins/rdp/rdp_file.c
remmina-plugins/rdp/rdp_plugin.c
remmina-plugins/rdp/rdp_graphics.c
remmina-plugins/rdp/rdp_cliprdr.c
remmina-plugins/rdp/rdp_channels.c
remmina-plugins/rdp/rdp_event.c
remmina-plugins/rdp/rdp_settings.c
remmina-plugins/spice/spice_plugin_file_transfer.c
remmina-plugins/spice/spice_plugin.c
remmina-plugins/spice/spice_plugin_usb.c
remmina-plugins/telepathy/telepathy_plugin.c
remmina-plugins/telepathy/telepathy_channel_handler.c
remmina-plugins/telepathy/telepathy_handler.c
remmina/ui/remmina_survey.glade
remmina/ui/remmina_string_list.glade
remmina/ui/remmina_spinner.glade
remmina/src/remmina_avahi.c
remmina/src/remmina_applet_menu_item.c
remmina/src/remmina_ftp_client.c
remmina/src/remmina_string_list.c
remmina/src/remmina_exec.c
remmina/src/remmina_connection_window.c
remmina/src/remmina_plugin_cmdexec.c
remmina/src/remmina_pref.c
remmina/ui/remmina_key_chooser.glade
remmina/ui/remmina_preferences.glade
remmina/ui/remmina_about.glade
remmina/ui/remmina_spinner.glade
remmina/ui/remmina_string_list.glade
remmina/ui/remmina_main.glade
remmina/ui/remmina_preferences.glade
Loading