Skip to content

Commit aa4af48

Browse files
antenoreantenore
authored
Merge pull request #1537 from FreeRDP/refactoring
Refactoring - Renamed and merged plugin directories
2 parents 48beaf5 + 9bdd197 commit aa4af48

131 files changed

Lines changed: 10111 additions & 10111 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,8 @@ endif()
237237

238238
if(GTK_FOUND)
239239
add_subdirectory(remmina)
240-
add_subdirectory(remmina-plugins)
241-
add_subdirectory(remmina-plugin-secret)
240+
add_subdirectory(plugins)
241+
add_subdirectory(plugins/secret)
242242
endif()
243243

244244
if(WITH_EXAMPLES)

‎Doxyfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -797,7 +797,7 @@ INPUT = CHANGELOG.md \
797797
README.md \
798798
../Remmina.wiki \
799799
remmina \
800-
remmina-plugins \
800+
plugins \
801801
remmina-plugin-secret \
802802
scripts
803803

remmina-plugins/CMakeLists.txt renamed to plugins/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ set(FREERDP_REQUIRED_REVISION 0)
3939
set(FREERDP_REQUIRED_VERSIONSTRING
4040
${FREERDP_REQUIRED_MAJOR}.${FREERDP_REQUIRED_MINOR}.${FREERDP_REQUIRED_REVISION})
4141

42-
include_directories(${CMAKE_SOURCE_DIR}/remmina-plugins)
42+
include_directories(${CMAKE_SOURCE_DIR}/plugins)
4343

4444
set(APPICON16_EMBLEMS_DIR "${REMMINA_DATADIR}/icons/hicolor/16x16/emblems")
4545
set(APPICON22_EMBLEMS_DIR "${REMMINA_DATADIR}/icons/hicolor/22x22/emblems")

remmina-plugins/common/remmina_plugin.h renamed to plugins/common/remmina_plugin.h

File renamed without changes.

remmina-plugins/exec/16x16/emblems/remmina-tool.png renamed to plugins/exec/16x16/emblems/remmina-tool.png

File renamed without changes.

remmina-plugins/exec/22x22/emblems/remmina-tool.png renamed to plugins/exec/22x22/emblems/remmina-tool.png

File renamed without changes.

remmina-plugins/exec/CMakeLists.txt renamed to plugins/exec/CMakeLists.txt

File renamed without changes.

remmina-plugins/exec/exec_plugin.c renamed to plugins/exec/exec_plugin.c

File renamed without changes.

remmina-plugins/exec/exec_plugin_config.h renamed to plugins/exec/exec_plugin_config.h

File renamed without changes.

remmina-plugins/nx/16x16/emblems/remmina-nx.png renamed to plugins/nx/16x16/emblems/remmina-nx.png

File renamed without changes.

0 commit comments

Comments
 (0)