2006-02-23 [colin] 2.0.0cvs78

	* src/alertpanel.c
		Change OK to Close in alertpanel with View log
		button; add accel to View log. Patch by Fabien
		Vantard

diff --git a/ChangeLog b/ChangeLog
index d57b6dfdbf97b71c9304e6d50fadc0270a3651fa..18a1f99e69bced84bb309f0236a0d0723403f833 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-23 [colin]     2.0.0cvs78
+
+       * src/alertpanel.c
+               Change OK to Close in alertpanel with View log
+               button; add accel to View log. Patch by Fabien
+               Vantard
+
 2006-02-23 [wwp]       2.0.0cvs77
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index df4d0bdc52d40b0df88ca4f42326f10b4edd8de7..6e685f9cd11ccf2349ead009d4fe7db9e51a9a33 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1261,3 +1261,4 @@
 ( cvs diff -u -r 1.1.2.29 -r 1.1.2.30 commitHelper;  ) > 2.0.0cvs75.patchset
 ( cvs diff -u -r 1.1.2.30 -r 1.1.2.31 commitHelper;  ) > 2.0.0cvs76.patchset
 ( cvs diff -u -r 1.382.2.245 -r 1.382.2.246 src/compose.c;  ) > 2.0.0cvs77.patchset
+( cvs diff -u -r 1.17.2.20 -r 1.17.2.21 src/alertpanel.c;  ) > 2.0.0cvs78.patchset

diff --git a/configure.ac b/configure.ac
index af762d5ea78ab44f6b6493f7598d37583bd8904b..d1beb6bf47c309c034ef783583da4e455d5aabd6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=77
+EXTRA_VERSION=78
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/alertpanel.c b/src/alertpanel.c
index ba67a3a7e6573783491d3960cc9970bd1544eb20..f66e5b43b6eccf7beecc7202fa3ab4534edc6e98 100644 (file)
--- a/src/alertpanel.c
+++ b/src/alertpanel.c
@@ -185,8 +185,8 @@ void alertpanel_error_log(const gchar *format, ...)
        mainwin = mainwindow_get_mainwindow();
        
        if (mainwin && mainwin->logwin) {
-               val = alertpanel_full(_("Error"), buf, GTK_STOCK_OK,
-                                     _("View log"), NULL, FALSE, NULL,
+               val = alertpanel_full(_("Error"), buf, GTK_STOCK_CLOSE,
+                                     _("_View log"), NULL, FALSE, NULL,
                                      ALERT_ERROR, G_ALERTDEFAULT);
                if (val == G_ALERTALTERNATE)
                        log_window_show(mainwin->logwin);