2005-10-19 [colin] 1.9.15cvs75

	* sylpheed-claws.desktop
	* src/Makefile.am
	* src/main.c
		Ship a sylpheed-claws binary instead
		of a sylpheed one. Change the socket
		name, too
	* src/folderview.c
		Update folder only if it changed
	* src/wizard.c
		Fix i18n in welcome mail, patch by
		Fabien Vantard

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 7f81896f2212ebbba2df274991dd039784885df6..f0fb4edd932a7ec2edad28fff1f6a3f64f72eeaa 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,17 @@
+2005-10-19 [colin]     1.9.15cvs75
+
+       * sylpheed-claws.desktop
+       * src/Makefile.am
+       * src/main.c
+               Ship a sylpheed-claws binary instead
+               of a sylpheed one. Change the socket
+               name, too
+       * src/folderview.c
+               Update folder only if it changed
+       * src/wizard.c
+               Fix i18n in welcome mail, patch by
+               Fabien Vantard
+
 2005-10-19 [paul]
 
        1.9.99-rc2 released

diff --git a/PATCHSETS b/PATCHSETS
index 7eb7a97e63f325c5c504a4eaceae8c7dedb74283..452f967c72b7788b559269b3adcf10c1fdb6dd5b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -911,3 +911,4 @@
 ( cvs diff -u -r 1.155.2.32 -r 1.155.2.33 src/Makefile.am;  cvs diff -u -r 1.9.2.5 -r 1.9.2.6 src/addressadd.c;  cvs diff -u -r 1.60.2.37 -r 1.60.2.38 src/addressbook.c;  cvs diff -u -r 1.207.2.73 -r 1.207.2.74 src/folderview.c;  cvs diff -u -r 1.14.2.11 -r 1.14.2.12 src/grouplistdialog.c;  cvs diff -u -r 1.83.2.47 -r 1.83.2.48 src/mimeview.c;  cvs diff -u -r 1.25.2.18 -r 1.25.2.19 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.12 -r 1.18.2.13 src/stock_pixmap.h;  cvs diff -u -r 1.395.2.140 -r 1.395.2.141 src/summaryview.c;  cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/gtk/gtksctree.c;  cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/gtk/gtksctree.h;  diff -u /dev/null src/pixmaps/empty.xpm;  ) > 1.9.15cvs72.patchset
 ( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpcore/passphrase.c;  ) > 1.9.15cvs73.patchset
 ( cvs diff -u -r 1.213.2.64 -r 1.213.2.65 src/folder.c;  cvs diff -u -r 1.207.2.74 -r 1.207.2.75 src/folderview.c;  ) > 1.9.15cvs74.patchset
+( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 sylpheed-claws.desktop;  cvs diff -u -r 1.155.2.33 -r 1.155.2.34 src/Makefile.am;  cvs diff -u -r 1.207.2.75 -r 1.207.2.76 src/folderview.c;  cvs diff -u -r 1.115.2.60 -r 1.115.2.61 src/main.c;  cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/wizard.c;  ) > 1.9.15cvs75.patchset

diff --git a/configure.ac b/configure.ac
index a63069ad5014b7ac34e880e7b5d65e4c3b17ac72..4928e14f5c5915d2cc6a885fca9269f8a36877d2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=74
+EXTRA_VERSION=75
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/Makefile.am b/src/Makefile.am
index d668fbdb06181d7d32421bfcde7a304ca8df9554..aa606339100e56eb8a0fe3750cc16b9530e3feaa 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,8 @@
 SUBDIRS = common gtk plugins etpan
 
-bin_PROGRAMS = sylpheed
+bin_PROGRAMS = sylpheed-claws
 
-sylpheed_SOURCES = \
+sylpheed_claws_SOURCES = \
        account.c \
        action.c \
        addrbook.c \
@@ -136,8 +136,8 @@ sylpheed_SOURCES = \
        vcard.c \
        wizard.c
 
-sylpheedincludedir = $(pkgincludedir)
-sylpheedinclude_HEADERS = \
+sylpheed_clawsincludedir = $(pkgincludedir)
+sylpheed_clawsinclude_HEADERS = \
        account.h \
        action.h \
        adbookbase.h \
@@ -391,10 +391,10 @@ INCLUDES = \
        -Igtk \
        -Ietpan
 
-sylpheed_LDFLAGS = \
+sylpheed_claws_LDFLAGS = \
        -export-dynamic
 
-sylpheed_LDADD = \
+sylpheed_claws_LDADD = \
        etpan/libsylpheedetpan.la \
        gtk/libsylpheedgtk.la \
        $(ASPELL_LIBS) \
@@ -412,7 +412,7 @@ sylpheed_LDADD = \
        $(LIBETPAN_LIBS)
 
 AM_CPPFLAGS = \
-       -DG_LOG_DOMAIN=\"Sylpheed\" \
+       -DG_LOG_DOMAIN=\"Sylpheed-Claws\" \
        -DLOCALEDIR=\""$(localedir)"\" \
        -DMANUALDIR=\""$(manualdir)"\" \
        -DFAQDIR=\""$(faqdir)"\" \

diff --git a/src/folderview.c b/src/folderview.c
index 743c4667002f91a6dc702d6200319972ca090f22..db508ac478ecf0519adc991ebe3d8eceef5854eb 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1019,7 +1019,7 @@ gint folderview_check_new(Folder *folder)
        GtkCTreeNode *node;
        gint new_msgs = 0;
        gint former_new_msgs = 0;
-       gint former_new = 0;
+       gint former_new = 0, former_unread = 0, former_total;
 
        for (list = folderview_list; list != NULL; list = list->next) {
                folderview = (FolderView *)list->data;
@@ -1038,7 +1038,9 @@ gint folderview_check_new(Folder *folder)
                        if (!item->prefs->newmailcheck) continue;
 
                        folderview_scan_tree_func(item->folder, item, NULL);
-                       former_new = item->new_msgs;
+                       former_new    = item->new_msgs;
+                       former_unread = item->unread_msgs;
+                       former_total  = item->total_msgs;
 
                        if (folder_item_scan(item) < 0) {
                                summaryview_unlock(folderview->summaryview, item);
@@ -1046,7 +1048,11 @@ gint folderview_check_new(Folder *folder)
                                        break;
                        }
 
-                       folderview_update_node(folderview, node);
+                       if (former_new    != item->new_msgs ||
+                           former_unread != item->unread_msgs ||
+                           former_total  != item->total_msgs)
+                               folderview_update_node(folderview, node);
+
                        new_msgs += item->new_msgs;
                        former_new_msgs += former_new;
                }

diff --git a/src/main.c b/src/main.c
index 0d071af3a27537b1a576903fadad54c295d19870..4986c27dfcf4e777a47f1ede1d711e0b175c76f6 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -830,7 +830,7 @@ gchar *get_socket_name(void)
        static gchar *filename = NULL;
 
        if (filename == NULL) {
-               filename = g_strdup_printf("%s%csylpheed-%d",
+               filename = g_strdup_printf("%s%csylpheed-claws-%d",
                                           g_get_tmp_dir(), G_DIR_SEPARATOR,
 #if HAVE_GETUID
                                           getuid());

diff --git a/src/wizard.c b/src/wizard.c
index 636271f2b4d99668e82029f55c03c2f0602b55fd..2bfc8efce439e71dabe24e9fa5235c1862904f03 100644 (file)
--- a/src/wizard.c
+++ b/src/wizard.c
@@ -158,10 +158,12 @@ static void write_welcome_email(WizardWindow *wizard)
        subj = g_strdup_printf(_("Welcome to Sylpheed-Claws"));
 
        head = g_strdup_printf(
-               "From: Sylpheed-Claws Team <sylpheed-claws-users@lists.sf.net>\n"
+               "From: %s <sylpheed-claws-users@lists.sf.net>\n"
                "To: %s <%s>\n"
                "Date: %s\n"
-               "Subject: %s\n",
+               "Subject: %s\n"
+               "Content-Type: text/plain; charset=UTF-8\n",
+               _("Sylpheed-Claws Team"),
                gtk_entry_get_text(GTK_ENTRY(wizard->full_name)),
                gtk_entry_get_text(GTK_ENTRY(wizard->email)),
                buf_date, subj);

diff --git a/sylpheed-claws.desktop b/sylpheed-claws.desktop
index 7a593c7fa11264db1100b99470bf1ff54aef8eef..1ee5b6045b58890eb23007d948b66dfa4a8f155b 100644 (file)
--- a/sylpheed-claws.desktop
+++ b/sylpheed-claws.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Sylpheed-Claws
-Exec=sylpheed
+Exec=sylpheed-claws
 Icon=sylpheed-claws.png
 Info="Sylpheed-Claws"
 Categories=Application;Network;