2011-10-29 [colin] 3.7.10cvs57

	* src/addr_compl.c
		Fix focus of completion window with gnome shell

diff --git a/ChangeLog b/ChangeLog
index ffd0efdfa032f74486eb742b209a1de7b7c7b016..46d0b788cdb64f5c0f58f26af64733a427c80293 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-29 [colin]     3.7.10cvs57
+
+       * src/addr_compl.c
+               Fix focus of completion window with gnome shell
+

 2011-10-29 [colin]     3.7.10cvs56
 
        * src/folderview.c
 2011-10-29 [colin]     3.7.10cvs56
 
        * src/folderview.c

diff --git a/PATCHSETS b/PATCHSETS
index 8d02e454e56da2a2070e60be51bc06241f65b936..6594be38469d0f77e91d2c3a28fffbe173711bad 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4260,3 +4260,4 @@
 ( cvs diff -u -r 1.382.2.588 -r 1.382.2.589 src/compose.c;  ) > 3.7.10cvs54.patchset
 ( cvs diff -u -r 1.17.2.45 -r 1.17.2.46 src/alertpanel.c;  cvs diff -u -r 1.274.2.332 -r 1.274.2.333 src/mainwindow.c;  ) > 3.7.10cvs55.patchset
 ( cvs diff -u -r 1.207.2.224 -r 1.207.2.225 src/folderview.c;  ) > 3.7.10cvs56.patchset
 ( cvs diff -u -r 1.382.2.588 -r 1.382.2.589 src/compose.c;  ) > 3.7.10cvs54.patchset
 ( cvs diff -u -r 1.17.2.45 -r 1.17.2.46 src/alertpanel.c;  cvs diff -u -r 1.274.2.332 -r 1.274.2.333 src/mainwindow.c;  ) > 3.7.10cvs55.patchset
 ( cvs diff -u -r 1.207.2.224 -r 1.207.2.225 src/folderview.c;  ) > 3.7.10cvs56.patchset

+( cvs diff -u -r 1.27.2.58 -r 1.27.2.59 src/addr_compl.c;  ) > 3.7.10cvs57.patchset

diff --git a/configure.ac b/configure.ac
index c9cd26a42a7cb8f2f85dd0c40232805d63b8f16d..9a7d43288edc653bf96f13341ae0e4f05c1dc585 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=56
+EXTRA_VERSION=57

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/addr_compl.c b/src/addr_compl.c
index b2b89a53e535dd31c54f3d5d10ffc740a5f33bd9..e2e5673bd1fd3abadf7cb02e654342a749f6adae 100644 (file)
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -849,13 +849,20 @@ static void addrcompl_resize_window( CompletionWindow *cw ) {
        gtk_widget_hide_all( cw->window );
        gtk_widget_show_all( cw->window );
        gtk_widget_size_request( cw->list_view, &r );
        gtk_widget_hide_all( cw->window );
        gtk_widget_show_all( cw->window );
        gtk_widget_size_request( cw->list_view, &r );

-
+printf("%d  + %d < %d\n", y, r.height, gdk_screen_height());

        /* Adjust window height to available screen space */
        /* Adjust window height to available screen space */

-       if( ( y + r.height ) > gdk_screen_height() ) {
-               gtk_window_set_resizable(GTK_WINDOW(cw->window), FALSE);
-               gtk_widget_set_size_request( cw->window, width, gdk_screen_height() - y );
-       } else
-               gtk_widget_set_size_request(cw->window, width, r.height);
+       if( y + r.height > gdk_screen_height())
+               r.height = gdk_screen_height() - y;
+
+       gtk_widget_set_size_request(cw->window, width, r.height);
+
+       gdk_pointer_grab(gtk_widget_get_window(cw->window), TRUE,
+                        GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK |
+                        GDK_BUTTON_RELEASE_MASK,
+                        NULL, NULL, GDK_CURRENT_TIME);
+       gdk_keyboard_grab(gtk_widget_get_window(cw->window), FALSE, GDK_CURRENT_TIME);
+       gtk_grab_add(cw->window);
+

 }
 
 static GdkPixbuf *group_pixbuf = NULL;
 }
 
 static GdkPixbuf *group_pixbuf = NULL;


@@ -1370,13 +1377,8 @@ static void address_completion_create_completion_window( GtkEntry *entry_ )
                         GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK |
                         GDK_BUTTON_RELEASE_MASK,
                         NULL, NULL, GDK_CURRENT_TIME);
                         GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK |
                         GDK_BUTTON_RELEASE_MASK,
                         NULL, NULL, GDK_CURRENT_TIME);

+       gdk_keyboard_grab(gtk_widget_get_window(window), FALSE, GDK_CURRENT_TIME);

        gtk_grab_add( window );
        gtk_grab_add( window );

-
-       /* XXX: GTK2 too??? 
-        *
-        * GTK1: this gets rid of the irritating focus rectangle that doesn't
-        * follow the selection */
-       gtkut_widget_set_can_focus(list_view, FALSE);

 }
 
 /**
 }
 
 /**