Updated copyright. Added license and website info.

2005-12-10  William Jon McCann  <[email protected]>

	* shell/rb-shell.c (rb_shell_cmd_about): Updated copyright.
	Added license and website info.

	* MAINTAINERS.old: Add Colin.
	* MAINTAINERS: Add James.
	* AUTHORS: Put back in order.  Add extra space between name and email
	to make it easier to read.  Add James and jonathan.

	* widgets/rb-song-info.c (rb_song_info_init)
	(rb_song_info_constructor): Make sure close button is primary/rightmost.

AUTHORS

@@ -1,29 +1,31 @@
-Jorn Baayen <[email protected]>
-Paolo Borelli <[email protected]>
-Kenneth Christiansen <[email protected]>
-Ryan Lortie <[email protected]>
-Mark Finlay <[email protected]>
-Marco Pesenti Gritti <[email protected]>
-Joshua Haberman <[email protected]>
-Mark Humphreys <[email protected]>
-James Kahn <[email protected]>
+Jorn Baayen  <[email protected]>
+Paolo Borelli  <[email protected]>
+Kenneth Christiansen  <[email protected]>
+David Dollar  <[email protected]>
+Christophe Fergeau  <[email protected]>
+Mark Finlay  <[email protected]>
+Marco Pesenti Gritti  <[email protected]>
+Joshua Haberman  <[email protected]>
+Mark Humphreys  <[email protected]>
+James Kahn  <[email protected]>
 Laurens Krol <[email protected]>
-Xan Lopez <[email protected]>
-Olivier Martin <[email protected]>
+James Livingston  <[email protected]>
+Xan Lopez  <[email protected]>
+Ryan Lortie  <[email protected]>
+Olivier Martin  <[email protected]>
+Jonathan Matthew  <[email protected]>
+William Jon McCann  <[email protected]>
 Seth Nickell <[email protected]>
 Bastien Nocera <[email protected]>
-Benjamin Otte <[email protected]>
-Jan Arne Petersen <[email protected]>
-Kristian Rietveld <[email protected]>
-Yann Rouillard <[email protected]>
-Christian Schaller <[email protected]>
-Dennis Smit <[email protected]>
-Bob Smith <[email protected]>
-Michael Terry <[email protected]>
-Colin Walters <[email protected]>
-James Willcox <[email protected]>
-Jeffrey Yasskin <[email protected]>
-Christophe Fergeau <[email protected]>
-David Dollar <[email protected]>
-William Jon McCann <[email protected]>
-Charles Schmidt <[email protected]>
+Benjamin Otte  <[email protected]>
+Jan Arne Petersen  <[email protected]>
+Kristian Rietveld  <[email protected]>
+Yann Rouillard  <[email protected]>
+Christian Schaller  <[email protected]>
+Charles Schmidt  <[email protected]>
+Dennis Smit  <[email protected]>
+Bob Smith  <[email protected]>
+Michael Terry  <[email protected]>
+Colin Walters  <[email protected]>
+James Willcox  <[email protected]>
+Jeffrey Yasskin  <[email protected]>

ChangeLog

@@ -1,3 +1,16 @@
+2005-12-10  William Jon McCann  <[email protected]>
+
+	* shell/rb-shell.c (rb_shell_cmd_about): Updated copyright.
+	Added license and website info.
+
+	* MAINTAINERS.old: Add Colin.
+	* MAINTAINERS: Add James.
+	* AUTHORS: Put back in order.  Add extra space between name and email
+	to make it easier to read.  Add James and jonathan.
+
+	* widgets/rb-song-info.c (rb_song_info_init) 
+	(rb_song_info_constructor): Make sure close button is primary/rightmost.
+
 2005-12-10  Jonathan Matthew  <[email protected]>
 
 	Play queue implementation. Closes bug 107787.

MAINTAINERS

@@ -1 +1 @@
-Colin Walters <walters@verbum.org>
+James Livingston  <jrl@ids.org.au>

MAINTAINERS.old

@@ -1,2 +1,3 @@
-Jorn Baayen <[email protected]>
-Bastien Nocera <[email protected]>
+Colin Walters  <[email protected]>
+Jorn Baayen  <[email protected]>
+Bastien Nocera  <[email protected]>

shell/rb-shell.c

@@ -1935,6 +1935,22 @@ rb_shell_cmd_about (GtkAction *action,
 
 	const char *translator_credits = _("translator_credits");
 
+	const char *license[] = {
+		N_("Rhythmbox is free software; you can redistribute it and/or modify\n"
+		   "it under the terms of the GNU General Public License as published by\n"
+		   "the Free Software Foundation; either version 2 of the License, or\n"
+		   "(at your option) any later version.\n"),
+		N_("Rhythmbox is distributed in the hope that it will be useful,\n"
+		   "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+		   "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+		   "GNU General Public License for more details.\n"),
+		N_("You should have received a copy of the GNU General Public License\n"
+		   "along with Rhythmbox; if not, write to the Free Software Foundation, Inc.,\n"
+		   "59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n")
+	};
+
+	char *license_trans;
+
 	pixbuf = gdk_pixbuf_new_from_file (rb_file ("about-logo.png"), NULL);
 
 	authors[0] = _("Maintainers:");
@@ -1947,17 +1963,24 @@ rb_shell_cmd_about (GtkAction *action,
 
 	comment = g_string_new (_("Music management and playback software for GNOME."));
 
+	license_trans = g_strconcat (_(license[0]), "\n", _(license[1]), "\n",
+				     _(license[2]), "\n", NULL);
+
 	gtk_show_about_dialog (GTK_WINDOW (shell->priv->window),
 			       "name", "Rhythmbox",
 			       "version", VERSION,
-			       "copyright", "Copyright \xc2\xa9 2003, 2004 Colin Walters\nCopyright \xc2\xa9 2002, 2003 Jorn Baayen",
+			       "copyright", "Copyright \xc2\xa9 2005 The Rhythmbox authors\nCopyright \xc2\xa9 2003 - 2005 Colin Walters\nCopyright \xc2\xa9 2002, 2003 Jorn Baayen",
+			       "license", license_trans,
+			       "website", "http://www.gnome.org/projects/rhythmbox",
 			       "comments", comment->str,
 			       "authors", (const char **) authors,
 			       "documenters", (const char **) documenters,
 			       "translator-credits", strcmp (translator_credits, "translator_credits") != 0 ? translator_credits : NULL,
 			       "logo", pixbuf,
 			       NULL);
+
 	g_string_free (comment, TRUE);
+	g_free (license_trans);
 }
 
 void

widgets/rb-song-info.c

@@ -211,15 +211,6 @@ rb_song_info_init (RBSongInfo *song_info)
 
 	gtk_dialog_set_has_separator (GTK_DIALOG (song_info), FALSE);
 
-	gtk_dialog_add_button (GTK_DIALOG (song_info),
-			       GTK_STOCK_CLOSE,
-			       GTK_RESPONSE_CLOSE);
-
-	gtk_dialog_set_default_response (GTK_DIALOG (song_info),
-					 GTK_RESPONSE_CLOSE);
-
-
-
 	gtk_container_set_border_width (GTK_CONTAINER (song_info), 5);
 	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (song_info)->vbox), 2);
 }
@@ -405,6 +396,13 @@ rb_song_info_constructor (GType type, guint n_construct_properties,
 	else
 		rb_song_info_construct_multiple (song_info, xml, editable);
 
+	gtk_dialog_add_button (GTK_DIALOG (song_info),
+			       GTK_STOCK_CLOSE,
+			       GTK_RESPONSE_CLOSE);
+
+	gtk_dialog_set_default_response (GTK_DIALOG (song_info),
+					 GTK_RESPONSE_CLOSE);
+
 	g_object_unref (G_OBJECT (xml));
 	return G_OBJECT (song_info);
 }