From 5ca4e70d5230430c9368b79a57b3bc7c3f8e29f5 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sat, 4 Dec 2004 16:13:22 +0000 Subject: [PATCH] 2004-12-04 [colin] 0.9.12cvs183.1 * src/compose.c Sync with HEAD (compose window position saving) --- ChangeLog-gtk2.claws | 5 +++++ PATCHSETS | 1 + configure.ac | 4 ++-- src/compose.c | 24 +++++++++++++++++++----- 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 0a90e9202..3f93f94e3 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,8 @@ +2004-12-04 [colin] 0.9.12cvs183.1 + + * src/compose.c + Sync with HEAD (compose window position saving) + 2004-12-04 [paul] 0.9.12cvs182.3 * src/messageview.c diff --git a/PATCHSETS b/PATCHSETS index 3bc7d59eb..5a4ed0b00 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -275,3 +275,4 @@ ( cvs diff -u -r 1.396.2.14 -r 1.396.2.15 ChangeLog; cvs diff -u -r 1.2504.2.35 -r 1.2504.2.36 ChangeLog.claws; cvs diff -u -r 1.391.2.14 -r 1.391.2.15 ChangeLog.jp; cvs diff -u -r 1.29.2.2 -r 1.29.2.3 INSTALL; cvs diff -u -r 1.42.2.5 -r 1.42.2.6 NEWS; cvs diff -u -r 1.8.2.1 -r 1.8.2.2 README; cvs diff -u -r 1.7.2.1 -r 1.7.2.2 README.jp; cvs diff -u -r 1.654.2.306 -r 1.654.2.307 configure.ac; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/Makefile.am; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-1.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-10.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-11.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-12.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-13.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-14.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-15.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-16.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-17.html; cvs diff -u -r 0 -r 1 doc/manual/ja/sylpheed-18.html; cvs diff -u -r 0 -r 1 doc/manual/ja/sylpheed-19.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-2.html; cvs diff -u -r 0 -r 1 doc/manual/ja/sylpheed-20.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-3.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-4.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-5.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-6.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-7.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-8.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed-9.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed.html; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 doc/manual/ja/sylpheed.sgml; cvs diff -u -r 1.58.2.4 -r 1.58.2.5 po/de.po; cvs diff -u -r 1.155.2.15 -r 1.155.2.16 src/Makefile.am; cvs diff -u -r 1.382.2.77 -r 1.382.2.78 src/compose.c; cvs diff -u -r 1.49.2.24 -r 1.49.2.25 src/procmime.c; cvs diff -u -r -1.1.1.1 -r -1.1.1.2 src/pixmaps/regular.xpm; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/plugins/pgpmime/pgpmime.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/pgpmime/plugin.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpmime/prefs_gpg.c; ) > 0.9.12cvs182.1.patchset ( cvs diff -u -r 1.155.2.16 -r 1.155.2.17 src/Makefile.am; ) > 0.9.12cvs182.2.patchset ( cvs diff -u -r 1.94.2.35 -r 1.94.2.36 src/messageview.c; cvs diff -u -r 1.83.2.25 -r 1.83.2.26 src/mimeview.c; cvs diff -u -r 1.16.2.3 -r 1.16.2.4 src/prefs_customheader.c; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/gtk/quicksearch.c; ) > 0.9.12cvs182.3.patchset +( cvs diff -u -r 1.382.2.78 -r 1.382.2.79 src/compose.c; ) > 0.9.12cvs183.1.patchset diff --git a/configure.ac b/configure.ac index dbb4e62f3..29cf18170 100644 --- a/configure.ac +++ b/configure.ac @@ -11,9 +11,9 @@ MINOR_VERSION=9 MICRO_VERSION=12 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=182 +EXTRA_VERSION=183 EXTRA_RELEASE= -EXTRA_GTK2_VERSION=.3 +EXTRA_GTK2_VERSION=.1 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION} diff --git a/src/compose.c b/src/compose.c index bab438450..b5513521e 100644 --- a/src/compose.c +++ b/src/compose.c @@ -501,6 +501,8 @@ static gboolean compose_send_control_enter (Compose *compose); static gint compose_defer_auto_save_draft (Compose *compose); static PrefsAccount *compose_guess_forward_account_from_msginfo (MsgInfo *msginfo); +static void compose_close (Compose *compose); + static GtkItemFactoryEntry compose_popup_entries[] = { {N_("/_Add..."), NULL, compose_attach_cb, 0, NULL}, @@ -3307,7 +3309,7 @@ gint compose_send(Compose *compose) if (prefs_common.send_dialog_mode != SEND_DIALOG_ALWAYS) { compose->sending = FALSE; - gtk_widget_destroy(compose->window); + compose_close(compose); /* No more compose access in the normal codepath * after this point! */ } @@ -3340,7 +3342,7 @@ gint compose_send(Compose *compose) folder_item_remove_msg(folder, msgnum); folder_item_scan(folder); if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS) - gtk_widget_destroy(compose->window); + compose_close(compose); } else { alertpanel_error(_("The message was queued but could not be " "sent.\nUse \"Send queued messages\" from " @@ -6271,7 +6273,8 @@ static void compose_send_later_cb(gpointer data, guint action, gint val; val = compose_queue_sub(compose, NULL, NULL, TRUE); - if (!val) gtk_widget_destroy(compose->window); + if (!val) + compose_close(compose); } void compose_draft (gpointer data) @@ -6364,7 +6367,7 @@ static void compose_draft_cb(gpointer data, guint action, GtkWidget *widget) lock = FALSE; if (action == COMPOSE_QUIT_EDITING) - gtk_widget_destroy(compose->window); + compose_close(compose); else { struct stat s; gchar *path; @@ -6500,7 +6503,7 @@ static void compose_close_cb(gpointer data, guint action, GtkWidget *widget) } } - gtk_widget_destroy(compose->window); + compose_close(compose); } static void compose_address_cb(gpointer data, guint action, GtkWidget *widget) @@ -7397,6 +7400,17 @@ static PrefsAccount *compose_guess_forward_account_from_msginfo(MsgInfo *msginfo return account; } +static void compose_close(Compose *compose) +{ + gint x, y; + + g_return_if_fail(compose); + gtkut_widget_get_uposition(compose->window, &x, &y); + prefs_common.compose_x = x; + prefs_common.compose_y = y; + gtk_widget_destroy(compose->window); +} + /** * Add entry field for each address in list. * \param compose E-Mail composition object. -- 2.25.1