Skip to content

Commit

Permalink
Merge pull request #214 from chewing/refactor-settings
Browse files Browse the repository at this point in the history
refactor: Cleanup junk code created by GOB
  • Loading branch information
kanru authored Jul 21, 2024
2 parents 0ed8594 + 468abbb commit b56419c
Show file tree
Hide file tree
Showing 30 changed files with 941 additions and 3,240 deletions.
1 change: 1 addition & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
BasedOnStyle: LLVM
IndentWidth: 4
ColumnLimit: 100
30 changes: 8 additions & 22 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
add_library(common STATIC
IBusChewingApplier.c
IBusChewingProperties.c
IBusChewingLookupTable.c
MakerDialogBackend.c
MakerDialogProperty.c
MakerDialogUtil.c

IBusChewingLookupTable.h
IBusChewingProperties.h
MakerDialogBackend.h
MakerDialogProperty.h
MakerDialogPropertySpec.h
MakerDialogUtil.h
ibus-chewing-engine.h
)
Expand All @@ -20,19 +12,6 @@ target_link_libraries(common PUBLIC
PkgConfig::IBUS
)

add_library(gui-core STATIC
GSettingsBackend.c
GSettingsBackend.h
)
target_link_libraries(gui-core PUBLIC
common
PkgConfig::GLIB2
PkgConfig::GTK4
PkgConfig::LIBADWAITA
PkgConfig::IBUS
PkgConfig::CHEWING
)

add_custom_command(
OUTPUT ibus-setup-chewing-window-ui.c
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/setup
Expand Down Expand Up @@ -86,7 +65,14 @@ target_compile_definitions(ibus-engine-chewing
target_include_directories(ibus-engine-chewing
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

target_link_libraries(ibus-engine-chewing gui-core)
target_link_libraries(ibus-engine-chewing
common
PkgConfig::GLIB2
PkgConfig::GTK4
PkgConfig::LIBADWAITA
PkgConfig::IBUS
PkgConfig::CHEWING
)

set(PROJECT_GSCHEMA_XML ${PROJECT_SCHEMA_ID}.gschema.xml)
set(GSETTINGS_SCHEMAS_DIR ${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas)
Expand Down
134 changes: 0 additions & 134 deletions src/GSettingsBackend.c

This file was deleted.

59 changes: 0 additions & 59 deletions src/GSettingsBackend.h

This file was deleted.

Loading

0 comments on commit b56419c

Please sign in to comment.