2008-01-22 [holger] 3.2.0cvs59

	* src/addrduplicates.c
		Fix scrolling in addressbook duplicate
		finder result dialog

diff --git a/ChangeLog b/ChangeLog
index 42516af3371502ae96413ae92b763b45f32fb04a..12955dcd5c42079e967c501dc06a19e5cf9ed201 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-22 [holger]    3.2.0cvs59
+
+       * src/addrduplicates.c
+               Fix scrolling in addressbook duplicate
+               finder result dialog
+

 2008-01-21 [colin]     3.2.0cvs58
 
        * src/summaryview.c
 2008-01-21 [colin]     3.2.0cvs58
 
        * src/summaryview.c

diff --git a/PATCHSETS b/PATCHSETS
index 7f070f29ef315f5714cff4c09b62895d1aac9a33..34b612cec0ab2b3ef81e8e413cce28798ac70619 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3195,3 +3195,4 @@
 ( cvs diff -u -r 1.179.2.208 -r 1.179.2.209 src/imap.c;  cvs diff -u -r 1.1.4.94 -r 1.1.4.95 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.4.22 -r 1.1.4.23 src/etpan/imap-thread.h;  ) > 3.2.0cvs56.patchset
 ( cvs diff -u -r 1.100.2.58 -r 1.100.2.59 AUTHORS;  cvs diff -u -r 1.75.2.53 -r 1.75.2.54 src/matcher.c;  cvs diff -u -r 1.83.2.124 -r 1.83.2.125 src/mimeview.c;  cvs diff -u -r 1.9.2.25 -r 1.9.2.26 src/common/ssl.c;  cvs diff -u -r 1.1.2.44 -r 1.1.2.45 src/gtk/authors.h;  ) > 3.2.0cvs57.patchset
 ( cvs diff -u -r 1.395.2.351 -r 1.395.2.352 src/summaryview.c;  ) > 3.2.0cvs58.patchset
 ( cvs diff -u -r 1.179.2.208 -r 1.179.2.209 src/imap.c;  cvs diff -u -r 1.1.4.94 -r 1.1.4.95 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.4.22 -r 1.1.4.23 src/etpan/imap-thread.h;  ) > 3.2.0cvs56.patchset
 ( cvs diff -u -r 1.100.2.58 -r 1.100.2.59 AUTHORS;  cvs diff -u -r 1.75.2.53 -r 1.75.2.54 src/matcher.c;  cvs diff -u -r 1.83.2.124 -r 1.83.2.125 src/mimeview.c;  cvs diff -u -r 1.9.2.25 -r 1.9.2.26 src/common/ssl.c;  cvs diff -u -r 1.1.2.44 -r 1.1.2.45 src/gtk/authors.h;  ) > 3.2.0cvs57.patchset
 ( cvs diff -u -r 1.395.2.351 -r 1.395.2.352 src/summaryview.c;  ) > 3.2.0cvs58.patchset

+( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/addrduplicates.c;  ) > 3.2.0cvs59.patchset

diff --git a/configure.ac b/configure.ac
index 8a3a90b1f7ea18a9d05c0f95c9effb56ec0a445d..af75cfb4c31534c69a04000841f88b86e79248d8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=58
+EXTRA_VERSION=59

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/addrduplicates.c b/src/addrduplicates.c
index da0543d6720e4db4a42d9d5c723e8935656f4ca6..59fd75994eeafef136fe613ca8946fef3a4f0806 100644 (file)
--- a/src/addrduplicates.c
+++ b/src/addrduplicates.c
@@ -365,8 +365,7 @@ static void present_finder_results(GtkWindow *parent)
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_win),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_win),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);

-       gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_win),
-                                             email_view);
+       gtk_container_add(GTK_CONTAINER(scrolled_win), email_view);

 
        gtk_paned_add1(GTK_PANED(hpaned), scrolled_win);
 
 
        gtk_paned_add1(GTK_PANED(hpaned), scrolled_win);
 


@@ -374,8 +373,7 @@ static void present_finder_results(GtkWindow *parent)
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_win),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_win),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);

-       gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_win),
-                                             detail_view);
+       gtk_container_add(GTK_CONTAINER(scrolled_win), detail_view);

 
        if (prefs_common.addressbook_use_editaddress_dialog) {
                gtk_paned_add2(GTK_PANED(hpaned), scrolled_win);
 
        if (prefs_common.addressbook_use_editaddress_dialog) {
                gtk_paned_add2(GTK_PANED(hpaned), scrolled_win);