about box & document-manager patch

[Jeroen Zwartepoorte <jeroen xs4all nl>]

Hi all,

This patch fixes the crash you get when bringing the about box up the
2nd time. It also fixes a bug where a modified untitled document is
being closed without warning when an existing file is opened.

OK to commit?

Jeroen


? .tm_project.cache
? about.patch
? anjuta2.patch
? anjuta2.schemas
? libanjuta/anjuta-marshal.c
? libanjuta/anjuta-marshal.h
? libanjuta/libanjuta-1.0.pc
? plugins/terminal.tar.gz
? plugins/terminal/Makefile
? plugins/terminal/Makefile.in
? plugins/terminal/anjuta-terminal.server
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/anjuta2/ChangeLog,v
retrieving revision 1.220
diff -u -r1.220 ChangeLog
--- ChangeLog	12 Jul 2002 20:29:20 -0000	1.220
+++ ChangeLog	14 Jul 2002 10:08:56 -0000
@@ -1,3 +1,10 @@
+2002-07-14  Jeroen Zwartepoorte  <jeroen xs4all nl>
+
+	* plugins/document-manager/anjuta-document-manager.c:
+	(anjuta_notebook_document_manager_open): Fix closing changed untitled
+	document on opening an existing file.
+	* src/window.c: (about_cmd): Fix about dialog crashing the 2nd time.
+
 2002-07-13 Roberto Majadas   <phoenix nova es>
 
 	* plugins/shell-output/shell-output-tool.c (shell_output_add_dialog_options):
Index: plugins/document-manager/anjuta-document-manager.c
===================================================================
RCS file: /cvs/gnome/anjuta2/plugins/document-manager/anjuta-document-manager.c,v
retrieving revision 1.23
diff -u -r1.23 anjuta-document-manager.c
--- plugins/document-manager/anjuta-document-manager.c	23 Jun 2002 15:39:03 -0000	1.23
+++ plugins/document-manager/anjuta-document-manager.c	14 Jul 2002 10:08:57 -0000
@@ -990,7 +990,8 @@
 
 	document = docman->current_document;
 
-	if (document != NULL && !anjuta_bonobo_document_is_untitled (ANJUTA_BONOBO_DOCUMENT (document))) {
+	if (document != NULL && (!anjuta_bonobo_document_is_untitled (ANJUTA_BONOBO_DOCUMENT (document)) ||
+				 anjuta_bonobo_document_is_changed (ANJUTA_BONOBO_DOCUMENT (document)))) {
 		document = ANJUTA_DOCUMENT (anjuta_bonobo_document_new (docman->ui_container));
 		if (anjuta_bonobo_document_load_uri (ANJUTA_BONOBO_DOCUMENT (document), string_uri)) {
 			add_doc (docman, document);
Index: src/window.c
===================================================================
RCS file: /cvs/gnome/anjuta2/src/window.c,v
retrieving revision 1.62
diff -u -r1.62 window.c
--- src/window.c	11 Jun 2002 17:26:59 -0000	1.62
+++ src/window.c	14 Jul 2002 10:08:58 -0000
@@ -202,11 +202,9 @@
 			 VERSION,
 			 _("Copyright Various Authors (C) 1998-2001"),
 			 "A Gnome based IDE", authors, NULL, NULL, NULL);
-		gtk_window_set_transient_for (GTK_WINDOW(about), GTK_WINDOW(window));
-#if 0
-		g_signal_connect(GTK_OBJECT (about), "destroy",
-				 G_CALLBACK (about_cmd_destroy), &about);
-#endif
+		gtk_window_set_transient_for (GTK_WINDOW (about),
+					      GTK_WINDOW (window));
+		g_object_add_weak_pointer (G_OBJECT (about), &about);
 		gtk_widget_show (about);
 	} else
 		gdk_window_raise (GTK_WIDGET (about)->window);