totem r6210 - in trunk: . help help/C src

[pwithnall svn gnome org]

Author: pwithnall
Date: Tue Mar 31 16:25:06 2009
New Revision: 6210
URL: http://svn.gnome.org/viewvc/totem?rev=6210&view=rev

Log:
2009-03-31  Philip Withnall  <philip tecnocode co uk>

	* Makefile.am:
	* src/totem-menu.c (about_action_callback): Update the About
	dialogue. (Closes: #573295)

2009-03-31  Philip Withnall  <philip tecnocode co uk>

	* C/totem.xml:
	* Makefile.am: Allow the list of documenters to be 
automatically-
	generated. (Closes: #573295)



Modified:
   trunk/Makefile.am
   trunk/help/C/totem.xml
   trunk/help/Makefile.am
   trunk/src/totem-menu.c

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Tue Mar 31 16:25:06 2009
@@ -1,4 +1,4 @@
-SUBDIRS = lib bindings po data src docs help
+SUBDIRS = lib bindings po data help src docs
 
 if ENABLE_BROWSER_PLUGINS
 SUBDIRS += browser-plugin

Modified: trunk/help/C/totem.xml
==============================================================================
--- trunk/help/C/totem.xml	(original)
+++ trunk/help/C/totem.xml	Tue Mar 31 16:25:06 2009
@@ -62,24 +62,22 @@
 	<surname>HOH</surname> 
 	<affiliation> 
   	  <orgname>GNOME Documentation Project</orgname> 
-	  <address> <email>cbhoh gnome org</email> </address> 
-	</affiliation> 
+	</affiliation>
+	<email>cbhoh gnome org</email>
       </author>
       <author>
 	<firstname>Baptiste</firstname> 
 	<surname>Mille-Mathias</surname> 
 	<affiliation> 
-      <orgname>GNOME Documentation project</orgname> 
-  	<address> <email>baptiste millemathias gmail org</email> </address> 
-  </affiliation>
+          <orgname>GNOME Documentation project</orgname>
+        </affiliation>
+        <email>baptiste millemathias gmail org</email>
         <contrib>Update documentation</contrib>      
       </author>
        <author>
 	<firstname>Philip</firstname> 
 	<surname>Withnall</surname> 
-	<affiliation> 
-  	<address> <email>philip tecnocode co uk</email> </address> 
-  </affiliation>
+	<email>philip tecnocode co uk</email>
         <contrib>Update documentation</contrib>      
       </author>   
 

Modified: trunk/help/Makefile.am
==============================================================================
--- trunk/help/Makefile.am	(original)
+++ trunk/help/Makefile.am	Tue Mar 31 16:25:06 2009
@@ -3,6 +3,8 @@
 
 DOC_MODULE = totem
 DOC_ENTITIES = legal.xml
+DOC_H_FILE = totem-docs.h
+DOC_H_DOCS = C/totem.xml
 DOC_INCLUDES = 
 
 DOC_FIGURES  = 	figures/totem_show_playlist_button.png 	\

Modified: trunk/src/totem-menu.c
==============================================================================
--- trunk/src/totem-menu.c	(original)
+++ trunk/src/totem-menu.c	Tue Mar 31 16:25:06 2009
@@ -1160,14 +1160,11 @@
 		"Ronald Bultje <rbultje ronald bitfreak net>",
 		"Julien Moutte <julien moutte net> (GStreamer backend)",
 		"Tim-Philipp M\303\274ller <tim\100centricular\056net> (GStreamer backend)",
+		"Philip Withnall <philip tecnocode co uk>",
 		NULL
 	};
 	const char *artists[] = { "Jakub Steiner <jimmac ximian com>", NULL };
-	const char *documenters[] =
-	{
-		"Chee Bin Hoh <cbhoh gnome org>",
-		NULL
-	};
+	#include "../help/totem-docs.h"
 	char *license = totem_interface_get_license ();
 
 	backend_version = bacon_video_widget_get_backend_name (totem->bvw);
@@ -1177,17 +1174,17 @@
 
 	gtk_show_about_dialog (GTK_WINDOW (totem->win),
 				     "version", VERSION,
-				     "copyright", _("Copyright \xc2\xa9 2002-2008 Bastien Nocera"),
+				     "copyright", _("Copyright \xc2\xa9 2002-2009 Bastien Nocera"),
 				     "comments", description,
 				     "authors", authors,
-				     "documenters", documenters,
+				     "documenters", documentation_credits,
 				     "artists", artists,
 				     "translator-credits", _("translator-credits"),
 				     "logo-icon-name", "totem",
 				     "license", license,
 				     "wrap-license", TRUE,
 				     "website-label", _("Totem Website"),
-				     "website", "http://www.gnome.org/projects/totem/";,
+				     "website", "http://projects.gnome.org/totem/";,
 				     NULL);
 
 	g_free (backend_version);