GitLab repository storage has been migrated to hashed layout. Please contact Infrastructure team if you notice any issues with repositories or hooks.

Commit cdd0a514 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

app/fileops.c Make sure that we don't try to destroy query_boxes twice or

2000-11-18  Michael Natterer  <mitch@gimp.org>

	* app/fileops.c
	* libgimp/gimpquerybox.[ch]: Make sure that we don't try to destroy
	query_boxes twice or try to disconnect not-any-more connected
	handlers.

	* app/color_notebook.c
	* app/gimpcontext.[ch]
	* app/gimphelp.[ch]
	* app/lc_dialog.[ch]
	* app/menus.h
	* app/preferences_dialog.c
	* app/tools.[ch]
	* libgimp/gimpcolorbutton.[ch]
	* libgimp/gimpdialog.[ch]
	* libgimp/gimpexport.[ch]
	* libgimp/gimpfileselection.[ch]
	* libgimp/gimphelpui.[ch]
	* libgimp/gimppatheditor.[ch]
	* libgimp/gimppixmap.[ch]
	* libgimp/gimpsizeentry.[ch]
	* libgimp/gimpui.[ch]
	* libgimp/gimpunitmenu.[ch]
	* libgimp/gimpwidgets.[ch]: in a coding attack, changed help_data
	and many other strings passed to UI functions to (const gchar *).
	As a consequence, I had to fix lots of warnings ;)

	* plug-ins/common/tga.c
	* plug-ins/imagemap/imap_main.c: fixed warnings.

	Code cleanup and indentation all over the place.
parent e1234e64
2000-11-18 Michael Natterer <mitch@gimp.org>
* app/fileops.c
* libgimp/gimpquerybox.[ch]: Make sure that we don't try to destroy
query_boxes twice or try to disconnect not-any-more connected
handlers.
* app/color_notebook.c
* app/gimpcontext.[ch]
* app/gimphelp.[ch]
* app/lc_dialog.[ch]
* app/menus.h
* app/preferences_dialog.c
* app/tools.[ch]
* libgimp/gimpcolorbutton.[ch]
* libgimp/gimpdialog.[ch]
* libgimp/gimpexport.[ch]
* libgimp/gimpfileselection.[ch]
* libgimp/gimphelpui.[ch]
* libgimp/gimppatheditor.[ch]
* libgimp/gimppixmap.[ch]
* libgimp/gimpsizeentry.[ch]
* libgimp/gimpui.[ch]
* libgimp/gimpunitmenu.[ch]
* libgimp/gimpwidgets.[ch]: in a coding attack, changed help_data
and many other strings passed to UI functions to (const gchar *).
As a consequence, I had to fix lots of warnings ;)
* plug-ins/common/tga.c
* plug-ins/imagemap/imap_main.c: fixed warnings.
Code cleanup and indentation all over the place.
2000-11-16 Sven Neumann <sven@gimp.org>
* plug-ins/print/Makefile.am
......
......@@ -35,19 +35,6 @@
#include "libgimp/gimpintl.h"
static void color_notebook_ok_callback (GtkWidget *widget,
gpointer data);
static void color_notebook_cancel_callback (GtkWidget *widget,
gpointer data);
static void color_notebook_update_callback (gpointer,
gint,
gint,
gint);
static void color_notebook_page_switch (GtkWidget *,
GtkNotebookPage *,
guint);
static void color_notebook_help_func (gchar *help_data);
/* information we keep on each registered colour selector */
typedef struct _ColorSelectorInfo ColorSelectorInfo;
......@@ -72,7 +59,21 @@ struct _ColorSelectorInstance
ColorSelectorInstance *next;
};
static void selector_death (ColorSelectorInfo *info);
static void color_notebook_ok_callback (GtkWidget *widget,
gpointer data);
static void color_notebook_cancel_callback (GtkWidget *widget,
gpointer data);
static void color_notebook_update_callback (gpointer data,
gint red,
gint green,
gint blue);
static void color_notebook_page_switch (GtkWidget *widget,
GtkNotebookPage *page,
guint page_num);
static void color_notebook_help_func (const gchar *help_data);
static void color_notebook_selector_death (ColorSelectorInfo *info);
/* master list of all registered colour selectors */
......@@ -116,7 +117,7 @@ color_notebook_new (gint red,
cnp->shell =
gimp_dialog_new (_("Color Selection"), "color_selection",
color_notebook_help_func, (gchar *) cnp,
color_notebook_help_func, (const gchar *) cnp,
GTK_WIN_POS_NONE,
FALSE, FALSE, FALSE,
......@@ -235,7 +236,7 @@ color_notebook_free (ColorNotebook *cnp)
csel->info->refs--;
if (csel->info->refs == 0 && !csel->info->active)
selector_death (csel->info);
color_notebook_selector_death (csel->info);
g_free (csel);
csel = next;
......@@ -352,7 +353,7 @@ color_notebook_page_switch (GtkWidget *widget,
}
static void
color_notebook_help_func (gchar *data)
color_notebook_help_func (const gchar *data)
{
ColorNotebook *cnp;
gchar *help_path;
......@@ -418,7 +419,7 @@ gimp_color_selector_unregister (GimpColorSelectorID id,
info->death_callback = callback;
info->death_data = data;
if (info->refs == 0)
selector_death (info);
color_notebook_selector_death (info);
return TRUE;
}
info = info->next;
......@@ -429,7 +430,7 @@ gimp_color_selector_unregister (GimpColorSelectorID id,
}
static void
selector_death (ColorSelectorInfo *info)
color_notebook_selector_death (ColorSelectorInfo *info)
{
ColorSelectorInfo *here, *prev;
......
......@@ -575,7 +575,7 @@ gimp_context_get_type (void)
}
GimpContext *
gimp_context_new (gchar *name,
gimp_context_new (const gchar *name,
GimpContext *template)
{
GimpContext *context;
......@@ -663,7 +663,7 @@ gimp_context_get_name (GimpContext *context)
void
gimp_context_set_name (GimpContext *context,
gchar *name)
const gchar *name)
{
context_check_current (context);
context_return_if_fail (context);
......
......@@ -147,7 +147,7 @@ struct _GimpContextClass
};
GtkType gimp_context_get_type (void);
GimpContext * gimp_context_new (gchar *name,
GimpContext * gimp_context_new (const gchar *name,
GimpContext *template);
/* TODO: - gimp_context_find ()
......@@ -179,7 +179,7 @@ GimpContext * gimp_context_get_standard (void);
*/
gchar * gimp_context_get_name (GimpContext *context);
void gimp_context_set_name (GimpContext *context,
gchar *name);
const gchar *name);
GimpContext * gimp_context_get_parent (GimpContext *context);
void gimp_context_set_parent (GimpContext *context,
......
......@@ -35,19 +35,6 @@
#include "libgimp/gimpintl.h"
static void color_notebook_ok_callback (GtkWidget *widget,
gpointer data);
static void color_notebook_cancel_callback (GtkWidget *widget,
gpointer data);
static void color_notebook_update_callback (gpointer,
gint,
gint,
gint);
static void color_notebook_page_switch (GtkWidget *,
GtkNotebookPage *,
guint);
static void color_notebook_help_func (gchar *help_data);
/* information we keep on each registered colour selector */
typedef struct _ColorSelectorInfo ColorSelectorInfo;
......@@ -72,7 +59,21 @@ struct _ColorSelectorInstance
ColorSelectorInstance *next;
};
static void selector_death (ColorSelectorInfo *info);
static void color_notebook_ok_callback (GtkWidget *widget,
gpointer data);
static void color_notebook_cancel_callback (GtkWidget *widget,
gpointer data);
static void color_notebook_update_callback (gpointer data,
gint red,
gint green,
gint blue);
static void color_notebook_page_switch (GtkWidget *widget,
GtkNotebookPage *page,
guint page_num);
static void color_notebook_help_func (const gchar *help_data);
static void color_notebook_selector_death (ColorSelectorInfo *info);
/* master list of all registered colour selectors */
......@@ -116,7 +117,7 @@ color_notebook_new (gint red,
cnp->shell =
gimp_dialog_new (_("Color Selection"), "color_selection",
color_notebook_help_func, (gchar *) cnp,
color_notebook_help_func, (const gchar *) cnp,
GTK_WIN_POS_NONE,
FALSE, FALSE, FALSE,
......@@ -235,7 +236,7 @@ color_notebook_free (ColorNotebook *cnp)
csel->info->refs--;
if (csel->info->refs == 0 && !csel->info->active)
selector_death (csel->info);
color_notebook_selector_death (csel->info);
g_free (csel);
csel = next;
......@@ -352,7 +353,7 @@ color_notebook_page_switch (GtkWidget *widget,
}
static void
color_notebook_help_func (gchar *data)
color_notebook_help_func (const gchar *data)
{
ColorNotebook *cnp;
gchar *help_path;
......@@ -418,7 +419,7 @@ gimp_color_selector_unregister (GimpColorSelectorID id,
info->death_callback = callback;
info->death_data = data;
if (info->refs == 0)
selector_death (info);
color_notebook_selector_death (info);
return TRUE;
}
info = info->next;
......@@ -429,7 +430,7 @@ gimp_color_selector_unregister (GimpColorSelectorID id,
}
static void
selector_death (ColorSelectorInfo *info)
color_notebook_selector_death (ColorSelectorInfo *info)
{
ColorSelectorInfo *here, *prev;
......
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
* Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -54,23 +54,39 @@ typedef enum
/* preferences local functions */
static PrefsState prefs_check_settings (void);
static void prefs_ok_callback (GtkWidget *, GtkWidget *);
static void prefs_save_callback (GtkWidget *, GtkWidget *);
static void prefs_cancel_callback (GtkWidget *, GtkWidget *);
static void prefs_toggle_callback (GtkWidget *widget, gpointer data);
static void prefs_preview_size_callback (GtkWidget *widget, gpointer data);
static void prefs_nav_preview_size_callback (GtkWidget *widget, gpointer data);
static void prefs_string_callback (GtkWidget *widget, gpointer data);
static void prefs_text_callback (GtkWidget *widget, gpointer data);
static void prefs_filename_callback (GtkWidget *widget, gpointer data);
static void prefs_path_callback (GtkWidget *widget, gpointer data);
static void prefs_clear_session_info_callback (GtkWidget *widget, gpointer data);
static void prefs_default_size_callback (GtkWidget *widget, gpointer data);
static void prefs_default_resolution_callback (GtkWidget *widget, gpointer data);
static void prefs_res_source_callback (GtkWidget *widget, gpointer data);
static void prefs_monitor_resolution_callback (GtkWidget *widget, gpointer data);
static void prefs_resolution_calibrate_callback (GtkWidget *widget, gpointer data);
static void prefs_ok_callback (GtkWidget *widget,
GtkWidget *dlg);
static void prefs_save_callback (GtkWidget *widget,
GtkWidget *dlg);
static void prefs_cancel_callback (GtkWidget *widget,
GtkWidget *dlg);
static void prefs_toggle_callback (GtkWidget *widget,
gpointer data);
static void prefs_preview_size_callback (GtkWidget *widget,
gpointer data);
static void prefs_nav_preview_size_callback (GtkWidget *widget,
gpointer data);
static void prefs_string_callback (GtkWidget *widget,
gpointer data);
static void prefs_text_callback (GtkWidget *widget,
gpointer data);
static void prefs_filename_callback (GtkWidget *widget,
gpointer data);
static void prefs_path_callback (GtkWidget *widget,
gpointer data);
static void prefs_clear_session_info_callback (GtkWidget *widget,
gpointer data);
static void prefs_default_size_callback (GtkWidget *widget,
gpointer data);
static void prefs_default_resolution_callback (GtkWidget *widget,
gpointer data);
static void prefs_res_source_callback (GtkWidget *widget,
gpointer data);
static void prefs_monitor_resolution_callback (GtkWidget *widget,
gpointer data);
static void prefs_resolution_calibrate_callback (GtkWidget *widget,
gpointer data);
static void prefs_restart_notification (void);
......@@ -1295,7 +1311,7 @@ prefs_frame_new (gchar *label,
}
static void
prefs_help_func (gchar *help_data)
prefs_help_func (const gchar *help_data)
{
GtkWidget *notebook;
GtkWidget *event_box;
......
......@@ -629,18 +629,14 @@ file_revert_callback (GtkWidget *widget,
FALSE,
text,
_("Yes"), _("No"),
NULL, NULL,
GTK_OBJECT (gimage), "destroy",
file_revert_confirm_callback,
gimage);
gtk_object_set_data (GTK_OBJECT (gimage), REVERT_DATA_KEY, query_box);
gtk_signal_connect_object_while_alive (GTK_OBJECT (gimage), "destroy",
GTK_SIGNAL_FUNC (gtk_widget_destroy),
GTK_OBJECT (query_box));
g_free (text);
gtk_object_set_data (GTK_OBJECT (gimage), REVERT_DATA_KEY, query_box);
gtk_widget_show (query_box);
}
}
......
......@@ -575,7 +575,7 @@ gimp_context_get_type (void)
}
GimpContext *
gimp_context_new (gchar *name,
gimp_context_new (const gchar *name,
GimpContext *template)
{
GimpContext *context;
......@@ -663,7 +663,7 @@ gimp_context_get_name (GimpContext *context)
void
gimp_context_set_name (GimpContext *context,
gchar *name)
const gchar *name)
{
context_check_current (context);
context_return_if_fail (context);
......
......@@ -147,7 +147,7 @@ struct _GimpContextClass
};
GtkType gimp_context_get_type (void);
GimpContext * gimp_context_new (gchar *name,
GimpContext * gimp_context_new (const gchar *name,
GimpContext *template);
/* TODO: - gimp_context_find ()
......@@ -179,7 +179,7 @@ GimpContext * gimp_context_get_standard (void);
*/
gchar * gimp_context_get_name (GimpContext *context);
void gimp_context_set_name (GimpContext *context,
gchar *name);
const gchar *name);
GimpContext * gimp_context_get_parent (GimpContext *context);
void gimp_context_set_parent (GimpContext *context,
......
......@@ -2,7 +2,7 @@
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* gimphelp.c
* Copyright (C) 1999 Michael Natterer <mitch@gimp.org>
* Copyright (C) 1999-2000 Michael Natterer <mitch@gimp.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -53,13 +53,13 @@ struct _GimpIdleHelp
};
/* local function prototypes */
static gint gimp_idle_help (gpointer data);
static gboolean gimp_help_internal (gchar *help_path,
gchar *current_locale,
gchar *help_data);
static void gimp_help_netscape (gchar *help_path,
gchar *current_locale,
gchar *help_data);
static gint gimp_idle_help (gpointer data);
static gboolean gimp_help_internal (const gchar *help_path,
const gchar *current_locale,
const gchar *help_data);
static void gimp_help_netscape (const gchar *help_path,
const gchar *current_locale,
const gchar *help_data);
/**********************/
/* public functions */
......@@ -67,15 +67,15 @@ static void gimp_help_netscape (gchar *help_path,
/* The standard help function */
void
gimp_standard_help_func (gchar *help_data)
gimp_standard_help_func (const gchar *help_data)
{
gimp_help (NULL, help_data);
}
/* the main help function */
void
gimp_help (gchar *help_path,
gchar *help_data)
gimp_help (const gchar *help_path,
const gchar *help_data)
{
if (use_help)
{
......@@ -169,9 +169,9 @@ gimp_help_internal_not_found_callback (GtkWidget *widget,
}
static gboolean
gimp_help_internal (gchar *help_path,
gchar *current_locale,
gchar *help_data)
gimp_help_internal (const gchar *help_path,
const gchar *current_locale,
const gchar *help_data)
{
ProcRecord *proc_rec;
......@@ -207,11 +207,11 @@ gimp_help_internal (gchar *help_path,
args[0].arg_type = PDB_INT32;
args[0].value.pdb_int = RUN_INTERACTIVE;
args[1].arg_type = PDB_STRING;
args[1].value.pdb_pointer = help_path;
args[1].value.pdb_pointer = (gpointer) help_path;
args[2].arg_type = PDB_STRING;
args[2].value.pdb_pointer = current_locale;
args[2].value.pdb_pointer = (gpointer) current_locale;
args[3].arg_type = PDB_STRING;
args[3].value.pdb_pointer = help_data;
args[3].value.pdb_pointer = (gpointer) help_data;
plug_in_run (proc_rec, args, 4, FALSE, TRUE, 0);
......@@ -237,9 +237,9 @@ gimp_help_internal (gchar *help_path,
}
static void
gimp_help_netscape (gchar *help_path,
gchar *current_locale,
gchar *help_data)
gimp_help_netscape (const gchar *help_path,
const gchar *current_locale,
const gchar *help_data)
{
Argument *return_vals;
gint nreturn_vals;
......
......@@ -2,7 +2,7 @@
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* gimphelp.h
* Copyright (C) 1999 Michael Natterer <mitch@gimp.org>
* Copyright (C) 1999-2000 Michael Natterer <mitch@gimp.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -18,21 +18,26 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __GIMP_HELP_H__
#define __GIMP_HELP_H__
#include <gtk/gtk.h>
#include "libgimp/gimphelpui.h"
enum
{
HELP_BROWSER_GIMP,
HELP_BROWSER_NETSCAPE
};
/* the main help function */
void gimp_help (gchar *help_path,
gchar *help_data);
void gimp_help (const gchar *help_path,
const gchar *help_data);
#endif /* __GIMP_HELP_H__ */
......@@ -35,19 +35,6 @@
#include "libgimp/gimpintl.h"
static void color_notebook_ok_callback (GtkWidget *widget,
gpointer data);
static void color_notebook_cancel_callback (GtkWidget *widget,
gpointer data);
static void color_notebook_update_callback (gpointer,
gint,
gint,
gint);
static void color_notebook_page_switch (GtkWidget *,
GtkNotebookPage *,
guint);
static void color_notebook_help_func (gchar *help_data);
/* information we keep on each registered colour selector */
typedef struct _ColorSelectorInfo ColorSelectorInfo;
......@@ -72,7 +59,21 @@ struct _ColorSelectorInstance
ColorSelectorInstance *next;
};
static void selector_death (ColorSelectorInfo *info);
static void color_notebook_ok_callback (GtkWidget *widget,
gpointer data);
static void color_notebook_cancel_callback (GtkWidget *widget,
gpointer data);
static void color_notebook_update_callback (gpointer data,
gint red,
gint green,
gint blue);
static void color_notebook_page_switch (GtkWidget *widget,
GtkNotebookPage *page,
guint page_num);
static void color_notebook_help_func (const gchar *help_data);
static void color_notebook_selector_death (ColorSelectorInfo *info);
/* master list of all registered colour selectors */
......@@ -116,7 +117,7 @@ color_notebook_new (gint red,
cnp->shell =
gimp_dialog_new (_("Color Selection"), "color_selection",
color_notebook_help_func, (gchar *) cnp,
color_notebook_help_func, (const gchar *) cnp,
GTK_WIN_POS_NONE,
FALSE, FALSE, FALSE,
......@@ -235,7 +236,7 @@ color_notebook_free (ColorNotebook *cnp)
csel->info->refs--;
if (csel->info->refs == 0 && !csel->info->active)
selector_death (csel->info);
color_notebook_selector_death (csel->info);
g_free (csel);
csel = next;
......@@ -352,7 +353,7 @@ color_notebook_page_switch (GtkWidget *widget,
}
static void
color_notebook_help_func (gchar *data)
color_notebook_help_func (const gchar *data)
{
ColorNotebook *cnp;
gchar *help_path;
......@@ -418,7 +419,7 @@ gimp_color_selector_unregister (GimpColorSelectorID id,
info->death_callback = callback;
info->death_data = data;
if (info->refs == 0)
selector_death (info);
color_notebook_selector_death (info);
return TRUE;
}
info = info->next;
......@@ -429,7 +430,7 @@ gimp_color_selector_unregister (GimpColorSelectorID id,
}
static void
selector_death (ColorSelectorInfo *info)
color_notebook_selector_death (ColorSelectorInfo *info)
{
ColorSelectorInfo *here, *prev;
......
......@@ -26,8 +26,8 @@ struct _GimpItemFactoryEntry
{
GtkItemFactoryEntry entry;
gchar *help_page;
gchar *description;
const gchar *help_page;
gchar *description;
};
void menus_get_toolbox_menubar (GtkWidget **menubar,
......
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
* Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -54,23 +54,39 @@ typedef enum
/* preferences local functions */
static PrefsState prefs_check_settings (void);
static void prefs_ok_callback (GtkWidget *, GtkWidget *);
static void prefs_save_callback (GtkWidget *, GtkWidget *);
static void prefs_cancel_callback (GtkWidget *, GtkWidget *);
static void prefs_toggle_callback (GtkWidget *widget, gpointer data);
static void prefs_preview_size_callback (GtkWidget *widget, gpointer data);
static void prefs_nav_preview_size_callback (GtkWidget *widget, gpointer data);
static void prefs_string_callback (GtkWidget *widget, gpointer data);
static void prefs_text_callback (GtkWidget *widget, gpointer data);
static void prefs_filename_callback (GtkWidget *widget, gpointer data);
static void prefs_path_callback (GtkWidget *widget, gpointer data);
static void prefs_clear_session_info_callback (GtkWidget *widget, gpointer data);
static void prefs_default_size_callback (GtkWidget *widget, gpointer data);
static void prefs_default_resolution_callback (GtkWidget *widget, gpointer data);
static void prefs_res_source_callback (GtkWidget *widget, gpointer data);
static void prefs_monitor_resolution_callback (GtkWidget *widget, gpointer data);
static void prefs_resolution_calibrate_callback (GtkWidget *widget, gpointer data);
static void prefs_ok_callback (GtkWidget *widget,
GtkWidget *dlg);
static void prefs_save_callback (GtkWidget *widget,
GtkWidget *dlg);
static void prefs_cancel_callback (GtkWidget *widget,
GtkWidget *dlg);
static void prefs_toggle_callback (GtkWidget *widget,
gpointer data);
static void prefs_preview_size_callback (GtkWidget *widget,
gpointer data);
static void prefs_nav_preview_size_callback (GtkWidget *widget,
gpointer data);
static void prefs_string_callback (GtkWidget *widget,
gpointer data);
static void prefs_text_callback (GtkWidget *widget,
gpointer data);
static void prefs_filename_callback (GtkWidget *widget,
gpointer data);
static void prefs_path_callback (GtkWidget *widget,
gpointer data);
static void prefs_clear_session_info_callback (GtkWidget *widget,
gpointer data);
static void prefs_default_size_callback (GtkWidget *widget,
gpointer data);
static void prefs_default_resolution_callback (GtkWidget *widget,
gpointer data);
static void prefs_res_source_callback (GtkWidget *widget,
gpointer data);
static void prefs_monitor_resolution_callback (GtkWidget *widget,
gpointer data);
static void prefs_resolution_calibrate_callback (GtkWidget *widget,
gpointer data);
static void prefs_restart_notification (void);
......@@ -1295,7 +1311,7 @@ prefs_frame_new (gchar *label,
}
static void
prefs_help_func (gchar *help_data)
prefs_help_func (const gchar *help_data)
{
GtkWidget *notebook;