2009-12-20 [holger] 3.7.3cvs45
authorHolger Berndt <hb@claws-mail.org>
Sun, 20 Dec 2009 20:16:51 +0000 (20:16 +0000)
committerHolger Berndt <hb@claws-mail.org>
Sun, 20 Dec 2009 20:16:51 +0000 (20:16 +0000)
* src/compose.c
Delay CREATED_HOOKLIST invokation until
after the modifications to the compose window
are done, to allow hooks to further modify the
window without getting overridden again

ChangeLog
PATCHSETS
configure.ac
src/compose.c

index c87bac8..9ab05eb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-20 [holger]    3.7.3cvs45
+
+       * src/compose.c
+               Delay CREATED_HOOKLIST invokation until
+               after the modifications to the compose window
+               are done, to allow hooks to further modify the
+               window without getting overridden again
+
 2009-12-20 [holger]    3.7.3cvs44
 
        * src/prefs_toolbar.h
index 592a222..b0f9819 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.382.2.537 -r 1.382.2.538 src/compose.c;  cvs diff -u -r 1.50.2.57 -r 1.50.2.58 src/compose.h;  ) > 3.7.3cvs42.patchset
 ( cvs diff -u -r 1.30.2.59 -r 1.30.2.60 src/prefs_toolbar.c;  cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/prefs_toolbar.h;  cvs diff -u -r 1.43.2.112 -r 1.43.2.113 src/toolbar.c;  ) > 3.7.3cvs43.patchset
 ( cvs diff -u -r 1.5.2.9 -r 1.5.2.10 src/prefs_toolbar.h;  ) > 3.7.3cvs44.patchset
+( cvs diff -u -r 1.382.2.538 -r 1.382.2.539 src/compose.c;  ) > 3.7.3cvs45.patchset
index f1e307f..ee7bc75 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=44
+EXTRA_VERSION=45
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index ae38b37..366b164 100644 (file)
@@ -1222,6 +1222,9 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
 
        compose->modified = FALSE;
        compose_set_title(compose);
+
+  hooks_invoke(COMPOSE_CREATED_HOOKLIST, compose);
+
         return compose;
 }
 
@@ -1659,6 +1662,7 @@ static Compose *compose_generic_reply(MsgInfo *msginfo,
                return NULL;
        }
        END_TIMING();
+
        return compose;
 }
 
@@ -1858,6 +1862,8 @@ Compose *compose_forward(PrefsAccount *account, MsgInfo *msginfo,
                return NULL;
        }
 
+       hooks_invoke(COMPOSE_CREATED_HOOKLIST, compose);
+
         return compose;
 }
 
@@ -2004,6 +2010,8 @@ static Compose *compose_forward_multiple(PrefsAccount *account, GSList *msginfo_
                return NULL;
        }
 
+       hooks_invoke(COMPOSE_CREATED_HOOKLIST, compose);
+
        return compose;
 }
 
@@ -2332,6 +2340,8 @@ Compose *compose_reedit(MsgInfo *msginfo, gboolean batch)
        
        compose->sig_str = account_get_signature_str(compose->account);
        
+       hooks_invoke(COMPOSE_CREATED_HOOKLIST, compose);
+
        return compose;
 }
 
@@ -2437,6 +2447,8 @@ Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo,
                return NULL;
        }
        
+       hooks_invoke(COMPOSE_CREATED_HOOKLIST, compose);
+
        return compose;
 }
 
@@ -7605,8 +7617,6 @@ static Compose *compose_create(PrefsAccount *account,
 #endif
        }
        
-       hooks_invoke(COMPOSE_CREATED_HOOKLIST, compose);
-
        return compose;
 }
 
@@ -11061,6 +11071,7 @@ static void compose_reply_from_messageview_real(MessageView *msgview, GSList *ms
        }
        g_free(s_system);
        g_free(body);
+       hooks_invoke(COMPOSE_CREATED_HOOKLIST, compose);
 }
 
 void compose_reply_from_messageview(MessageView *msgview, GSList *msginfo_list,