2007-03-30 [paul] 2.8.1cvs68

	* src/mainwindow.c
	* src/summaryview.c
	* src/summaryview.h
		update summary when changing layout type
		(fixes wrong folder icon being displayed)
		Thanks to Colin

diff --git a/ChangeLog b/ChangeLog
index b06db89db3ffa1281836b551afb377f95c7e3ba9..4329cf3267724cb0bcc35da0e328389a09773496 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-03-30 [paul]      2.8.1cvs68
+
+       * src/mainwindow.c
+       * src/summaryview.c
+       * src/summaryview.h
+               update summary when changing layout type
+               (fixes wrong folder icon being displayed)
+               Thanks to Colin
+
 2007-03-29 [colin]     2.8.1cvs67
 
        * src/prefs_ext_prog.c

diff --git a/PATCHSETS b/PATCHSETS
index 75b31947869629ca5e3e0ff4da06ce48c000706b..3fef781aa1a804510a0bce4aeab572b950d38b56 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2484,3 +2484,4 @@
 ( cvs diff -u -r 1.13.2.28 -r 1.13.2.29 src/common/socket.c;  cvs diff -u -r 1.13.2.12 -r 1.13.2.13 src/common/socket.h;  ) > 2.8.1cvs65.patchset
 ( cvs diff -u -r 1.382.2.367 -r 1.382.2.368 src/compose.c;  cvs diff -u -r 1.50.2.33 -r 1.50.2.34 src/compose.h;  cvs diff -u -r 1.204.2.126 -r 1.204.2.127 src/prefs_common.c;  cvs diff -u -r 1.13.2.29 -r 1.13.2.30 src/common/socket.c;  cvs diff -u -r 1.13.2.13 -r 1.13.2.14 src/common/socket.h;  ) > 2.8.1cvs66.patchset
 ( cvs diff -u -r 1.3.2.14 -r 1.3.2.15 src/prefs_ext_prog.c;  ) > 2.8.1cvs67.patchset
+( cvs diff -u -r 1.274.2.182 -r 1.274.2.183 src/mainwindow.c;  cvs diff -u -r 1.395.2.293 -r 1.395.2.294 src/summaryview.c;  cvs diff -u -r 1.68.2.35 -r 1.68.2.36 src/summaryview.h;  ) > 2.8.1cvs68.patchset

diff --git a/configure.ac b/configure.ac
index e3210329bf7d3ff33cfb6e338baa3e8be89d670f..2d67398056f289fc6ad957cada8eb451f34bccd3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=67
+EXTRA_VERSION=68
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 928375e55483013c06974a0f04ae759965c85ad2..9150dbdaf52ac04ac1780212d7e752d50e20c646 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1475,7 +1475,8 @@ MainWindow *main_window_create()
            prefs_common.layout_mode == SMALL_LAYOUT) {
                summary_relayout(mainwin->summaryview); 
        }
-
+       summary_update_unread(mainwin->summaryview, NULL);
+       
        gtk_widget_show(mainwin->window);
 
        /* initialize views */
@@ -3179,6 +3180,7 @@ static void set_layout_cb(MainWindow *mainwin, guint action,
                mainwindow_exit_folder(mainwin);
        }
        summary_relayout(mainwin->summaryview); 
+       summary_update_unread(mainwin->summaryview, NULL);
 }
 
 void main_window_toggle_work_offline (MainWindow *mainwin, gboolean offline,

diff --git a/src/summaryview.c b/src/summaryview.c
index aaee3e05b1d34c0c0a0f2d42baf10b5232aa36ed..ea85d930d4a322d8aaacd7f9e4937800f38632e0 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -5906,7 +5906,6 @@ static void summary_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
                                 GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_DEFAULT, button, event);
        gtk_drag_set_icon_default(context);
        if (prefs_common.layout_mode == SMALL_LAYOUT) {
-               gint min, max, mid;
                GtkWidget *paned = GTK_WIDGET_PTR(summaryview)->parent;
                if (paned && GTK_IS_PANED(paned)) {
                        mainwindow_reset_paned(GTK_PANED(paned));
@@ -6468,7 +6467,7 @@ static gboolean summary_update_msg(gpointer source, gpointer data)
        return FALSE;
 }
 
-static void summary_update_unread(SummaryView *summaryview, FolderItem *removed_item)
+void summary_update_unread(SummaryView *summaryview, FolderItem *removed_item)
 {
        guint new, unread, unreadmarked, marked, total;
        static gboolean tips_initialized = FALSE;

diff --git a/src/summaryview.h b/src/summaryview.h
index 3592eb7a95e586466dcb0d27945e5f9c2d183fcd..2b1f0be93f6b8e1d81deb93d160622cfc60402f9 100644 (file)
--- a/src/summaryview.h
+++ b/src/summaryview.h
@@ -312,4 +312,5 @@ void summary_reflect_prefs(void);
 void summaryview_activate_quicksearch(SummaryView *summaryview, gboolean show);
 void summary_set_menu_sensitive        (SummaryView            *summaryview);
 void summary_relayout(SummaryView *summaryview);
+void summary_update_unread(SummaryView *summaryview, FolderItem *removed_item);
 #endif /* __SUMMARY_H__ */