From 3845fa6f4162346b790186c099c03276847ba6f9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pawe=C5=82=20P=C4=99kala?= Date: Thu, 2 Feb 2012 21:54:21 +0000 Subject: [PATCH] 2012-02-02 [pawel] 3.8.0cvs23 * src/folderview.c Fix bug #2590 'Un-capitalize strings' Patch by Christian Hesse --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/folderview.c | 4 ++-- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3c4251f87..83c52a1b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-02-02 [pawel] 3.8.0cvs23 + + * src/folderview.c + Fix bug #2590 'Un-capitalize strings' + Patch by Christian Hesse + 2012-02-02 [pawel] 3.8.0cvs22 * src/mainwindow.c diff --git a/PATCHSETS b/PATCHSETS index 016406629..4ca8fdf1a 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4339,3 +4339,4 @@ ( cvs diff -u -r 1.18.2.33 -r 1.18.2.34 src/jpilot.c; cvs diff -u -r 1.6.10.19 -r 1.6.10.20 src/mutt.c; cvs diff -u -r 1.6.2.18 -r 1.6.2.19 src/pine.c; cvs diff -u -r 1.150.2.120 -r 1.150.2.121 src/procmsg.c; cvs diff -u -r 1.14.2.21 -r 1.14.2.22 src/vcard.c; cvs diff -u -r 1.9.2.32 -r 1.9.2.33 src/gtk/sslcertwindow.c; ) > 3.8.0cvs20.patchset ( cvs diff -u -r 1.213.2.204 -r 1.213.2.205 src/folder.c; cvs diff -u -r 1.94.2.225 -r 1.94.2.226 src/messageview.c; cvs diff -u -r 1.19.2.26 -r 1.19.2.27 src/messageview.h; cvs diff -u -r 1.60.2.57 -r 1.60.2.58 src/procmsg.h; ) > 3.8.0cvs21.patchset ( cvs diff -u -r 1.274.2.341 -r 1.274.2.342 src/mainwindow.c; ) > 3.8.0cvs22.patchset +( cvs diff -u -r 1.207.2.226 -r 1.207.2.227 src/folderview.c; ) > 3.8.0cvs23.patchset diff --git a/configure.ac b/configure.ac index 7daeb106b..c1acb06c8 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=8 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=22 +EXTRA_VERSION=23 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/folderview.c b/src/folderview.c index 8e0280b7f..25389143c 100644 --- a/src/folderview.c +++ b/src/folderview.c @@ -2080,7 +2080,7 @@ void folderview_close_opened(FolderView *folderview) olditem = gtk_cmctree_node_get_row_data(GTK_CMCTREE(folderview->ctree), folderview->opened); if (olditem) { - gchar *buf = g_strdup_printf(_("Closing Folder %s..."), + gchar *buf = g_strdup_printf(_("Closing folder %s..."), olditem->path ? olditem->path:olditem->name); /* will be null if we just moved the previously opened folder */ STATUSBAR_PUSH(folderview->mainwin, buf); @@ -2175,7 +2175,7 @@ static void folderview_selected(GtkCMCTree *ctree, GtkCMCTreeNode *row, /* Open Folder */ /* TODO: wwp: avoid displaying (null) in the status bar */ - buf = g_strdup_printf(_("Opening Folder %s..."), item->path ? + buf = g_strdup_printf(_("Opening folder %s..."), item->path ? item->path : "(null)"); debug_print("%s\n", buf); STATUSBAR_PUSH(folderview->mainwin, buf); -- 2.25.1