gnome-applets r11194 - trunk/mini-commander/src

[diegoe svn gnome org]

Author: diegoe
Date: Wed Jan 14 07:56:58 2009
New Revision: 11194
URL: http://svn.gnome.org/viewvc/gnome-applets?rev=11194&view=rev

Log:
Drop gnome_help from mini-commander applet

Modified:
   trunk/mini-commander/src/help.c
   trunk/mini-commander/src/mini-commander_applet.c
   trunk/mini-commander/src/preferences.c

Modified: trunk/mini-commander/src/help.c
==============================================================================
--- trunk/mini-commander/src/help.c	(original)
+++ trunk/mini-commander/src/help.c	Wed Jan 14 07:56:58 2009
@@ -21,8 +21,6 @@
 
 #include <config.h>
 
-#include <libgnomeui/gnome-help.h>
-
 #include "help.h"
 
 void 
@@ -32,9 +30,9 @@
 {
     GError *error = NULL;
    
-    gnome_help_display_on_screen (
-		"command-line", NULL,
-		gtk_widget_get_screen (GTK_WIDGET (mcdata->applet)),
+    gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (mcdata->applet)),
+		"command-line",
+		gtk_get_current_event_time (),
 		&error);
 
     if (error) { /* FIXME: this error needs to be seen by the user */

Modified: trunk/mini-commander/src/mini-commander_applet.c
==============================================================================
--- trunk/mini-commander/src/mini-commander_applet.c	(original)
+++ trunk/mini-commander/src/mini-commander_applet.c	Wed Jan 14 07:56:58 2009
@@ -39,7 +39,6 @@
 
 #include <panel-applet.h>
 #include <gconf/gconf-client.h>
-#include <libgnomeui/gnome-window-icon.h>
 #include "mini-commander_applet.h"
 #include "preferences.h"
 #include "command_line.h"

Modified: trunk/mini-commander/src/preferences.c
==============================================================================
--- trunk/mini-commander/src/preferences.c	(original)
+++ trunk/mini-commander/src/preferences.c	Wed Jan 14 07:56:58 2009
@@ -31,8 +31,6 @@
 
 #include <panel-applet.h>
 #include <panel-applet-gconf.h>
-#include <libgnome/gnome-init.h>
-#include <libgnomeui/gnome-help.h>
 #include <gconf/gconf-client.h>
 
 #include "mini-commander_applet.h"
@@ -343,21 +341,20 @@
 show_help_section (GtkWindow *dialog, gchar *section)
 {
 	GError *error = NULL;
-	static GnomeProgram *applet_program = NULL;
-	
-	if (!applet_program) {
-		int argc = 1;
-		char *argv[2] = { "command-line" };
-		applet_program = gnome_program_init ("command-line", VERSION,
-						      LIBGNOME_MODULE, argc, argv,
-     						      GNOME_PROGRAM_STANDARD_PROPERTIES, NULL);
-	}
+	char *uri;
 
-	gnome_help_display_desktop_on_screen (
-			applet_program, "command-line", "command-line", section,
-			gtk_widget_get_screen (GTK_WIDGET (dialog)),
+	if (section)
+		uri = g_strdup_printf ("ghelp:command-line?%s", section);
+	else
+		uri = g_strdup ("ghelp:command-line");
+
+	gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (dialog)),
+			uri,
+			gtk_get_current_event_time (),
 			&error);
 
+	g_free (uri);
+
 	if (error) {
 		GtkWidget *error_dialog;