Removed help-offline from installation

koiuo · Mar 29, 2010 · 7704a7d · 7704a7d
1 parent 26f6e3d
commit 7704a7d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = po src gap batch help help-online
+SUBDIRS = po src gap batch help-online
 
 EXTRA_DIST = \
 	BUGS			\

diff --git a/Makefile.in b/Makefile.in
@@ -205,7 +205,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-SUBDIRS = po src gap batch help help-online
+SUBDIRS = po src gap batch help-online
 EXTRA_DIST = \
 	BUGS			\
 	autogen.sh		\

diff --git a/src/main.c b/src/main.c
@@ -213,25 +213,22 @@ static void query (void)
 
   gimp_plugin_domain_register (GETTEXT_PACKAGE, LOCALEDIR);
 
-  help_offline_path = g_build_filename (PLUGIN_DATADIR, "help", NULL);
+  help_offline_path = g_build_filename (PLUGIN_DATADIR, "help-offline", NULL);
   help_online_path = g_build_filename (PLUGIN_DATADIR, "help-online", NULL);
 
   if (user_manual_is_installed(help_offline_path))
     {
-      printf("FOUND!\n"); fflush(stdout);
       help_path = help_offline_path;
     }
   else
     {
-      printf("NOT FOUND!\n"); fflush(stdout);
       help_path = help_online_path;
     }
   help_uri = g_filename_to_uri (help_path, NULL, NULL);
   g_free (help_offline_path);
   g_free (help_online_path);
 
   gimp_plugin_help_register ("plug-in-lqr-help", help_uri); 
-  printf("help_uri=%s\n", help_uri);
   g_free (help_uri); 
 
   gimp_install_procedure (PLUG_IN_NAME,
@@ -259,15 +256,16 @@ run (const gchar * name,
   GimpRunMode run_mode;
   GimpPDBStatusType status = GIMP_PDB_SUCCESS;
 
-  *nreturn_vals = 1;
-  *return_vals = values;
   gboolean run_dialog = TRUE;
   gboolean run_render = TRUE;
   gint dialog_resp;
   gint dialog_I_resp;
   gint dialog_aux_resp;
   gboolean render_success = FALSE;
 
+  *nreturn_vals = 1;
+  *return_vals = values;
+
   /*  Initialize i18n support  */
   bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 #ifdef HAVE_BIND_TEXTDOMAIN_CODESET