From 838e68b9eb96648a3483c9283bc924b9c430cee7 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Tue, 9 Jun 1998 05:05:52 +0000 Subject: [PATCH] use @gimpdir@ instead of hardcoding .gimp * gimptool.in: use @gimpdir@ instead of hardcoding .gimp * app/palette.c: remove unnecessary gtk_widget_destroy for menus that have already been removed (from Shuji Narazaki) -Yosh --- ChangeLog | 7 +++++++ app/gui/palette-editor.c | 2 -- app/palette.c | 2 -- app/widgets/gimppaletteeditor.c | 2 -- gimptool-1.2.in | 4 ++-- gimptool.in | 4 ++-- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index cbb7c9ed28..c32d4bf042 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Mon Jun 8 21:55:55 PDT 1998 Manish Singh + + * gimptool.in: use @gimpdir@ instead of hardcoding .gimp + + * app/palette.c: remove unnecessary gtk_widget_destroy for menus + that have already been removed (from Shuji Narazaki) + Mon Jun 8 20:58:09 PDT 1998 Manish Singh * app/blend.c diff --git a/app/gui/palette-editor.c b/app/gui/palette-editor.c index 177a6cad19..b8552ea5e1 100644 --- a/app/gui/palette-editor.c +++ b/app/gui/palette-editor.c @@ -1007,7 +1007,6 @@ palette_add_entries_callback (GtkWidget *w, palette_entries_list = palette_entries_insert_list (palette_entries_list, entries); gtk_option_menu_remove_menu (GTK_OPTION_MENU (palette->option_menu)); - gtk_widget_destroy (palette->menu); palette_create_palette_menu (palette, entries); } } @@ -1036,7 +1035,6 @@ palette_delete_entries_callback (GtkWidget *w, } gtk_option_menu_remove_menu (GTK_OPTION_MENU (palette->option_menu)); - gtk_widget_destroy (palette->menu); entries = palette->entries; if (entries && entries->filename) diff --git a/app/palette.c b/app/palette.c index 177a6cad19..b8552ea5e1 100644 --- a/app/palette.c +++ b/app/palette.c @@ -1007,7 +1007,6 @@ palette_add_entries_callback (GtkWidget *w, palette_entries_list = palette_entries_insert_list (palette_entries_list, entries); gtk_option_menu_remove_menu (GTK_OPTION_MENU (palette->option_menu)); - gtk_widget_destroy (palette->menu); palette_create_palette_menu (palette, entries); } } @@ -1036,7 +1035,6 @@ palette_delete_entries_callback (GtkWidget *w, } gtk_option_menu_remove_menu (GTK_OPTION_MENU (palette->option_menu)); - gtk_widget_destroy (palette->menu); entries = palette->entries; if (entries && entries->filename) diff --git a/app/widgets/gimppaletteeditor.c b/app/widgets/gimppaletteeditor.c index 177a6cad19..b8552ea5e1 100644 --- a/app/widgets/gimppaletteeditor.c +++ b/app/widgets/gimppaletteeditor.c @@ -1007,7 +1007,6 @@ palette_add_entries_callback (GtkWidget *w, palette_entries_list = palette_entries_insert_list (palette_entries_list, entries); gtk_option_menu_remove_menu (GTK_OPTION_MENU (palette->option_menu)); - gtk_widget_destroy (palette->menu); palette_create_palette_menu (palette, entries); } } @@ -1036,7 +1035,6 @@ palette_delete_entries_callback (GtkWidget *w, } gtk_option_menu_remove_menu (GTK_OPTION_MENU (palette->option_menu)); - gtk_widget_destroy (palette->menu); entries = palette->entries; if (entries && entries->filename) diff --git a/gimptool-1.2.in b/gimptool-1.2.in index 3a97cd0204..b192d74523 100644 --- a/gimptool-1.2.in +++ b/gimptool-1.2.in @@ -78,7 +78,7 @@ while test $# -gt 0; do case $1 in --install-bin) install_cmd="@INSTALL@ @INSTALL_PROGRAM@" - install_dir="$HOME/.gimp/plug-ins" + install_dir="$HOME/@gimpdir@/plug-ins" ;; --install-admin-bin) install_cmd="@INSTALL@ @INSTALL_PROGRAM@" @@ -115,7 +115,7 @@ while test $# -gt 0; do --build) install_dir=. ;; --install) - install_dir="$HOME/.gimp/plug-ins" ;; + install_dir="$HOME/@gimpdir@/plug-ins" ;; --install-admin) install_dir="$plug_in_dir/plug-ins" ;; esac diff --git a/gimptool.in b/gimptool.in index 3a97cd0204..b192d74523 100644 --- a/gimptool.in +++ b/gimptool.in @@ -78,7 +78,7 @@ while test $# -gt 0; do case $1 in --install-bin) install_cmd="@INSTALL@ @INSTALL_PROGRAM@" - install_dir="$HOME/.gimp/plug-ins" + install_dir="$HOME/@gimpdir@/plug-ins" ;; --install-admin-bin) install_cmd="@INSTALL@ @INSTALL_PROGRAM@" @@ -115,7 +115,7 @@ while test $# -gt 0; do --build) install_dir=. ;; --install) - install_dir="$HOME/.gimp/plug-ins" ;; + install_dir="$HOME/@gimpdir@/plug-ins" ;; --install-admin) install_dir="$plug_in_dir/plug-ins" ;; esac