[evolution-patches] [addressbook] Patch for Bug #218273

[Devashish <sdevashish novell com>]

Hi 

The attached patch is a fix for 218273.

Thanks
Devashish

Index: addressbook/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1990
diff -u -p -r1.1990 ChangeLog
--- addressbook/ChangeLog	26 Aug 2005 05:39:33 -0000	1.1990
+++ addressbook/ChangeLog	5 Sep 2005 08:44:52 -0000
@@ -1,3 +1,17 @@
+2005-09-05  Devashish Sharma <sdevashish novell com>
+
+	* gui/widgets/e-addressbook-view.c (display_view): Changed the
+	parameter passed to gal_view_minicard_attach.
+	
+	* gui/widgets/gal-view-minicard.c (column_width_changed): Sets the
+	horizontal scroll amount for the addresss card view to the current
+	page size. 
+	
+	* gui/widgets/gal-view-minicard.h: Changed function prototype for
+	gal_view_minicard_attach. Passing EABView instead of
+	EMinicardViewWidget.
+	Fixes Bug#218273
+	
 2005-08-26  Devashish Sharma <sdevashish novell com>
 
 	* gui/widgets/e-addressbook-view.etspec: In ETableSpecification source
Index: addressbook/gui/widgets/e-addressbook-view.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-addressbook-view.c,v
retrieving revision 1.170
diff -u -p -r1.170 e-addressbook-view.c
--- addressbook/gui/widgets/e-addressbook-view.c	24 Aug 2005 03:06:51 -0000	1.170
+++ addressbook/gui/widgets/e-addressbook-view.c	5 Sep 2005 08:42:44 -0000
@@ -603,7 +603,7 @@ display_view(GalViewInstance *instance,
 	}
 	else if (GAL_IS_VIEW_MINICARD(view)) {
 		change_view_type (address_view, EAB_VIEW_MINICARD);
-		gal_view_minicard_attach (GAL_VIEW_MINICARD (view), E_MINICARD_VIEW_WIDGET (address_view->object));
+		gal_view_minicard_attach (GAL_VIEW_MINICARD (view), address_view);
 	}
 #ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
 	else if (GAL_IS_VIEW_TREEVIEW (view)) {
Index: addressbook/gui/widgets/gal-view-minicard.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/gal-view-minicard.c,v
retrieving revision 1.14
diff -u -p -r1.14 gal-view-minicard.c
--- addressbook/gui/widgets/gal-view-minicard.c	17 Jun 2005 15:20:26 -0000	1.14
+++ addressbook/gui/widgets/gal-view-minicard.c	5 Sep 2005 08:44:38 -0000
@@ -179,20 +179,27 @@ gal_view_minicard_get_type        (void)
 }
 
 static void
-column_width_changed (EMinicardViewWidget *w, double width, GalViewMinicard *view)
+column_width_changed (EMinicardViewWidget *w, double width, EABView *address_view)
 {
+	GalViewMinicard *view = GAL_VIEW_MINICARD (gal_view_instance_get_current_view (address_view->view_instance));
 	d(g_print("%s: Old width = %f, New width = %f\n", G_GNUC_FUNCTION, view->column_width, width));
 	if (view->column_width != width) {
 		view->column_width = width;
 		gal_view_changed(GAL_VIEW(view));
 	}
+
+	GtkScrolledWindow * scrolled_window = GTK_SCROLLED_WINDOW(address_view->widget);
+	GtkAdjustment *adj = gtk_scrolled_window_get_hadjustment (scrolled_window);
+	GtkAdjustment *adj_new = gtk_adjustment_new(adj->value, adj->lower, adj->upper, adj->page_size, adj->page_increment,adj->page_size);
+	gtk_scrolled_window_set_hadjustment(scrolled_window, adj_new);
 }
 
 void
-gal_view_minicard_attach (GalViewMinicard *view, EMinicardViewWidget *emvw)
+gal_view_minicard_attach (GalViewMinicard *view, EABView *address_view)
 {
 	gal_view_minicard_detach (view);
 
+	EMinicardViewWidget *emvw = E_MINICARD_VIEW_WIDGET (address_view->object);
 	view->emvw = emvw;
 
 	g_object_ref (view->emvw);
@@ -203,7 +210,7 @@ gal_view_minicard_attach (GalViewMinicar
 
 	view->emvw_column_width_changed_id =
 		g_signal_connect(view->emvw, "column_width_changed",
-				 G_CALLBACK (column_width_changed), view);
+				 G_CALLBACK (column_width_changed), address_view);
 }
 
 void
Index: addressbook/gui/widgets/gal-view-minicard.h
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/gal-view-minicard.h,v
retrieving revision 1.6
diff -u -p -r1.6 gal-view-minicard.h
--- addressbook/gui/widgets/gal-view-minicard.h	17 Jun 2005 15:20:26 -0000	1.6
+++ addressbook/gui/widgets/gal-view-minicard.h	5 Sep 2005 08:44:38 -0000
@@ -12,6 +12,7 @@
 
 #include <widgets/menus/gal-view.h>
 #include <e-minicard-view-widget.h>
+#include "e-addressbook-view.h"
 
 #define GAL_TYPE_VIEW_MINICARD        (gal_view_minicard_get_type ())
 #define GAL_VIEW_MINICARD(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), GAL_TYPE_VIEW_MINICARD, GalViewMinicard))
@@ -39,7 +40,7 @@ GalView *gal_view_minicard_new        (c
 GalView *gal_view_minicard_construct  (GalViewMinicard     *view,
 				       const gchar         *title);
 void     gal_view_minicard_attach     (GalViewMinicard     *view,
-				       EMinicardViewWidget *emvw);
+				       EABView *address_view);
 void     gal_view_minicard_detach     (GalViewMinicard     *view);
 
 #endif /* _GAL_VIEW_MINICARD_H_ */