added a GtkWindow argument for callers to specify the parent window.

2003-06-27  Rodrigo Moya <rodrigo@ximian.com>

	* gui/dialogs/send-comp.[ch] (send_component_dialog):
	* gui/dialogs/cancel-comp.[ch] (cancel_component_dialog): added a
	GtkWindow argument for callers to specify the parent window.

	* gui/dialogs/changed-comp.[ch] (changed_component_dialog): added
	'parent' argument and use GtkMessageDialog instead of
	gnome_question_dialog.

	* gui/e-calendar-table.c (e_calendar_table_delete_selected):
	* gui/e-day-view.c (e_day_view_delete_event_internal,
	  e_day_view_on_cut, e_day_view_finish_long_event_resize,
	  e_day_view_finish_resize, e_day_view_on_editting_stopped,
	  e_day_view_on_top_canvas_drag_data_received, selection_received):
	* gui/e-week-view.c (e_week_view_delete_event_internal,
	  e_week_view_on_cut, e_week_view_on_editing_stopped,
	  selection_received):
	* gui/dialogs/event-editor.c (cancel_meeting_cmd):
	* gui/dialogs/task-editor.c (cancel_task_cmd):
	* gui/dialogs/comp-editor.c (delete_cmd, obj_removed_cb): pass the parent window to
	the *_component_dialog() functions.

	* gui/dialogs/delete-comp.c (delete_component_dialog): use the 'widget'
	argument to get the parent window for the dialog.

svn path=/trunk/; revision=21684

1 files changed, 32 insertions, 13 deletions

diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index fcc24dc3d0..84fb5a4f89 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -4142,7 +4142,8 @@ e_day_view_delete_event_internal (EDayView *day_view, EDayViewEvent *event)
 		const char *uid;
 
 		if (itip_organizer_is_user (event->comp, day_view->client) 
-		    && cancel_component_dialog (day_view->client, event->comp, TRUE))
+		    && cancel_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (day_view),
+						day_view->client, event->comp, TRUE))
 			itip_send_comp (CAL_COMPONENT_METHOD_CANCEL, event->comp, day_view->client, NULL);
 
 		cal_component_get_uid (event->comp, &uid);
@@ -4278,7 +4279,8 @@ e_day_view_on_cut (GtkWidget *widget, gpointer data)
 	e_day_view_on_copy (widget, data);
 
 	if (itip_organizer_is_user (event->comp, day_view->client) 
-	    && cancel_component_dialog (day_view->client, event->comp, TRUE))
+	    && cancel_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (day_view),
+					day_view->client, event->comp, TRUE))
 		itip_send_comp (CAL_COMPONENT_METHOD_CANCEL, event->comp, day_view->client, NULL);
 
 	cal_component_get_uid (event->comp, &uid);
@@ -4912,7 +4914,9 @@ e_day_view_finish_long_event_resize (EDayView *day_view)
  
  		if (recur_component_dialog (comp, &mod, NULL)) {
  			if (cal_client_update_object_with_mod (day_view->client, comp, mod) == CAL_CLIENT_RESULT_SUCCESS) {
- 				if (itip_organizer_is_user (comp, day_view->client) && send_component_dialog (day_view->client, comp, FALSE))
+ 				if (itip_organizer_is_user (comp, day_view->client) &&
+				    send_component_dialog (gtk_widget_get_toplevel (day_view),
+							   day_view->client, comp, FALSE))
  					itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, day_view->client, NULL);
  			} else {
  				g_message ("e_day_view_finish_resize(): Could not update the object!");
@@ -4921,7 +4925,9 @@ e_day_view_finish_long_event_resize (EDayView *day_view)
  			gtk_widget_queue_draw (day_view->top_canvas);
  		}		
  	} else if (cal_client_update_object (day_view->client, comp) == CAL_CLIENT_RESULT_SUCCESS) {
- 		if (itip_organizer_is_user (comp, day_view->client) && send_component_dialog (day_view->client, comp, TRUE))
+ 		if (itip_organizer_is_user (comp, day_view->client) &&
+		    send_component_dialog (gtk_widget_get_toplevel (day_view),
+					   day_view->client, comp, TRUE))
   			itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, day_view->client, NULL);
   	} else {
   		g_message ("e_day_view_finish_long_event_resize(): Could not update the object!");
@@ -4990,7 +4996,9 @@ e_day_view_finish_resize (EDayView *day_view)
 
 		if (recur_component_dialog (comp, &mod, NULL)) {
 			if (cal_client_update_object_with_mod (day_view->client, comp, mod) == CAL_CLIENT_RESULT_SUCCESS) {
-				if (itip_organizer_is_user (comp, day_view->client) && send_component_dialog (day_view->client, comp, FALSE))
+				if (itip_organizer_is_user (comp, day_view->client) &&
+				    send_component_dialog (gtk_widget_get_toplevel (day_view),
+							   day_view->client, comp, FALSE))
 					itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, day_view->client, NULL);
 			} else {
 				g_message ("e_day_view_finish_resize(): Could not update the object!");
@@ -4999,7 +5007,8 @@ e_day_view_finish_resize (EDayView *day_view)
 			gtk_widget_queue_draw (day_view->main_canvas);
 		}		
 	} else if (cal_client_update_object (day_view->client, comp) == CAL_CLIENT_RESULT_SUCCESS) {
-		if (itip_organizer_is_user (comp, day_view->client) && send_component_dialog (day_view->client, comp, FALSE))
+		if (itip_organizer_is_user (comp, day_view->client) &&
+		    send_component_dialog (gtk_widget_get_toplevel (day_view), day_view->client, comp, FALSE))
 			itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, day_view->client, NULL);
 	} else {
 		g_message ("e_day_view_finish_resize(): Could not update the object!");
@@ -6549,7 +6558,8 @@ e_day_view_on_editing_stopped (EDayView *day_view,
 			if (recur_component_dialog (event->comp, &mod, NULL)) {
 				if (cal_client_update_object_with_mod (day_view->client, event->comp, mod) == CAL_CLIENT_RESULT_SUCCESS) {
 					if (itip_organizer_is_user (event->comp, day_view->client) 
-					    && send_component_dialog (day_view->client, event->comp, FALSE))
+					    && send_component_dialog (gtk_widget_get_toplevel (day_view),
+								      day_view->client, event->comp, FALSE))
 						itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, event->comp, 
 								day_view->client, NULL);
 				} else {
@@ -6557,7 +6567,9 @@ e_day_view_on_editing_stopped (EDayView *day_view,
 				}
 			}
 		} else if (cal_client_update_object (day_view->client, event->comp) == CAL_CLIENT_RESULT_SUCCESS) {
-			if (itip_organizer_is_user (event->comp, day_view->client) && send_component_dialog (day_view->client, event->comp, FALSE))
+			if (itip_organizer_is_user (event->comp, day_view->client) &&
+			    send_component_dialog (gtk_widget_get_toplevel (day_view),
+						   day_view->client, event->comp, FALSE))
 				itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, event->comp,
 						day_view->client, NULL);
 		} else {
@@ -7662,7 +7674,8 @@ e_day_view_on_top_canvas_drag_data_received  (GtkWidget          *widget,
 				if (recur_component_dialog (comp, &mod, NULL)) {
 					if (cal_client_update_object_with_mod (day_view->client, comp, mod) == CAL_CLIENT_RESULT_SUCCESS) {
 						if (itip_organizer_is_user (comp, day_view->client) 
-						    && send_component_dialog (day_view->client, comp, FALSE))
+						    && send_component_dialog (gtk_widget_get_toplevel (day_view),
+									      day_view->client, comp, FALSE))
 							itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, 
 									day_view->client, NULL);
 					} else {
@@ -7672,7 +7685,9 @@ e_day_view_on_top_canvas_drag_data_received  (GtkWidget          *widget,
 				}
 			} else if (cal_client_update_object (day_view->client, comp)
 			    == CAL_CLIENT_RESULT_SUCCESS) {
-				if (itip_organizer_is_user (comp, day_view->client) && send_component_dialog (day_view->client, comp, FALSE))
+				if (itip_organizer_is_user (comp, day_view->client) &&
+				    send_component_dialog (gtk_widget_get_toplevel (day_view),
+							   day_view->client, comp, FALSE))
 					itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp,
 							day_view->client, NULL);
 			} else {
@@ -7790,7 +7805,8 @@ e_day_view_on_main_canvas_drag_data_received  (GtkWidget          *widget,
 				if (recur_component_dialog (comp, &mod, NULL)) {
 					if (cal_client_update_object_with_mod (day_view->client, comp, mod) == CAL_CLIENT_RESULT_SUCCESS) {
 						if (itip_organizer_is_user (comp, day_view->client) 
-						    && send_component_dialog (day_view->client, comp, FALSE))
+						    && send_component_dialog (gtk_widget_get_toplevel (day_view),
+									      day_view->client, comp, FALSE))
 							itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, 
 									day_view->client, NULL);
 					} else {
@@ -7800,7 +7816,9 @@ e_day_view_on_main_canvas_drag_data_received  (GtkWidget          *widget,
 				}
 			} else if (cal_client_update_object (day_view->client, comp)
 			    == CAL_CLIENT_RESULT_SUCCESS) {
-				if (itip_organizer_is_user (comp, day_view->client) && send_component_dialog (day_view->client, comp, FALSE))
+				if (itip_organizer_is_user (comp, day_view->client) &&
+				    send_component_dialog (gtk_widget_get_toplevel (day_view),
+							   day_view->client, comp, FALSE))
 					itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp,
 							day_view->client, NULL);
 			} else {
@@ -7986,7 +8004,8 @@ selection_received (GtkWidget *invisible,
 
 		cal_client_update_object (day_view->client, comp);
 
-		if (itip_organizer_is_user (comp, day_view->client) && send_component_dialog (day_view->client, comp, TRUE))
+		if (itip_organizer_is_user (comp, day_view->client) && 
+		    send_component_dialog (gtk_widget_get_toplevel (day_view), day_view->client, comp, TRUE))
 			itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, day_view->client, NULL);
 
 		g_object_unref (comp);