totem r5433 - in trunk: . data src

[hadess svn gnome org]

Author: hadess
Date: Mon May 26 13:11:33 2008
New Revision: 5433
URL: http://svn.gnome.org/viewvc/totem?rev=5433&view=rev

Log:
2008-05-26  Bastien Nocera  <hadess hadess net>

	* data/mime-type-list.txt: Add video/x-flv as a support mime-type

	* src/totem-menu.c (about_action_callback): Remove "GNOME" vs. "GTK+"
	backends

	* src/totem-video-indexer.c (main):
	* src/totem-video-thumbnailer.c (main):
	* src/totem.c (main): Remove calls to
	gnome_authentication_manager_init (), as we don't use gnome-vfs
	anymore (Closes: #534824)



Modified:
   trunk/ChangeLog
   trunk/data/mime-type-list.txt
   trunk/src/totem-menu.c
   trunk/src/totem-video-indexer.c
   trunk/src/totem-video-thumbnailer.c
   trunk/src/totem.c

Modified: trunk/data/mime-type-list.txt
==============================================================================
--- trunk/data/mime-type-list.txt	(original)
+++ trunk/data/mime-type-list.txt	Mon May 26 13:11:33 2008
@@ -79,6 +79,7 @@
 video/x-flc
 video/x-fli
 video/x-flic
+video/x-flv
 video/x-m4v
 video/x-matroska
 video/x-mpeg

Modified: trunk/src/totem-menu.c
==============================================================================
--- trunk/src/totem-menu.c	(original)
+++ trunk/src/totem-menu.c	Mon May 26 13:11:33 2008
@@ -1167,7 +1167,6 @@
 about_action_callback (GtkAction *action, Totem *totem)
 {
 	char *backend_version, *description;
-	const char *frontend_type;
 
 	const char *authors[] =
 	{
@@ -1185,17 +1184,10 @@
 	};
 	char *license = totem_interface_get_license ();
 
-#ifdef HAVE_GTK_ONLY
-	frontend_type = N_("GTK+");
-#else
-	frontend_type = N_("GNOME");
-#endif
-
 	backend_version = bacon_video_widget_get_backend_name (totem->bvw);
-	/* This lists the back-end and front-end types and versions, such as
-	 * Movie Player using GStreamer 0.10.1 and GNOME */
-	description = g_strdup_printf (_("Movie Player using %s and %s"),
-				       backend_version, _(frontend_type));
+	/* This lists the back-end type and version, such as
+	 * Movie Player using GStreamer 0.10.1 */
+	description = g_strdup_printf (_("Movie Player using %s"), backend_version);
 
 	gtk_show_about_dialog (GTK_WINDOW (totem->win),
 				     "version", VERSION,

Modified: trunk/src/totem-video-indexer.c
==============================================================================
--- trunk/src/totem-video-indexer.c	(original)
+++ trunk/src/totem-video-indexer.c	Mon May 26 13:11:33 2008
@@ -31,10 +31,6 @@
 
 #include <gtk/gtk.h>
 
-#ifndef HAVE_GTK_ONLY
-#include <gnome.h>
-#endif
-
 #include <bacon-video-widget.h>
 #include <glib/gthread.h>
 #include <string.h>
@@ -165,10 +161,6 @@
 	g_option_context_add_group (context, options);
 	g_type_init ();
 
-#ifndef HAVE_GTK_ONLY
-	gnome_authentication_manager_init ();
-#endif
-
 	if (g_option_context_parse (context, &argc, &argv, &error) == FALSE) {
 		g_print ("couldn't parse command-line options: %s\n", error->message);
 		g_error_free (error);

Modified: trunk/src/totem-video-thumbnailer.c
==============================================================================
--- trunk/src/totem-video-thumbnailer.c	(original)
+++ trunk/src/totem-video-thumbnailer.c	Mon May 26 13:11:33 2008
@@ -36,9 +36,6 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifndef HAVE_GTK_ONLY
-#include <libgnomeui/gnome-authentication-manager.h>
-#endif
 #include "bacon-video-widget.h"
 #include "totem-resources.h"
 
@@ -469,10 +466,6 @@
 	}
 #endif /* THUMB_DEBUG */
 
-#ifndef HAVE_GTK_ONLY
-	gnome_authentication_manager_init ();
-#endif
-
 	if (filenames == NULL || g_strv_length (filenames) != 2) {
 		char *help;
 		help = g_option_context_get_help (context, FALSE, NULL);

Modified: trunk/src/totem.c
==============================================================================
--- trunk/src/totem.c	(original)
+++ trunk/src/totem.c	Mon May 26 13:11:33 2008
@@ -3388,10 +3388,6 @@
 		totem_action_error_and_exit (_("Totem could not initialize the configuration engine."), _("Make sure that GNOME is properly installed."), NULL);
 	}
 
-#ifndef HAVE_GTK_ONLY
-	gnome_authentication_manager_init ();
-#endif /* !HAVE_GTK_ONLY */
-
 	totem = g_object_new (TOTEM_TYPE_OBJECT, NULL);
 	totem->gc = gc;