[xiphos-source] [crosswire/xiphos] 29ea2c: codeclean: license headers, dead code, GResource m...

LAfricain noreply at github.com
Thu Aug 20 15:42:05 EDT 2026


  Branch: refs/heads/master
  Home:   https://github.com/crosswire/xiphos
  Commit: 29ea2ceefceb6fa0abd8f3f5fafb74da8f88e77d
      https://github.com/crosswire/xiphos/commit/29ea2ceefceb6fa0abd8f3f5fafb74da8f88e77d
  Author: L'Africain <fr.cyrille at tiberiade.be>
  Date:   2026-08-20 (Thu, 20 Aug 2026)

  Changed paths:
    M CMakeLists.txt
    M cmake/XiphosBuildTools.cmake
    M cmake/XiphosConfig_h.cmake
    M cmake/XiphosDependencies.cmake
    M cmake/XiphosFlags.cmake
    M cmake/XiphosOptions.cmake
    M cmake/XiphosReport.cmake
    M cpack/CMakeLists.txt
    M cpack/debian/XiphosDebianPkg.cmake
    M cpack/fedora/XiphosRPMPkg.cmake
    M cpack/windows/XiphosWindowsPkg.cmake
    M desktop/CMakeLists.txt
    M doc/CMakeLists.txt
    R help/C/figures/gtkhtml3-vs-mozembed.png
    M help/CMakeLists.txt
    R help/fa/figures/gtkhtml3-vs-mozembed.png
    R help/fr/figures/gtkhtml3-vs-mozembed.png
    M pixmaps/CMakeLists.txt
    M po/CMakeLists.txt
    M src/backend/CMakeLists.txt
    M src/backend/gs_stringmgr.cpp
    M src/backend/module_manager.cc
    M src/backend/module_manager.hh
    M src/backend/sword_main.cc
    M src/backend/sword_main.hh
    M src/editor/CMakeLists.txt
    M src/editor/editor.c
    M src/editor/editor.h
    M src/editor/gtktextview_editor.c
    M src/editor/gtktextview_editor.h
    M src/editor/link_dialog.c
    M src/editor/link_dialog.h
    M src/editor/slib-editor.c
    M src/editor/slib-editor.h
    M src/editor/template.h
    M src/editor/webkit_editor.c
    M src/editor/webkit_editor.h
    M src/examples/CMakeLists.txt
    M src/examples/xiphos-nav.c
    M src/gtk/CMakeLists.txt
    M src/gtk/about_modules.c
    M src/gtk/about_sword.c
    M src/gtk/about_trans.c
    M src/gtk/about_xiphos.c
    M src/gtk/bibletext.c
    M src/gtk/bibletext_dialog.c
    M src/gtk/bookmark_dialog.c
    M src/gtk/bookmarks_menu.c
    M src/gtk/bookmarks_treeview.c
    M src/gtk/cipher_key_dialog.c
    M src/gtk/commentary.c
    M src/gtk/commentary_dialog.c
    M src/gtk/dialog.c
    M src/gtk/dictlex.c
    M src/gtk/dictlex_dialog.c
    M src/gtk/display_info.c
    M src/gtk/dummy.cpp
    M src/gtk/export_bookmarks.c
    M src/gtk/export_dialog.c
    M src/gtk/find_dialog.c
    M src/gtk/font_dialog.c
    M src/gtk/gbs.c
    M src/gtk/gbs_dialog.c
    M src/gtk/gui.c
    M src/gtk/ipc.c
    M src/gtk/main_menu.c
    M src/gtk/main_window.c
    M src/gtk/menu_popup.c
    M src/gtk/mod_mgr.c
    M src/gtk/navbar_book.c
    M src/gtk/navbar_book_dialog.c
    M src/gtk/navbar_versekey.c
    M src/gtk/navbar_versekey_dialog.c
    M src/gtk/navbar_versekey_editor.c
    M src/gtk/navbar_versekey_parallel.c
    M src/gtk/parallel_dialog.c
    M src/gtk/parallel_tab.c
    M src/gtk/parallel_view.c
    M src/gtk/preferences_dialog.c
    M src/gtk/search_dialog.c
    M src/gtk/search_sidebar.c
    M src/gtk/sidebar.c
    M src/gtk/sidebar_dialog.c
    M src/gtk/splash.c
    M src/gtk/tabbed_browser.c
    M src/gtk/treekey-editor.c
    M src/gtk/utilities.c
    M src/gtk/xiphos.c
    M src/gui/about_modules.h
    M src/gui/about_sword.h
    M src/gui/about_trans.h
    M src/gui/about_xiphos.h
    M src/gui/bibletext.h
    M src/gui/bibletext_dialog.h
    M src/gui/bookmark_dialog.h
    M src/gui/bookmarks.h
    M src/gui/bookmarks_menu.h
    M src/gui/bookmarks_treeview.h
    M src/gui/cipher_key_dialog.h
    M src/gui/commentary.h
    M src/gui/commentary_dialog.h
    M src/gui/debug_glib_null.h
    M src/gui/dialog.h
    M src/gui/dictlex.h
    M src/gui/dictlex_dialog.h
    M src/gui/display_info.h
    M src/gui/export_bookmarks.h
    M src/gui/export_dialog.h
    M src/gui/find_dialog.h
    M src/gui/font_dialog.h
    M src/gui/gbs.h
    M src/gui/gbs_dialog.h
    M src/gui/import_andbible.h
    M src/gui/ipc.h
    M src/gui/main_menu.h
    M src/gui/main_window.h
    M src/gui/menu_popup.h
    M src/gui/mod_mgr.h
    M src/gui/navbar_book.h
    M src/gui/navbar_book_dialog.h
    M src/gui/navbar_versekey.h
    M src/gui/navbar_versekey_dialog.h
    M src/gui/navbar_versekey_editor.h
    M src/gui/navbar_versekey_parallel.h
    M src/gui/parallel_dialog.h
    M src/gui/parallel_tab.h
    M src/gui/parallel_view.h
    M src/gui/preferences_dialog.h
    M src/gui/search_dialog.h
    M src/gui/search_sidebar.h
    M src/gui/sidebar.h
    M src/gui/sidebar_dialog.h
    M src/gui/tabbed_browser.h
    M src/gui/treekey-editor.h
    M src/gui/utilities.h
    M src/gui/widgets.h
    M src/gui/xiphos.h
    M src/main/CMakeLists.txt
    M src/main/biblesync_glue.cc
    M src/main/biblesync_glue.h
    M src/main/configs.cc
    M src/main/configs.h
    M src/main/display.cc
    M src/main/display.hh
    M src/main/export_passage.cc
    M src/main/export_passage.h
    M src/main/global_ops.cc
    M src/main/global_ops.hh
    M src/main/gtk_compat.h
    M src/main/import_andbible.cc
    M src/main/lists.cc
    M src/main/lists.h
    M src/main/main.c
    M src/main/mod_mgr.cc
    M src/main/mod_mgr.h
    M src/main/module_dialogs.cc
    M src/main/module_dialogs.h
    M src/main/modulecache.cc
    M src/main/modulecache.hh
    M src/main/navbar.cc
    M src/main/navbar.h
    M src/main/navbar_book.cc
    M src/main/navbar_book.h
    M src/main/navbar_book_dialog.cc
    M src/main/navbar_book_dialog.h
    M src/main/navbar_versekey.cc
    M src/main/navbar_versekey.h
    M src/main/parallel_view.cc
    M src/main/parallel_view.h
    M src/main/prayerlists.cc
    M src/main/prayerlists.h
    M src/main/previewer.cc
    M src/main/previewer.h
    M src/main/search_dialog.cc
    M src/main/search_dialog.h
    M src/main/search_sidebar.cc
    M src/main/search_sidebar.h
    M src/main/settings.c
    M src/main/settings.h
    M src/main/sidebar.cc
    M src/main/sidebar.h
    M src/main/sword.cc
    M src/main/sword.h
    M src/main/sword_treekey.cc
    M src/main/sword_treekey.h
    M src/main/tab_history.c
    M src/main/tab_history.h
    M src/main/url.cc
    M src/main/url.hh
    M src/main/xml.c
    M src/main/xml.h
    M src/webkit/CMakeLists.txt
    M src/webkit/wk-html.c
    M src/webkit/wk-html.h
    M src/xiphos_html/CMakeLists.txt
    M src/xiphos_html/xiphos_html.c
    M src/xiphos_html/xiphos_html.h
    M ui/CMakeLists.txt
    R ui/gs2-48x48-old.png
    A ui/gs2-48x48.png
    A ui/splash.png
    A ui/xiphos.gresource.xml
    M win32/CMakeLists.txt

  Log Message:
  -----------
  codeclean: license headers, dead code, GResource migration (#1381)

* Update outdated FSF postal address in license headers

Replace the obsolete '51 Franklin St, Fifth Floor, Boston, MA
02110-1301, USA' address with the FSF-recommended pointer to
<https://www.gnu.org/licenses/>, per issue #894 item 7.

* Remove commented-out / dead code

Strip dead code left as comments: single-line commented statements
(g_free calls, stale widget/extern declarations, etc.) and larger
/* */ blocks superseded by current implementations (old glade_xml_
get_widget signal-connect code paths replaced by UI_GET_ITEM, etc.).
Per issue #894 item 2.

* Embed GtkBuilder UI files via GResource

Compile the 13 .gtkbuilder files and gtk_webedit.ui directly into
the xiphos binary via glib-compile-resources, instead of locating
and reading them from disk at runtime through gui_general_user_file().

- Add ui/xiphos.gresource.xml manifest (prefix /org/xiphos/ui/)
- Add CMake build step generating xiphos_resources.c, linked into
  the xiphos target
- Switch all GTK3 GtkBuilder load sites (gtk_builder_add_from_file /
  gtk_builder_add_objects_from_file) to the *_from_resource
  equivalents
- Drop now-dead file-path plumbing (glade_file/gbuilder_file
  variables) at each call site
- Remove a dead GTK_CHECK_VERSION(3,10,0) fallback branch in
  link_dialog.c, no longer relevant on GResource

Per issue #894 item 4. Icons/pixmaps intentionally left out of this
pass - candidate for a follow-up PR.

Full build (cmake --build) verified clean, no warnings introduced.

---------

Co-authored-by: lafricain79 <lafricain79 at gmail.com>



To unsubscribe from these emails, change your notification settings at https://github.com/crosswire/xiphos/settings/notifications


More information about the xiphos-source mailing list