2006-11-10 [paul] 2.6.0cvs27

	* src/crash.c
		more renaming
		add libSM to get_compiled_in_features()
	* src/main.c
		more renaming

diff --git a/ChangeLog b/ChangeLog
index c2f0fe1a39996386d54e094885c6761563f434b4..68d138606cdaff007d078956ce10712889de031c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-11-10 [paul]      2.6.0cvs27
+
+       * src/crash.c
+               more renaming
+               add libSM to get_compiled_in_features()
+       * src/main.c
+               more renaming
+

 2006-11-10 [colin]     2.6.0cvs26
 
        * src/etpan/imap-thread.c
 2006-11-10 [colin]     2.6.0cvs26
 
        * src/etpan/imap-thread.c

diff --git a/PATCHSETS b/PATCHSETS
index 0d3852b60e75d19849822b2f5dd54705c1cec88f..21971a50aaf5b5fd9e0b1afde24bc8ec85169aa6 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2051,3 +2051,4 @@
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/bogofilter/bogofilter_gtk.c;  ) > 2.6.0cvs24.patchset
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/addrbook.xml;  cvs diff -u -r 1.1.2.33 -r 1.1.2.34 manual/advanced.xml;  cvs diff -u -r 1.1.2.13 -r 1.1.2.14 manual/faq.xml;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 manual/intro.xml;  ) > 2.6.0cvs25.patchset
 ( cvs diff -u -r 1.1.4.57 -r 1.1.4.58 src/etpan/imap-thread.c;  ) > 2.6.0cvs26.patchset
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/bogofilter/bogofilter_gtk.c;  ) > 2.6.0cvs24.patchset
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/addrbook.xml;  cvs diff -u -r 1.1.2.33 -r 1.1.2.34 manual/advanced.xml;  cvs diff -u -r 1.1.2.13 -r 1.1.2.14 manual/faq.xml;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 manual/intro.xml;  ) > 2.6.0cvs25.patchset
 ( cvs diff -u -r 1.1.4.57 -r 1.1.4.58 src/etpan/imap-thread.c;  ) > 2.6.0cvs26.patchset

+( cvs diff -u -r 1.23.2.18 -r 1.23.2.19 src/crash.c;  cvs diff -u -r 1.115.2.112 -r 1.115.2.113 src/main.c;  ) > 2.6.0cvs27.patchset

diff --git a/configure.ac b/configure.ac
index 10446ff9e09fd18d332f936c8b5571b247b0e2e1..d6143100673a9d094cf26cf62b4163be37469856 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=26
+EXTRA_VERSION=27

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/crash.c b/src/crash.c
index e4e9bf7f3264c4fc564c0aa29924c9eeebb328e1..401d859bc3373036dede79008e4b62b702ba94f8 100644 (file)
--- a/src/crash.c
+++ b/src/crash.c
@@ -306,7 +306,7 @@ static void crash_save_crash_log(GtkButton *button, const gchar *text)
 
        timer = time(NULL);
        lt = localtime(&timer);
 
        timer = time(NULL);
        lt = localtime(&timer);

-       strftime(buf, sizeof buf, "sylpheed-crash-log-%Y-%m-%d-%H-%M-%S.txt", lt);
+       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)
                str_write_to_file(text, filename);
        if (NULL != (filename = filesel_select_file_save(_("Save crash information"), buf))
        &&  *filename)
                str_write_to_file(text, filename);


@@ -433,6 +433,9 @@ static const gchar *get_compiled_in_features(void)
 #endif
 #if USE_GNOMEPRINT
                   " libgnomeprint"
 #endif
 #if USE_GNOMEPRINT
                   " libgnomeprint"

+#endif
+#if HAVE_LIBSM
+                  " libSM"

 #endif
        "");
 }
 #endif
        "");
 }


@@ -475,11 +478,11 @@ static const gchar *get_operating_system(void)
 
 /*!
  *\brief       see if the crash dialog is allowed (because some
 
 /*!
  *\brief       see if the crash dialog is allowed (because some

- *             developers may prefer to run sylpheed under gdb...)
+ *             developers may prefer to run claws-mail under gdb...)

  */
 static gboolean is_crash_dialog_allowed(void)
 {
  */
 static gboolean is_crash_dialog_allowed(void)
 {

-       return !getenv("SYLPHEED_NO_CRASH");
+       return !getenv("CLAWS_NO_CRASH");

 }
 
 /*!
 }
 
 /*!

diff --git a/src/main.c b/src/main.c
index 7d2b50f5c18bf3d016ddc3471b29308f511ebe9e..c30e681c1210da41c291558b84757ed892fb2010 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -646,11 +646,11 @@ int main(int argc, char *argv[])
        remove_all_files(get_tmp_dir());
        remove_all_files(get_mime_tmp_dir());
 
        remove_all_files(get_tmp_dir());
        remove_all_files(get_mime_tmp_dir());
 

-       if (is_file_exist("sylpheed.log")) {
-               if (rename_force("sylpheed.log", "sylpheed.log.bak") < 0)
-                       FILE_OP_ERROR("sylpheed.log", "rename");
+       if (is_file_exist("claws.log")) {
+               if (rename_force("claws.log", "claws.log.bak") < 0)
+                       FILE_OP_ERROR("claws.log", "rename");

        }
        }

-       set_log_file("sylpheed.log");
+       set_log_file("claws.log");

 
        CHDIR_RETURN_VAL_IF_FAIL(get_home_dir(), 1);
 
 
        CHDIR_RETURN_VAL_IF_FAIL(get_home_dir(), 1);