Changed the code in options and autopick call back in e-meeting-time-sel.c

so that the menus drop at appropriate positions as suggested in the report
of the bug #248133

svn path=/trunk/; revision=30918

2 files changed, 21 insertions, 12 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 3ac1889d31..78cf57f62d 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,15 +1,23 @@
+2005-12-21  P S Chakravarthi <pchakravarthi@novell.com>
+
+	Fixes #248133
+	* gui/e-meeting-time-sel.c :
+	modified the code in options and autopick call backs
+	so that the menu that drops is at appropriate position
+	as suggested in the bug report.
+
 2005-12-21  Johnny Jacob <johnnyjacob@gmail.com>
- 
- 	* gui/memos-component.c (impl_createControls): -> createView for
- 	new shell apis.
- 
+
+	* gui/memos-component.c (impl_createControls): -> createView for
+	new shell apis.
+
 2005-12-21  Not Zed  <NotZed@Ximian.com>
- 
- 	* gui/tasks-component.c (impl_createControls): same.
- 
- 	* gui/calendar-component.c (impl_createControls): ->createView for
- 	new shell apis.
- 
+
+	* gui/tasks-component.c (impl_createControls): same.
+
+	* gui/calendar-component.c (impl_createControls): ->createView for
+	new shell apis.
+
 2005-12-20  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes #324525
@@ -28,6 +36,7 @@
 	* gui/cal-search-bar.h: Re-order the bit-values in accordance to
 	re-ordered search-bar menu items.
 	
+>>>>>>> 1.2900
 2005-12-20  P S Chakravarthi <pchakravarthi@novell.com>  
 
 	Fixes #323955
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 46c8deb2f5..801347ce3b 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -1438,7 +1438,7 @@ e_meeting_time_selector_options_menu_position_callback (GtkMenu *menu,
 	/* Calculate our preferred position. */
 	gdk_window_get_origin (mts->options_button->window, x, y);
 	*x += mts->options_button->allocation.x;
-	*y += mts->options_button->allocation.y + mts->options_button->allocation.height / 2 - 2;
+	*y += mts->options_button->allocation.y + mts->options_button->allocation.height - 2;
 
 	/* Now make sure we are on the screen. */
 	gtk_widget_size_request (mts->options_menu, &menu_requisition);
@@ -1487,7 +1487,7 @@ e_meeting_time_selector_autopick_menu_position_callback (GtkMenu *menu,
 	/* Calculate our preferred position. */
 	gdk_window_get_origin (mts->autopick_button->window, x, y);
 	*x += mts->autopick_button->allocation.x;
-	*y += mts->autopick_button->allocation.y + mts->autopick_button->allocation.height / 2 - 2;
+	*y += mts->autopick_button->allocation.y + mts->autopick_button->allocation.height - 2;
 
 	/* Now make sure we are on the screen. */
 	gtk_widget_size_request (mts->autopick_menu, &menu_requisition);