[gthumb] give focus to the viewer after it's mapped

[Paolo Bacchilega <paobac src gnome org>]

commit 5246ad99bfaf19fcd9e031a98f4e7ee68e552afb
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sat Feb 20 10:53:28 2010 +0100

    give focus to the viewer after it's mapped
    
    [bug #608364]

 extensions/image_viewer/gth-image-viewer-page.c |   14 ++++++++++++++
 gthumb/gth-image-viewer.c                       |    3 ++-
 2 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/extensions/image_viewer/gth-image-viewer-page.c b/extensions/image_viewer/gth-image-viewer-page.c
index b085699..2315100 100644
--- a/extensions/image_viewer/gth-image-viewer-page.c
+++ b/extensions/image_viewer/gth-image-viewer-page.c
@@ -248,6 +248,16 @@ viewer_scroll_event_cb (GtkWidget 	   *widget,
 
 
 static gboolean
+viewer_image_map_event_cb (GtkWidget          *widget,
+			   GdkEvent           *event,
+			   GthImageViewerPage *self)
+{
+	gth_viewer_page_focus (GTH_VIEWER_PAGE (self));
+	return FALSE;
+}
+
+
+static gboolean
 viewer_key_press_cb (GtkWidget          *widget,
 		     GdkEventKey        *event,
 		     GthImageViewerPage *self)
@@ -428,6 +438,10 @@ gth_image_viewer_page_real_activate (GthViewerPage *base,
 				"scroll_event",
 				G_CALLBACK (viewer_scroll_event_cb),
 				self);
+	g_signal_connect_after (G_OBJECT (self->priv->viewer),
+				"map_event",
+				G_CALLBACK (viewer_image_map_event_cb),
+				self);
 	g_signal_connect (G_OBJECT (self->priv->viewer),
 			  "key_press_event",
 			  G_CALLBACK (viewer_key_press_cb),
diff --git a/gthumb/gth-image-viewer.c b/gthumb/gth-image-viewer.c
index 8624913..c3f7ffd 100644
--- a/gthumb/gth-image-viewer.c
+++ b/gthumb/gth-image-viewer.c
@@ -349,7 +349,8 @@ gth_image_viewer_realize (GtkWidget *widget)
 				  | GDK_BUTTON_RELEASE_MASK
 				  | GDK_POINTER_MOTION_MASK
 				  | GDK_POINTER_MOTION_HINT_MASK
-				  | GDK_BUTTON_MOTION_MASK);
+				  | GDK_BUTTON_MOTION_MASK
+				  | GDK_STRUCTURE_MASK);
 
 	attributes_mask        = (GDK_WA_X
 				  | GDK_WA_Y