2007-06-05 [wwp] 2.9.2cvs40

	* src/compose.c
	* src/compose.h
		Use per-folder/per-account quote chars when applying a
		template or inserting text as well. Const'ify some
		vars more.

diff --git a/ChangeLog b/ChangeLog
index 819ceeaa6afe9487b2b76489d08667babe84a04b..ec58c2bc85a7fabaadeeab66f8d8d1fe1632784a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-06-05 [wwp]       2.9.2cvs40
+
+       * src/compose.c
+       * src/compose.h
+               Use per-folder/per-account quote chars when applying a
+               template or inserting text as well. Const'ify some
+               vars more.
+

 2007-06-04 [colin]     2.9.2cvs39
 
        * src/compose.c
 2007-06-04 [colin]     2.9.2cvs39
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index ca5e85df399a850f8f8a8e1a96907afbb1d19d8a..24e116aa38f880b7691eae9006ca89efd6dc9996 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2615,3 +2615,4 @@
 ( cvs diff -u -r 1.382.2.384 -r 1.382.2.385 src/compose.c;  ) > 2.9.2cvs37.patchset
 ( cvs diff -u -r 1.382.2.385 -r 1.382.2.386 src/compose.c;  ) > 2.9.2cvs38.patchset
 ( cvs diff -u -r 1.382.2.386 -r 1.382.2.387 src/compose.c;  ) > 2.9.2cvs39.patchset
 ( cvs diff -u -r 1.382.2.384 -r 1.382.2.385 src/compose.c;  ) > 2.9.2cvs37.patchset
 ( cvs diff -u -r 1.382.2.385 -r 1.382.2.386 src/compose.c;  ) > 2.9.2cvs38.patchset
 ( cvs diff -u -r 1.382.2.386 -r 1.382.2.387 src/compose.c;  ) > 2.9.2cvs39.patchset

+( cvs diff -u -r 1.382.2.387 -r 1.382.2.388 src/compose.c;  cvs diff -u -r 1.50.2.35 -r 1.50.2.36 src/compose.h;  ) > 2.9.2cvs40.patchset

diff --git a/configure.ac b/configure.ac
index 6c81b61b6316363dae3956cbe662912e833bd02f..91842f320512f9c0e1571f575847ff0cc001ad27 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=39
+EXTRA_VERSION=40

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 1a11e10f017f6db2480a775f0171aa2a5ea3e776..59a27174c345f2f7475a6f74ee4b3e20465a0efe 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -199,6 +199,7 @@ static Compose *compose_generic_new                 (PrefsAccount   *account,
                                                 GList          *listAddress );
 
 static Compose *compose_create                 (PrefsAccount   *account,
                                                 GList          *listAddress );
 
 static Compose *compose_create                 (PrefsAccount   *account,

+                                                FolderItem              *item,

                                                 ComposeMode     mode,
                                                 gboolean batch);
 
                                                 ComposeMode     mode,
                                                 gboolean batch);
 


@@ -980,8 +981,8 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
        GtkTextBuffer *textbuf;
        GtkTextIter iter;
        GtkItemFactory *ifactory;
        GtkTextBuffer *textbuf;
        GtkTextIter iter;
        GtkItemFactory *ifactory;

-       gchar *subject_format = NULL;
-       gchar *body_format = NULL;
+       const gchar *subject_format = NULL;
+       const gchar *body_format = NULL;

 
        if (item && item->prefs && item->prefs->enable_default_account)
                account = account_find_from_id(item->prefs->default_account);
 
        if (item && item->prefs && item->prefs->enable_default_account)
                account = account_find_from_id(item->prefs->default_account);


@@ -989,7 +990,7 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
        if (!account) account = cur_account;
        g_return_val_if_fail(account != NULL, NULL);
 
        if (!account) account = cur_account;
        g_return_val_if_fail(account != NULL, NULL);
 

-       compose = compose_create(account, COMPOSE_NEW, FALSE);
+       compose = compose_create(account, item, COMPOSE_NEW, FALSE);

 
        ifactory = gtk_item_factory_from_widget(compose->menubar);
 
 
        ifactory = gtk_item_factory_from_widget(compose->menubar);
 


@@ -1401,8 +1402,8 @@ static Compose *compose_generic_reply(MsgInfo *msginfo,
        GtkTextView *textview;
        GtkTextBuffer *textbuf;
        gboolean quote = FALSE;
        GtkTextView *textview;
        GtkTextBuffer *textbuf;
        gboolean quote = FALSE;

-       gchar *qmark = NULL;
-       gchar *body_fmt = NULL;
+       const gchar *qmark = NULL;
+       const gchar *body_fmt = NULL;

 
        g_return_val_if_fail(msginfo != NULL, NULL);
        g_return_val_if_fail(msginfo->folder != NULL, NULL);
 
        g_return_val_if_fail(msginfo != NULL, NULL);
        g_return_val_if_fail(msginfo->folder != NULL, NULL);


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

-       compose = compose_create(account, COMPOSE_REPLY, FALSE);
+       compose = compose_create(account, msginfo->folder, COMPOSE_REPLY, FALSE);

 
        compose->updating = TRUE;
 
 
        compose->updating = TRUE;
 


@@ -1538,7 +1539,7 @@ Compose *compose_forward(PrefsAccount *account, MsgInfo *msginfo,
                                (msginfo)))
                account = cur_account;
 
                                (msginfo)))
                account = cur_account;
 

-       compose = compose_create(account, COMPOSE_FORWARD, batch);
+       compose = compose_create(account, msginfo->folder, COMPOSE_FORWARD, batch);

 
        compose->updating = TRUE;
        compose->fwdinfo = procmsg_msginfo_get_full_info(msginfo);
 
        compose->updating = TRUE;
        compose->fwdinfo = procmsg_msginfo_get_full_info(msginfo);


@@ -1578,8 +1579,8 @@ Compose *compose_forward(PrefsAccount *account, MsgInfo *msginfo,
 
                g_free(msgfile);
        } else {
 
                g_free(msgfile);
        } else {

-               gchar *qmark = NULL;
-               gchar *body_fmt = prefs_common.fw_quotefmt;
+               const gchar *qmark = NULL;
+               const gchar *body_fmt = prefs_common.fw_quotefmt;

                MsgInfo *full_msginfo;
 
                full_msginfo = procmsg_msginfo_get_full_info(msginfo);
                MsgInfo *full_msginfo;
 
                full_msginfo = procmsg_msginfo_get_full_info(msginfo);


@@ -1692,7 +1693,7 @@ static Compose *compose_forward_multiple(PrefsAccount *account, GSList *msginfo_
                MSG_SET_PERM_FLAGS(((MsgInfo *)msginfo->data)->flags, MSG_FORWARDED);
        }
 
                MSG_SET_PERM_FLAGS(((MsgInfo *)msginfo->data)->flags, MSG_FORWARDED);
        }
 

-       compose = compose_create(account, COMPOSE_FORWARD, FALSE);
+       compose = compose_create(account, ((MsgInfo *)msginfo_list->data)->folder, COMPOSE_FORWARD, FALSE);

 
        compose->updating = TRUE;
 
 
        compose->updating = TRUE;
 


@@ -1932,7 +1933,7 @@ Compose *compose_reedit(MsgInfo *msginfo, gboolean batch)
         }
        g_return_val_if_fail(account != NULL, NULL);
 
         }
        g_return_val_if_fail(account != NULL, NULL);
 

-       compose = compose_create(account, COMPOSE_REEDIT, batch);
+       compose = compose_create(account, msginfo->folder, COMPOSE_REEDIT, batch);

        
        compose->replyinfo = replyinfo;
        compose->fwdinfo = fwdinfo;
        
        compose->replyinfo = replyinfo;
        compose->fwdinfo = fwdinfo;


@@ -2061,7 +2062,7 @@ Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo,
                                        prefs_common.reply_account_autosel);
        g_return_val_if_fail(account != NULL, NULL);
 
                                        prefs_common.reply_account_autosel);
        g_return_val_if_fail(account != NULL, NULL);
 

-       compose = compose_create(account, COMPOSE_REDIRECT, batch);
+       compose = compose_create(account, msginfo->folder, COMPOSE_REDIRECT, batch);

 
        compose->updating = TRUE;
 
 
        compose->updating = TRUE;
 


@@ -6286,7 +6287,9 @@ static gboolean compose_popup_menu(GtkWidget *widget, gpointer data)
 }
 
 static gboolean compose_force_window_origin = TRUE;
 }
 
 static gboolean compose_force_window_origin = TRUE;

-static Compose *compose_create(PrefsAccount *account, ComposeMode mode,
+static Compose *compose_create(PrefsAccount *account,
+                                                FolderItem *folder,
+                                                ComposeMode mode,

                                                 gboolean batch)
 {
        Compose   *compose;
                                                 gboolean batch)
 {
        Compose   *compose;


@@ -6342,6 +6345,7 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode,
 
        compose->batch = batch;
        compose->account = account;
 
        compose->batch = batch;
        compose->account = account;

+       compose->folder = folder;

        
        compose->mutex = g_mutex_new();
        compose->set_cursor_pos = -1;
        
        compose->mutex = g_mutex_new();
        compose->set_cursor_pos = -1;


@@ -7107,6 +7111,44 @@ void compose_reflect_prefs_pixmap_theme(void)
        }
 }
 
        }
 }
 

+static const gchar *compose_quote_char_from_context(Compose *compose)
+{
+       const gchar *qmark = NULL;
+
+       g_return_val_if_fail(compose != NULL, NULL);
+
+       switch (compose->mode) {
+               /* use forward-specific quote char */
+               case COMPOSE_FORWARD:
+               case COMPOSE_FORWARD_AS_ATTACH:
+               case COMPOSE_FORWARD_INLINE:
+                       if (compose->folder && compose->folder->prefs &&
+                                       compose->folder->prefs->forward_with_format)
+                               qmark = compose->folder->prefs->forward_quotemark;
+                       else if (compose->account->forward_with_format)
+                               qmark = compose->account->forward_quotemark;
+                       else
+                               qmark = prefs_common.fw_quotemark;
+                       break;
+
+               /* use reply-specific quote char in all other modes */
+               default:
+                       if (compose->folder && compose->folder->prefs &&
+                                       compose->folder->prefs->reply_with_format)
+                               qmark = compose->folder->prefs->reply_quotemark;
+                       else if (compose->account->reply_with_format)
+                               qmark = compose->account->reply_quotemark;
+                       else
+                               qmark = prefs_common.quotemark;
+                       break;
+       }
+
+       if (qmark == NULL || *qmark == '\0')
+               qmark = "> ";
+
+       return qmark;
+}
+

 static void compose_template_apply(Compose *compose, Template *tmpl,
                                   gboolean replace)
 {
 static void compose_template_apply(Compose *compose, Template *tmpl,
                                   gboolean replace)
 {


@@ -7114,7 +7156,7 @@ static void compose_template_apply(Compose *compose, Template *tmpl,
        GtkTextBuffer *buffer;
        GtkTextMark *mark;
        GtkTextIter iter;
        GtkTextBuffer *buffer;
        GtkTextMark *mark;
        GtkTextIter iter;

-       gchar *qmark;
+       const gchar *qmark;

        gchar *parsed_str = NULL;
        gint cursor_pos = 0;
        const gchar *err_msg = _("Template body format error at line %d.");
        gchar *parsed_str = NULL;
        gint cursor_pos = 0;
        const gchar *err_msg = _("Template body format error at line %d.");


@@ -7126,11 +7168,7 @@ static void compose_template_apply(Compose *compose, Template *tmpl,
        buffer = gtk_text_view_get_buffer(text);
 
        if (tmpl->value) {
        buffer = gtk_text_view_get_buffer(text);
 
        if (tmpl->value) {

-               /* FIXME - use per-folder/account quotemark */
-               if (prefs_common.quotemark && *prefs_common.quotemark)
-                       qmark = prefs_common.quotemark;
-               else
-                       qmark = "> ";
+               qmark = compose_quote_char_from_context(compose);

 
                if (compose->replyinfo != NULL) {
 
 
                if (compose->replyinfo != NULL) {
 


@@ -9528,18 +9566,14 @@ static void text_inserted(GtkTextBuffer *buffer, GtkTextIter *iter,
                                        compose);
        if (paste_as_quotation) {
                gchar *new_text;
                                        compose);
        if (paste_as_quotation) {
                gchar *new_text;

-               gchar *qmark;
+               const gchar *qmark;

 
                if (len < 0)
                        len = strlen(text);
 
                new_text = g_strndup(text, len);
 
 
                if (len < 0)
                        len = strlen(text);
 
                new_text = g_strndup(text, len);
 

-               /* FIXME - use per-folder/account quotemark */
-               if (prefs_common.quotemark && *prefs_common.quotemark)
-                       qmark = prefs_common.quotemark;
-               else
-                       qmark = "> ";
+               qmark = compose_quote_char_from_context(compose);

 
                mark = gtk_text_buffer_create_mark(buffer, NULL, iter, FALSE);
                gtk_text_buffer_place_cursor(buffer, iter);
 
                mark = gtk_text_buffer_create_mark(buffer, NULL, iter, FALSE);
                gtk_text_buffer_place_cursor(buffer, iter);

diff --git a/src/compose.h b/src/compose.h
index bd8785f10f4a1b8f38bfadfc33be699bd4ded5bf..5be9c8a51a7b678ce995800c75c810ffc36c6955 100644 (file)
--- a/src/compose.h
+++ b/src/compose.h
@@ -37,6 +37,7 @@ typedef struct _AttachInfo    AttachInfo;
 #include "codeconv.h"
 #include "template.h"
 #include "textview.h"
 #include "codeconv.h"
 #include "template.h"
 #include "textview.h"

+#include "folder.h"

 
 #ifdef USE_ASPELL
 #include "gtkaspell.h"
 
 #ifdef USE_ASPELL
 #include "gtkaspell.h"


@@ -185,6 +186,7 @@ struct _Compose
        GSList *newsgroup_list;
 
        PrefsAccount *account;
        GSList *newsgroup_list;
 
        PrefsAccount *account;

+       FolderItem *folder;

 
        UndoMain *undostruct;
 
 
        UndoMain *undostruct;