anjuta r4553 - in trunk: . plugins/symbol-db

[mcora svn gnome org]

Author: mcora
Date: Thu Jan  8 18:43:47 2009
New Revision: 4553
URL: http://svn.gnome.org/viewvc/anjuta?rev=4553&view=rev

Log:
	* plugins/symbol-db/anjuta-symbol-db-plugin.ui:
	* plugins/symbol-db/plugin.c (goto_file_tag),
	(on_goto_file_tag_impl_activate):
	#567049 â Goto Definition fails for symbols ending in a digit.
	Renamed Goto Definition -> Goto Implementation. Before it was too
	confusing.

Modified:
   trunk/ChangeLog
   trunk/plugins/symbol-db/anjuta-symbol-db-plugin.ui
   trunk/plugins/symbol-db/plugin.c

Modified: trunk/plugins/symbol-db/anjuta-symbol-db-plugin.ui
==============================================================================
--- trunk/plugins/symbol-db/anjuta-symbol-db-plugin.ui	(original)
+++ trunk/plugins/symbol-db/anjuta-symbol-db-plugin.ui	Thu Jan  8 18:43:47 2009
@@ -2,8 +2,8 @@
 <ui>
 	<popup name="PopupDocumentManager">
 		<menu name="Goto" action="ActionMenuGoto">
-			<menuitem name="TagDef" action="ActionSymbolDBGotoDef" />
 			<menuitem name="TagDecl" action="ActionSymbolDBGotoDecl" />
+			<menuitem name="TagImpl" action="ActionSymbolDBGotoImpl" />
 		</menu>
 	</popup>
 </ui>

Modified: trunk/plugins/symbol-db/plugin.c
==============================================================================
--- trunk/plugins/symbol-db/plugin.c	(original)
+++ trunk/plugins/symbol-db/plugin.c	Thu Jan  8 18:43:47 2009
@@ -116,7 +116,7 @@
 
 static void
 goto_file_tag (SymbolDBPlugin *sdb_plugin, const char *word,
-			   gboolean prefer_definition)
+			   gboolean prefer_implementation)
 {
 	SymbolDBEngineIterator *iterator;	
 	iterator = symbol_db_engine_find_symbol_by_name_pattern (sdb_plugin->sdbe_project, 
@@ -136,9 +136,9 @@
 		symbol_kind = symbol_db_engine_iterator_node_get_symbol_extra_string (
 					iter_node, SYMINFO_KIND);				
 		
-		if ((prefer_definition == FALSE && g_strcmp0 (symbol_kind, "prototype") == 0) ||
-			(prefer_definition == TRUE && g_strcmp0 (symbol_kind, "function") == 0) ||
-			(prefer_definition == TRUE && g_strcmp0 (symbol_kind, "macro") == 0))
+		if ((prefer_implementation == FALSE && g_strcmp0 (symbol_kind, "prototype") == 0) ||
+			(prefer_implementation == TRUE && g_strcmp0 (symbol_kind, "function") == 0) ||
+			(prefer_implementation == TRUE && g_strcmp0 (symbol_kind, "macro") == 0))
 		{
 			gint line = 
 				symbol_db_engine_iterator_node_get_symbol_file_pos (iter_node);
@@ -156,7 +156,7 @@
 }
 
 static void
-on_goto_file_tag_def_activate (GtkAction *action, SymbolDBPlugin *sdb_plugin)
+on_goto_file_tag_impl_activate (GtkAction *action, SymbolDBPlugin *sdb_plugin)
 {
 	IAnjutaEditor *ed;
 	gchar *word;
@@ -195,21 +195,21 @@
 {
 	{ "ActionMenuGoto", NULL, N_("_Goto"), NULL, NULL, NULL},
 	{
-		"ActionSymbolDBGotoDef",
-		NULL,
-		N_("Tag _Definition"),
-		"<control>d",
-		N_("Goto symbol definition"),
-		G_CALLBACK (on_goto_file_tag_def_activate)
-	},
-	{
 		"ActionSymbolDBGotoDecl",
 		NULL,
 		N_("Tag De_claration"),
 		"<shift><control>d",
 		N_("Goto symbol declaration"),
 		G_CALLBACK (on_goto_file_tag_decl_activate)
-	}
+	},
+	{
+		"ActionSymbolDBGotoImpl",
+		NULL,
+		N_("Tag _Implementation"),
+		"<control>d",
+		N_("Goto symbol definition"),
+		G_CALLBACK (on_goto_file_tag_impl_activate)
+	}	
 };
 
 static void