2006-03-17 [wwp] 2.0.0cvs147

	* src/compose.c
		fix a compilation warning (wrong return type, introduced w/ cvs143), and
		applied code style/indentation to the modified function.

diff --git a/ChangeLog b/ChangeLog
index a74acfefeb2e7c4389b9d4afeb456302d2a3c648..07359c15c62c5560a763e3e44b2c41b38fb90b73 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-17 [wwp]       2.0.0cvs147
+
+       * src/compose.c
+               fix a compilation warning (wrong return type, introduced w/ cvs143), and
+               applied code style/indentation to the modified function.
+
 2006-03-17 [wwp]       2.0.0cvs146
 
        * src/procmsg.c

diff --git a/PATCHSETS b/PATCHSETS
index 6e368deca8fc0abb29d7bc18d609aed9736f2cd0..56032da1b56193ecaa9c63b185a836e70660d131 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1332,3 +1332,4 @@
 ( cvs diff -u -r 1.9.2.16 -r 1.9.2.17 src/sourcewindow.c;  cvs diff -u -r 1.1.1.1.16.2 -r 1.1.1.1.16.3 src/sourcewindow.h;  ) > 2.0.0cvs144.patchset
 ( cvs diff -u -r 1.115.2.77 -r 1.115.2.78 src/main.c;  cvs diff -u -r 1.96.2.101 -r 1.96.2.102 src/textview.c;  ) > 2.0.0cvs145.patchset
 ( cvs diff -u -r 1.150.2.58 -r 1.150.2.59 src/procmsg.c;  cvs diff -u -r 1.382.2.251 -r 1.382.2.252 src/compose.c;  ) > 2.0.0cvs146.patchset
+( cvs diff -u -r 1.382.2.252 -r 1.382.2.253 src/compose.c;  ) > 2.0.0cvs147.patchset

diff --git a/configure.ac b/configure.ac
index 7b5dc5811278569c197a7011b4983cd3de85b42a..be7e8a7f84144aada30acff2d8c9cf661c328f6e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=146
+EXTRA_VERSION=147
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index f3a044bea1806b430e2c49a8abc9e5169dda9482..13baf4b2e9ef33d5825a57f986e95b9afff70f96 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -960,6 +960,8 @@ static void compose_force_encryption(Compose *compose, PrefsAccount *account,
        g_return_if_fail(compose != NULL);
        g_return_if_fail(account != NULL);
 
+/*     if (!item->prefs->do_not_sign_or_encrypt)*/
+       {
        if (override_pref == FALSE && account->default_encrypt_reply == FALSE)
                return;
 
@@ -972,6 +974,7 @@ static void compose_force_encryption(Compose *compose, PrefsAccount *account,
                        privacy = (gchar *)(privacy_avail->data);
                }
        }
+       }
        if (privacy != NULL) {
                compose->privacy_system = g_strdup(privacy);
                compose_update_privacy_system_menu_item(compose, FALSE);
@@ -1565,8 +1568,9 @@ void compose_reedit(MsgInfo *msginfo)
        g_return_if_fail(msginfo != NULL);
        g_return_if_fail(msginfo->folder != NULL);
 
-       if (compose_put_existing_to_front(msginfo)) 
+       if (compose_put_existing_to_front(msginfo)) {
                return;
+       }
 
         if (folder_has_parent_of_type(msginfo->folder, F_QUEUE) ||
            folder_has_parent_of_type(msginfo->folder, F_DRAFT)) {
@@ -1613,17 +1617,20 @@ void compose_reedit(MsgInfo *msginfo)
                        param = atoi(&queueheader_buf[strlen("X-Priority: ")]); /* mind the space */
                        compose->priority = param;
                }
-       } else 
+       } else {
                account = msginfo->folder->folder->account;
+       }
 
        if (!account && prefs_common.reedit_account_autosel) {
                        gchar from[BUFFSIZE];
-               if (!procheader_get_header_from_msginfo(msginfo, from, sizeof(from), "FROM:")){
+               if (!procheader_get_header_from_msginfo(msginfo, from, sizeof(from), "FROM:")) {
                        extract_address(from);
                        account = account_find_from_address(from);
                 }
        }
-        if (!account) account = cur_account;
+        if (!account) {
+               account = cur_account;
+        }
        g_return_if_fail(account != NULL);
 
        compose = compose_create(account, COMPOSE_REEDIT, FALSE);
@@ -1642,7 +1649,7 @@ void compose_reedit(MsgInfo *msginfo)
        
        if (compose->deferred_destroy) {
                compose_destroy(compose);
-               return NULL;
+               return;
        }
 
        compose_extract_original_charset(compose);
@@ -1669,7 +1676,9 @@ void compose_reedit(MsgInfo *msginfo)
                }
        }
        
-       if (compose_parse_header(compose, msginfo) < 0) return;
+       if (compose_parse_header(compose, msginfo) < 0) {
+               return;
+       }
        compose_reedit_set_entry(compose, msginfo);
 
        textview = GTK_TEXT_VIEW(compose->text);
@@ -1685,12 +1694,15 @@ void compose_reedit(MsgInfo *msginfo)
        
        if (procmime_msginfo_is_encrypted(msginfo)) {
                fp = procmime_get_first_encrypted_text_content(msginfo);
-               if (fp) 
+               if (fp) {
                        compose_force_encryption(compose, account, TRUE);
-       } else
+               }
+       } else {
                fp = procmime_get_first_text_content(msginfo);
-       if (fp == NULL)
+       }
+       if (fp == NULL) {
                g_warning("Can't get text part\n");
+       }
 
        if (fp != NULL) {
                gboolean prev_autowrap = compose->autowrap;
@@ -1715,8 +1727,9 @@ void compose_reedit(MsgInfo *msginfo)
 
        gtk_widget_grab_focus(compose->text);
 
-        if (prefs_common.auto_exteditor)
+        if (prefs_common.auto_exteditor) {
                compose_exec_ext_editor(compose);
+       }
        compose->modified = FALSE;
        compose_set_title(compose);
 }