* src/widgets/modest-attachment-view.c:

        * Set better the event box initialisation.
* src/widgets/modest-attachments-view.c:
        * Not it uses internally the absolute position of the events and
          specific attachment views. This finally fixes a hard bug.
          (fixes NB#58394).
* src/maemo/modest-addressbook.c:
        * Uses the synchronous call to open the address book on
          selecting addresses.

pmo-trunk-r2262

diff --git a/src/maemo/modest-address-book.c b/src/maemo/modest-address-book.c
index 0479a6d..eccf77f 100644 (file)
--- a/src/maemo/modest-address-book.c
+++ b/src/maemo/modest-address-book.c
@@ -164,7 +164,7 @@ modest_address_book_select_addresses (ModestRecptEditor *recpt_editor)
        toplevel = gtk_widget_get_toplevel (GTK_WIDGET (recpt_editor));
 
        contact_model = osso_abook_contact_model_new ();
-       if (!open_addressbook ()) {
+       if (!open_addressbook_sync ()) {
                if (contact_model) {
                        g_object_unref (contact_model);
                        contact_model = NULL;

diff --git a/src/widgets/modest-attachment-view.c b/src/widgets/modest-attachment-view.c
index 13a0dbd..da3456a 100644 (file)
--- a/src/widgets/modest-attachment-view.c
+++ b/src/widgets/modest-attachment-view.c
@@ -321,7 +321,9 @@ modest_attachment_view_instance_init (GTypeInstance *instance, gpointer g_class)
        
        pango_layout_set_ellipsize (priv->layout_full_filename, PANGO_ELLIPSIZE_NONE);
 
-       gtk_event_box_set_above_child (GTK_EVENT_BOX (instance), TRUE);
+       gtk_event_box_set_above_child (GTK_EVENT_BOX (instance), FALSE);
+       gtk_event_box_set_visible_window (GTK_EVENT_BOX (instance), TRUE);
+       gtk_widget_set_events (GTK_WIDGET (instance), 0);
 
        GTK_WIDGET_UNSET_FLAGS (GTK_WIDGET (instance), GTK_CAN_FOCUS);
 

diff --git a/src/widgets/modest-attachments-view.c b/src/widgets/modest-attachments-view.c
index 2ed99c7..bc5f823 100644 (file)
--- a/src/widgets/modest-attachments-view.c
+++ b/src/widgets/modest-attachments-view.c
@@ -318,20 +318,15 @@ button_press_event (GtkWidget *widget,
                    GdkEventButton *event,
                    ModestAttachmentsView *atts_view)
 {
-       gint widget_x, widget_y;
        ModestAttachmentsViewPrivate *priv = MODEST_ATTACHMENTS_VIEW_GET_PRIVATE (atts_view);
        if (!GTK_WIDGET_HAS_FOCUS (widget))
                gtk_widget_grab_focus (widget);
 
        if (event->button == 1 && event->type == GDK_BUTTON_PRESS) {
                GtkWidget *att_view = NULL;
-               GdkWindow *parent_window;
-
-               parent_window = gtk_widget_get_parent_window (widget);
-               gdk_window_get_origin (parent_window, &widget_x, &widget_y);
 
                att_view = get_att_view_at_coords (MODEST_ATTACHMENTS_VIEW (widget), 
-                                                  ((gint) event->x_root) - widget_x, ((gint) event->y_root) - widget_y);
+                                                  (gint) event->x_root, (gint) event->y_root);
 
                if (att_view != NULL) {
                        if (GTK_WIDGET_STATE (att_view) == GTK_STATE_SELECTED && (g_list_length (priv->selected) < 2)) {
@@ -358,15 +353,10 @@ button_release_event (GtkWidget *widget,
 {
        ModestAttachmentsViewPrivate *priv = MODEST_ATTACHMENTS_VIEW_GET_PRIVATE (atts_view);
        if (widget == gtk_grab_get_current ()) {
-               GdkWindow *parent_window;
                GtkWidget *att_view = NULL;
-               gint widget_x, widget_y;
-
-               parent_window = gtk_widget_get_parent_window (widget);
-               gdk_window_get_origin (parent_window, &widget_x, &widget_y);
 
                att_view = get_att_view_at_coords (MODEST_ATTACHMENTS_VIEW (widget), 
-                                                  ((gint) event->x_root) - widget_x, ((gint) event->y_root) - widget_y);
+                                                  (gint) event->x_root, (gint) event->y_root);
 
                if (att_view != NULL) {
                        unselect_all (MODEST_ATTACHMENTS_VIEW (widget));
@@ -375,7 +365,6 @@ button_release_event (GtkWidget *widget,
                                      MODEST_ATTACHMENT_VIEW (att_view));
                }
                priv->rubber_start = NULL;
-               
                gtk_grab_remove (widget);
        }
        return TRUE;
@@ -389,14 +378,9 @@ motion_notify_event (GtkWidget *widget,
        ModestAttachmentsViewPrivate *priv = MODEST_ATTACHMENTS_VIEW_GET_PRIVATE (atts_view);
        if (gtk_grab_get_current () == widget) {
                GtkWidget *att_view = NULL;
-               GdkWindow *parent_window;
-               gint widget_x, widget_y;
-
-               parent_window = gtk_widget_get_parent_window (widget);
-               gdk_window_get_origin (parent_window, &widget_x, &widget_y);
 
                att_view = get_att_view_at_coords (MODEST_ATTACHMENTS_VIEW (widget), 
-                                                  ((gint) event->x_root) - widget_x, ((gint) event->y_root) - widget_y);
+                                                  (gint) event->x_root, (gint) event->y_root);
 
                if (att_view != NULL) {
                        unselect_all (MODEST_ATTACHMENTS_VIEW (widget));
@@ -525,9 +509,12 @@ get_att_view_at_coords (ModestAttachmentsView *atts_view,
        for (node = att_view_list; node != NULL; node = g_list_next (node)) {
                GtkWidget *att_view = (GtkWidget *) node->data;
                gint pos_x, pos_y, w, h, int_x, int_y;
+               gint widget_x, widget_y;
+
+               gdk_window_get_origin (att_view->window, &widget_x, &widget_y);
 
-               pos_x = att_view->allocation.x;
-               pos_y = att_view->allocation.y;
+               pos_x = widget_x;
+               pos_y = widget_y;
                w = att_view->allocation.width;
                h = att_view->allocation.height;