trim uri before sending to the statusbar

diff --git a/ChangeLog.claws b/ChangeLog.claws
index c91a0d4f8e9c8efd736fabfde28ab180da2d340c..2d4ceb13ae85ec4e8d3f673f89c92a46d007b475 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2003-09-01 [paul]      0.9.4claws49
+
+       * src/textview.c
+               trim uri before sending to the statusbar
+               fixes Bug 275 'Clicking on long URL wrapped onto two lines
+               in the message window causes main S-C window to enlarge 
+               past screen edges'
+
 2003-09-01 [paul]      0.9.4claws48
 
        * sync with 0.9.4cvs12

diff --git a/configure.ac b/configure.ac
index 5adc067b75634f2c3dcaac4c12d37cf717422803..7a56bfe544388d0d9a2de27a7aaf5b044c928226 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=48
+EXTRA_VERSION=49
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/textview.c b/src/textview.c
index b40966a1869c6df702b18291a0ee4fcf45391356..f64d5779b23e4ac31801641d33fc57e6bbfe9064 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -1847,6 +1847,9 @@ static gint textview_button_released(GtkWidget *widget, GdkEventButton *event,
 
                        if (textview->cur_pos >= uri->start &&
                            textview->cur_pos <= uri->end) {
+                               gchar *trimmed_uri;
+                               
+                               trimmed_uri = trim_string(uri->uri, 60);
                                /* single click: display url in statusbar */
                                if (event->button == 1 && textview->last_buttonpress != GDK_2BUTTON_PRESS) {
                                        if (textview->messageview->mainwin) {
@@ -1861,7 +1864,7 @@ static gint textview_button_released(GtkWidget *widget, GdkEventButton *event,
                                                textview->show_url_msgid = gtk_statusbar_push(
                                                                GTK_STATUSBAR(textview->messageview->mainwin->statusbar),
                                                                textview->messageview->mainwin->folderview_cid,
-                                                               uri->uri);
+                                                               trimmed_uri);
                                                textview->show_url_timeout_tag = gtk_timeout_add( 4000, show_url_timeout_cb, textview );
                                                gtkut_widget_wait_for_draw(textview->messageview->mainwin->hbox_stat);
                                        }