Commit 1f47a470 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

app/app_procs.c app/core/gimp.c app/gui/gui.c removed debugging output.

2002-12-30  Sven Neumann  <sven@gimp.org>

	* app/app_procs.c
	* app/core/gimp.c
	* app/gui/gui.c
	* app/widgets/gimpitemfactory.c: removed debugging output.

	* app/plug-in/plug-ins.c: need to expand the plug_in_path before
	using it.

	* app/gui/plug-in-menus.c (plug_in_menus_init): removed an
	unneeded assertion.

	* plug-ins/imagemap/Makefile.am (EXTRA_DIST): removed references
	to files that were removed some time ago.
parent ad693c3b
2002-12-30 Sven Neumann <sven@gimp.org>
* app/app_procs.c
* app/core/gimp.c
* app/gui/gui.c
* app/widgets/gimpitemfactory.c: removed debugging output.
* app/plug-in/plug-ins.c: need to expand the plug_in_path before
using it.
* app/gui/plug-in-menus.c (plug_in_menus_init): removed an
unneeded assertion.
* plug-ins/imagemap/Makefile.am (EXTRA_DIST): removed references
to files that were removed some time ago.
2002-12-30 Sven Neumann <sven@gimp.org>
* app/config/Makefile.am
......
......@@ -71,10 +71,6 @@ static gboolean app_exit_callback (Gimp *gimp,
static gboolean app_exit_finish_callback (Gimp *gimp,
gboolean kill_it);
/* gimprc debugging code, to be removed */
static void gimprc_notify_callback (GObject *object,
GParamSpec *pspec);
/* global variables */
......@@ -134,10 +130,12 @@ app_init (gint gimp_argc,
alternate_gimprc,
be_verbose);
#if 0
/* solely for debugging */
g_signal_connect (G_OBJECT (gimprc), "notify",
G_CALLBACK (gimprc_notify_callback),
NULL);
#endif
/* initialize lowlevel stuff */
base_init (GIMP_BASE_CONFIG (gimprc), use_mmx);
......@@ -260,9 +258,6 @@ static gboolean
app_exit_callback (Gimp *gimp,
gboolean kill_it)
{
g_print ("EXIT: app_exit_callback(%s)\n",
kill_it ? "TRUE" : "FALSE");
plug_ins_exit (gimp);
if (! gimp->no_interface)
......@@ -275,9 +270,6 @@ static gboolean
app_exit_finish_callback (Gimp *gimp,
gboolean kill_it)
{
g_print ("EXIT: app_exit_finish_callback(%s)\n",
kill_it ? "TRUE" : "FALSE");
g_object_unref (G_OBJECT (gimp));
the_gimp = NULL;
......@@ -292,6 +284,8 @@ app_exit_finish_callback (Gimp *gimp,
}
#if 0
/****************************************
* gimprc debugging code, to be removed *
****************************************/
......@@ -326,3 +320,5 @@ gimprc_notify_callback (GObject *object,
g_string_free (str, TRUE);
g_value_unset (&value);
}
#endif
......@@ -469,9 +469,6 @@ static gboolean
gimp_real_exit (Gimp *gimp,
gboolean kill_it)
{
g_print ("EXIT: gimp_real_exit(%s)\n",
kill_it ? "TRUE" : "FALSE");
gimp_modules_unload (gimp);
gimp_data_factory_data_save (gimp->brush_factory);
gimp_data_factory_data_save (gimp->pattern_factory);
......
......@@ -29,6 +29,7 @@
#include "gui-types.h"
#include "config/gimpguiconfig.h"
#include "config/gimpconfig-path.h"
#include "core/gimp.h"
#include "core/gimpcontainer.h"
......@@ -154,10 +155,16 @@ gui_themes_init (Gimp *gimp)
if (config->theme_path)
{
gimp_datafiles_read_directories (config->theme_path,
gchar *path;
path = gimp_config_path_expand (config->theme_path, TRUE, NULL);
gimp_datafiles_read_directories (path,
G_FILE_TEST_IS_DIR,
gui_themes_dir_foreach_func,
gimp);
g_free (path);
}
theme_dir = gui_themes_get_theme_dir (gimp);
......@@ -507,9 +514,6 @@ static gboolean
gui_exit_callback (Gimp *gimp,
gboolean kill_it)
{
g_print ("EXIT: gui_exit_callback(%s)\n",
kill_it ? "TRUE" : "FALSE");
if (! kill_it && gimp_displays_dirty (gimp))
{
GtkWidget *dialog;
......@@ -549,9 +553,6 @@ static gboolean
gui_exit_finish_callback (Gimp *gimp,
gboolean kill_it)
{
g_print ("EXIT: gui_exit_finish_callback(%s)\n",
kill_it ? "TRUE" : "FALSE");
menus_exit (gimp);
render_exit (gimp);
......
......@@ -68,7 +68,6 @@ plug_in_menus_init (GSList *plug_in_defs,
GSList *domains = NULL;
GSList *tmp;
g_return_if_fail (plug_in_defs != NULL);
g_return_if_fail (std_plugins_domain != NULL);
domains = g_slist_append (domains, (gpointer) std_plugins_domain);
......
......@@ -68,7 +68,6 @@ plug_in_menus_init (GSList *plug_in_defs,
GSList *domains = NULL;
GSList *tmp;
g_return_if_fail (plug_in_defs != NULL);
g_return_if_fail (std_plugins_domain != NULL);
domains = g_slist_append (domains, (gpointer) std_plugins_domain);
......
......@@ -29,6 +29,7 @@
#include "plug-in-types.h"
#include "config/gimpcoreconfig.h"
#include "config/gimpconfig-path.h"
#include "core/gimp.h"
#include "core/gimpcontext.h"
......@@ -97,6 +98,7 @@ plug_ins_init (Gimp *gimp,
{
gchar *filename;
gchar *basename;
gchar *path;
GSList *tmp;
GSList *tmp2;
PlugInDef *plug_in_def;
......@@ -110,10 +112,15 @@ plug_ins_init (Gimp *gimp,
plug_in_init (gimp);
/* search for binaries in the plug-in directory path */
gimp_datafiles_read_directories (gimp->config->plug_in_path,
path = gimp_config_path_expand (gimp->config->plug_in_path, TRUE, NULL);
gimp_datafiles_read_directories (path,
G_FILE_TEST_IS_EXECUTABLE,
plug_ins_init_file, NULL);
g_free (path);
/* read the pluginrc file for cached data */
if (gimp->config->plug_in_rc_path)
{
......
......@@ -29,6 +29,7 @@
#include "plug-in-types.h"
#include "config/gimpcoreconfig.h"
#include "config/gimpconfig-path.h"
#include "core/gimp.h"
#include "core/gimpcontext.h"
......@@ -97,6 +98,7 @@ plug_ins_init (Gimp *gimp,
{
gchar *filename;
gchar *basename;
gchar *path;
GSList *tmp;
GSList *tmp2;
PlugInDef *plug_in_def;
......@@ -110,10 +112,15 @@ plug_ins_init (Gimp *gimp,
plug_in_init (gimp);
/* search for binaries in the plug-in directory path */
gimp_datafiles_read_directories (gimp->config->plug_in_path,
path = gimp_config_path_expand (gimp->config->plug_in_path, TRUE, NULL);
gimp_datafiles_read_directories (path,
G_FILE_TEST_IS_EXECUTABLE,
plug_ins_init_file, NULL);
g_free (path);
/* read the pluginrc file for cached data */
if (gimp->config->plug_in_rc_path)
{
......
......@@ -127,8 +127,6 @@ gimp_item_factory_destroy (GtkObject *object)
factory_path = GTK_ITEM_FACTORY (object)->path;
g_print ("gimp_item_factory_destroy (%s)\n", factory_path);
if (factory_path)
{
GimpItemFactoryClass *factory_class;
......@@ -142,9 +140,6 @@ gimp_item_factory_destroy (GtkObject *object)
{
list = g_list_remove (list, factory);
g_print ("gimp_item_factory_destroy (%d %s factories remaining)\n",
g_list_length (list), factory_path);
if (list)
g_hash_table_replace (factory_class->factories,
g_strdup (factory_path),
......
......@@ -6,8 +6,6 @@ libexec_PROGRAMS = imagemap
EXTRA_DIST = \
arrow.xpm \
arrow_down.xpm \
arrow_up.xpm \
circle.xpm \
coord.xpm \
dimension.xpm \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment