totem r5563 - in trunk: . src

[hadess svn gnome org]

Author: hadess
Date: Mon Aug 18 11:02:50 2008
New Revision: 5563
URL: http://svn.gnome.org/viewvc/totem?rev=5563&view=rev

Log:
2008-08-18  Bastien Nocera  <hadess hadess net>

	* configure.in: update GTK+ req
	* src/totem-audio-preview.c: remove unneeded gnome
	include
	* src/totem-menu.c (totem_ui_manager_setup):
	* src/totem.c (totem_action_show_help): Use a newer GTK+
	to launch the help, and don't require libgnomeui for that,
	based on patch from Philip Withnall <philip tecnocode co uk>
	(Closes: #514384)



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/totem-audio-preview.c
   trunk/src/totem-menu.c
   trunk/src/totem.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Aug 18 11:02:50 2008
@@ -34,7 +34,7 @@
 
 # Requirements
 GLIB_REQS=2.13.4
-GTK_REQS=2.12.6
+GTK_REQS=2.13.0
 TOTEM_PLPARSER_REQS=2.21.90
 GNOMEUI_REQS=2.3.3
 LIBGNOME_REQS=2.14.0

Modified: trunk/src/totem-audio-preview.c
==============================================================================
--- trunk/src/totem-audio-preview.c	(original)
+++ trunk/src/totem-audio-preview.c	Mon Aug 18 11:02:50 2008
@@ -32,10 +32,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>

Modified: trunk/src/totem-menu.c
==============================================================================
--- trunk/src/totem-menu.c	(original)
+++ trunk/src/totem-menu.c	Mon Aug 18 11:02:50 2008
@@ -1371,12 +1371,6 @@
 				G_N_ELEMENTS (seek_entries_rtl), totem);
 	}
 
-	/* Hide help if we're using GTK+ only */
-#ifdef HAVE_GTK_ONLY
-	GtkAction *action = gtk_action_group_get_action (totem->main_action_group, "contents");
-	gtk_action_set_visible (action, FALSE);
-#endif /* HAVE_GTK_ONLY */
-
 	totem->ui_manager = GTK_UI_MANAGER (gtk_builder_get_object (totem->xml, "totem-ui-manager"));
 
 	totem->devices_action_group = NULL;

Modified: trunk/src/totem.c
==============================================================================
--- trunk/src/totem.c	(original)
+++ trunk/src/totem.c	Mon Aug 18 11:02:50 2008
@@ -1453,15 +1453,12 @@
 void
 totem_action_show_help (Totem *totem)
 {
-#ifndef HAVE_GTK_ONLY
-	GError *err = NULL;
+	GError *error = NULL;
 
-	if (gnome_help_display ("totem.xml", NULL, &err) == FALSE)
-	{
-		totem_action_error (_("Totem could not display the help contents."), err->message, totem);
-		g_error_free (err);
+	if (gtk_show_uri (gtk_widget_get_screen (totem->win), "ghelp:totem", gtk_get_current_event_time (), &error) == FALSE) {
+		totem_action_error (_("Totem could not display the help contents."), error->message, totem);
+		g_error_free (error);
 	}
-#endif /* !HAVE_GTK_ONLY */
 }
 
 static gboolean