commit 964a1c59760227a5a99b1ce19dd0caf18a71f423
parent 739c497b8ddb5cbc3ebae9109ba359a2576dbe1a
Author: Colin Leroy <colin@colino.net>
Date: Wed, 5 Mar 2008 17:25:15 +0000
2008-03-05 [colin] 3.3.1cvs10
* src/folder.h
* src/folderview.c
Add klass functions for notification of folder
opening/closing via the GUI
* src/summaryview.c
* src/summaryview.h
Add a specific container for the scrolledwin
Diffstat:
7 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,23 @@
+2008-03-05 [colin] 3.3.1cvs10
+
+ * src/folder.h
+ * src/folderview.c
+ Add klass functions for notification of folder
+ opening/closing via the GUI
+ * src/summaryview.c
+ * src/summaryview.h
+ Add a specific container for the scrolledwin
+
+2008-03-05 [colin] 3.3.1cvs9
+
+ * src/folder.h
+ * src/folderview.c
+ Add klass functions for notification of folder
+ opening/closing via the GUI
+ * src/summaryview.c
+ * src/summaryview.h
+ Add a specific container for the scrolledwin
+
2008-03-02 [colin] 3.3.1cvs8
* src/messageview.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3243,3 +3243,5 @@
( cvs diff -u -r 1.213.2.177 -r 1.213.2.178 src/folder.c; cvs diff -u -r 1.1.2.54 -r 1.1.2.55 src/imap_gtk.c; ) > 3.3.1cvs6.patchset
( cvs diff -u -r 1.115.2.190 -r 1.115.2.191 src/main.c; ) > 3.3.1cvs7.patchset
( cvs diff -u -r 1.94.2.172 -r 1.94.2.173 src/messageview.c; ) > 3.3.1cvs8.patchset
+( cvs diff -u -r 1.87.2.55 -r 1.87.2.56 src/folder.h; cvs diff -u -r 1.207.2.197 -r 1.207.2.198 src/folderview.c; cvs diff -u -r 1.395.2.355 -r 1.395.2.356 src/summaryview.c; cvs diff -u -r 1.68.2.42 -r 1.68.2.43 src/summaryview.h; ) > 3.3.1cvs9.patchset
+( cvs diff -u -r 1.87.2.55 -r 1.87.2.56 src/folder.h; cvs diff -u -r 1.207.2.197 -r 1.207.2.198 src/folderview.c; cvs diff -u -r 1.395.2.355 -r 1.395.2.356 src/summaryview.c; cvs diff -u -r 1.68.2.42 -r 1.68.2.43 src/summaryview.h; ) > 3.3.1cvs10.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=8
+EXTRA_VERSION=10
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/folder.h b/src/folder.h
@@ -621,6 +621,8 @@ struct _FolderClass
MsgInfo *msginfo,
GSList *tags_set,
GSList *tags_unset);
+ void (*item_opened) (FolderItem *item);
+ void (*item_closed) (FolderItem *item);
};
enum {
diff --git a/src/folderview.c b/src/folderview.c
@@ -2156,6 +2156,9 @@ void folderview_close_opened(FolderView *folderview)
folder_item_close(olditem);
main_window_cursor_normal(folderview->mainwin);
STATUSBAR_POP(folderview->mainwin);
+ if (olditem->folder->klass->item_closed)
+ olditem->folder->klass->item_closed(olditem);
+
}
}
@@ -2293,6 +2296,8 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
if (gtk_ctree_node_is_visible(ctree, row)
!= GTK_VISIBILITY_FULL)
gtk_ctree_node_moveto(ctree, row, -1, 0.5, 0);
+ if (item->folder->klass->item_opened)
+ item->folder->klass->item_opened(item);
}
STATUSBAR_POP(folderview->mainwin);
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -715,7 +715,9 @@ SummaryView *summary_create(void)
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
#ifndef MAEMO
- gtk_box_pack_start(GTK_BOX(vbox), scrolledwin, TRUE, TRUE, 0);
+ summaryview->mainwidget_hbox = gtk_hbox_new(FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(summaryview->mainwidget_hbox), scrolledwin, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), summaryview->mainwidget_hbox, TRUE, TRUE, 0);
#endif
gtk_widget_set_size_request(vbox,
prefs_common.summaryview_width,
@@ -739,7 +741,9 @@ SummaryView *summary_create(void)
gtk_box_pack_start(GTK_BOX(vbox), quicksearch_get_widget(quicksearch), FALSE, FALSE, 0);
#ifdef MAEMO
- gtk_box_pack_start(GTK_BOX(vbox), scrolledwin, TRUE, TRUE, 0);
+ summaryview->mainwidget_hbox = gtk_hbox_new(FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(summaryview->mainwidget_hbox), scrolledwin, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), summaryview->mainwidget_hbox, TRUE, TRUE, 0);
#endif
quicksearch_set_execute_callback(quicksearch, quicksearch_execute_cb, summaryview);
diff --git a/src/summaryview.h b/src/summaryview.h
@@ -88,6 +88,7 @@ struct _SummaryColumnState
struct _SummaryView
{
GtkWidget *vbox;
+ GtkWidget *mainwidget_hbox;
GtkWidget *scrolledwin;
GtkWidget *ctree;
GtkWidget *hbox;
