gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix 'View->Open in new window' bug

Browse source
This commit is contained in:
Paul Mangan 2002-05-08 06:27:40 +00:00
parent 81bf3e129c
commit 836e78fa8c
5 changed files with 39 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog.claws
View file

@ -1,3 +1,10 @@
2002-05-08 [paul] 0.7.5claws12
* src/mainwindow.c
src/textview.[ch]
fix segfault on View->Open in new window
patch submitted by Thorsten Maerz <torte@netztorte.de>
2002-05-07 [paul] 0.7.5claws11
* sync with 0.7.5cvs9

2
configure.in
View file

@ -8,7 +8,7 @@ MINOR_VERSION=7
MICRO_VERSION=5
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=claws11
EXTRA_VERSION=claws12
VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
dnl set $target

3
src/messageview.c
View file

@ -375,9 +375,6 @@ void messageview_show(MessageView *messageview, MsgInfo *msginfo,
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;

38
src/textview.c
View file

@ -257,6 +257,7 @@ 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;
}
@ -1641,6 +1642,16 @@ static gint textview_key_pressed(GtkWidget *widget, GdkEventKey *event,
return TRUE;
}
static gint show_url_timeout_cb(TextView *textview ){
if (textview->messageview->mainwin)
if (textview->show_url_msgid)
gtk_statusbar_remove(GTK_STATUSBAR(
textview->messageview->mainwin->statusbar),
textview->messageview->mainwin->folderview_cid,
textview->show_url_msgid);
return FALSE;
}
static gint textview_button_pressed(GtkWidget *widget, GdkEventButton *event,
TextView *textview)
{
@ -1667,21 +1678,30 @@ static gint textview_button_released(GtkWidget *widget, GdkEventButton *event,
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) {
/* 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);
if (event->button == 1) {
if (textview->messageview->mainwin
&& textview->last_buttonpress != GDK_2BUTTON_PRESS) {
if (textview->show_url_msgid) {
gtk_timeout_remove(textview->show_url_timeout_tag);
gtk_statusbar_remove(GTK_STATUSBAR(
textview->messageview->mainwin->statusbar),
textview->messageview->mainwin->folderview_cid,
textview->show_url_msgid);
textview->show_url_msgid = 0;
}
textview->show_url_msgid = gtk_statusbar_push(
GTK_STATUSBAR(textview->messageview->mainwin->statusbar),
textview->messageview->mainwin->folderview_cid,
uri->uri);
textview->show_url_timeout_tag = gtk_timeout_add( 2000, show_url_timeout_cb, textview );
gtkut_widget_wait_for_draw(textview->messageview->mainwin->hbox_stat);
}
} else
if (!g_strncasecmp(uri->uri, "mailto:", 7)) {
if (event->button == 3) {

2
src/textview.h
View file

@ -58,6 +58,8 @@ struct _TextView
MessageView *messageview;
gint last_buttonpress;
gint show_url_msgid;
gint show_url_timeout_tag;
};
TextView *textview_create (void);