display url in statusbar

diff --git a/AUTHORS b/AUTHORS
index c31516e693b69201892a60d48b45d5fa81c5fbf1..9dced557dc3c72d73585a27ff63a586851c69067 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -142,3 +142,4 @@ contributors (beside the above; based on Changelog)
        Stefaan Eeckels
        Pascal Jermini
        Thorsten Thielen
        Stefaan Eeckels
        Pascal Jermini
        Thorsten Thielen

+       Thorsten Maerz

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 0ee353377750989066c35f689e7cfbfe280c4084..f331b4c3518254cd899f566b01c60f74601bf9ad 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2002-05-06 [paul]      0.7.5claws10
+
+       * src/messageview.c
+         src/textview.c
+               display url in statusbar on single-click
+               patch submitted by Thorsten Maerz <torte@netztorte.de>
+

 2002-05-06 [match]     0.7.5claws9
 
        * src/addritem.[ch]
 2002-05-06 [match]     0.7.5claws9
 
        * src/addritem.[ch]

diff --git a/configure.in b/configure.in
index 7af1ee9f38a50169d18beb155ccdadbfa7c9d9ae..ad4432b6c5131a33119eee105758f3de5b8b872b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws9
+EXTRA_VERSION=claws10

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/messageview.c b/src/messageview.c
index 4c5e5f6e1d28b797987e8fe7d01d1798e45cfe57..1ecfef805b4d4553bb81f7d1b28ba5e16043c988 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -375,6 +375,9 @@ void messageview_show(MessageView *messageview, MsgInfo *msginfo,
 
        g_return_if_fail(msginfo != NULL);
 
 
        g_return_if_fail(msginfo != NULL);
 

+       gtk_statusbar_pop(GTK_STATUSBAR(messageview->mainwin->statusbar),
+                         messageview->mainwin->folderview_cid);
+

 #if USE_GPGME
        if ((fp = procmsg_open_message_decrypted(msginfo, &mimeinfo)) == NULL)
                return;
 #if USE_GPGME
        if ((fp = procmsg_open_message_decrypted(msginfo, &mimeinfo)) == NULL)
                return;

diff --git a/src/textview.c b/src/textview.c
index fd84a1021424eb5cdf6648097938dcb5d1ca0eb8..baa9f1cc524e68582c1044cf3f0ab5b6f48dd04f 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -984,8 +984,8 @@ static void textview_write_link(TextView *textview, const gchar *url,
     uri = g_new(RemoteURI, 1);
     uri->uri = g_strdup(url);
     uri->start = gtk_stext_get_point(text);
     uri = g_new(RemoteURI, 1);
     uri->uri = g_strdup(url);
     uri->start = gtk_stext_get_point(text);

-    gtk_stext_insert(text, textview->msgfont, link_color, NULL, buf,
-                   strlen(buf));
+    gtk_stext_insert(text, textview->msgfont, link_color, NULL, str,
+                   strlen(str));

     uri->end = gtk_stext_get_point(text);
     textview->uri_list = g_slist_append(textview->uri_list, uri);
 }
     uri->end = gtk_stext_get_point(text);
     textview->uri_list = g_slist_append(textview->uri_list, uri);
 }


@@ -1656,7 +1656,7 @@ static gint textview_button_released(GtkWidget *widget, GdkEventButton *event,
                gtk_editable_get_position(GTK_EDITABLE(textview->text));
 
        if (event && 
                gtk_editable_get_position(GTK_EDITABLE(textview->text));
 
        if (event && 

-           ((event->button == 1 && textview->last_buttonpress == GDK_2BUTTON_PRESS)
+           ((event->button == 1)

             || event->button == 2 || event->button == 3)) {
                GSList *cur;
 
             || event->button == 2 || event->button == 3)) {
                GSList *cur;
 


@@ -1667,11 +1667,22 @@ static gint textview_button_released(GtkWidget *widget, GdkEventButton *event,
                        textview->cur_pos--;
                }
 
                        textview->cur_pos--;
                }
 

+               gtk_statusbar_pop(GTK_STATUSBAR(textview->messageview->mainwin->statusbar),
+                                 textview->messageview->mainwin->folderview_cid);
+

                for (cur = textview->uri_list; cur != NULL; cur = cur->next) {
                        RemoteURI *uri = (RemoteURI *)cur->data;
 
                        if (textview->cur_pos >= uri->start &&
                            textview->cur_pos <  uri->end) {
                for (cur = textview->uri_list; cur != NULL; cur = cur->next) {
                        RemoteURI *uri = (RemoteURI *)cur->data;
 
                        if (textview->cur_pos >= uri->start &&
                            textview->cur_pos <  uri->end) {

+                               /* single click: display url in statusbar */
+                               if (event->button == 1 
+                                   && (textview->last_buttonpress != GDK_2BUTTON_PRESS)) {
+                                       gtk_statusbar_push(
+                                               GTK_STATUSBAR(textview->messageview->mainwin->statusbar),
+                                               textview->messageview->mainwin->folderview_cid, uri->uri);
+                                       gtkut_widget_wait_for_draw(textview->messageview->mainwin->hbox_stat);
+                               } else

                                if (!g_strncasecmp(uri->uri, "mailto:", 7)) {
                                        if (event->button == 3) {
                                                gchar *fromname, *fromaddress;
                                if (!g_strncasecmp(uri->uri, "mailto:", 7)) {
                                        if (event->button == 3) {
                                                gchar *fromname, *fromaddress;