brasero r1632 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Mon Dec 15 17:40:43 2008
New Revision: 1632
URL: http://svn.gnome.org/viewvc/brasero?rev=1632&view=rev

Log:
	Use GTK+ to manage help files. Patch by Luis Medinas.
	Fix #560358 â [PATCH] Move to gtk_show_uri another step to remove libgnome

	* configure.in:
	* src/brasero-app.c (on_help_cb):


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/brasero-app.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Dec 15 17:40:43 2008
@@ -184,7 +184,7 @@
 LIBGNOMEUI_REQUIRED=2.10.0
 
 AC_ARG_ENABLE(gnome2,
-			[  --enable-gnome2		Build with GNOME2 (improved integration with GNOME2, help system, session management support) [[default = yes]]],,
+			[  --enable-gnome2		Build with GNOME2 (improved integration with GNOME2, session management support) [[default = yes]]],,
 			[enable_gnome2="yes"])
 
 if test x"$enable_gnome2" = "xyes"; then

Modified: trunk/src/brasero-app.c
==============================================================================
--- trunk/src/brasero-app.c	(original)
+++ trunk/src/brasero-app.c	Mon Dec 15 17:40:43 2008
@@ -27,13 +27,6 @@
 
 #include <gtk/gtk.h>
 
-#ifdef BUILD_GNOME2
-
-#include <libgnome/gnome-help.h>
-#include <libgnomeui/libgnomeui.h>
-
-#endif
-
 #include "brasero-app.h"
 #include "brasero-utils.h"
 #include "brasero-jacket-edit.h"
@@ -86,10 +79,7 @@
 static void on_exit_cb (GtkAction *action, BraseroApp *app);
 
 static void on_about_cb (GtkAction *action, BraseroApp *app);
-
-#ifdef BUILD_GNOME2
 static void on_help_cb (GtkAction *action, BraseroApp *app);
-#endif
 
 static GtkActionEntry entries[] = {
 	{"ProjectMenu", NULL, N_("_Project")},
@@ -114,13 +104,9 @@
 	{"Exit", GTK_STOCK_QUIT, NULL, NULL,
 	 N_("Exit the program"), G_CALLBACK (on_exit_cb)},
 
-#ifdef BUILD_GNOME2
-	
 	{"Contents", GTK_STOCK_HELP, N_("_Contents"), "F1", N_("Display help"),
 	 G_CALLBACK (on_help_cb)}, 
 
-#endif
-
 	{"About", GTK_STOCK_ABOUT, NULL, NULL, N_("About"),
 	 G_CALLBACK (on_about_cb)},
 };
@@ -149,11 +135,8 @@
 		"<menuitem action='Check'/>"
 	    "</menu>"
 	    "<menu action='HelpMenu'>"
-
-#ifdef BUILD_GNOME2
 		"<menuitem action='Contents'/>"
 		"<separator/>"
-#endif
 		"<menuitem action='About'/>"
 	    "</menu>"
 	    "</menubar>"
@@ -562,16 +545,12 @@
 	g_free (license);
 }
 
-#ifdef BUILD_GNOME2
-
 static void
 on_help_cb (GtkAction *action, BraseroApp *app)
 {
 	GError *error = NULL;
 
- 	gnome_help_display ("brasero.xml",
-			     NULL,
-			     &error);
+ 	gtk_show_uri (NULL, "ghelp:brasero", gtk_get_current_event_time (), &error);
    	if (error) {
 		GtkWidget *d;
         
@@ -586,8 +565,6 @@
 	}
 }
 
-#endif
-
 static gboolean
 on_window_state_changed_cb (GtkWidget *widget,
 			    GdkEventWindowState *event,