Commit 25b82ec2 authored by Antenore Gatta's avatar Antenore Gatta

remmina_pref and remmina_pref_file where not defined

parent 202aa49c
......@@ -50,7 +50,7 @@ include(FindOptionalPackage)
include(ConfigOptions)
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release")
set(CMAKE_BUILD_TYPE "Release")
endif()
if(NOT BUILD_SHARED_LIBS)
......@@ -58,26 +58,26 @@ if(NOT BUILD_SHARED_LIBS)
endif()
if(CMAKE_COMPILER_IS_GNUCC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
if(WITH_GCC_SANITIZE_ADDRESS)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")
endif()
if(WITH_SSE2)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2")
endif()
CHECK_C_COMPILER_FLAG(-Wno-unused-result Wno-unused-result)
if(Wno-unused-result)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-result")
endif()
CHECK_C_COMPILER_FLAG(-Wno-unused-but-set-variable Wno-unused-but-set-variable)
if(Wno-unused-but-set-variable)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-but-set-variable")
endif()
CHECK_C_COMPILER_FLAG(-Wno-unused-function Wno-unused-function)
if(Wno-unused-function)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function")
endif()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
if(WITH_GCC_SANITIZE_ADDRESS)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")
endif()
if(WITH_SSE2)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2")
endif()
CHECK_C_COMPILER_FLAG(-Wno-unused-result Wno-unused-result)
if(Wno-unused-result)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-result")
endif()
CHECK_C_COMPILER_FLAG(-Wno-unused-but-set-variable Wno-unused-but-set-variable)
if(Wno-unused-but-set-variable)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-but-set-variable")
endif()
CHECK_C_COMPILER_FLAG(-Wno-unused-function Wno-unused-function)
if(Wno-unused-function)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function")
endif()
endif()
check_include_files(sys/param.h HAVE_SYS_PARAM_H)
......@@ -98,11 +98,11 @@ include_directories(remmina/include)
# FreeBSD
if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-rdynamic")
include_directories(/usr/local/include /usr/include)
link_directories(/usr/local/lib /usr/lib)
set(CMAKE_REQUIRED_INCLUDES /usr/local/include)
set(CMAKE_SHARED_LIBRARY_PREFIX ${CMAKE_SHARED_LIBRARY_PREFIX} /usr/local/lib)
set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-rdynamic")
include_directories(/usr/local/include /usr/include)
link_directories(/usr/local/lib /usr/lib)
set(CMAKE_REQUIRED_INCLUDES /usr/local/include)
set(CMAKE_SHARED_LIBRARY_PREFIX ${CMAKE_SHARED_LIBRARY_PREFIX} /usr/local/lib)
endif()
# Versioning
......@@ -116,7 +116,7 @@ set(REMMINA_VERSION "${REMMINA_VERSION_MAJOR}.${REMMINA_VERSION_MINOR}.${REMMINA
include(GetGitRevisionDescription)
git_get_exact_tag(GIT_REVISION --tags --always)
if (${GIT_REVISION} STREQUAL "n/a")
git_rev_parse(GIT_REVISION --short)
git_rev_parse(GIT_REVISION --short)
endif()
if(NOT GIT_REVISION)
......@@ -132,11 +132,11 @@ set(REMMINA_UIDIR "${CMAKE_INSTALL_FULL_DATADIR}/remmina/ui")
# Uninstall support
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
IMMEDIATE @ONLY)
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
IMMEDIATE @ONLY)
add_custom_target(uninstall
"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
find_required_package(GTK)
find_required_package(PTHREAD)
......@@ -147,10 +147,11 @@ find_suggested_package(AVAHI)
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)
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)
......@@ -159,23 +160,23 @@ else()
endif()
if(GCRYPT_FOUND)
add_definitions(-DHAVE_LIBGCRYPT)
add_definitions(-DHAVE_LIBGCRYPT)
endif()
if(AVAHI_FOUND)
add_definitions(-DHAVE_LIBAVAHI_UI)
add_definitions(-DHAVE_LIBAVAHI_CLIENT)
add_definitions(-DHAVE_LIBAVAHI_UI)
add_definitions(-DHAVE_LIBAVAHI_CLIENT)
endif()
if(GTK_FOUND)
add_subdirectory(remmina)
add_subdirectory(remmina-plugins)
add_subdirectory(remmina-plugins-gnome)
add_subdirectory(remmina)
add_subdirectory(remmina-plugins)
add_subdirectory(remmina-plugins-gnome)
endif()
if(WITH_EXAMPLES)
message(STATUS "Enabling examples and test plugins.")
add_definitions(-DWITH_EXAMPLES)
message(STATUS "Enabling examples and test plugins.")
add_definitions(-DWITH_EXAMPLES)
endif()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
......@@ -34,80 +34,80 @@
cmake_minimum_required(VERSION 2.8)
set(REMMINA_SRCS
src/remmina_about.c
src/remmina_about.h
src/remmina_applet_menu.c
src/remmina_applet_menu.h
src/remmina_applet_menu_item.c
src/remmina_applet_menu_item.h
src/remmina_avahi.c
src/remmina_avahi.h
src/remmina.c
src/remmina_chat_window.c
src/remmina_chat_window.h
src/remmina_connection_window.c
src/remmina_connection_window.h
src/remmina_crypt.c
src/remmina_crypt.h
src/remmina_exec.c
src/remmina_exec.h
src/remmina_file.c
src/remmina_file_editor.c
src/remmina_file_editor.h
src/remmina_file.h
src/remmina_file_manager.c
src/remmina_file_manager.h
src/remmina_ftp_client.c
src/remmina_ftp_client.h
src/remmina_icon.c
src/remmina_icon.h
src/remmina_init_dialog.c
src/remmina_init_dialog.h
src/remmina_key_chooser.c
src/remmina_key_chooser.h
src/remmina_log.c
src/remmina_log.h
src/remmina_main.c
src/remmina_main.h
src/remmina_marshals.c
src/remmina_marshals.h
src/remmina_marshals.list
src/remmina_masterthread_exec.c
src/remmina_masterthread_exec.h
src/remmina_plugin_manager.c
src/remmina_plugin_manager.h
src/remmina_plugin_cmdexec.c
src/remmina_plugin_cmdexec.h
src/remmina_pref.c
src/remmina_pref_dialog.c
src/remmina_pref_dialog.h
src/remmina_pref.h
src/remmina_protocol_widget.c
src/remmina_protocol_widget.h
src/remmina_public.c
src/remmina_public.h
src/remmina_scrolled_viewport.c
src/remmina_scrolled_viewport.h
src/remmina_sftp_client.c
src/remmina_sftp_client.h
src/remmina_sftp_plugin.c
src/remmina_sftp_plugin.h
src/remmina_ssh.c
src/remmina_ssh.h
src/remmina_ssh_plugin.c
src/remmina_ssh_plugin.h
src/remmina_string_array.c
src/remmina_string_array.h
src/remmina_string_list.c
src/remmina_string_list.h
src/remmina_widget_pool.c
src/remmina_widget_pool.h
src/remmina_external_tools.c
src/remmina_external_tools.h
src/remmina_sysinfo.h
src/remmina_sysinfo.c
)
list(APPEND REMMINA_SRCS
"src/remmina_about.c"
"src/remmina_about.h"
"src/remmina_applet_menu.c"
"src/remmina_applet_menu.h"
"src/remmina_applet_menu_item.c"
"src/remmina_applet_menu_item.h"
"src/remmina_avahi.c"
"src/remmina_avahi.h"
"src/remmina.c"
"src/remmina_chat_window.c"
"src/remmina_chat_window.h"
"src/remmina_crypt.c"
"src/remmina_crypt.h"
"src/remmina_exec.c"
"src/remmina_exec.h"
"src/remmina_file.c"
"src/remmina_file_editor.c"
"src/remmina_file_editor.h"
"src/remmina_file.h"
"src/remmina_file_manager.c"
"src/remmina_file_manager.h"
"src/remmina_ftp_client.c"
"src/remmina_ftp_client.h"
"src/remmina_icon.c"
"src/remmina_icon.h"
"src/remmina_init_dialog.c"
"src/remmina_init_dialog.h"
"src/remmina_key_chooser.c"
"src/remmina_key_chooser.h"
"src/remmina_log.c"
"src/remmina_log.h"
"src/remmina_main.c"
"src/remmina_main.h"
"src/remmina_marshals.c"
"src/remmina_marshals.h"
"src/remmina_marshals.list"
"src/remmina_masterthread_exec.c"
"src/remmina_masterthread_exec.h"
"src/remmina_plugin_manager.c"
"src/remmina_plugin_manager.h"
"src/remmina_plugin_cmdexec.c"
"src/remmina_plugin_cmdexec.h"
"src/remmina_pref.c"
"src/remmina_pref_dialog.c"
"src/remmina_pref_dialog.h"
"src/remmina_pref.h"
"src/remmina_protocol_widget.c"
"src/remmina_protocol_widget.h"
"src/remmina_public.c"
"src/remmina_public.h"
"src/remmina_scrolled_viewport.c"
"src/remmina_scrolled_viewport.h"
"src/remmina_sftp_client.c"
"src/remmina_sftp_client.h"
"src/remmina_sftp_plugin.c"
"src/remmina_sftp_plugin.h"
"src/remmina_ssh.c"
"src/remmina_ssh.h"
"src/remmina_ssh_plugin.c"
"src/remmina_ssh_plugin.h"
"src/remmina_string_array.c"
"src/remmina_string_array.h"
"src/remmina_string_list.c"
"src/remmina_string_list.h"
"src/remmina_widget_pool.c"
"src/remmina_widget_pool.h"
"src/remmina_external_tools.c"
"src/remmina_external_tools.h"
"src/remmina_sysinfo.h"
"src/remmina_sysinfo.c"
"src/remmina_connection_window.c"
"src/remmina_connection_window.h"
)
if(WITH_SURVEY)
# either of webkitpackages would do
......@@ -116,18 +116,16 @@ if(WITH_SURVEY)
webkit2gtk-3.0
)
if(WEBKIT2_FOUND)
set(REMMINA_SRCS
${REMMINA_SRCS}
src/remmina_survey.c
src/remmina_survey.h
list(APPEND REMMINA_SRCS
"src/remmina_survey.c"
"src/remmina_survey.h"
)
else()
else(WEBKIT2_FOUND)
message(ERROR "Weki2gtk-4.0 is required")
endif()
endif()
endif(WEBKIT2_FOUND)
endif(WITH_SURVEY)
add_executable(remmina ${REMMINA_SRCS})
include_directories(${GTK_INCLUDE_DIRS})
target_link_libraries(remmina ${GTK_LIBRARIES})
......@@ -142,8 +140,8 @@ if(WITH_SURVEY)
)
add_definitions(${WEBKIT2_CFLAGS_OTHER})
target_link_libraries(remmina ${WEBKIT2_LIBRARIES})
endif()
endif()
endif(WEBKIT2_FOUND)
endif(WITH_SURVEY)
find_package(X11)
include_directories(${X11_INCLUDE_DIR})
......@@ -151,40 +149,40 @@ target_link_libraries(remmina ${X11_LIBRARIES})
find_suggested_package(LIBSSH)
if(LIBSSH_FOUND)
add_definitions(-DHAVE_LIBSSH)
include_directories(${LIBSSH_INCLUDE_DIRS})
target_link_libraries(remmina ${LIBSSH_LIBRARIES})
add_definitions(-DHAVE_LIBSSH)
include_directories(${LIBSSH_INCLUDE_DIRS})
target_link_libraries(remmina ${LIBSSH_LIBRARIES})
endif()
if(PTHREAD_FOUND)
include_directories(${PTHREAD_INCLUDE_DIRS})
target_link_libraries(remmina ${PTHREAD_LIBRARIES})
include_directories(${PTHREAD_INCLUDE_DIRS})
target_link_libraries(remmina ${PTHREAD_LIBRARIES})
endif()
if(GCRYPT_FOUND)
include_directories(${GCRYPT_INCLUDE_DIRS})
target_link_libraries(remmina ${GCRYPT_LIBRARIES})
include_directories(${GCRYPT_INCLUDE_DIRS})
target_link_libraries(remmina ${GCRYPT_LIBRARIES})
endif()
if(AVAHI_FOUND)
include_directories(${AVAHI_INCLUDE_DIRS})
target_link_libraries(remmina ${AVAHI_LIBRARIES})
include_directories(${AVAHI_INCLUDE_DIRS})
target_link_libraries(remmina ${AVAHI_LIBRARIES})
endif()
option(WITH_VTE "Build with support for VTE" ON)
if(GTK3_FOUND AND WITH_VTE)
set(_VTE_VERSION_NUMS 2.91 2.90)
foreach(__VTE_VERSION ${_VTE_VERSION_NUMS})
set(_VTE_VERSION_NUM ${__VTE_VERSION})
find_package(VTE)
if(VTE_FOUND)
break()
endif()
message(STATUS "VTE ${__VTE_VERSION} not found")
endforeach(__VTE_VERSION)
set(_VTE_VERSION_NUMS 2.91 2.90)
foreach(__VTE_VERSION ${_VTE_VERSION_NUMS})
set(_VTE_VERSION_NUM ${__VTE_VERSION})
find_package(VTE)
if(VTE_FOUND)
break()
endif()
message(STATUS "VTE ${__VTE_VERSION} not found")
endforeach(__VTE_VERSION)
elseif(WITH_VTE)
set(_VTE_VERSION_NUM)
find_package(VTE)
set(_VTE_VERSION_NUM)
find_package(VTE)
endif()
if (VTE_FOUND)
......@@ -194,12 +192,12 @@ if (VTE_FOUND)
endif()
if(GTK3_FOUND)
find_suggested_package(APPINDICATOR)
if(APPINDICATOR_FOUND)
add_definitions(-DHAVE_LIBAPPINDICATOR)
include_directories(${APPINDICATOR_INCLUDE_DIRS})
target_link_libraries(remmina ${APPINDICATOR_LIBRARIES})
endif()
find_suggested_package(APPINDICATOR)
if(APPINDICATOR_FOUND)
add_definitions(-DHAVE_LIBAPPINDICATOR)
include_directories(${APPINDICATOR_INCLUDE_DIRS})
target_link_libraries(remmina ${APPINDICATOR_LIBRARIES})
endif()
endif()
find_package(Intl)
......@@ -209,7 +207,7 @@ if(INTL_FOUND AND "${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
target_link_libraries(remmina ${Intl_LIBRARIES})
endif()
if(WITH_TRANSLATIONS)
add_subdirectory(po)
add_subdirectory(po)
endif()
set(REMMINA_EXTERNAL_TOOLS_DIR "${CMAKE_INSTALL_FULL_DATADIR}/remmina/external_tools")
......
......@@ -35,13 +35,12 @@
#include "config.h"
#include <stdlib.h>
#include <cairo/cairo-xlib.h>
#include <glib/gi18n.h>
#include <gdk/gdk.h>
#include <gdk/gdkkeysyms.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <stdlib.h>
#include "remmina_connection_window.h"
#include "remmina_file.h"
......@@ -57,6 +56,11 @@
#include "remmina_log.h"
#include "remmina/remmina_trace_calls.h"
#ifndef WITH_SURVEY
gchar *remmina_pref_file;
RemminaPref remmina_pref;
#endif /* WITH_SURVEY */
G_DEFINE_TYPE( RemminaConnectionWindow, remmina_connection_window, GTK_TYPE_WINDOW)
#define MOTION_TIME 100
......
......@@ -49,7 +49,7 @@
#include "remmina_exec.h"
#ifdef WITH_SURVEY
#include "remmina_survey.h"
#endif
#endif /* WITH_SURVEY */
#include "remmina_icon.h"
#include "remmina/remmina_trace_calls.h"
......@@ -110,7 +110,7 @@ void remmina_exec_command(RemminaCommandType command, const gchar* data)
/* test if network is up and start survey */
remmina_survey_cb(GTK_WINDOW(mainwindow));
}
#endif
#endif /* WITH_SURVEY */
}
break;
......
......@@ -44,9 +44,6 @@
#include "remmina_file_editor.h"
#include "remmina_connection_window.h"
#include "remmina_about.h"
#ifdef WITH_SURVEY
#include "remmina_survey.h"
#endif
#include "remmina_pref.h"
#include "remmina_pref_dialog.h"
#include "remmina_widget_pool.h"
......@@ -57,6 +54,9 @@
#include "remmina_exec.h"
#include "remmina_external_tools.h"
#include "remmina/remmina_trace_calls.h"
#ifdef WITH_SURVEY
#include "remmina_survey.h"
#endif /* WITH_SURVEY */
static RemminaMain *remminamain;
......@@ -936,7 +936,7 @@ void remmina_main_on_action_help_survey(GtkAction *action, gpointer user_data)
g_signal_connect(G_OBJECT(dialog), "response", G_CALLBACK(gtk_widget_destroy), NULL);
gtk_widget_show(dialog);
#endif
#endif /* WITH_SURVEY */
}
void remmina_main_on_action_application_about(GtkAction *action, gpointer user_data)
......@@ -1219,7 +1219,7 @@ GtkWidget* remmina_main_new(void)
remminamain->action_help_debug = GTK_ACTION(GET_OBJECT("action_help_debug"));
#ifdef WITH_SURVEY
remminamain->action_help_survey = GTK_ACTION(GET_OBJECT("action_help_survey"));
#endif
#endif /* WITH_SURVEY */
G_GNUC_END_IGNORE_DEPRECATIONS
/* Connect signals */
gtk_builder_connect_signals(remminamain->builder, NULL);
......
......@@ -96,7 +96,7 @@ typedef struct _RemminaMain
GtkAction *action_help_debug;
#ifdef WITH_SURVEY
GtkAction *action_help_survey;
#endif
#endif /* WITH_SURVEY */
RemminaMainPriv *priv;
} RemminaMain;
......
......@@ -274,7 +274,7 @@ void remmina_pref_init(void)
remmina_pref.survey = g_key_file_get_boolean(gkeyfile, "remmina_pref", "survey", NULL);
else
remmina_pref.survey = TRUE;
#endif
#endif /* WITH_SURVEY */
if (g_key_file_has_key(gkeyfile, "remmina_pref", "invisible_toolbar", NULL))
remmina_pref.invisible_toolbar = g_key_file_get_boolean(gkeyfile, "remmina_pref", "invisible_toolbar", NULL);
......@@ -620,7 +620,7 @@ void remmina_pref_save(void)
g_key_file_set_boolean(gkeyfile, "remmina_pref", "save_when_connect", remmina_pref.save_when_connect);
#ifdef WITH_SURVEY
g_key_file_set_boolean(gkeyfile, "remmina_pref", "survey", remmina_pref.survey);
#endif
#endif /* WITH_SURVEY */
g_key_file_set_boolean(gkeyfile, "remmina_pref", "invisible_toolbar", remmina_pref.invisible_toolbar);
g_key_file_set_integer(gkeyfile, "remmina_pref", "floating_toolbar_placement", remmina_pref.floating_toolbar_placement);
g_key_file_set_integer(gkeyfile, "remmina_pref", "toolbar_placement", remmina_pref.toolbar_placement);
......@@ -843,7 +843,7 @@ gboolean remmina_pref_get_survey(void)
TRACE_CALL("remmina_pref_get_survey");
return remmina_pref.survey;
}
#endif
#endif /* WITH_SURVEY */
gboolean remmina_pref_get_ssh_parseconfig(void)
{
......
......@@ -179,7 +179,7 @@ void remmina_pref_save(void);
#ifdef WITH_SURVEY
gboolean remmina_pref_get_survey(void);
#endif
#endif /* WITH_SURVEY */
void remmina_pref_add_recent(const gchar *protocol, const gchar *server);
gchar* remmina_pref_get_recent(const gchar *protocol);
......
......@@ -127,7 +127,7 @@ void remmina_pref_on_dialog_destroy(GtkWidget *widget, gpointer user_data)
remmina_pref.save_when_connect = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_options_save_settings));
#ifdef WITH_SURVEY
remmina_pref.survey = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_options_survey));
#endif
#endif /* WITH_SURVEY */
remmina_pref.invisible_toolbar = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_appearance_invisible_toolbar));
remmina_pref.always_show_tab = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_appearance_show_tabs));
remmina_pref.hide_connection_toolbar = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_appearance_hide_toolbar));
......@@ -287,7 +287,7 @@ static void remmina_pref_dialog_init(void)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_options_save_settings), remmina_pref.save_when_connect);
#ifdef WITH_SURVEY
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_options_survey), remmina_pref.survey);
#endif
#endif /* WITH_SURVEY */
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_appearance_invisible_toolbar), remmina_pref.invisible_toolbar);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_appearance_show_tabs), remmina_pref.always_show_tab);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_appearance_hide_toolbar), remmina_pref.hide_connection_toolbar);
......@@ -395,7 +395,7 @@ GtkDialog* remmina_pref_dialog_new(gint default_tab, GtkWindow *parent)
remmina_pref_dialog->checkbutton_options_save_settings = GTK_CHECK_BUTTON(GET_OBJECT("checkbutton_options_save_settings"));
#ifdef WITH_SURVEY
remmina_pref_dialog->checkbutton_options_survey = GTK_CHECK_BUTTON(GET_OBJECT("checkbutton_options_survey"));
#endif
#endif /* WITH_SURVEY */
remmina_pref_dialog->checkbutton_appearance_invisible_toolbar = GTK_CHECK_BUTTON(GET_OBJECT("checkbutton_appearance_invisible_toolbar"));
remmina_pref_dialog->checkbutton_appearance_show_tabs = GTK_CHECK_BUTTON(GET_OBJECT("checkbutton_appearance_show_tabs"));
remmina_pref_dialog->checkbutton_appearance_hide_toolbar = GTK_CHECK_BUTTON(GET_OBJECT("checkbutton_appearance_hide_toolbar"));
......
......@@ -54,7 +54,7 @@ typedef struct _RemminaPrefDialog
GtkCheckButton *checkbutton_options_save_settings;
#ifdef WITH_SURVEY
GtkCheckButton *checkbutton_options_survey;
#endif
#endif /* WITH_SURVEY */
GtkCheckButton *checkbutton_appearance_invisible_toolbar;
GtkCheckButton *checkbutton_appearance_show_tabs;
GtkCheckButton *checkbutton_appearance_hide_toolbar;
......
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