2012-01-23 [mir] 3.7.10cvs16.20-new-contacts

	* commitHelper
	* src/addrbook.c
	* src/exportldif.c
	* src/mimeview.c
	    Applied patch 3.8.0cvs14, 3.8.0cvs15, 3.8.0cvs16 from HEAD.

diff --git a/ChangeLog b/ChangeLog
index d6c1155814f56b4d417f3752aef79d57a6647379..528e7b80ce0d95b68089fefcbe4e2a28d74fc92b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-01-23 [mir]       3.7.10cvs16.20-new-contacts
+
+       * commitHelper
+       * src/addrbook.c
+       * src/exportldif.c
+       * src/mimeview.c
+           Applied patch 3.8.0cvs14, 3.8.0cvs15, 3.8.0cvs16 from HEAD.
+
 2012-01-11 [mir]       3.7.10cvs16.19-new-contacts
 
        * src/mainwindow.c

diff --git a/PATCHSETS b/PATCHSETS
index f252ce3b4de45cd721745752048676e217c6563b..57790263e77b9cc2a5ba451c5cd4500e2c5a0ea1 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4238,3 +4238,4 @@
 ( cvs diff -u -r 1.1.2.17.2.1 -r 1.1.2.17.2.2 src/gtk/gtkcmctree.c;  ) > 3.7.10cvs16.17-new-contacts.patchset
 ( cvs diff -u -r 1.115.2.239.2.3 -r 1.115.2.239.2.4 src/main.c;  ) > 3.7.10cvs16.18-new-contacts.patchset
 ( cvs diff -u -r 1.274.2.328.2.3 -r 1.274.2.328.2.4 src/mainwindow.c;  cvs diff -u -r 1.39.2.61.2.1 -r 1.39.2.61.2.2 src/mainwindow.h;  cvs diff -u -r 1.395.2.430.2.3 -r 1.395.2.430.2.4 src/summaryview.c;  cvs diff -u -r 1.43.2.124.2.1 -r 1.43.2.124.2.2 src/toolbar.c;  ) > 3.7.10cvs16.19-new-contacts.patchset
+( cvs diff -u -r 1.1.2.39.2.1 -r 1.1.2.39.2.2 commitHelper;  cvs diff -u -r 1.22.2.24.2.1 -r 1.22.2.24.2.2 src/addrbook.c;  cvs diff -u -r 1.1.4.22.2.1 -r 1.1.4.22.2.2 src/exportldif.c;  cvs diff -u -r 1.83.2.170.2.3 -r 1.83.2.170.2.4 src/mimeview.c;  ) > 3.7.10cvs16.20-new-contacts.patchset

diff --git a/commitHelper b/commitHelper
index 621621687ec8f031d397e96449932811a0f44227..fc95cbbd3ca3fea80fada4ee2e39670011679a2f 100644 (file)
--- a/commitHelper
+++ b/commitHelper
@@ -143,5 +143,5 @@ if [ "$ans" == "y" ]; then
                cvs commit -m "`cat /tmp/logentry.$$` "
        fi;
        rm -f /tmp/logentry.$$
-       wget -O /dev/null -o /dev/null http://www.colino.net/claws-mail/update.php
+       wget -O /dev/null -o /dev/null http://www.claws-mail.org/tracker/update.php
 fi

diff --git a/configure.ac b/configure.ac
index f6c75cbf4c245c78de50dcc65f6784277d664890..be27751f6b26f045a6ea4cff38094b80ce6f9767 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=16.19
+EXTRA_VERSION=16.20
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=-new-contacts
 

diff --git a/src/addrbook.c b/src/addrbook.c
index 4350bf2531a9fe14bd13652392b68cef882d21f0..e08a5e71e00e3ae54e02254963759813bcc39baa 100644 (file)
--- a/src/addrbook.c
+++ b/src/addrbook.c
@@ -1804,7 +1804,7 @@ GList *addrbook_get_bookfile_list(AddressBookFile *book) {
        GDir *dir;
        const gchar *dir_name;
        struct stat statbuf;
-       gchar buf[WORK_BUFLEN];
+       gchar buf[WORK_BUFLEN + 1];
        gchar numbuf[WORK_BUFLEN];
        gint len, lenpre, lensuf, lennum;
        long int val, maxval;
@@ -1827,7 +1827,7 @@ GList *addrbook_get_bookfile_list(AddressBookFile *book) {
        }
 
        adbookdir = g_strdup(buf);
-       strncat(buf, ADDRBOOK_PREFIX, WORK_BUFLEN);
+       strncat(buf, ADDRBOOK_PREFIX, WORK_BUFLEN - strlen(buf));
 
        if( ( dir = g_dir_open( adbookdir, 0, NULL ) ) == NULL ) {
                book->retVal = MGU_OPEN_DIRECTORY;
@@ -1846,7 +1846,7 @@ GList *addrbook_get_bookfile_list(AddressBookFile *book) {
                gboolean flg;
 
                strncpy(buf, adbookdir, WORK_BUFLEN);
-               strncat(buf, dir_name, WORK_BUFLEN);
+               strncat(buf, dir_name, WORK_BUFLEN - strlen(buf));
                g_stat(buf, &statbuf);
                if (S_ISREG(statbuf.st_mode)) {
                        if (strncmp(

diff --git a/src/exportldif.c b/src/exportldif.c
index c96901de7423168dec417ecb48fa3283ba3ae1eb..b535d0e55aab050c67a3d6b3e9d8cf6ea3dc4fae 100644 (file)
--- a/src/exportldif.c
+++ b/src/exportldif.c
@@ -197,7 +197,7 @@ static gchar *exportldif_fmt_value( gchar *value ) {
 static gchar *exportldif_fmt_dn(
                ExportLdifCtl *ctl, const ItemPerson *person )
 {
-       gchar buf[ FMT_BUFSIZE ];
+       gchar buf[ FMT_BUFSIZE + 1 ];
        gchar *retVal = NULL;
        gchar *attr = NULL;
        gchar *value = NULL;
@@ -231,23 +231,23 @@ static gchar *exportldif_fmt_dn(
        if( attr ) {
                if( value ) {
                        if( strlen( value ) > 0 ) {
-                               strncat( buf, attr, FMT_BUFSIZE );
-                               strncat( buf, "=", FMT_BUFSIZE );
+                               strncat( buf, attr, FMT_BUFSIZE - strlen(buf) );
+                               strncat( buf, "=", FMT_BUFSIZE - strlen(buf) );
                                if( dupval ) {
                                        /* Format and free duplicated value */
-                                       strncat( buf, dupval, FMT_BUFSIZE );
+                                       strncat( buf, dupval, FMT_BUFSIZE - strlen(buf) );
                                        g_free( dupval );
                                }
                                else {
                                        /* Use original value */
-                                       strncat( buf, value, FMT_BUFSIZE );
+                                       strncat( buf, value, FMT_BUFSIZE - strlen(buf) );
                                }
 
                                /* Append suffix */
                                if( ctl->suffix ) {
                                        if( strlen( ctl->suffix ) > 0 ) {
-                                               strncat( buf, ",", FMT_BUFSIZE );
-                                               strncat( buf, ctl->suffix, FMT_BUFSIZE );
+                                               strncat( buf, ",", FMT_BUFSIZE - strlen(buf) );
+                                               strncat( buf, ctl->suffix, FMT_BUFSIZE - strlen(buf) );
                                        }
                                }
 

diff --git a/src/mimeview.c b/src/mimeview.c
index e706fd2ce47b043e44877c5248614dba15977d7d..0ab2c887e0f76dc112e0fc9e77accb84bb76c383 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -89,10 +89,6 @@ static gboolean mimeview_write_part          (const gchar    *filename,
 
 static void mimeview_selected          (GtkTreeSelection       *selection,
                                         MimeView       *mimeview);
-static void mimeview_start_drag        (GtkWidget      *widget,
-                                        gint            button,
-                                        GdkEvent       *event,
-                                        MimeView       *mimeview);
 static gint mimeview_button_pressed    (GtkWidget      *widget,
                                         GdkEventButton *event,
                                         MimeView       *mimeview);
@@ -337,16 +333,16 @@ MimeView *mimeview_create(MainWindow *mainwin)
 
        gtk_widget_show(ctree);
        gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
+       gtk_drag_source_set(ctree, GDK_BUTTON1_MASK|GDK_BUTTON3_MASK, 
+                           mimeview_mime_types, 1, GDK_ACTION_COPY);
 
        g_signal_connect(G_OBJECT(selection), "changed",
                         G_CALLBACK(mimeview_selected), mimeview);
-       g_signal_connect(G_OBJECT(ctree), "button-release-event",
+       g_signal_connect(G_OBJECT(ctree), "button_release_event",
                         G_CALLBACK(mimeview_button_pressed), mimeview);
-       g_signal_connect(G_OBJECT(ctree), "key-press-event",
+       g_signal_connect(G_OBJECT(ctree), "key_press_event",
                         G_CALLBACK(mimeview_key_pressed), mimeview);
-       g_signal_connect(G_OBJECT (ctree),"drag-begin",
-                        G_CALLBACK (mimeview_start_drag), mimeview);
-       g_signal_connect(G_OBJECT(ctree), "drag-data-get",
+       g_signal_connect(G_OBJECT(ctree), "drag_data_get",
                         G_CALLBACK(mimeview_drag_data_get), mimeview);
 
        mime_notebook = gtk_notebook_new();
@@ -1449,24 +1445,6 @@ static void mimeview_selected(GtkTreeSelection *selection, MimeView *mimeview)
        }
 }
 
-static void mimeview_start_drag(GtkWidget *widget, gint button,
-                               GdkEvent *event, MimeView *mimeview)
-{
-       GdkDragContext *context;
-       MimeInfo *partinfo;
-
-       cm_return_if_fail(mimeview != NULL);
-
-       partinfo = mimeview_get_selected_part(mimeview);
-       if (partinfo == NULL || 
-           partinfo->disposition == DISPOSITIONTYPE_INLINE)
-               return;
-
-       context = gtk_drag_begin(widget, mimeview->target_list,
-                                GDK_ACTION_COPY, button, event);
-       gtk_drag_set_icon_default(context);
-}
-
 static gint mimeview_button_pressed(GtkWidget *widget, GdkEventButton *event,
                                    MimeView *mimeview)
 {