anjuta r4041 - in trunk: . plugins/debug-manager plugins/document-manager

[jhs svn gnome org]

Author: jhs
Date: Wed Jul  2 10:30:18 2008
New Revision: 4041
URL: http://svn.gnome.org/viewvc/anjuta?rev=4041&view=rev

Log:
2008-07-02  Johannes Schmid  <jhs gnome org>

	* plugins/debug-manager/breakpoints.c
	(on_jump_to_breakpoint_activate):
	* plugins/debug-manager/disassemble.c (on_location_changed):
	* plugins/debug-manager/plugin.c (dma_plugin_location_changed),
	(dma_plugin_activate):
	* plugins/document-manager/anjuta-docman.c
	(anjuta_docman_goto_file_line_mark):
	
	Fixed crash when double-clicking on a breakpoint. Anyway, it still doesn\'t work
	because of some strange signal handling (the GFile seems to get destroyed on it\'s
	way).


Modified:
   trunk/ChangeLog
   trunk/plugins/debug-manager/breakpoints.c
   trunk/plugins/debug-manager/disassemble.c
   trunk/plugins/debug-manager/plugin.c
   trunk/plugins/document-manager/anjuta-docman.c

Modified: trunk/plugins/debug-manager/breakpoints.c
==============================================================================
--- trunk/plugins/debug-manager/breakpoints.c	(original)
+++ trunk/plugins/debug-manager/breakpoints.c	Wed Jul  2 10:30:18 2008
@@ -1588,10 +1588,11 @@
 	if (valid)
 	{
 		BreakpointItem *bi;
-		
+		GFile* file = g_file_new_for_uri (bi->uri);
 		gtk_tree_model_get (model, &iter, DATA_COLUMN, &bi, -1);
-
-		g_signal_emit_by_name (bd->plugin, "location-changed", bi->bp.address, bi->uri, bi->bp.line);
+		DEBUG_PRINT ("Uri: %s", bi->uri);
+		g_signal_emit_by_name (bd->plugin, "location-changed", bi->bp.address, file, bi->bp.line);
+		g_object_unref (file);
 	}
 }
 

Modified: trunk/plugins/debug-manager/disassemble.c
==============================================================================
--- trunk/plugins/debug-manager/disassemble.c	(original)
+++ trunk/plugins/debug-manager/disassemble.c	Wed Jul  2 10:30:18 2008
@@ -802,7 +802,7 @@
 }
 
 static void
-on_location_changed (DmaDisassemble *self, gulong address, const gchar* uri, guint line)
+on_location_changed (DmaDisassemble *self, gulong address, GFile* file, guint line)
 {
 	dma_sparse_view_goto (self->view, address);
 }

Modified: trunk/plugins/debug-manager/plugin.c
==============================================================================
--- trunk/plugins/debug-manager/plugin.c	(original)
+++ trunk/plugins/debug-manager/plugin.c	Wed Jul  2 10:30:18 2008
@@ -560,19 +560,18 @@
 /* Called when the user want to go to another location */
 
 static void
-dma_plugin_location_changed (DebugManagerPlugin *self, gulong address, const gchar* uri, guint line)
+dma_plugin_location_changed (DebugManagerPlugin *self, gulong address, GFile* file, guint line)
 {
 	/* Go to location in editor */
-	if (uri != NULL)
+	if (file != NULL)
 	{
 		IAnjutaDocumentManager *docman;
-
+		DEBUG_PRINT ("Plugin uri: %s", g_file_get_uri (file));
+		
         docman = anjuta_shell_get_interface (ANJUTA_PLUGIN(self)->shell, IAnjutaDocumentManager, NULL);
         if (docman)
         {
-			GFile* file = g_file_new_for_uri (uri);
 			ianjuta_document_manager_goto_file_line (docman, file, line, NULL);
-			g_object_unref (file);
         }
 	}
 }
@@ -1075,7 +1074,7 @@
 	g_signal_connect (this, "program-exited", G_CALLBACK (dma_plugin_program_loaded), this);
 	g_signal_connect (this, "program-moved", G_CALLBACK (dma_plugin_program_moved), this);
 	g_signal_connect (this, "signal-received", G_CALLBACK (dma_plugin_signal_received), this);
-	g_signal_connect (this, "location_changed", G_CALLBACK (dma_plugin_location_changed), this);
+	g_signal_connect (this, "location-changed", G_CALLBACK (dma_plugin_location_changed), this);
 	
 	/* Add all our debug manager actions */
 	ui = anjuta_shell_get_ui (ANJUTA_PLUGIN (plugin)->shell, NULL);

Modified: trunk/plugins/document-manager/anjuta-docman.c
==============================================================================
--- trunk/plugins/document-manager/anjuta-docman.c	(original)
+++ trunk/plugins/document-manager/anjuta-docman.c	Wed Jul  2 10:30:18 2008
@@ -1225,6 +1225,8 @@
 	const gchar* line_str;
 	GFile* real_file;
 	
+	DEBUG_PRINT ("Open uri: %s", uri);
+	
 	if ((line_str = strstr(uri, "#")) && line <= 0)
 	{
 		line = atoi (line_str + 1);