[evolution-patches] 40536, transient-for on mail send-receive dialogue

[Not Zed <notzed ximian com>]

Patch sets a transient-for on the send-receive dialogue.

It also tracks the parent view xid in the evolution-shell-component
wrapper, so that the send-recieve button can find it easily.  I thought
this was the simplest/easiest/best approach for tracking it.  Also
allows any other callbacks on the component access to the same facility.

I dont know if UI has an opinion on this behaviour ...

 Z

? shell/2.diff
? shell/Evolution-Wombat-common.c
? shell/Evolution-Wombat-skels.c
? shell/Evolution-Wombat-stubs.c
? shell/Evolution-Wombat.h
? shell/GNOME_Evolution_Shell.oaf
? shell/GNOME_Evolution_Shell.oafinfo
? shell/e-shell-view.c.save
? shell/e-upgrade.c
? shell/shell.diff
? shell/zmem.log
? shell/importer/importer.c
? shell/importer/importer.h
? mail/GNOME_Evolution_Mail.oaf
? mail/GNOME_Evolution_Mail.oafinfo
? mail/Mail-common.c
? mail/Mail-skels.c
? mail/Mail-stubs.c
? mail/Mail.h
? mail/a
? mail/a.out
? mail/bak
? mail/blah.c
? mail/blah.ps
? mail/changes.diff
? mail/conf.keys
? mail/diff
? mail/econf.h
? mail/mail-config.c.save
? mail/mail-config.evolution
? mail/mail-send-recv.c.save
? mail/message-list.c.save
? mail/ml.diff
? mail/old
? mail/out
? mail/store_change.diff
? mail/test-mt
? mail/typescript
? mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.oaf
? mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.oaf.in
? mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf
? mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.oaf
? mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.oaf.in
? mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf
? mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.oaf
? mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.oaf.in
? mail/importers/b
? mail/importers/elm-importer.c.new
? mail/importers/elm.ps
Index: shell/evolution-shell-component.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/evolution-shell-component.c,v
retrieving revision 1.84
diff -r1.84 evolution-shell-component.c
81a82,83
> 	gulong parent_view_xid;
> 
503a506,510
> 	if (interactive)
> 		shell_component->priv->parent_view_xid = new_view_xid;
> 	else
> 		shell_component->priv->parent_view_xid = 0L;
> 
1125a1133,1140
> }
> 
> gulong evolution_shell_component_get_parent_view_xid(EvolutionShellComponent                            *shell_component)
> {
> 	g_return_val_if_fail (shell_component != NULL, 0);
> 	g_return_val_if_fail (EVOLUTION_IS_SHELL_COMPONENT (shell_component), 0);
> 
> 	return shell_component->priv->parent_view_xid;
Index: shell/evolution-shell-component.h
===================================================================
RCS file: /cvs/gnome/evolution/shell/evolution-shell-component.h,v
retrieving revision 1.44
diff -r1.44 evolution-shell-component.h
199a200,201
> gulong evolution_shell_component_get_parent_view_xid(EvolutionShellComponent                            *shell_component);
> 
Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.2675
diff -r1.2675 ChangeLog
0a1,9
> 2003-04-03  Not Zed  <NotZed Ximian com>
> 
> 	* component-factory.c (send_receive_cb): run the warning dialogue
> 	asynchronously.  Also, set the mail send/receive dialogue to
> 	transient for parent.
> 
> 	* mail-send-recv.c (mail_send_receive): return the dialogue for
> 	send/receive.
> 
Index: mail/component-factory.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/component-factory.c,v
retrieving revision 1.321
diff -r1.321 component-factory.c
40a41,42
> #include "e-util/e-dialog-utils.h"
> 
984c986,987
< 	
---
> 	GtkWidget *dialog;
> 
993,995c996
< 		GtkWidget *dialog;
< 		
< 		dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
---
> 		dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
997,1000c998,1002
< 		gtk_dialog_run ((GtkDialog *) dialog);
< 		gtk_widget_destroy (dialog);
< 		
< 		return;
---
> 		g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog);
> 		gtk_widget_show (dialog);
> 	} else {
> 		dialog = mail_send_receive ();
> 		e_dialog_set_transient_for_xid((GtkWindow *)dialog, evolution_shell_component_get_parent_view_xid(shell_component));
1002,1003d1003
< 	
< 	mail_send_receive ();
Index: mail/mail-send-recv.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-send-recv.c,v
retrieving revision 1.67
diff -r1.67 mail-send-recv.c
672c672
< void mail_send_receive (void)
---
> GtkWidget *mail_send_receive (void)
685c685
< 		return;
---
> 		return send_recv_dialogue;
689c689
< 		return;
---
> 		return send_recv_dialogue;
693c693
< 		return;
---
> 		return send_recv_dialogue;
728a729,730
> 
> 	return send_recv_dialogue;
Index: mail/mail-send-recv.h
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-send-recv.h,v
retrieving revision 1.9
diff -r1.9 mail-send-recv.h
34c34
< void mail_send_receive(void);
---
> GtkWidget *mail_send_receive(void);