diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.ja | 7 | ||||
| -rw-r--r-- | libsylph/prefs_common.c | 2 | ||||
| -rw-r--r-- | libsylph/prefs_common.h | 1 | ||||
| -rw-r--r-- | src/compose.c | 6 | ||||
| -rw-r--r-- | src/prefs_common_dialog.c | 7 |
6 files changed, 14 insertions, 16 deletions
@@ -1,5 +1,12 @@ 2006-01-26 + * libsylph/prefs_common.[ch] + src/compose.c + src/prefs_common_dialog.c: removed 'Wrap before sending' option, + which was rather problematic. + +2006-01-26 + * libsylph/socket.c configure.in: supported IPv6 on Win32. diff --git a/ChangeLog.ja b/ChangeLog.ja index 0ed34210..324335af 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,5 +1,12 @@ 2006-01-26 + * libsylph/prefs_common.[ch] + src/compose.c + src/prefs_common_dialog.c: 問題のあった「送信時に自動整形する」 + オプションを廃止。 + +2006-01-26 + * libsylph/socket.c configure.in: Win32 で IPv6 に対応。 diff --git a/libsylph/prefs_common.c b/libsylph/prefs_common.c index 5b96a5a9..0f430afd 100644 --- a/libsylph/prefs_common.c +++ b/libsylph/prefs_common.c @@ -72,8 +72,6 @@ static PrefParam param[] = { {"linewrap_length", "72", &prefs_common.linewrap_len, P_INT}, {"linewrap_quotation", "FALSE", &prefs_common.linewrap_quote, P_BOOL}, {"linewrap_auto", "FALSE", &prefs_common.autowrap, P_BOOL}, - {"linewrap_before_sending", "FALSE", &prefs_common.linewrap_at_send, - P_BOOL}, {"enable_autosave", "FALSE", &prefs_common.enable_autosave, P_BOOL}, {"autosave_interval", "5", &prefs_common.autosave_itv, P_INT}, diff --git a/libsylph/prefs_common.h b/libsylph/prefs_common.h index a317e235..af484a89 100644 --- a/libsylph/prefs_common.h +++ b/libsylph/prefs_common.h @@ -72,7 +72,6 @@ struct _PrefsCommon gint linewrap_len; gboolean linewrap_quote; gboolean autowrap; - gboolean linewrap_at_send; gboolean auto_exteditor; gboolean enable_autosave; gint autosave_itv; diff --git a/src/compose.c b/src/compose.c index ead2d434..d7ca382e 100644 --- a/src/compose.c +++ b/src/compose.c @@ -2670,9 +2670,6 @@ static gint compose_send(Compose *compose) return -1; } } else { - if (prefs_common.linewrap_at_send) - compose_wrap_all(compose); - if (compose_write_to_file(compose, tmp, FALSE) < 0) { compose_unlock(compose); return -1; @@ -5861,9 +5858,6 @@ static void compose_send_later_cb(gpointer data, guint action, return; } } else { - if (prefs_common.linewrap_at_send) - compose_wrap_all(compose); - if (compose_write_to_file(compose, tmp, FALSE) < 0) { alertpanel_error(_("Can't queue the message.")); return; diff --git a/src/prefs_common_dialog.c b/src/prefs_common_dialog.c index 0f564897..7780a521 100644 --- a/src/prefs_common_dialog.c +++ b/src/prefs_common_dialog.c @@ -93,7 +93,6 @@ static struct Compose { GtkObject *spinbtn_linewrap_adj; GtkWidget *checkbtn_wrapquote; GtkWidget *checkbtn_autowrap; - GtkWidget *checkbtn_wrapatsend; GtkWidget *checkbtn_autosave; GtkWidget *spinbtn_autosave; @@ -305,8 +304,6 @@ static PrefsUIData ui_data[] = { prefs_set_data_from_toggle, prefs_set_toggle}, {"linewrap_auto", &compose.checkbtn_autowrap, prefs_set_data_from_toggle, prefs_set_toggle}, - {"linewrap_before_sending", &compose.checkbtn_wrapatsend, - prefs_set_data_from_toggle, prefs_set_toggle}, {"enable_autosave", &compose.checkbtn_autosave, prefs_set_data_from_toggle, prefs_set_toggle}, @@ -922,7 +919,6 @@ static void prefs_compose_create(void) GtkWidget *spinbtn_linewrap; GtkWidget *checkbtn_wrapquote; GtkWidget *checkbtn_autowrap; - GtkWidget *checkbtn_wrapatsend; GtkWidget *hbox_autosave; GtkWidget *checkbtn_autosave; @@ -1058,8 +1054,6 @@ static void prefs_compose_create(void) gtk_box_pack_start (GTK_BOX (vbox2), hbox4, FALSE, FALSE, 0); PACK_CHECK_BUTTON (hbox4, checkbtn_autowrap, _("Wrap on input")); - PACK_CHECK_BUTTON - (hbox4, checkbtn_wrapatsend, _("Wrap before sending")); PACK_VSPACER (vbox2, vbox3, VSPACING_NARROW_2); @@ -1115,7 +1109,6 @@ static void prefs_compose_create(void) compose.spinbtn_linewrap_adj = spinbtn_linewrap_adj; compose.checkbtn_wrapquote = checkbtn_wrapquote; compose.checkbtn_autowrap = checkbtn_autowrap; - compose.checkbtn_wrapatsend = checkbtn_wrapatsend; compose.checkbtn_autosave = checkbtn_autosave; compose.spinbtn_autosave = spinbtn_autosave; |