anjuta r4627 - in trunk: . plugins/symbol-db plugins/symbol-db/images

[mcora svn gnome org]

Author: mcora
Date: Fri Jan 23 17:57:32 2009
New Revision: 4627
URL: http://svn.gnome.org/viewvc/anjuta?rev=4627&view=rev

Log:
	* plugins/symbol-db/plugin.c (on_session_load), (on_project_root_added):
	fixed #568119 â Automatic scanning of system-packages doesn't work

	* plugins/symbol-db/images/Makefile.am:
	* (added) plugins/symbol-db/images/element-interface-24.png
	* (added) plugins/symbol-db/images/element-method-24.png
	* plugins/symbol-db/plugin.c (register_stock_icons):
	added some icons for popup menu.	

Added:
   trunk/plugins/symbol-db/images/element-interface-24.png   (contents, props changed)
   trunk/plugins/symbol-db/images/element-method-24.png   (contents, props changed)
Modified:
   trunk/ChangeLog
   trunk/plugins/symbol-db/Makefile.am
   trunk/plugins/symbol-db/images/Makefile.am
   trunk/plugins/symbol-db/plugin.c

Modified: trunk/plugins/symbol-db/Makefile.am
==============================================================================
--- trunk/plugins/symbol-db/Makefile.am	(original)
+++ trunk/plugins/symbol-db/Makefile.am	Fri Jan 23 17:57:32 2009
@@ -56,7 +56,7 @@
 	symbol-db-view-locals.h \
 	symbol-db-view-search.h \
 	symbol-db-view-search.c \
-    	symbol-db-engine-iterator-node.h \
+  symbol-db-engine-iterator-node.h \
 	symbol-db-engine-iterator-node.c \
 	symbol-db-system.h \
 	symbol-db-system.c  symbol-db-prefs.h \

Modified: trunk/plugins/symbol-db/images/Makefile.am
==============================================================================
--- trunk/plugins/symbol-db/images/Makefile.am	(original)
+++ trunk/plugins/symbol-db/images/Makefile.am	Fri Jan 23 17:57:32 2009
@@ -8,7 +8,9 @@
 	element-event-16.png \
 	element-field-16.png \
 	element-interface-16.png \
+	element-interface-24.png \
 	element-method-16.png \
+  element-method-24.png \
 	element-namespace-16.png \
 	element-property-16.png \
 	element-structure-16.png

Added: trunk/plugins/symbol-db/images/element-interface-24.png
==============================================================================
Binary file. No diff available.

Added: trunk/plugins/symbol-db/images/element-method-24.png
==============================================================================
Binary file. No diff available.

Modified: trunk/plugins/symbol-db/plugin.c
==============================================================================
--- trunk/plugins/symbol-db/plugin.c	(original)
+++ trunk/plugins/symbol-db/plugin.c	Fri Jan 23 17:57:32 2009
@@ -57,6 +57,12 @@
 #define SESSION_SECTION		"SymbolDB"
 #define SESSION_KEY			"SystemPackages"
 
+#define ANJUTA_PIXMAP_GOTO_DECLARATION		"element-interface"
+#define ANJUTA_PIXMAP_GOTO_IMPLEMENTATION	"element-method"
+
+#define ANJUTA_STOCK_GOTO_DECLARATION		"element-interface"
+#define ANJUTA_STOCK_GOTO_IMPLEMENTATION	"element-method"
+
 static gpointer parent_class;
 
 /* signals */
@@ -92,6 +98,8 @@
 	/* Register stock icons */
 	BEGIN_REGISTER_ICON (plugin);
 	REGISTER_ICON (ICON_FILE, "symbol-db-plugin-icon");
+	REGISTER_ICON_FULL (ANJUTA_PIXMAP_GOTO_DECLARATION, ANJUTA_STOCK_GOTO_DECLARATION);
+	REGISTER_ICON_FULL (ANJUTA_PIXMAP_GOTO_IMPLEMENTATION, ANJUTA_STOCK_GOTO_IMPLEMENTATION);
 	END_REGISTER_ICON;
 }
 
@@ -266,7 +274,7 @@
 	{ "ActionMenuGoto", NULL, N_("_Goto"), NULL, NULL, NULL},
 	{
 		"ActionSymbolDBGotoDecl",
-		NULL,
+		ANJUTA_STOCK_GOTO_DECLARATION,
 		N_("Tag De_claration"),
 		"<shift><control>d",
 		N_("Goto symbol declaration"),
@@ -274,7 +282,7 @@
 	},
 	{
 		"ActionSymbolDBGotoImpl",
-		NULL,
+		ANJUTA_STOCK_GOTO_IMPLEMENTATION,
 		N_("Tag _Implementation"),
 		"<control>d",
 		N_("Goto symbol definition"),
@@ -642,41 +650,15 @@
 	
 	if (phase == ANJUTA_SESSION_PHASE_START)
 	{
-		GList *session_packages = anjuta_session_get_string_list (session, 
-														SESSION_SECTION, 
-														SESSION_KEY);
-		
-		GList *to_scan_packages = NULL;
+		sdb_plugin->session_packages = anjuta_session_get_string_list (session, 
+																	   SESSION_SECTION, 
+																	   SESSION_KEY);
 	
 		DEBUG_PRINT ("SymbolDB: session_loading started. Getting info from %s",
 					 anjuta_session_get_session_directory (session));
 		sdb_plugin->session_loading = TRUE;
-		
-		if (session_packages == NULL)
-		{
-			/* hey, does user want to import system sources for this project? */
-			gboolean automatic_scan = anjuta_preferences_get_int (sdb_plugin->prefs, 
-														  PROJECT_AUTOSCAN);
-			/* letting session_packages to NULL won't start the population */
-			if (automatic_scan == TRUE)
-			{
-				GList *project_default_packages = 
-					ianjuta_project_manager_get_packages (pm, NULL);
-			
-				/* take the project's defaults */
-				to_scan_packages = project_default_packages;
-			}
-		}
-		else
-		{
-			to_scan_packages = session_packages;
-		}
-
-		
-		sdb_plugin->session_packages = to_scan_packages;
-		
-		/* no need to free the GList(s) */
 	}
+	
 	else if (phase == ANJUTA_SESSION_PHASE_END)
 	{
 		IAnjutaDocumentManager* docman;
@@ -1756,6 +1738,21 @@
 	 */
 	gtk_widget_hide (sdb_plugin->progress_bar_system);
 	
+	pm = anjuta_shell_get_interface (ANJUTA_PLUGIN (sdb_plugin)->shell,
+									 IAnjutaProjectManager, NULL);
+	
+	if (sdb_plugin->session_packages == NULL)
+	{
+		/* hey, does user want to import system sources for this project? */
+		gboolean automatic_scan = anjuta_preferences_get_int (sdb_plugin->prefs, 
+															  PROJECT_AUTOSCAN);
+		
+		if (automatic_scan == TRUE)
+		{
+			sdb_plugin->session_packages = ianjuta_project_manager_get_packages (pm, NULL);
+		}
+	}
+
 	/* get preferences about the parallel scan */
 	gboolean parallel_scan = anjuta_preferences_get_int (sdb_plugin->prefs, 
 														 PARALLEL_SCAN); 
@@ -1770,9 +1767,7 @@
 	
 	/*
 	 *   The Project thing
-	 */
-	pm = anjuta_shell_get_interface (ANJUTA_PLUGIN (sdb_plugin)->shell,
-									 IAnjutaProjectManager, NULL);	
+	 */	
 		
 	g_free (sdb_plugin->project_root_uri);
 	sdb_plugin->project_root_uri = NULL;