lib/egg/egg-editable-toolbar.c lib/egg/egg-toolbar-editor.c

2006-02-04  Peter Harvey  <peter.a.harvey@gmail.com>

	* lib/egg/egg-editable-toolbar.c
	* lib/egg/egg-toolbar-editor.c
	* lib/egg/egg-toolbars-model.c
	* lib/egg/egg-toolbars-model.h
	* src/bookmarks/ephy-bookmark-factory-action.c
	* src/bookmarks/ephy-topic-factory-action.c
	* src/ephy-toolbars-model.c
	* src/epiphany.defs

	Improve the system for testing whether an item has already
	been used on the toolbar.

1 files changed, 19 insertions, 10 deletions

diff --git a/src/epiphany.defs b/src/epiphany.defs
index 9d0b81adb..33157fe16 100644
--- a/src/epiphany.defs
+++ b/src/epiphany.defs
@@ -1619,18 +1619,27 @@
 ;  (return-type "EggToolbarsModel*")
 ;)
 
-(define-method load
+(define-method load_names
   (of-object "EggToolbarsModel")
-  (c-name "egg_toolbars_model_load")
+  (c-name "egg_toolbars_model_load_names")
   (return-type "gboolean")
   (parameters
     '("const-char*" "xml_file")
   )
 )
 
-(define-method save
+(define-method load_toolbars
+  (of-object "EggToolbarsModel")
+  (c-name "egg_toolbars_model_load_toolbars")
+  (return-type "gboolean")
+  (parameters
+    '("const-char*" "xml_file")
+  )
+)
+
+(define-method save_toolbars
   (of-object "EggToolbarsModel")
-  (c-name "egg_toolbars_model_save")
+  (c-name "egg_toolbars_model_save_toolbars")
   (return-type "none")
   (parameters
     '("const-char*" "xml_file")
@@ -1676,24 +1685,24 @@
 ;  )
 ;)
 
-(define-method get_avail
+(define-method get_name_avail
   (of-object "EggToolbarsModel")
-  (c-name "egg_toolbars_model_get_avail")
+  (c-name "egg_toolbars_model_get_name_avail")
   (return-type "GPtrArray*")
 )
 
-(define-method get_n_avail
+(define-method get_name_flags
   (of-object "EggToolbarsModel")
-  (c-name "egg_toolbars_model_get_n_avail")
+  (c-name "egg_toolbars_model_get_name_flags")
   (return-type "gint")
   (parameters
     '("const-char*" "name")
   )
 )
 
-(define-method set_n_avail
+(define-method set_name_flags
   (of-object "EggToolbarsModel")
-  (c-name "egg_toolbars_model_set_n_avail")
+  (c-name "egg_toolbars_model_set_name_flags")
   (return-type "none")
   (parameters
     '("const-char*" "name")