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

12 files changed, 36 insertions, 24 deletions

diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c
index 0e48dd3763..e9efe92d99 100644
--- a/calendar/gui/dialogs/cancel-comp.c
+++ b/calendar/gui/dialogs/cancel-comp.c
@@ -40,7 +40,7 @@
  * Return value: TRUE if the user clicked Yes, FALSE otherwise.
  **/
 gboolean
-cancel_component_dialog (CalClient *client, CalComponent *comp, gboolean deleting)
+cancel_component_dialog (GtkWindow *parent, CalClient *client, CalComponent *comp, gboolean deleting)
 {
 	GtkWidget *dialog;
 	CalComponentVType vtype;
@@ -81,12 +81,12 @@ cancel_component_dialog (CalClient *client, CalComponent *comp, gboolean deletin
 		break;
 
 	default:
-		g_message ("send_component_dialog(): "
+		g_message ("cancel_component_dialog(): "
 			   "Cannot handle object of type %d", vtype);
 		return FALSE;
 	}
 	
-	dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
+	dialog = gtk_message_dialog_new (parent, GTK_DIALOG_MODAL,
 					 GTK_MESSAGE_QUESTION,
 					 GTK_BUTTONS_YES_NO, str);
 
diff --git a/calendar/gui/dialogs/cancel-comp.h b/calendar/gui/dialogs/cancel-comp.h
index 9c31a49fd8..7dfb0fae31 100644
--- a/calendar/gui/dialogs/cancel-comp.h
+++ b/calendar/gui/dialogs/cancel-comp.h
@@ -25,6 +25,6 @@
 #include <cal-client/cal-client.h>
 #include <cal-util/cal-component.h>
 
-gboolean cancel_component_dialog (CalClient *client, CalComponent *comp, gboolean deleting);
+gboolean cancel_component_dialog (GtkWindow *parent, CalClient *client, CalComponent *comp, gboolean deleting);
 
 #endif
diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c
index 7fa2c1d0be..6d7ab0fc49 100644
--- a/calendar/gui/dialogs/changed-comp.c
+++ b/calendar/gui/dialogs/changed-comp.c
@@ -23,9 +23,8 @@
 #endif
 
 #include <glib.h>
+#include <gtk/gtkmessagedialog.h>
 #include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
 #include <libgnomeui/gnome-uidefs.h>
 #include <gal/widgets/e-unicode.h>
 #include "changed-comp.h"
@@ -34,6 +33,7 @@
 
 /**
  * changed_component_dialog:
+ * @parent: Parent window for the dialog.
  * @comp: A calendar component
  * @deleted: Whether the object is being deleted or updated
  * @changed: Whether or not the user has made changes
@@ -44,11 +44,12 @@
  * Return value: TRUE if the user clicked Yes, FALSE otherwise.
  **/
 gboolean
-changed_component_dialog (CalComponent *comp, gboolean deleted, gboolean changed)
+changed_component_dialog (GtkWindow *parent, CalComponent *comp, gboolean deleted, gboolean changed)
 {
 	GtkWidget *dialog;
 	CalComponentVType vtype;
 	char *str;
+	gint response;
 
 	vtype = cal_component_get_vtype (comp);
 
@@ -101,9 +102,14 @@ changed_component_dialog (CalComponent *comp, gboolean deleted, gboolean changed
 			str = g_strdup_printf (_("%s  You have made no changes, update the editor?"), str); 
 	}
 	
-	dialog = gnome_question_dialog_modal (str, NULL, NULL);
+	dialog = gtk_message_dialog_new (parent, GTK_DIALOG_MODAL,
+					 GTK_MESSAGE_QUESTION,
+					 GTK_BUTTONS_YES_NO, str);
 
-	if (gnome_dialog_run (GNOME_DIALOG (dialog)) == GNOME_YES)
+	response = gtk_dialog_run (GTK_DIALOG (dialog));
+	gtk_widget_destroy (dialog);
+
+	if (response == GTK_RESPONSE_YES)
 		return TRUE;
 	else
 		return FALSE;
diff --git a/calendar/gui/dialogs/changed-comp.h b/calendar/gui/dialogs/changed-comp.h
index 915d7a5372..a29e1a5fc4 100644
--- a/calendar/gui/dialogs/changed-comp.h
+++ b/calendar/gui/dialogs/changed-comp.h
@@ -22,8 +22,9 @@
 #define CHANGED_COMP_H
 
 #include <glib.h>
+#include <gtk/gtkwindow.h>
 #include <cal-util/cal-component.h>
 
-gboolean changed_component_dialog (CalComponent *comp, gboolean deleted, gboolean changed);
+gboolean changed_component_dialog (GtkWindow *window, CalComponent *comp, gboolean deleted, gboolean changed);
 
 #endif
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index d1712eca03..62612975d2 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -371,7 +371,7 @@ save_comp_with_send (CompEditor *editor)
 	if (!save_comp (editor))
 		return FALSE;
 
- 	if (send && send_component_dialog (priv->client, priv->comp, !priv->existing_org)) {
+ 	if (send && send_component_dialog ((GtkWindow *) editor, priv->client, priv->comp, !priv->existing_org)) {
  		if (itip_organizer_is_user (priv->comp, priv->client))
  			return comp_editor_send_comp (editor, CAL_COMPONENT_METHOD_REQUEST);
  		else
@@ -1312,7 +1312,8 @@ delete_cmd (GtkWidget *widget, gpointer data)
 
 	if (delete_component_dialog (priv->comp, FALSE, 1, vtype, GTK_WIDGET (editor))) {
 		if (itip_organizer_is_user (priv->comp, priv->client) 
-		    && cancel_component_dialog (priv->client, priv->comp, TRUE))
+		    && cancel_component_dialog ((GtkWindow *) editor,
+						priv->client, priv->comp, TRUE))
 			itip_send_comp (CAL_COMPONENT_METHOD_CANCEL, priv->comp, priv->client, NULL);
 
 		delete_comp (editor);
@@ -1448,7 +1449,7 @@ obj_updated_cb (CalClient *client, const char *uid, gpointer data)
 	cal_component_get_uid (priv->comp, &edit_uid);
 
 	if (!strcmp (uid, edit_uid) && !priv->updating) {
-		if (changed_component_dialog (priv->comp, FALSE, priv->changed)) {
+		if (changed_component_dialog ((GtkWindow *) editor, priv->comp, FALSE, priv->changed)) {
 			status = cal_client_get_object (priv->client, uid, &comp);
 			if (status == CAL_CLIENT_GET_SUCCESS) {
 				comp_editor_edit_comp (editor, comp);
@@ -1475,7 +1476,7 @@ obj_removed_cb (CalClient *client, const char *uid, gpointer data)
 	cal_component_get_uid (priv->comp, &edit_uid);
 
 	if (!strcmp (uid, edit_uid) && !priv->updating) {
-		if (changed_component_dialog (priv->comp, TRUE, priv->changed))
+		if (changed_component_dialog ((GtkWindow *) editor, priv->comp, TRUE, priv->changed))
 			close_dialog (editor);
 	}
 }
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
index 995eed72d3..b222bc7285 100644
--- a/calendar/gui/dialogs/delete-comp.c
+++ b/calendar/gui/dialogs/delete-comp.c
@@ -150,10 +150,11 @@ delete_component_dialog (CalComponent *comp,
 		}
 	}
 
-	dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", str);
+	dialog = gtk_message_dialog_new (gtk_widget_get_toplevel (widget),
+					 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", str);
 	g_free (str);
-	ret = gtk_dialog_run((GtkDialog *)dialog) == GTK_RESPONSE_YES;
-	gtk_widget_destroy(dialog);
+	ret = gtk_dialog_run ((GtkDialog *)dialog) == GTK_RESPONSE_YES;
+	gtk_widget_destroy (dialog);
 
 	return ret;
 }
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 93d0a39c53..a67f2b14f9 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -481,7 +481,8 @@ cancel_meeting_cmd (GtkWidget *widget, gpointer data)
 	CalComponent *comp;
 	
 	comp = comp_editor_get_current_comp (COMP_EDITOR (ee));
-	if (cancel_component_dialog (comp_editor_get_cal_client (COMP_EDITOR (ee)), comp, FALSE)) {
+	if (cancel_component_dialog ((GtkWindow *) ee,
+				     comp_editor_get_cal_client (COMP_EDITOR (ee)), comp, FALSE)) {
 		comp_editor_send_comp (COMP_EDITOR (ee), CAL_COMPONENT_METHOD_CANCEL);
 		comp_editor_delete_comp (COMP_EDITOR (ee));
 	}
diff --git a/calendar/gui/dialogs/recur-comp.c b/calendar/gui/dialogs/recur-comp.c
index 81db34733c..caf3e59196 100644
--- a/calendar/gui/dialogs/recur-comp.c
+++ b/calendar/gui/dialogs/recur-comp.c
@@ -64,7 +64,7 @@ recur_component_dialog (CalComponent *comp,
 	}
 
 
-	dialog = gtk_message_dialog_new(parent, 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, "%s", str);
+	dialog = gtk_message_dialog_new (parent, 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, "%s", str);
 	g_free (str);
 	
 	hbox = gtk_hbox_new (FALSE, 2);
diff --git a/calendar/gui/dialogs/recur-comp.h b/calendar/gui/dialogs/recur-comp.h
index 7c3472853b..123e55e779 100644
--- a/calendar/gui/dialogs/recur-comp.h
+++ b/calendar/gui/dialogs/recur-comp.h
@@ -21,7 +21,7 @@
 #ifndef RECUR_COMP_H
 #define RECUR_COMP_H
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtkwindow.h>
 #include <cal-util/cal-component.h>
 #include <cal-util/cal-util.h>
 
diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c
index de89d607c2..0ca96ead7b 100644
--- a/calendar/gui/dialogs/send-comp.c
+++ b/calendar/gui/dialogs/send-comp.c
@@ -40,7 +40,7 @@
  * Return value: TRUE if the user clicked Yes, FALSE otherwise.
  **/
 gboolean
-send_component_dialog (CalClient *client, CalComponent *comp, gboolean new)
+send_component_dialog (GtkWindow *parent, CalClient *client, CalComponent *comp, gboolean new)
 {
 	GtkWidget *dialog;
 	CalComponentVType vtype;
@@ -80,7 +80,7 @@ send_component_dialog (CalClient *client, CalComponent *comp, gboolean new)
 		return FALSE;
 	}
 	
-	dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
+	dialog = gtk_message_dialog_new (parent, GTK_DIALOG_MODAL,
 					 GTK_MESSAGE_QUESTION,
 					 GTK_BUTTONS_YES_NO, str);
 
diff --git a/calendar/gui/dialogs/send-comp.h b/calendar/gui/dialogs/send-comp.h
index d7e990e5b1..e02bd74d1e 100644
--- a/calendar/gui/dialogs/send-comp.h
+++ b/calendar/gui/dialogs/send-comp.h
@@ -22,9 +22,10 @@
 #define SEND_COMP_H
 
 #include <glib.h>
+#include <gtk/gtkwindow.h>
 #include <cal-client/cal-client.h>
 #include <cal-util/cal-component.h>
 
-gboolean send_component_dialog (CalClient *client, CalComponent *comp, gboolean new);
+gboolean send_component_dialog (GtkWindow *parent, CalClient *client, CalComponent *comp, gboolean new);
 
 #endif
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index f5add85a29..891520c95d 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -428,7 +428,8 @@ cancel_task_cmd (GtkWidget *widget, gpointer data)
 	CalComponent *comp;
 	
 	comp = comp_editor_get_current_comp (COMP_EDITOR (te));
-	if (cancel_component_dialog (comp_editor_get_cal_client (COMP_EDITOR (te)), comp, FALSE)) {
+	if (cancel_component_dialog ((GtkWindow *) te,
+				     comp_editor_get_cal_client (COMP_EDITOR (te)), comp, FALSE)) {
 		comp_editor_send_comp (COMP_EDITOR (te), CAL_COMPONENT_METHOD_CANCEL);
 		comp_editor_delete_comp (COMP_EDITOR (te));
 	}