2009-08-20 [holger] 3.7.2cvs19

	* src/compose.c
	* src/compose.h
		Make it possible for code outside
		compose (e.g. plugins) to attach files

diff --git a/ChangeLog b/ChangeLog
index 96db8e0ab487f1c821f325b0756936eeae9108e1..3a34a91b898d827aac6a2de1051eb203cf188c4d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-08-20 [holger]    3.7.2cvs19
+
+       * src/compose.c
+       * src/compose.h
+               Make it possible for code outside
+               compose (e.g. plugins) to attach files
+

 2009-08-20 [colin]     3.7.2cvs18
 
        * src/main.c
 2009-08-20 [colin]     3.7.2cvs18
 
        * src/main.c

diff --git a/PATCHSETS b/PATCHSETS
index 409ffa18cf26de1ed884ca1a2c40ce392f16ec1e..e534b2836218f0c002c694972fb775b01fd92c60 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3843,3 +3843,4 @@
 ( cvs diff -u -r 1.43.2.109 -r 1.43.2.110 src/toolbar.c;  ) > 3.7.2cvs16.patchset
 ( cvs diff -u -r 1.3.2.32 -r 1.3.2.33 src/ldapquery.c;  ) > 3.7.2cvs17.patchset
 ( cvs diff -u -r 1.115.2.221 -r 1.115.2.222 src/main.c;  ) > 3.7.2cvs18.patchset
 ( cvs diff -u -r 1.43.2.109 -r 1.43.2.110 src/toolbar.c;  ) > 3.7.2cvs16.patchset
 ( cvs diff -u -r 1.3.2.32 -r 1.3.2.33 src/ldapquery.c;  ) > 3.7.2cvs17.patchset
 ( cvs diff -u -r 1.115.2.221 -r 1.115.2.222 src/main.c;  ) > 3.7.2cvs18.patchset

+( cvs diff -u -r 1.382.2.519 -r 1.382.2.520 src/compose.c;  cvs diff -u -r 1.50.2.54 -r 1.50.2.55 src/compose.h;  ) > 3.7.2cvs19.patchset

diff --git a/configure.ac b/configure.ac
index 5981e853c1f7039d85c20df92e883258e7d38b4a..33657b029dc9ab322d9c04617e794c1fbdb10413 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=18
+EXTRA_VERSION=19

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index b8f2eb7b62b741c761b5b2bb04284bf08c4b13d2..d8e6e2625ade3704ff89ca1c04fc0aceeaf9208a 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -526,8 +526,6 @@ static void compose_set_dictionaries_from_folder_prefs(Compose *compose,
 #endif
 static void compose_attach_update_label(Compose *compose);
 
 #endif
 static void compose_attach_update_label(Compose *compose);
 

-static void compose_attach_from_list(Compose *compose, GList *file_list, gboolean free_data);
-

 static GtkActionEntry compose_popup_entries[] =
 {
        {"Compose",                     NULL, "Compose" },
 static GtkActionEntry compose_popup_entries[] =
 {
        {"Compose",                     NULL, "Compose" },


@@ -9332,7 +9330,7 @@ static void compose_save_cb(GtkAction *action, gpointer data)
        compose->rmode = COMPOSE_REEDIT;
 }
 
        compose->rmode = COMPOSE_REEDIT;
 }
 

-static void compose_attach_from_list(Compose *compose, GList *file_list, gboolean free_data)
+void compose_attach_from_list(Compose *compose, GList *file_list, gboolean free_data)

 {
        if (compose && file_list) {
                GList *tmp;
 {
        if (compose && file_list) {
                GList *tmp;

diff --git a/src/compose.h b/src/compose.h
index cd3c057ccd172f80d73dddbacab9a7a963be5af4..7b1cdc0a07cea5a90a1cca6e64655c64ff6b49cc 100644 (file)
--- a/src/compose.h
+++ b/src/compose.h
@@ -320,4 +320,5 @@ gboolean compose_close                      (Compose *compose);
 void compose_close_toolbar             (Compose *compose);
 void compose_clear_exit_drafts         (void);
 void compose_reopen_exit_drafts                (void);
 void compose_close_toolbar             (Compose *compose);
 void compose_clear_exit_drafts         (void);
 void compose_reopen_exit_drafts                (void);

+void compose_attach_from_list (Compose *compose, GList *file_list, gboolean free_data);

 #endif /* __COMPOSE_H__ */
 #endif /* __COMPOSE_H__ */