totem r5710 - in trunk: . data src src/plugins/tracker

[pwithnall svn gnome org]

Author: pwithnall
Date: Sat Sep 20 21:47:33 2008
New Revision: 5710
URL: http://svn.gnome.org/viewvc/totem?rev=5710&view=rev

Log:
2008-09-20  Philip Withnall  <philip tecnocode co uk>

	* src/plugins/tracker/totem-tracker-widget.c (get_search_count):
	* src/totem-playlist.c (totem_playlist_error): Fix using 
unvetted
	strings in printf-style functions.
	* data/totem.schemas.in:
	* src/totem-menu.c (about_action_callback):
	* src/totem-options.c: Fix some hyphenation problems in strings, 
and
	update the copyright date in the about dialogue.



Modified:
   trunk/ChangeLog
   trunk/data/totem.schemas.in
   trunk/src/plugins/tracker/totem-tracker-widget.c
   trunk/src/totem-menu.c
   trunk/src/totem-options.c
   trunk/src/totem-playlist.c

Modified: trunk/data/totem.schemas.in
==============================================================================
--- trunk/data/totem.schemas.in	(original)
+++ trunk/data/totem.schemas.in	Sat Sep 20 21:47:33 2008
@@ -11,7 +11,7 @@
 	  <short>Allow the screensaver to activate even when audio-only is playing</short>
 	  <long>
 	    Allow the screensaver to activate even when audio-only is playing.
-	    This is useful for monitor powered speakers.
+	    This is useful for monitor-powered speakers.
 	  </long>
 	</locale>
       </schema>

Modified: trunk/src/plugins/tracker/totem-tracker-widget.c
==============================================================================
--- trunk/src/plugins/tracker/totem-tracker-widget.c	(original)
+++ trunk/src/plugins/tracker/totem-tracker-widget.c	Sat Sep 20 21:47:33 2008
@@ -187,7 +187,7 @@
 			   G_TYPE_INVALID, G_TYPE_INT, &count, G_TYPE_INVALID);
 
 	if (error) {
-		g_warning (error->message);
+		g_warning ("%s", error->message);
 		g_error_free (error);
 		return -1;
 	}

Modified: trunk/src/totem-menu.c
==============================================================================
--- trunk/src/totem-menu.c	(original)
+++ trunk/src/totem-menu.c	Sat Sep 20 21:47:33 2008
@@ -1173,7 +1173,7 @@
 
 	gtk_show_about_dialog (GTK_WINDOW (totem->win),
 				     "version", VERSION,
-				     "copyright", _("Copyright \xc2\xa9 2002-2007 Bastien Nocera"),
+				     "copyright", _("Copyright \xc2\xa9 2002-2008 Bastien Nocera"),
 				     "comments", description,
 				     "authors", authors,
 				     "documenters", documenters,

Modified: trunk/src/totem-options.c
==============================================================================
--- trunk/src/totem-options.c	(original)
+++ trunk/src/totem-options.c	Sat Sep 20 21:47:33 2008
@@ -49,7 +49,7 @@
 	{"quit", '\0', 0, G_OPTION_ARG_NONE, &optionstate.quit, N_("Quit"), NULL},
 	{"enqueue", '\0', 0, G_OPTION_ARG_NONE, &optionstate.enqueue, N_("Enqueue"), NULL},
 	{"replace", '\0', 0, G_OPTION_ARG_NONE, &optionstate.replace, N_("Replace"), NULL},
-	{"no-existing-session", '\0', 0, G_OPTION_ARG_NONE, &optionstate.notconnectexistingsession, N_("Don't connect to an already running instance"), NULL},
+	{"no-existing-session", '\0', 0, G_OPTION_ARG_NONE, &optionstate.notconnectexistingsession, N_("Don't connect to an already-running instance"), NULL},
 	/* translators: this option prints the current movie's title on the command-line */
 	{"printplaying", '\0', 0, G_OPTION_ARG_NONE, &optionstate.printplaying, N_("Print playing movie"), NULL},
 	{"seek", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_INT64, &optionstate.seek, N_("Seek"), NULL},

Modified: trunk/src/totem-playlist.c
==============================================================================
--- trunk/src/totem-playlist.c	(original)
+++ trunk/src/totem-playlist.c	Sat Sep 20 21:47:33 2008
@@ -246,9 +246,9 @@
 				GTK_DIALOG_MODAL,
 				GTK_MESSAGE_ERROR,
 				GTK_BUTTONS_OK,
-				title);
+				"%s", title);
 	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (error_dialog),
-						  reason);
+						  "%s", reason);
 
 	gtk_container_set_border_width (GTK_CONTAINER (error_dialog), 5);
 	gtk_dialog_set_default_response (GTK_DIALOG (error_dialog),