* src/textview.[ch]

	remove dead code that at one time controlled display of
	URIs in status bar

diff --git a/ChangeLog.claws b/ChangeLog.claws
index ce7da98e756765bae941647aa3c157b9140e6208..ec448b9b8c1ce74686a2054c812b32c48dccae8b 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2004-03-11 [alfons]    0.9.10claws3
+
+       * src/textview.[ch]
+               remove dead code that at one time controlled display of
+               URIs in status bar
+
 2004-03-10 [paul]      0.9.10claws2
 
        * po/it.po

diff --git a/configure.ac b/configure.ac
index 24330a3bf7d8a2dd81ddb3192170af6e97245886..6040bd718d49eb54db0523ad83e918f9556a9cf3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=2
+EXTRA_VERSION=3
 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 aac21cf49f141aa3d8d7f1d27a26153fbb68a61d..8ae0346e9d659ee926b93be5e51993f17951f1a0 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -292,7 +292,6 @@ TextView *textview_create(void)
        textview->cur_pos          = 0;
        textview->show_all_headers = FALSE;
        textview->last_buttonpress = GDK_NOTHING;
-       textview->show_url_msgid   = 0;
 
        return textview;
 }
@@ -1868,15 +1867,11 @@ static gint textview_button_released(GtkWidget *widget, GdkEventButton *event,
                                /* single click: display url in statusbar */
                                if (event->button == 1 && textview->last_buttonpress != GDK_2BUTTON_PRESS) {
                                        if (textview->messageview->mainwin) {
-                                               if (textview->show_url_msgid) {
-                                                       TEXTVIEW_STATUSBAR_POP(textview);
-                                                       textview->show_url_msgid = 0;
-                                               }
-                                                       TEXTVIEW_STATUSBAR_PUSH(textview, trimmed_uri);
-                                                       textview->show_url_timeout_tag = gtk_timeout_add( 4000, show_url_timeout_cb, textview );
+                                               TEXTVIEW_STATUSBAR_PUSH(textview, trimmed_uri);
+                                               textview->show_url_timeout_tag = gtk_timeout_add
+                                                       (4000, show_url_timeout_cb, textview);
                                        }
-                               } else
-                               if (!g_strncasecmp(uri->uri, "mailto:", 7)) {
+                               } else if (!g_strncasecmp(uri->uri, "mailto:", 7)) {
                                        if (event->button == 3) {
                                                gchar *fromname, *fromaddress;
                                                

diff --git a/src/textview.h b/src/textview.h
index 94259802473b091ef0db6ccda0755f135518a67a..ec881e1834e4878be39541e138b528fd943e56f7 100644 (file)
--- a/src/textview.h
+++ b/src/textview.h
@@ -60,7 +60,6 @@ struct _TextView
 
        MessageView *messageview;
        gint last_buttonpress;
-       gint show_url_msgid;
        gint show_url_timeout_tag;
 };