Coverity fixes

[claws.git] / src / crash.c

diff --git a/src/crash.c b/src/crash.c
index dffe9182bf703fbbbb8a79c0373bf16df824c164..d3c5022af0558494781a01cd7c089d8c6182f720 100644 (file)
--- a/src/crash.c
+++ b/src/crash.c
@@ -1,6 +1,6 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002 by the Claws Mail Team and Hiroyuki Yamamoto
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2002-2012 by the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,7 +42,7 @@
 #      include <sys/utsname.h>
 #endif
 
-#if defined(__GNU_LIBRARY__)
+#if defined(__GNU_LIBRARY__) && !defined(__UCLIBC__)
 #      include <gnu/libc-version.h>
 #endif
 
@@ -53,6 +53,7 @@
 #include "filesel.h"
 #include "version.h"
 #include "prefs_common.h"
+#include "manage_window.h"
 
 /*
  * NOTE: the crash dialog is called when claws is not 
@@ -251,17 +252,17 @@ static GtkWidget *crash_dialog_show(const gchar *text, const gchar *debug_output
        button3 = gtk_button_new_with_label(_("Close"));
        gtk_widget_show(button3);
        gtk_container_add(GTK_CONTAINER(hbuttonbox4), button3);
-       GTK_WIDGET_SET_FLAGS(button3, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(button3, TRUE);
 
        button4 = gtk_button_new_with_label(_("Save..."));
        gtk_widget_show(button4);
        gtk_container_add(GTK_CONTAINER(hbuttonbox4), button4);
-       GTK_WIDGET_SET_FLAGS(button4, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(button4, TRUE);
 
        button5 = gtk_button_new_with_label(_("Create bug report"));
        gtk_widget_show(button5);
        gtk_container_add(GTK_CONTAINER(hbuttonbox4), button5);
-       GTK_WIDGET_SET_FLAGS(button5, GTK_CAN_DEFAULT);
+       gtkut_widget_set_can_default(button5, TRUE);
        
        g_signal_connect(G_OBJECT(window1), "delete_event",
                         G_CALLBACK(gtk_main_quit), NULL);
@@ -272,6 +273,8 @@ static GtkWidget *crash_dialog_show(const gchar *text, const gchar *debug_output
        g_signal_connect(G_OBJECT(button5), "clicked",
                         G_CALLBACK(crash_create_bug_report), NULL);
 
+       MANAGE_WINDOW_SIGNALS_CONNECT(window1);
+
        gtk_widget_show(window1);
 
        gtk_main();
@@ -330,7 +333,10 @@ static void crash_debug(unsigned long crash_pid,
        int choutput[2];
        pid_t pid;
 
-       pipe(choutput);
+       if (pipe(choutput) == -1) {
+               g_print("can't pipe - error %s", errno);
+               return;
+       }
 
        if (0 == (pid = fork())) {
                char *argp[10];
@@ -403,9 +409,6 @@ static void crash_debug(unsigned long crash_pid,
 static const gchar *get_compiled_in_features(void)
 {
        return g_strdup_printf("%s",
-#if USE_THREADS
-                  " gthread"
-#endif
 #if INET6
                   " IPv6"
 #endif
@@ -415,9 +418,6 @@ static const gchar *get_compiled_in_features(void)
 #if HAVE_LIBCOMPFACE
                   " compface"
 #endif
-#if USE_OPENSSL
-                  " OpenSSL"
-#endif
 #if USE_GNUTLS
                   " GnuTLS"
 #endif
@@ -427,15 +427,12 @@ static const gchar *get_compiled_in_features(void)
 #if USE_JPILOT
                   " JPilot"
 #endif
-#if USE_ASPELL
+#if USE_ENCHANT
                   " GNU/aspell"
 #endif
 #if HAVE_LIBETPAN
                   " libetpan"
 #endif
-#if USE_GNOMEPRINT
-                  " libgnomeprint"
-#endif
 #if HAVE_LIBSM
                   " libSM"
 #endif
@@ -449,7 +446,9 @@ static const gchar *get_compiled_in_features(void)
  */
 static const gchar *get_lib_version(void)
 {
-#if defined(__GNU_LIBRARY__)
+#if defined(__UCLIBC__)
+       return g_strdup_printf("uClibc %i.%i.%i", __UCLIBC_MAJOR__, __UCLIBC_MINOR__, __UCLIBC_SUBLEVEL__);
+#elif defined(__GNU_LIBRARY__)
        return g_strdup_printf("GNU libc %s", gnu_get_libc_version());
 #else
        return g_strdup(_("Unknown"));
@@ -559,7 +558,7 @@ static void crash_handler(int sig)
 static void crash_cleanup_exit(void)
 {
        const char *filename = claws_get_socket_name();
-       g_unlink(filename);
+       claws_unlink(filename);
 }
 
 #endif