2007-05-31 [wwp] 2.9.2cvs25

	* src/compose.c
		Removed unused code.

diff --git a/ChangeLog b/ChangeLog
index cf2de00fa25603441e9a3c95c136db5f41735842..73d4c66964746a3ccce5c08f67cc533d5022d05a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-31 [wwp]       2.9.2cvs25
+
+       * src/compose.c
+               Removed unused code.
+

 2007-05-31 [colin]     2.9.2cvs24
 
        * src/addressbook.c
 2007-05-31 [colin]     2.9.2cvs24
 
        * src/addressbook.c

diff --git a/PATCHSETS b/PATCHSETS
index fd7bfe110a13283fcd08804d26c482d9d0402e90..eca2ed09f54d4c3b4c4681ae732753cb6b17acca 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2600,3 +2600,4 @@
 ( cvs diff -u -r 1.1.2.71 -r 1.1.2.72 src/gtk/quicksearch.c;  ) > 2.9.2cvs22.patchset
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/bogofilter/Makefile.am;  cvs diff -u -r 1.4.2.7 -r 1.4.2.8 src/plugins/clamav/Makefile.am;  cvs diff -u -r 1.3.2.3 -r 1.3.2.4 src/plugins/demo/Makefile.am;  cvs diff -u -r 1.4.2.5 -r 1.4.2.6 src/plugins/dillo_viewer/Makefile.am;  cvs diff -u -r 1.5.2.6 -r 1.5.2.7 src/plugins/spamassassin/Makefile.am;  ) > 2.9.2cvs23.patchset
 ( cvs diff -u -r 1.60.2.88 -r 1.60.2.89 src/addressbook.c;  ) > 2.9.2cvs24.patchset
 ( cvs diff -u -r 1.1.2.71 -r 1.1.2.72 src/gtk/quicksearch.c;  ) > 2.9.2cvs22.patchset
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/bogofilter/Makefile.am;  cvs diff -u -r 1.4.2.7 -r 1.4.2.8 src/plugins/clamav/Makefile.am;  cvs diff -u -r 1.3.2.3 -r 1.3.2.4 src/plugins/demo/Makefile.am;  cvs diff -u -r 1.4.2.5 -r 1.4.2.6 src/plugins/dillo_viewer/Makefile.am;  cvs diff -u -r 1.5.2.6 -r 1.5.2.7 src/plugins/spamassassin/Makefile.am;  ) > 2.9.2cvs23.patchset
 ( cvs diff -u -r 1.60.2.88 -r 1.60.2.89 src/addressbook.c;  ) > 2.9.2cvs24.patchset

+( cvs diff -u -r 1.382.2.382 -r 1.382.2.383 src/compose.c;  ) > 2.9.2cvs25.patchset

diff --git a/configure.ac b/configure.ac
index c0911670fbe62dd7fb2feafdbd9bef107c963a3a..ea7b1ca483cda50141e774ccaec517d943a4a2a6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=24
+EXTRA_VERSION=25

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 780fb784759b6e5641a6d21d9fe1047cb8d65438..6fdca129776323220e4722fd8fa7c86618745d2a 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1398,7 +1398,6 @@ static Compose *compose_generic_reply(MsgInfo *msginfo,
        GtkItemFactory *ifactory;
        Compose *compose;
        PrefsAccount *account = NULL;
        GtkItemFactory *ifactory;
        Compose *compose;
        PrefsAccount *account = NULL;

-       PrefsAccount *reply_account;

        GtkTextView *textview;
        GtkTextBuffer *textbuf;
        gboolean quote = FALSE;
        GtkTextView *textview;
        GtkTextBuffer *textbuf;
        gboolean quote = FALSE;


@@ -1412,18 +1411,6 @@ static Compose *compose_generic_reply(MsgInfo *msginfo,
 
        g_return_val_if_fail(account != NULL, NULL);
 
 
        g_return_val_if_fail(account != NULL, NULL);
 

-       if (to_sender && account->protocol == A_NNTP &&
-           !followup_and_reply_to) {
-               reply_account =
-                       account_find_from_address(account->address);
-               if (!reply_account)
-                       reply_account = compose_current_mail_account();
-               if (!reply_account)
-                       return NULL;
-       } else
-               reply_account = account;
-       /* wwp: TODO: why isn't reply_account used below? shouldn't we use reply_account instead of account? */
-

        compose = compose_create(account, COMPOSE_REPLY, FALSE);
 
        compose->updating = TRUE;
        compose = compose_create(account, COMPOSE_REPLY, FALSE);
 
        compose->updating = TRUE;