2005-02-12 [paul] 1.0.1cvs4.5

	* src/textview.c
		remove unnecessary code (thanks to Alfons)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 8524166f92715cd324becb642db319371af6645d..abc3a7d5e667670e139bca1a4e5ecac8bd5b92fb 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-02-12 [paul]      1.0.1cvs4.5
+
+       * src/textview.c
+               remove unnecessary code (thanks to Alfons)
+

 2005-02-12 [paul]      1.0.1cvs4.4
 
        * src/textview.c
 2005-02-12 [paul]      1.0.1cvs4.4
 
        * src/textview.c

diff --git a/PATCHSETS b/PATCHSETS
index 05c04b85bc17a938d38f824b6455f9e554f79b0f..0153a2222eb70832675c2a19a21a6ef4c70f8b6b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -373,3 +373,4 @@
 ( cvs diff -u -r 1.6.2.3 -r 1.6.2.4 po/Makefile.in.in; ) > 1.0.1cvs4.2.patchset
 ( cvs diff -u -r 1.382.2.98 -r 1.382.2.99 src/compose.c; ) > 1.0.1cvs4.3.patchset
 ( cvs diff -u -r 1.96.2.44 -r 1.96.2.45 src/textview.c; ) > 1.0.1cvs4.4.patchset
 ( cvs diff -u -r 1.6.2.3 -r 1.6.2.4 po/Makefile.in.in; ) > 1.0.1cvs4.2.patchset
 ( cvs diff -u -r 1.382.2.98 -r 1.382.2.99 src/compose.c; ) > 1.0.1cvs4.3.patchset
 ( cvs diff -u -r 1.96.2.44 -r 1.96.2.45 src/textview.c; ) > 1.0.1cvs4.4.patchset

+( cvs diff -u -r 1.96.2.45 -r 1.96.2.46 src/textview.c; ) > 1.0.1cvs4.5.patchset

diff --git a/configure.ac b/configure.ac
index f061aed05e3d4742e3bb309eaa00a20c7cf9708e..0e17dd22710dbed683e760221d4e298b442485c8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=4
 EXTRA_RELEASE=
 BINARY_AGE=0
 EXTRA_VERSION=4
 EXTRA_RELEASE=

-EXTRA_GTK2_VERSION=.4
+EXTRA_GTK2_VERSION=.5

 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/textview.c b/src/textview.c
index 5dfa78cc904db2eb7f9f7336116c3401085080e1..c5356b519a94e0058dcf5063b429b6c0df3c639e 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -2205,18 +2205,13 @@ static void mail_to_uri_cb (TextView *textview, guint action, void *data)
 
 static void copy_mail_to_uri_cb        (TextView *textview, guint action, void *data)
 {
 
 static void copy_mail_to_uri_cb        (TextView *textview, guint action, void *data)
 {

-       gchar *fromaddress;

        RemoteURI *uri = g_object_get_data(G_OBJECT(textview->mail_popup_menu),
                                           "menu_button");
        if (uri == NULL)
                return;
 
        RemoteURI *uri = g_object_get_data(G_OBJECT(textview->mail_popup_menu),
                                           "menu_button");
        if (uri == NULL)
                return;
 

-       fromaddress = g_strdup(uri->uri + 7);
-       
-       gtk_clipboard_set_text(gtk_clipboard_get(GDK_NONE), fromaddress, -1);
+       gtk_clipboard_set_text(gtk_clipboard_get(GDK_NONE), uri->uri + 7, -1);

        g_object_set_data(G_OBJECT(textview->mail_popup_menu), "menu_button",
                          NULL);
        g_object_set_data(G_OBJECT(textview->mail_popup_menu), "menu_button",
                          NULL);

-
-       g_free(fromaddress);

 }
 
 }