anjuta r3924 - in trunk: . plugins/symbol-browser

[jhs svn gnome org]

Author: jhs
Date: Sat May 10 09:39:43 2008
New Revision: 3924
URL: http://svn.gnome.org/viewvc/anjuta?rev=3924&view=rev

Log:
2008-05-10  Johannes Schmid  <jhs gnome org>

	* plugins/symbol-browser/anjuta-symbol-browser-plugin.glade:
	* plugins/symbol-browser/plugin.c (project_root_added),
	(isymbol_manager_search):
	
	Fixed global tags loading from project configuration and added a
	configuration option

Modified:
   trunk/ChangeLog
   trunk/plugins/symbol-browser/anjuta-symbol-browser-plugin.glade
   trunk/plugins/symbol-browser/plugin.c

Modified: trunk/plugins/symbol-browser/anjuta-symbol-browser-plugin.glade
==============================================================================
--- trunk/plugins/symbol-browser/anjuta-symbol-browser-plugin.glade	(original)
+++ trunk/plugins/symbol-browser/anjuta-symbol-browser-plugin.glade	Sat May 10 09:39:43 2008
@@ -17,6 +17,31 @@
             <property name="visible">True</property>
             <property name="border_width">5</property>
             <child>
+              <widget class="GtkHButtonBox" id="hbuttonbox5">
+                <property name="visible">True</property>
+                <property name="layout_style">GTK_BUTTONBOX_END</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="padding">5</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkCheckButton" id="preferences_toggle:bool:1:0:symbol_browser.tags_auto_load">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">Load API tags from project configuration</property>
+                <property name="response_id">0</property>
+                <property name="draw_indicator">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="padding">5</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
               <widget class="GtkHBox" id="hbox1">
                 <property name="visible">True</property>
                 <child>
@@ -31,6 +56,7 @@
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
                         <property name="yalign">0</property>
+                        <property name="top_padding">5</property>
                         <property name="left_padding">12</property>
                         <child>
                           <widget class="GtkScrolledWindow" id="scrolledwindow1">
@@ -126,16 +152,8 @@
                   </packing>
                 </child>
               </widget>
-            </child>
-            <child>
-              <widget class="GtkHButtonBox" id="hbuttonbox5">
-                <property name="visible">True</property>
-                <property name="layout_style">GTK_BUTTONBOX_END</property>
-              </widget>
               <packing>
-                <property name="expand">False</property>
-                <property name="padding">5</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </widget>

Modified: trunk/plugins/symbol-browser/plugin.c
==============================================================================
--- trunk/plugins/symbol-browser/plugin.c	(original)
+++ trunk/plugins/symbol-browser/plugin.c	Sat May 10 09:39:43 2008
@@ -398,6 +398,8 @@
 	g_signal_connect (G_OBJECT (pm), "element_removed",
 					  G_CALLBACK (on_project_element_removed), sv_plugin);
 	/* Load from project */
+	if (anjuta_preferences_get_int (sv_plugin->prefs,
+											"symbol_browser.tags_auto_load"))
 	{
 		gchar* dirname = g_build_filename (g_get_home_dir (), LOCAL_TAGS_DIR, NULL);
 		GList* packages = ianjuta_project_manager_get_packages (pm, NULL);
@@ -417,6 +419,7 @@
 		anjuta_preferences_set (sv_plugin->prefs, SYMBOL_BROWSER_TAGS, str->str);
 		g_string_free (str, TRUE);
 		g_free (dirname);
+		symbol_browser_load_global_tags (plugin);
 	}
 }	   
 
@@ -1113,6 +1116,8 @@
 						const gchar *match_name,
 						gboolean partial_name_match,
 						gboolean global_search,
+						gint results_limit, /* unused */
+						gint results_offset, /* unused */
 						GError **err)
 {
 	const GPtrArray *tags_array;
@@ -1131,7 +1136,7 @@
 		iter = anjuta_symbol_iter_new (tags_array);
 		return IANJUTA_ITERABLE (iter);
 	}
-	return NULL;
+	return NULL;	
 }
 
 static IAnjutaIterable*