# HG changeset patch # User Gary Kramlich # Date 1704965274 21600 # Node ID 867b39d2bc08718583b442aeb6659ceb988a9a0f # Parent 25d1b656d792507c09f87724bcf4eefbfa17026a Add the cpu, cpu_family, and endianness of the host machine to the about dialog Also added the Adwaita version as that'll be handy too. Testing Done: Opend the about box and verified there weren't any warnings and that all of the data looked accurate. Reviewed at https://reviews.imfreedom.org/r/2910/ diff -r 25d1b656d792 -r 867b39d2bc08 meson.build --- a/meson.build Tue Jan 02 00:53:02 2024 -0600 +++ b/meson.build Thu Jan 11 03:27:54 2024 -0600 @@ -56,6 +56,10 @@ conf.set_quoted('VERSION', meson.project_version()) conf.set_quoted('DISPLAY_VERSION', meson.project_version()) +conf.set_quoted('PURPLE_BUILD_CPU', host_machine.cpu()) +conf.set_quoted('PURPLE_BUILD_ARCHITECTURE', host_machine.cpu_family()) +conf.set_quoted('PURPLE_BUILD_ENDIANNESS', host_machine.endian()) + version_conf.set('PURPLE_MAJOR_VERSION', purple_major_version) version_conf.set('PURPLE_MINOR_VERSION', purple_minor_version) version_conf.set('PURPLE_MICRO_VERSION', purple_micro_version) diff -r 25d1b656d792 -r 867b39d2bc08 pidgin/pidginabout.c --- a/pidgin/pidginabout.c Tue Jan 02 00:53:02 2024 -0600 +++ b/pidgin/pidginabout.c Thu Jan 11 03:27:54 2024 -0600 @@ -172,10 +172,24 @@ static void pidgin_about_dialog_load_build_info(PidginAboutDialog *about) { + /* add the cpu */ + pidgin_about_dialog_group_add_row(about->build_info_group, + _("CPU"), + PURPLE_BUILD_CPU); + + /* add the architecture */ + pidgin_about_dialog_group_add_row(about->build_info_group, + _("Architecture"), + PURPLE_BUILD_ARCHITECTURE); + + /* add the endianness */ + pidgin_about_dialog_group_add_row(about->build_info_group, + _("Endianness"), + PURPLE_BUILD_ENDIANNESS); /* add the commit hash */ - pidgin_about_dialog_group_add_row(about->build_info_group, "Commit Hash", - REVISION); + pidgin_about_dialog_group_add_row(about->build_info_group, + _("Commit Hash"), REVISION); /* add the purple version */ pidgin_about_dialog_build_info_add_version(about->build_info_group, @@ -197,6 +211,13 @@ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); + + /* add the adwaita version */ + pidgin_about_dialog_build_info_add_version(about->build_info_group, + _("Adwaita Version"), + ADW_MAJOR_VERSION, + ADW_MINOR_VERSION, + ADW_MICRO_VERSION); } static char * @@ -206,14 +227,20 @@ info = g_strdup_printf( "Build Information\n" "=================\n" + "CPU: %s\n" + "Architecture: %s\n" + "Endianness: %s\n" "Commit Hash: %s\n" "Purple Version: %u.%u.%u\n" "GLib Version: %u.%u.%u\n" - "GTK Version: %u.%u.%u\n", + "GTK Version: %u.%u.%u\n" + "Adwaita Version: %u.%u.%u\n", + PURPLE_BUILD_CPU, PURPLE_BUILD_ARCHITECTURE, PURPLE_BUILD_ENDIANNESS, REVISION, PURPLE_MAJOR_VERSION, PURPLE_MINOR_VERSION, PURPLE_MICRO_VERSION, GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION, - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); + GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION, + ADW_MAJOR_VERSION, ADW_MINOR_VERSION, ADW_MICRO_VERSION); return info; } @@ -240,6 +267,13 @@ gtk_get_major_version(), gtk_get_minor_version(), gtk_get_micro_version()); + + /* add the adwaita version */ + pidgin_about_dialog_build_info_add_version(about->runtime_info_group, + _("Adwaita Version"), + adw_get_major_version(), + adw_get_minor_version(), + adw_get_micro_version()); } static char * @@ -251,10 +285,12 @@ "===================\n" "Purple Version: %u.%u.%u\n" "GLib Version: %u.%u.%u\n" - "GTK Version: %u.%u.%u\n", + "GTK Version: %u.%u.%u\n" + "Adwaita Version: %u.%u.%u\n", purple_major_version, purple_minor_version, purple_micro_version, glib_major_version, glib_minor_version, glib_micro_version, - gtk_get_major_version(), gtk_get_minor_version(), gtk_get_micro_version()); + gtk_get_major_version(), gtk_get_minor_version(), gtk_get_micro_version(), + adw_get_major_version(), adw_get_minor_version(), adw_get_micro_version()); return info; }