anjuta r3951 - in trunk: . plugins/debug-manager plugins/gdb

[sgranjoux svn gnome org]

Author: sgranjoux
Date: Sun May 25 11:03:59 2008
New Revision: 3951
URL: http://svn.gnome.org/viewvc/anjuta?rev=3951&view=rev

Log:
	* plugins/debug-manager/debug_tree.c:
	Fix a crash when changing a watch while debugger is stopped

	* plugins/gdb/plugin.c,
	plugins/gdb/anjuta-gdb.plugin.in:
	Allow loading application/octet-stream mime type


Modified:
   trunk/ChangeLog
   trunk/plugins/debug-manager/debug_tree.c
   trunk/plugins/gdb/anjuta-gdb.plugin.in
   trunk/plugins/gdb/plugin.c

Modified: trunk/plugins/debug-manager/debug_tree.c
==============================================================================
--- trunk/plugins/debug-manager/debug_tree.c	(original)
+++ trunk/plugins/debug-manager/debug_tree.c	Sun May 25 11:03:59 2008
@@ -637,7 +637,7 @@
 									 
 	gtk_tree_model_get (model, iter, DTREE_ENTRY_COLUMN, &data, -1);
 
-	if ((data != NULL) && (data->name != NULL))
+	if ((data != NULL) && (data->name != NULL) && (tree->debugger != NULL))
 	{
 		DmaVariablePacket *pack;
 					
@@ -648,10 +648,6 @@
 						(IAnjutaDebuggerCallback)gdb_var_list_children,
 						pack);
 	}
-	else
-	{
-		DEBUG_PRINT("Unexpected expand on undefined variable");
-	}
 								 
 	return;
 }
@@ -699,7 +695,7 @@
 		DmaVariablePacket *tran;
 
 		gtk_tree_model_get (model, &iter, DTREE_ENTRY_COLUMN, &item, -1);
-		if ((item != NULL) && (item->name != NULL))
+		if ((item != NULL) && (item->name != NULL) && (tree->debugger != NULL))
 		{
 			/* Variable is valid */
 			dma_queue_assign_variable (tree->debugger, item->name, text);

Modified: trunk/plugins/gdb/anjuta-gdb.plugin.in
==============================================================================
--- trunk/plugins/gdb/anjuta-gdb.plugin.in	(original)
+++ trunk/plugins/gdb/anjuta-gdb.plugin.in	Sun May 25 11:03:59 2008
@@ -7,4 +7,4 @@
 Interfaces=IAnjutaDebugger
 
 [File Loader]
-SupportedMimeTypes=application/x-executable,application/x-core,application/x-shellscript
+SupportedMimeTypes=application/x-executable,application/octet-stream,application/x-core,application/x-shellscript

Modified: trunk/plugins/gdb/plugin.c
==============================================================================
--- trunk/plugins/gdb/plugin.c	(original)
+++ trunk/plugins/gdb/plugin.c	Sun May 25 11:03:59 2008
@@ -312,7 +312,8 @@
 	{
 		/* Hope that the target is supported */
 	}
-	else if (strcmp (mime_type, "application/x-executable") == 0)
+	else if ((strcmp (mime_type, "application/x-executable") == 0) ||
+		(strcmp (mime_type, "application/octet-stream") == 0))
 	{
 		/* Supported target */
 	}