fix mismerge

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index d2b27da9873be14fa67e7d3a73cd1ecf84c67c5a..4b08b6e7f6b5f81fa943d22368e4a35a64db7415 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-07-03 [colin]     0.9.11cvs17.5
+
+       * src/textview.c
+               Fix mismerge which broke URI opening
+               
 2004-07-01 [colin]     0.9.11cvs17.4
 
        * src/gtk/filesel.c

diff --git a/configure.ac b/configure.ac
index 2e1d61cc852eae118d34f03179e1ad04c6cdae8b..bedf52d2b64a8509a1ed3018a4997bc51bc56187 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=17.4
+EXTRA_VERSION=17.5
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/textview.c b/src/textview.c
index a8d5f7afe92f339fac5adb5c1da68e38b42aef2a..dd2f4dba709558a1db508747fd9f1496ab0cb4da 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -1989,6 +1989,7 @@ static gboolean textview_uri_button_pressed(GtkTextTag *tag, GObject *obj,
 
                trimmed_uri = trim_string(uri->uri, 60);
                /* hover or single click: display url in statusbar */
+
                if (event->type == GDK_MOTION_NOTIFY
                    || (event->type == GDK_BUTTON_PRESS && bevent->button == 1)) {
                        if (textview->messageview->mainwin) {
@@ -2001,7 +2002,7 @@ static gboolean textview_uri_button_pressed(GtkTextTag *tag, GObject *obj,
                /* doubleclick: open compose / add address / browser */
                if ((event->type == GDK_2BUTTON_PRESS && bevent->button == 1) ||
                        bevent->button == 2 || bevent->button == 3) {
-                       if (!g_strncasecmp(uri->uri, "mailto:", 7))
+                       if (!g_strncasecmp(uri->uri, "mailto:", 7)) {
                                if (bevent->button == 3) {
                                        gchar *fromname, *fromaddress;
                                                
@@ -2019,23 +2020,24 @@ static gboolean textview_uri_button_pressed(GtkTextTag *tag, GObject *obj,
                                } else {
                                        PrefsAccount *account = NULL;
 
-                                               if (textview->messageview && textview->messageview->msginfo &&
-                                                   textview->messageview->msginfo->folder) {
-                                                       FolderItem   *folder_item;
+                                       if (textview->messageview && textview->messageview->msginfo &&
+                                           textview->messageview->msginfo->folder) {
+                                               FolderItem   *folder_item;
 
-                                                       folder_item = textview->messageview->msginfo->folder;
-                                                       if (folder_item->prefs && folder_item->prefs->enable_default_account)
-                                                               account = account_find_from_id(folder_item->prefs->default_account);
-                                               }
-                                               compose_new(account, uri->uri + 7, NULL);
+                                               folder_item = textview->messageview->msginfo->folder;
+                                               if (folder_item->prefs && folder_item->prefs->enable_default_account)
+                                                       account = account_find_from_id(folder_item->prefs->default_account);
                                        }
+                                       compose_new(account, uri->uri + 7, NULL);
+                               }
                        } else {
                                if (textview_uri_security_check(textview, uri) == TRUE) 
                                        open_uri(uri->uri,
                                                 prefs_common.uri_cmd);
                                return TRUE;
                        }
-                       g_free(trimmed_uri);
+               }
+               g_free(trimmed_uri);
        }
 
        return FALSE;