2006-04-25 [colin] 2.1.1cvs32

	* src/news.c
		Better progress bar
	* src/mimeview.c
	* src/summaryview.c
	* src/summaryview.h
		Fix focus chain
		Patches by Pawel Pekala

diff --git a/ChangeLog b/ChangeLog
index 21462aadcb0b89174b49d3062a0d388b36d98e28..cddec338a88eeeeea96fd10726ff06f94d1c13e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-04-25 [colin]     2.1.1cvs32
+
+       * src/news.c
+               Better progress bar
+       * src/mimeview.c
+       * src/summaryview.c
+       * src/summaryview.h
+               Fix focus chain
+               Patches by Pawel Pekala
+

 2006-04-24 [colin]     2.1.1cvs31
 
        * src/compose.c
 2006-04-24 [colin]     2.1.1cvs31
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 0469ae37acb039fd57857af16f889596d37f6125..57bb1847f29ac85a85d09bf6442c19e25b070dea 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1453,3 +1453,4 @@
 ( cvs diff -u -r 1.382.2.266 -r 1.382.2.267 src/compose.c;  cvs diff -u -r 1.179.2.109 -r 1.179.2.110 src/imap.c;  cvs diff -u -r 1.395.2.192 -r 1.395.2.193 src/summaryview.c;  ) > 2.1.1cvs29.patchset
 ( cvs diff -u -r 1.28.2.16 -r 1.28.2.17 src/addrindex.c;  cvs diff -u -r 1.8.2.11 -r 1.8.2.12 src/editldap.c;  cvs diff -u -r 1.10.2.6 -r 1.10.2.7 src/editldap_basedn.c;  cvs diff -u -r 1.3.2.2 -r 1.3.2.3 src/editldap_basedn.h;  cvs diff -u -r 1.2.2.4 -r 1.2.2.5 src/ldapctrl.c;  cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/ldapctrl.h;  cvs diff -u -r 1.3.2.7 -r 1.3.2.8 src/ldapquery.c;  cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/ldaputil.c;  cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/ldaputil.h;  ) > 2.1.1cvs30.patchset
 ( cvs diff -u -r 1.382.2.267 -r 1.382.2.268 src/compose.c;  ) > 2.1.1cvs31.patchset
 ( cvs diff -u -r 1.382.2.266 -r 1.382.2.267 src/compose.c;  cvs diff -u -r 1.179.2.109 -r 1.179.2.110 src/imap.c;  cvs diff -u -r 1.395.2.192 -r 1.395.2.193 src/summaryview.c;  ) > 2.1.1cvs29.patchset
 ( cvs diff -u -r 1.28.2.16 -r 1.28.2.17 src/addrindex.c;  cvs diff -u -r 1.8.2.11 -r 1.8.2.12 src/editldap.c;  cvs diff -u -r 1.10.2.6 -r 1.10.2.7 src/editldap_basedn.c;  cvs diff -u -r 1.3.2.2 -r 1.3.2.3 src/editldap_basedn.h;  cvs diff -u -r 1.2.2.4 -r 1.2.2.5 src/ldapctrl.c;  cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/ldapctrl.h;  cvs diff -u -r 1.3.2.7 -r 1.3.2.8 src/ldapquery.c;  cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/ldaputil.c;  cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/ldaputil.h;  ) > 2.1.1cvs30.patchset
 ( cvs diff -u -r 1.382.2.267 -r 1.382.2.268 src/compose.c;  ) > 2.1.1cvs31.patchset

+( cvs diff -u -r 1.83.2.67 -r 1.83.2.68 src/mimeview.c;  cvs diff -u -r 1.101.2.23 -r 1.101.2.24 src/news.c;  cvs diff -u -r 1.395.2.193 -r 1.395.2.194 src/summaryview.c;  cvs diff -u -r 1.68.2.22 -r 1.68.2.23 src/summaryview.h;  ) > 2.1.1cvs32.patchset

diff --git a/configure.ac b/configure.ac
index 0dcc2dbe32f20bd35c0d20aa3c28bdf597bddff5..d1a44c25dd7758831df07309b2e58ea3cecba6dc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=1
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=31
+EXTRA_VERSION=32

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mimeview.c b/src/mimeview.c
index e9a194ba42e598b012ddd6274dc24859298d86c5..a958d6044f960ed3315c85888288f7e166bc56bb 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -1849,8 +1849,7 @@ static gint icon_key_pressed(GtkWidget *button, GdkEventKey *event,
 
        if (!mimeview->messageview->mainwin) return FALSE;
        summaryview = mimeview->messageview->mainwin->summaryview;
 
        if (!mimeview->messageview->mainwin) return FALSE;
        summaryview = mimeview->messageview->mainwin->summaryview;

-       summary_pass_key_press_event(summaryview, event);
-       return TRUE;
+       return summary_pass_key_press_event(summaryview, event);

 }
 
 static void toggle_icon(GtkToggleButton *button, MimeView *mimeview)
 }
 
 static void toggle_icon(GtkToggleButton *button, MimeView *mimeview)

diff --git a/src/news.c b/src/news.c
index dd916860b6234edb4592f8c254bf03cd23154eb2..2ae1e13bb93c89873855d3475604830f46181a18 100644 (file)
--- a/src/news.c
+++ b/src/news.c
@@ -1016,7 +1016,7 @@ static GSList *news_get_msginfos_for_range(NNTPSession *session, FolderItem *ite
        GSList *newlist = NULL;
        GSList *llast = NULL;
        MsgInfo *msginfo;
        GSList *newlist = NULL;
        GSList *llast = NULL;
        MsgInfo *msginfo;

-       guint count = 0, lines = (end - begin + 2) * 3;
+       guint count = 0, lines = (end - begin) + 2;

        gint ok;
 
        g_return_val_if_fail(session != NULL, NULL);
        gint ok;
 
        g_return_val_if_fail(session != NULL, NULL);


@@ -1088,11 +1088,6 @@ static GSList *news_get_msginfos_for_range(NNTPSession *session, FolderItem *ite
                        news_folder_unlock(NEWS_FOLDER(item->folder));
                        return newlist;
                }
                        news_folder_unlock(NEWS_FOLDER(item->folder));
                        return newlist;
                }

-               count++;
-               progressindicator_set_percentage
-                       (PROGRESS_TYPE_NETWORK,
-                        session->fetch_base_percentage +
-                        (((gfloat) count) / ((gfloat) lines)) * session->fetch_total_percentage);

 
                if (buf[0] == '.' && buf[1] == '\r') break;
                if (!llast) {
 
                if (buf[0] == '.' && buf[1] == '\r') break;
                if (!llast) {


@@ -1125,11 +1120,6 @@ static GSList *news_get_msginfos_for_range(NNTPSession *session, FolderItem *ite
                        news_folder_unlock(NEWS_FOLDER(item->folder));
                        return newlist;
                }
                        news_folder_unlock(NEWS_FOLDER(item->folder));
                        return newlist;
                }

-               count++;
-               progressindicator_set_percentage
-                       (PROGRESS_TYPE_NETWORK,
-                        session->fetch_base_percentage +
-                        (((gfloat) count) / ((gfloat) lines)) * session->fetch_total_percentage);

 
                if (buf[0] == '.' && buf[1] == '\r') break;
                if (!llast) {
 
                if (buf[0] == '.' && buf[1] == '\r') break;
                if (!llast) {

diff --git a/src/summaryview.c b/src/summaryview.c
index b66808f392e39738620c553bb2c2abf719455c6b..75531cae9599f44fcdccc9d5474da7f5bda65dd7 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4788,9 +4788,9 @@ static gboolean summary_button_released(GtkWidget *ctree, GdkEventButton *event,
        return FALSE;
 }
 
        return FALSE;
 }
 

-void summary_pass_key_press_event(SummaryView *summaryview, GdkEventKey *event)
+gboolean summary_pass_key_press_event(SummaryView *summaryview, GdkEventKey *event)

 {
 {

-       summary_key_pressed(summaryview->ctree, event, summaryview);
+       return summary_key_pressed(summaryview->ctree, event, summaryview);

 }
 
 #define BREAK_ON_MODIFIER_KEY() \
 }
 
 #define BREAK_ON_MODIFIER_KEY() \

diff --git a/src/summaryview.h b/src/summaryview.h
index 56dbd74bb3890b119e2af616a48afe1585f71db9..31a4b970326d938d6098a6ad82f400a4eaa954ee 100644 (file)
--- a/src/summaryview.h
+++ b/src/summaryview.h
@@ -220,7 +220,7 @@ void summary_attract_by_subject       (SummaryView          *summaryview);
 
 gint summary_write_cache         (SummaryView          *summaryview);
 
 
 gint summary_write_cache         (SummaryView          *summaryview);
 

-void summary_pass_key_press_event (SummaryView         *summaryview,
+gboolean summary_pass_key_press_event (SummaryView             *summaryview,

                                   GdkEventKey          *event);
 
 void summary_display_msg_selected (SummaryView         *summaryview,
                                   GdkEventKey          *event);
 
 void summary_display_msg_selected (SummaryView         *summaryview,