nautilus r14581 - in trunk: . docs/reference/libnautilus-extension libnautilus-extension

[gdartigu svn gnome org]

Author: gdartigu
Date: Wed Sep  3 23:20:30 2008
New Revision: 14581
URL: http://svn.gnome.org/viewvc/nautilus?rev=14581&view=rev

Log:
2008-09-04  Gilles Dartiguelongue  <gdartigu svn gnome org>

	include some documentation, bug #396929.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/docs/reference/libnautilus-extension/Makefile.am
   trunk/libnautilus-extension/nautilus-column.c
   trunk/libnautilus-extension/nautilus-menu-item.c
   trunk/libnautilus-extension/nautilus-property-page.c
   trunk/libnautilus-extension/nautilus-property-page.h

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Sep  3 23:20:30 2008
@@ -35,7 +35,7 @@
 AC_CONFIG_SRCDIR(src)
 AC_CONFIG_HEADERS(config.h)
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.9 tar-ustar])
 AM_MAINTAINER_MODE
 AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL_FLAGS}"])
 
@@ -115,7 +115,7 @@
 
 dnl ==========================================================================
 
-GTK_DOC_CHECK
+GTK_DOC_CHECK([1.4])
 
 dnl ==========================================================================
 

Modified: trunk/docs/reference/libnautilus-extension/Makefile.am
==============================================================================
--- trunk/docs/reference/libnautilus-extension/Makefile.am	(original)
+++ trunk/docs/reference/libnautilus-extension/Makefile.am	Wed Sep  3 23:20:30 2008
@@ -6,7 +6,7 @@
 # The name of the module, e.g. 'glib'.
 DOC_MODULE=libnautilus-extension
 
-# The top-level SGML file. You can change this if you want to.
+# The top-level SGML file.
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
 
 # The directory containing the source code. Relative to $(srcdir).
@@ -23,7 +23,6 @@
 SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED"
 
 # Extra options to supply to gtkdoc-mkdb.
-# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
 MKDB_OPTIONS=--sgml-mode --output-format=xml
 
 # Extra options to supply to gtkdoc-mktmpl
@@ -34,18 +33,20 @@
 # e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
 FIXXREF_OPTIONS=
 
+# Used for dependencies. The docs will be rebuilt if any of these change.
 HFILE_GLOB=$(top_srcdir)/libnautilus-extension/*.h
 CFILE_GLOB=$(top_srcdir)/libnautilus-extension/*.c
 
-IGNORE_HFILES= \
+# Header files to ignore when scanning.
+IGNORE_HFILES = \
+	config.h \
+	nautilus-extension-i18n.h \
 	$(NULL)
 
-EXTRA_HFILES= \
-	$(NULL)
-	
-HTML_IMAGES= 
+# Images to copy into HTML directory
+HTML_IMAGES =
 
-content_files= \
+content_files = \
 	version.xml \
 	$(NULL)
 
@@ -53,17 +54,26 @@
 # These files must be listed here *and* in content_files
 # e.g. expand_content_files=running.sgml
 expand_content_files= \
-		$(NULL) 
+		$(NULL)
 
 # CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
 # Only needed if you are using gtkdoc-scangobj to dynamically query widget
 # signals and properties.
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
+GTKDOC_CFLAGS = \
+	$(GTK_DEBUG_FLAGS)                         \
+	-I$(srcdir)                                \
+	-I$(top_srcdir)                            \
+	-I$(top_srcdir)/libnautilus-extension      \
+	-I$(top_builddir)                          \
+	-I$(top_builddir)/libnautilus-extension    \
+	$(LIBNAUTILUS_EXTENSION_CFLAGS)            \
+	$(NULL)
 
-INCLUDES=-I$(top_srcdir) $(CORE_CFLAGS)
-GTKDOC_LIBS= -L$(top_builddir) $(CORE_LIBS) \
-	$(top_builddir)/libnautilus-extension/libnautilus-extension.la \
+GTKDOC_LIBS = \
+	$(top_builddir)/libnautilus-extension/libnautilus-extension.la       \
+	$(LIBNAUTILUS_EXTENSION_LIBS)                                        \
 	$(NULL)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.

Modified: trunk/libnautilus-extension/nautilus-column.c
==============================================================================
--- trunk/libnautilus-extension/nautilus-column.c	(original)
+++ trunk/libnautilus-extension/nautilus-column.c	Wed Sep  3 23:20:30 2008
@@ -47,6 +47,17 @@
 
 static GObjectClass *parent_class = NULL;
 
+/**
+ * nautilus_column_new:
+ * @name: identifier of the column
+ * @attribute: the file attribute to be displayed in the column
+ * @label: the user-visible label for the column
+ * @description: a user-visible description of the column
+ *
+ * Creates a new column
+ *
+ * Returns: a newly created #NautilusColumn
+ */
 NautilusColumn *
 nautilus_column_new (const char *name,
 		     const char *attribute,

Modified: trunk/libnautilus-extension/nautilus-menu-item.c
==============================================================================
--- trunk/libnautilus-extension/nautilus-menu-item.c	(original)
+++ trunk/libnautilus-extension/nautilus-menu-item.c	Wed Sep  3 23:20:30 2008
@@ -57,6 +57,17 @@
 
 static GObjectClass *parent_class = NULL;
 
+/**
+ * nautilus_menu_item_new:
+ * @name: the identifier for the menu item
+ * @label: the user-visible label of the menu item
+ * @tip: the tooltip of the menu item
+ * @icon: the name of the icon to display in the menu item
+ *
+ * Creates a new menu item that can be added to the toolbar or to a contextual menu.
+ *
+ * Returns: a newly create #NautilusMenuItem
+ */
 NautilusMenuItem *
 nautilus_menu_item_new (const char *name,
 			const char *label,
@@ -79,12 +90,25 @@
 	return item;
 }
 
+/**
+ * nautilus_menu_item_activate:
+ * @item: pointer to a #NautilusMenuItem
+ *
+ * emits the activate signal.
+ */
 void
 nautilus_menu_item_activate (NautilusMenuItem *item)
 {
 	g_signal_emit (item, signals[ACTIVATE], 0);
 }
 
+/**
+ * nautilus_menu_item_set_submenu:
+ * @item: pointer to a #NautilusMenuItem
+ * @menu: pointer to a #NautilusMenu to attach to the button
+ *
+ * Attachs a menu to the given #NautilusMenuItem.
+ */
 void
 nautilus_menu_item_set_submenu (NautilusMenuItem *item, NautilusMenu *menu)
 {

Modified: trunk/libnautilus-extension/nautilus-property-page.c
==============================================================================
--- trunk/libnautilus-extension/nautilus-property-page.c	(original)
+++ trunk/libnautilus-extension/nautilus-property-page.c	Wed Sep  3 23:20:30 2008
@@ -43,6 +43,16 @@
 
 static GObjectClass *parent_class = NULL;
 
+/**
+ * nautilus_property_page_new:
+ * @name: the identifier for the property page
+ * @label: the user-visible label of the property page
+ * @page: the property page to display
+ *
+ * Creates a new #NautilusPropertyPage from page_widget.
+ *
+ * Returns: a newly created #NautilusPropertyPage
+ */
 NautilusPropertyPage *
 nautilus_property_page_new (const char *name,
 			    GtkWidget *label,
@@ -218,7 +228,7 @@
 		
 		type = g_type_register_static 
 			(G_TYPE_OBJECT, 
-			 "NautilusPropertPage",
+			 "NautilusPropertyPage",
 			 &info, 0);
 	}
 

Modified: trunk/libnautilus-extension/nautilus-property-page.h
==============================================================================
--- trunk/libnautilus-extension/nautilus-property-page.h	(original)
+++ trunk/libnautilus-extension/nautilus-property-page.h	Wed Sep  3 23:20:30 2008
@@ -34,8 +34,8 @@
 #define NAUTILUS_TYPE_PROPERTY_PAGE            (nautilus_property_page_get_type())
 #define NAUTILUS_PROPERTY_PAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_PROPERTY_PAGE, NautilusPropertyPage))
 #define NAUTILUS_PROPERTY_PAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_PROPERTY_PAGE, NautilusPropertyPageClass))
-#define NAUTILUS_PROPERTY_IS_PAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NAUTILUS_TYPE_PROPERTY_PAGE))
-#define NAUTILUS_PROPERTY_IS_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_PROPERTY_PAGE))
+#define NAUTILUS_IS_PROPERTY_PAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NAUTILUS_TYPE_PROPERTY_PAGE))
+#define NAUTILUS_IS_PROPERTY_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_PROPERTY_PAGE))
 #define NAUTILUS_PROPERTY_PAGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), NAUTILUS_TYPE_PROPERTY_PAGE, NautilusPropertyPageClass))
 
 typedef struct _NautilusPropertyPage        NautilusPropertyPage;