2010-12-01 [pawel] 3.7.7cvs9

[claws.git] / src / crash.c

diff --git a/src/crash.c b/src/crash.c
index 98b14e9dfba70676dfda0c5fac2cde29aad5b7e6..f7f1589fd30716e0978fc8eb001fb2d20b5167d7 100644 (file)
--- a/src/crash.c
+++ b/src/crash.c
@@ -4,7 +4,7 @@
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifdef HAVE_CONFIG_H
@@ -46,9 +46,7 @@
 #      include <gnu/libc-version.h>
 #endif
 
-#ifdef SIGTERM
 #include "main.h"
-#endif
 #include "claws.h"
 #include "crash.h"
 #include "utils.h"
@@ -82,7 +80,7 @@ static void            crash_cleanup_exit             (void);
 
 /***/
 
-static const gchar *DEBUG_SCRIPT = "bt\nkill\nq";
+static const gchar *DEBUG_SCRIPT = "thread all apply\nbt full\nkill\nq";
 
 /***/
 
@@ -183,7 +181,7 @@ static GtkWidget *crash_dialog_show(const gchar *text, const gchar *debug_output
        GtkTextBuffer *buffer;
        GtkTextIter iter;
 
-       window1 = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+       window1 = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "crash");
        gtk_container_set_border_width(GTK_CONTAINER(window1), 5);
        gtk_window_set_title(GTK_WINDOW(window1), _("Claws Mail has crashed"));
        gtk_window_set_position(GTK_WINDOW(window1), GTK_WIN_POS_CENTER);
@@ -253,17 +251,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);
@@ -302,10 +300,11 @@ static void crash_save_crash_log(GtkButton *button, const gchar *text)
        time_t timer;
        struct tm *lt;
        char buf[100];
+       struct tm buft;
        gchar *filename;
 
        timer = time(NULL);
-       lt = localtime(&timer);
+       lt = localtime_r(&timer, &buft);
        strftime(buf, sizeof buf, "claws-crash-log-%Y-%m-%d-%H-%M-%S.txt", lt);
        if (NULL != (filename = filesel_select_file_save(_("Save crash information"), buf))
        &&  *filename)
@@ -318,7 +317,7 @@ static void crash_save_crash_log(GtkButton *button, const gchar *text)
  */
 static void crash_create_bug_report(GtkButton *button, const gchar *data)
 {
-       open_uri(BUGZILLA_URI, prefs_common.uri_cmd);
+       open_uri(BUGZILLA_URI, prefs_common_get_uri_cmd());
 }
 
 /*!
@@ -362,7 +361,7 @@ static void crash_debug(unsigned long crash_pid,
                dup(choutput[1]);
                close(choutput[0]);
                if (-1 == execvp("gdb", argp)) 
-                       puts("error execvp\n");
+                       g_print("error execvp\n");
        } else {
                char buf[100];
                int r;
@@ -373,7 +372,7 @@ static void crash_debug(unsigned long crash_pid,
                 * make it non blocking
                 */
                if (-1 == fcntl(choutput[0], F_SETFL, O_NONBLOCK))
-                       puts("set to non blocking failed\n");
+                       g_print("set to non blocking failed\n");
 
                /*
                 * get the output
@@ -416,8 +415,8 @@ static const gchar *get_compiled_in_features(void)
 #if HAVE_LIBCOMPFACE
                   " compface"
 #endif
-#if USE_OPENSSL
-                  " OpenSSL"
+#if USE_GNUTLS
+                  " GnuTLS"
 #endif
 #if USE_LDAP
                   " LDAP"
@@ -425,15 +424,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
@@ -556,9 +552,8 @@ static void crash_handler(int sig)
  */
 static void crash_cleanup_exit(void)
 {
-       extern gchar *get_socket_name(void);
-       const char *filename = get_socket_name();
-       g_unlink(filename);
+       const char *filename = claws_get_socket_name();
+       claws_unlink(filename);
 }
 
 #endif