Commit 849d6c0d authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

check for app/core/gimp.c instead of etc/gimprc.in which no longer exists.

2002-12-29  Sven Neumann  <neo@wintermute>

        * configure.in: check for app/core/gimp.c instead of etc/gimprc.in
        which no longer exists.

        * app/gui/user-install-dialog.c: use the term Folder instead of
        Directory (fixes bug #102016).
parent f5c1b364
2002-12-29 Sven Neumann <neo@wintermute>
* configure.in: check for app/core/gimp.c instead of etc/gimprc.in
which no longer exists.
* app/gui/user-install-dialog.c: use the term Folder instead of
Directory (fixes bug #102016).
2002-12-29 Sven Neumann <sven@gimp.org>
* configure.in
......
......@@ -109,12 +109,12 @@ static GdkColor white_color;
static GdkColor title_color;
typedef enum
{
TREE_ITEM_DONT, /* Don't pre-create */
TREE_ITEM_MKDIR_ONLY, /* Just mkdir */
TREE_ITEM_FROM_SYSCONF_DIR, /* Copy from sysconf directory */
TREE_ITEM_FROM_DATA_DIR /* ... from data directory */
} TreeItemType;
{
TREE_ITEM_DONT, /* Don't pre-create */
TREE_ITEM_MKDIR_ONLY, /* Just mkdir */
TREE_ITEM_FROM_SYSCONF_DIR, /* Copy from sysconf directory */
TREE_ITEM_FROM_DATA_DIR /* ... from data directory */
} TreeItemType;
static struct
{
......@@ -1147,12 +1147,12 @@ user_install_run (void)
{
if (i == 0)
{
g_snprintf (log_line, sizeof (log_line), _("Creating directory %s\n"),
g_snprintf (log_line, sizeof (log_line), _("Creating folder %s\n"),
gimp_directory ());
gtk_text_buffer_insert_at_cursor (log_buffer, log_line, -1);
if (mkdir (gimp_directory (), 0666) == -1)
{
install_error_message = g_strdup_printf (_("Cannot create directory -- %s"),
install_error_message = g_strdup_printf (_("Cannot create folder: %s"),
g_strerror (errno));
goto break_out_of_loop;
}
......@@ -1166,12 +1166,12 @@ user_install_run (void)
break;
case TREE_ITEM_MKDIR_ONLY:
g_snprintf (log_line, sizeof (log_line), _("Creating directory %s\n"),
g_snprintf (log_line, sizeof (log_line), _("Creating folder %s\n"),
dest);
gtk_text_buffer_insert_at_cursor (log_buffer, log_line, -1);
if (mkdir (dest, 0666) == -1)
{
install_error_message = g_strdup_printf (_("Cannot create directory -- %s"),
install_error_message = g_strdup_printf (_("Cannot create folder: %s"),
g_strerror (errno));
goto break_out_of_loop;
}
......@@ -1210,7 +1210,7 @@ user_install_run (void)
if (i < num_tree_items)
{
g_snprintf (log_line, sizeof (log_line), _(" Failure -- %s\n"),
g_snprintf (log_line, sizeof (log_line), _(" Failure: %s\n"),
install_error_message);
gtk_text_buffer_insert_at_cursor (log_buffer, log_line, -1);
add_label (GTK_BOX (log_page),
......
......@@ -120,7 +120,7 @@ static void gimp_display_shell_format_title (GimpDisplayShell *gdisp,
const gchar *format);
static void gimp_display_shell_close_warning_dialog (GimpDisplayShell *shell,
const gchar *image_name);
GimpImage *gimage);
static void gimp_display_shell_close_warning_callback (GtkWidget *widget,
gboolean close,
gpointer data);
......@@ -814,11 +814,9 @@ void
gimp_display_shell_close (GimpDisplayShell *shell,
gboolean kill_it)
{
GimpDisplayConfig *config;
GimpImage *gimage;
GimpImage *gimage;
gimage = shell->gdisp->gimage;
config = GIMP_DISPLAY_CONFIG (gimage->gimp->config);
/* FIXME: gimp_busy HACK not really appropriate here because we only
* want to prevent the busy image and display to be closed. --Mitch
......@@ -833,15 +831,9 @@ gimp_display_shell_close (GimpDisplayShell *shell,
if (! kill_it &&
gimage->disp_count == 1 &&
gimage->dirty &&
config->confirm_on_close)
GIMP_DISPLAY_CONFIG (gimage->gimp->config)->confirm_on_close)
{
gchar *basename;
basename = file_utils_uri_to_utf8_basename (gimp_image_get_uri (gimage));
gimp_display_shell_close_warning_dialog (shell, basename);
g_free (basename);
gimp_display_shell_close_warning_dialog (shell, gimage);
}
else
{
......@@ -2676,11 +2668,11 @@ gimp_display_shell_format_title (GimpDisplayShell *shell,
static void
gimp_display_shell_close_warning_dialog (GimpDisplayShell *shell,
const gchar *image_name)
GimpImage *gimage)
{
GtkWidget *mbox;
gchar *title;
gchar *warning;
gchar *name;
gchar *title;
gchar *warning;
if (shell->warning_dialog)
{
......@@ -2688,12 +2680,19 @@ gimp_display_shell_close_warning_dialog (GimpDisplayShell *shell,
return;
}
title = g_strdup_printf (_("Close %s?"), image_name);
name = file_utils_uri_to_utf8_basename (gimp_image_get_uri (gimage));
title = g_strdup_printf (_("Close %s?"), name);
warning = g_strdup_printf (_("Changes were made to %s.\n"
"Close anyway?"), image_name);
"Close anyway?"), name);
#if 0
shell->warning_dialog = gtk_message_dialog_new (shell->window,
0,
GTK_MESSAGE_QUESTION,);
#endif
shell->warning_dialog = mbox =
shell->warning_dialog =
gimp_query_boolean_box (title,
gimp_standard_help_func,
"dialogs/really_close.html",
......@@ -2704,10 +2703,11 @@ gimp_display_shell_close_warning_dialog (GimpDisplayShell *shell,
gimp_display_shell_close_warning_callback,
shell);
g_free (name);
g_free (title);
g_free (warning);
gtk_widget_show (mbox);
gtk_widget_show (shell->warning_dialog);
}
static void
......
......@@ -120,7 +120,7 @@ static void gimp_display_shell_format_title (GimpDisplayShell *gdisp,
const gchar *format);
static void gimp_display_shell_close_warning_dialog (GimpDisplayShell *shell,
const gchar *image_name);
GimpImage *gimage);
static void gimp_display_shell_close_warning_callback (GtkWidget *widget,
gboolean close,
gpointer data);
......@@ -814,11 +814,9 @@ void
gimp_display_shell_close (GimpDisplayShell *shell,
gboolean kill_it)
{
GimpDisplayConfig *config;
GimpImage *gimage;
GimpImage *gimage;
gimage = shell->gdisp->gimage;
config = GIMP_DISPLAY_CONFIG (gimage->gimp->config);
/* FIXME: gimp_busy HACK not really appropriate here because we only
* want to prevent the busy image and display to be closed. --Mitch
......@@ -833,15 +831,9 @@ gimp_display_shell_close (GimpDisplayShell *shell,
if (! kill_it &&
gimage->disp_count == 1 &&
gimage->dirty &&
config->confirm_on_close)
GIMP_DISPLAY_CONFIG (gimage->gimp->config)->confirm_on_close)
{
gchar *basename;
basename = file_utils_uri_to_utf8_basename (gimp_image_get_uri (gimage));
gimp_display_shell_close_warning_dialog (shell, basename);
g_free (basename);
gimp_display_shell_close_warning_dialog (shell, gimage);
}
else
{
......@@ -2676,11 +2668,11 @@ gimp_display_shell_format_title (GimpDisplayShell *shell,
static void
gimp_display_shell_close_warning_dialog (GimpDisplayShell *shell,
const gchar *image_name)
GimpImage *gimage)
{
GtkWidget *mbox;
gchar *title;
gchar *warning;
gchar *name;
gchar *title;
gchar *warning;
if (shell->warning_dialog)
{
......@@ -2688,12 +2680,19 @@ gimp_display_shell_close_warning_dialog (GimpDisplayShell *shell,
return;
}
title = g_strdup_printf (_("Close %s?"), image_name);
name = file_utils_uri_to_utf8_basename (gimp_image_get_uri (gimage));
title = g_strdup_printf (_("Close %s?"), name);
warning = g_strdup_printf (_("Changes were made to %s.\n"
"Close anyway?"), image_name);
"Close anyway?"), name);
#if 0
shell->warning_dialog = gtk_message_dialog_new (shell->window,
0,
GTK_MESSAGE_QUESTION,);
#endif
shell->warning_dialog = mbox =
shell->warning_dialog =
gimp_query_boolean_box (title,
gimp_standard_help_func,
"dialogs/really_close.html",
......@@ -2704,10 +2703,11 @@ gimp_display_shell_close_warning_dialog (GimpDisplayShell *shell,
gimp_display_shell_close_warning_callback,
shell);
g_free (name);
g_free (title);
g_free (warning);
gtk_widget_show (mbox);
gtk_widget_show (shell->warning_dialog);
}
static void
......
......@@ -109,12 +109,12 @@ static GdkColor white_color;
static GdkColor title_color;
typedef enum
{
TREE_ITEM_DONT, /* Don't pre-create */
TREE_ITEM_MKDIR_ONLY, /* Just mkdir */
TREE_ITEM_FROM_SYSCONF_DIR, /* Copy from sysconf directory */
TREE_ITEM_FROM_DATA_DIR /* ... from data directory */
} TreeItemType;
{
TREE_ITEM_DONT, /* Don't pre-create */
TREE_ITEM_MKDIR_ONLY, /* Just mkdir */
TREE_ITEM_FROM_SYSCONF_DIR, /* Copy from sysconf directory */
TREE_ITEM_FROM_DATA_DIR /* ... from data directory */
} TreeItemType;
static struct
{
......@@ -1147,12 +1147,12 @@ user_install_run (void)
{
if (i == 0)
{
g_snprintf (log_line, sizeof (log_line), _("Creating directory %s\n"),
g_snprintf (log_line, sizeof (log_line), _("Creating folder %s\n"),
gimp_directory ());
gtk_text_buffer_insert_at_cursor (log_buffer, log_line, -1);
if (mkdir (gimp_directory (), 0666) == -1)
{
install_error_message = g_strdup_printf (_("Cannot create directory -- %s"),
install_error_message = g_strdup_printf (_("Cannot create folder: %s"),
g_strerror (errno));
goto break_out_of_loop;
}
......@@ -1166,12 +1166,12 @@ user_install_run (void)
break;
case TREE_ITEM_MKDIR_ONLY:
g_snprintf (log_line, sizeof (log_line), _("Creating directory %s\n"),
g_snprintf (log_line, sizeof (log_line), _("Creating folder %s\n"),
dest);
gtk_text_buffer_insert_at_cursor (log_buffer, log_line, -1);
if (mkdir (dest, 0666) == -1)
{
install_error_message = g_strdup_printf (_("Cannot create directory -- %s"),
install_error_message = g_strdup_printf (_("Cannot create folder: %s"),
g_strerror (errno));
goto break_out_of_loop;
}
......@@ -1210,7 +1210,7 @@ user_install_run (void)
if (i < num_tree_items)
{
g_snprintf (log_line, sizeof (log_line), _(" Failure -- %s\n"),
g_snprintf (log_line, sizeof (log_line), _(" Failure: %s\n"),
install_error_message);
gtk_text_buffer_insert_at_cursor (log_buffer, log_line, -1);
add_label (GTK_BOX (log_page),
......
......@@ -7,7 +7,7 @@ dnl Process this file with autoconf to produce a configure script.
# require autoconf 2.52
AC_PREREQ(2.52)
AC_INIT(etc/gimprc.in)
AC_INIT(app/core/gimp.c)
############
......
2002-12-29 Sven Neumann <sven@gimp.org>
* POTFILES.in: added app/config/gimpconfig-path.c.
* de.po: updated german translation.
2002-12-27 Daniel Yacob <locales@geez.org>
* am.po: Updated Amharic translation.
......
......@@ -9,6 +9,7 @@ app/undo_history.c
app/base/base-enums.c
app/config/gimpconfig-deserialize.c
app/config/gimpconfig-path.c
app/config/gimpconfig.c
app/config/gimprc.c
app/config/gimpscanner.c
......
This diff is collapsed.
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