[xiphos-source] [crosswire/xiphos] 8a9803: gtk2-clean branch — remove GTK2/libglade support (...

[LAfricain]

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

  Changed paths:
    M cmake/XiphosConfig_h.cmake
    M cmake/XiphosDependencies.cmake
    M cmake/XiphosOptions.cmake
    M cmake/XiphosReport.cmake
    M src/editor/webkit_editor.c
    M src/gtk/CMakeLists.txt
    M src/gtk/bookmark_dialog.c
    M src/gtk/bookmarks_menu.c
    M src/gtk/export_bookmarks.c
    M src/gtk/export_dialog.c
    M src/gtk/main_menu.c
    M src/gtk/menu_popup.c
    M src/gtk/mod_mgr.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/preferences_dialog.c
    M src/gtk/search_dialog.c
    M src/gtk/sidebar.c
    M src/gtk/treekey-editor.c
    M src/gui/menu_popup.h
    M src/gui/utilities.h
    M ui/CMakeLists.txt
    R ui/bookmarks.glade
    R ui/editor_link_dialog.glade
    R ui/export-dialog.glade
    R ui/folder.glade
    R ui/gtk2_webedit.ui
    R ui/markverse.glade
    R ui/module-manager.glade
    R ui/navbar_versekey.glade
    R ui/prefs.glade
    R ui/search-dialog.glade
    R ui/selector-prefs.glade
    R ui/xi-export-bookmarks.glade
    A ui/xi-export-bookmarks.gtkbuilder
    R ui/xi-menus.glade
    M win32/CMakeLists.txt

  Log Message:
  -----------
  gtk2-clean branch — remove GTK2/libglade support (#1379)

* cleanup: fix xi-export-bookmarks, the last stray .glade reference

xi-export-bookmarks.glade was the only .glade file without a matching
.gtkbuilder counterpart. Turns out export_bookmarks.c never actually
used the libglade API on it in the first place — it already loads it
via gtk_builder_new()/gtk_builder_add_from_file() unconditionally.

Renamed the file to .gtkbuilder (its content was already valid
GtkBuilder XML) and removed the dead #ifndef USE_GTKBUILDER include
of <glade/glade-xml.h>, which was never reachable.

* cleanup: remove GTK2 option throughout the CMake build system

GTK2/libglade support is gone; GTK3 is now the only supported
toolkit. Removes the GTK2 option declaration and every conditional
branch that depended on it:

- XiphosOptions.cmake: drop option(GTK2) and its WEBKIT1 implication
- XiphosDependencies.cmake: keep only the GTK3 pkg-config branch
  (WEBKIT1/GTKHTML combinations unchanged); drops the GTK2 branch
  and the now-orphaned gtk+-unix-print-2.0 check
- XiphosConfig_h.cmake: USE_GTK_3/USE_GTKBUILDER are now always set
- XiphosReport.cmake: build summary always reports Gtk+-3.0
- src/gtk/CMakeLists.txt: drop the dead Unix-print link block
  (Unix-print_FOUND can no longer be set)
- win32/CMakeLists.txt: install only the GTK3 DLLs/shared files

* cleanup: remove GTK2/libglade code from all UI source files

USE_GTKBUILDER is now always defined (GTK2 option removed from
CMake). Drop every #ifdef USE_GTKBUILDER / #else (libglade) / #endif
branch across the 16 .c files and 2 headers that had them, keeping
only the GtkBuilder code path. Also removes a couple of small dead
code blocks found along the way:

- export_dialog.c: obsolete pieces already unreachable
- search_dialog.c: _create_mod_sel_dialog(), a libglade-only helper
  that was never compiled once USE_GTKBUILDER became unconditional
- menu_popup.c, navbar_versekey_parallel.c: dead commented-out
  glade_xml_get_widget() reference blocks

Build verified with GTKTVEDITOR=ON WEBKIT1=ON CONSOLE=OFF.

* cleanup: remove all .glade files and remaining GTK2 references

- webkit_editor.c: USE_GTK_3 always defined now, so gtk_webedit.ui is
  always used; drop the dead gtk2_webedit.ui branch
- mod_mgr.c: update stale comment referencing module-manager.glade
- ui/CMakeLists.txt: install only the GTK3 .gtkbuilder files,
  un-conditioned; drop gtk2_webedit.ui
- remove all remaining .glade files (bookmarks, editor_link_dialog,
  export-dialog, folder, markverse, module-manager, navbar_versekey,
  prefs, search-dialog, selector-prefs, xi-menus) — every one has a
  .gtkbuilder equivalent that's actually loaded, and nothing
  references the .glade files anymore

---------

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