commit 5523e5d6b51a06c8c85ccbd6e1546fda11f09043
parent 7d696832586c6be54087e68bfa2c4bfbdb1abd35
Author: Oliver Lowe <o@olowe.co>
Date: Tue, 12 Aug 2025 14:54:24 +1000
Don't print operating system name
Even more build config required
Diffstat:
6 files changed, 20 insertions(+), 96 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -335,7 +335,7 @@ fi
dnl Checks for header files.
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS(fcntl.h sys/file.h unistd.h paths.h \
- sys/param.h sys/utsname.h sys/select.h \
+ sys/param.h sys/select.h \
wchar.h wctype.h locale.h netdb.h)
AC_CHECK_HEADER([execinfo.h], [AC_DEFINE(HAVE_BACKTRACE,1,[Has backtrace*() needed for retrieving stack traces])])
AC_SEARCH_LIBS(backtrace_symbols, [execinfo])
diff --git a/src/common/utils.c b/src/common/utils.c
@@ -67,10 +67,6 @@
#include <time.h>
#include <regex.h>
-#ifdef G_OS_UNIX
-#include <sys/utsname.h>
-#endif
-
#include <fcntl.h>
#ifdef G_OS_WIN32
diff --git a/src/compose.c b/src/compose.c
@@ -5540,7 +5540,6 @@ static gint compose_redirect_write_headers(Compose *compose, FILE *fp)
gchar buf[BUFFSIZE];
gchar *str;
const gchar *entstr;
- /* struct utsname utsbuf; */
gboolean err = FALSE;
cm_return_val_if_fail(fp != NULL, -1);
diff --git a/src/crash.c b/src/crash.c
@@ -37,10 +37,6 @@
#include <errno.h>
#include <fcntl.h>
-#if HAVE_SYS_UTSNAME_H
-# include <sys/utsname.h>
-#endif
-
#if defined(__GNU_LIBRARY__) && !defined(__UCLIBC__)
# include <gnu/libc-version.h>
#endif
@@ -73,7 +69,6 @@ static void crash_debug (unsigned long crash_pid,
GString *debug_output);
static gchar *get_compiled_in_features (void);
static gchar *get_lib_version (void);
-static gchar *get_operating_system (void);
static gboolean is_crash_dialog_allowed (void);
static void crash_handler (int sig);
static void crash_cleanup_exit (void);
@@ -229,13 +224,12 @@ static GtkWidget *crash_dialog_show(const gchar *text, const gchar *debug_output
"GTK version %d.%d.%d / GLib %d.%d.%d\n"
"Locale: %s (charset: %s)\n"
"Features:%s\n"
- "Operating system: %s\n"
"C Library: %s\n--\n%s",
VERSION,
gtk_major_version, gtk_minor_version, gtk_micro_version,
glib_major_version, glib_minor_version, glib_micro_version,
conv_get_current_locale(), conv_get_locale_charset_str(),
- features, os, lversion, debug_output);
+ features, lversion, debug_output);
g_free(features);
g_free(os);
g_free(lversion);
@@ -430,8 +424,6 @@ static gchar *get_compiled_in_features(void)
"");
}
-/***/
-
/*!
*\brief library version
*/
@@ -446,28 +438,6 @@ static gchar *get_lib_version(void)
#endif
}
-/***/
-
-/*!
- *\brief operating system
- */
-static gchar *get_operating_system(void)
-{
-#if HAVE_SYS_UTSNAME_H
- struct utsname utsbuf;
- uname(&utsbuf);
- return g_strdup_printf("%s %s (%s)",
- utsbuf.sysname,
- utsbuf.release,
- utsbuf.machine);
-#else
- return g_strdup(_("Unknown"));
-
-#endif
-}
-
-/***/
-
/*!
*\brief see if the crash dialog is allowed (because some
* developers may prefer to run Claws Mail under gdb...)
diff --git a/src/gtk/about.c b/src/gtk/about.c
@@ -27,9 +27,6 @@
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
-#if HAVE_SYS_UTSNAME_H
-# include <sys/utsname.h>
-#endif
#include <errno.h>
#include "about.h"
@@ -91,10 +88,6 @@ static GtkWidget *about_create_child_page_info(void)
GdkRGBA uri_color;
gchar buf[1024];
GtkTextTag *tag;
-#if HAVE_SYS_UTSNAME_H
- struct utsname utsbuf;
-#endif
- gchar *format;
scrolledwin = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
@@ -158,38 +151,11 @@ static GtkWidget *about_create_child_page_info(void)
gtk_text_buffer_insert_with_tags_by_name(buffer, &iter,
(_("System Information\n")), -1, "underlined-list-title", NULL);
-#if HAVE_SYS_UTSNAME_H
- uname(&utsbuf);
- format = g_strconcat(
- "GTK %d.%d.%d / GLib %d.%d.%d\n",
- _("Locale: %s (charset: %s)\n"
- "Operating System: %s %s (%s)"), NULL);
- g_snprintf(buf, sizeof(buf), format,
- gtk_major_version, gtk_minor_version, gtk_micro_version,
- glib_major_version, glib_minor_version, glib_micro_version,
- conv_get_current_locale(), conv_get_locale_charset_str(),
- utsbuf.sysname, utsbuf.release, utsbuf.machine);
-#elif defined(G_OS_WIN32)
- format = g_strconcat(
- "GTK %d.%d.%d / GLib %d.%d.%d\n",
- _("Locale: %s (charset: %s)\n"
- "Operating System: %s"), NULL);
- g_snprintf(buf, sizeof(buf), format,
- gtk_major_version, gtk_minor_version, gtk_micro_version,
- glib_major_version, glib_minor_version, glib_micro_version,
- conv_get_current_locale(), conv_get_locale_charset_str(),
- "Win32");
-#else
- format = g_strconcat(
- "GTK %d.%d.%d / GLib %d.%d.%d\n",
- _("Locale: %s (charset: %s)\n"
- "Operating System: unknown"), NULL);
- g_snprintf(buf, sizeof(buf), format,
- gtk_major_version, gtk_minor_version, gtk_micro_version,
- glib_major_version, glib_minor_version, glib_micro_version,
- conv_get_current_locale(), conv_get_locale_charset_str());
-#endif
- g_free(format);
+ g_snprintf(buf, sizeof(buf),
+ "GTK %d.%d.%d / GLib %d.%d.%d\nLocale: %s (charset: %s)\n",
+ gtk_major_version, gtk_minor_version, gtk_micro_version,
+ glib_major_version, glib_minor_version, glib_micro_version,
+ conv_get_current_locale(), conv_get_locale_charset_str());
gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, buf, -1,
"indented-list-item", NULL);
diff --git a/src/gtk/description_window.c b/src/gtk/description_window.c
@@ -49,7 +49,7 @@ void description_window_create(DescriptionWindow *dwindow)
{
if (!dwindow->window) {
description_create(dwindow);
-
+
gtk_window_set_transient_for(GTK_WINDOW(dwindow->window), GTK_WINDOW(dwindow->parent));
dwindow->parent_modal = gtk_window_get_modal(GTK_WINDOW(dwindow->parent));
#ifndef G_OS_WIN32
@@ -73,30 +73,23 @@ static void description_create(DescriptionWindow * dwindow)
GtkWidget *close_btn;
GtkWidget *scrolledwin;
int i;
- int sz;
int line;
int j;
int *max_width = g_new0(int, dwindow->columns), width=0;
GtkRequisition req;
-
+
dwindow->window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "description_window");
-
+
gtk_window_set_title(GTK_WINDOW(dwindow->window),
gettext(dwindow->title));
gtk_container_set_border_width(GTK_CONTAINER(dwindow->window), 8);
gtk_window_set_resizable(GTK_WINDOW(dwindow->window), TRUE);
gtk_window_set_type_hint(GTK_WINDOW(dwindow->window), GDK_WINDOW_TYPE_HINT_DIALOG);
- /* Check number of lines to be show */
- sz = 0;
- for (i = 0; dwindow->symbol_table[i] != NULL; i = i + dwindow->columns) {
- sz++;
- }
-
scrolledwin = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-
+
table = gtk_grid_new();
gtk_container_add(GTK_CONTAINER(scrolledwin), table);
gtk_container_set_border_width(GTK_CONTAINER(table), 4);
@@ -110,7 +103,7 @@ static void description_create(DescriptionWindow * dwindow)
gint col = j;
gint colend = j+1;
/* Expand using next NULL columns */
- while ((colend < dwindow->columns) &&
+ while ((colend < dwindow->columns) &&
(dwindow->symbol_table[i+colend] == NULL)) {
colend++;
j++;
@@ -130,7 +123,7 @@ static void description_create(DescriptionWindow * dwindow)
}
} else {
GtkWidget *separator;
-
+
separator = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
gtk_grid_attach(GTK_GRID(table), separator, 0, line, 1, 1);
}
@@ -142,7 +135,7 @@ static void description_create(DescriptionWindow * dwindow)
g_free(max_width);
width += 100;
-
+
gtkut_stock_button_set_create(&hbbox, &close_btn, "window-close", _("_Close"),
NULL, NULL, NULL, NULL, NULL, NULL);
@@ -162,7 +155,7 @@ static void description_create(DescriptionWindow * dwindow)
TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(hbbox),
FALSE, FALSE, 3);
-
+
gtk_widget_grab_default(close_btn);
g_signal_connect(G_OBJECT(close_btn), "clicked",
@@ -175,14 +168,14 @@ static void description_create(DescriptionWindow * dwindow)
G_CALLBACK(description_window_focus_out_event), NULL);
g_signal_connect(G_OBJECT(dwindow->window), "destroy",
G_CALLBACK(description_window_destroy), dwindow);
-
+
if(dwindow->parent)
g_signal_connect(G_OBJECT(dwindow->parent), "hide",
G_CALLBACK(description_window_destroy), dwindow);
gtk_widget_show_all(vbox);
gtk_widget_set_size_request(dwindow->window,
- (width < 400) ? 400 : width, 450);
+ (width < 400) ? 400 : width, 450);
}
static gboolean description_window_key_pressed(GtkWidget *widget,
@@ -209,7 +202,7 @@ static gboolean description_window_focus_out_event (GtkWidget *widget,
gpointer data)
{
gtk_grab_remove(GTK_WIDGET(widget));
-
+
return FALSE;
}
@@ -222,11 +215,11 @@ static void description_window_destroy (GtkWidget *widget, gpointer data)
gtk_widget_destroy(dwindow->window);
dwindow->window = NULL;
}
-
+
if(dwindow->parent) {
if (GTK_IS_WINDOW(dwindow->parent))
gtk_window_set_modal(GTK_WINDOW(dwindow->parent), dwindow->parent_modal);
- g_signal_handlers_disconnect_by_func(G_OBJECT(dwindow->parent),
+ g_signal_handlers_disconnect_by_func(G_OBJECT(dwindow->parent),
description_window_destroy, dwindow->parent);
}
}
