dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Manish Singh 1998-06-09 05:05:52 +00:00
parent 5cc38d44a2
commit 838e68b9eb
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Mon Jun 8 21:55:55 PDT 1998 Manish Singh <yosh@gimp.org>
* 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 <yosh@gimp.org> Mon Jun 8 20:58:09 PDT 1998 Manish Singh <yosh@gimp.org>
* app/blend.c * app/blend.c

2
app/gui/palette-editor.c
View File

@ -1007,7 +1007,6 @@ palette_add_entries_callback (GtkWidget *w,
palette_entries_list = palette_entries_insert_list (palette_entries_list, entries); palette_entries_list = palette_entries_insert_list (palette_entries_list, entries);
gtk_option_menu_remove_menu (GTK_OPTION_MENU (palette->option_menu)); gtk_option_menu_remove_menu (GTK_OPTION_MENU (palette->option_menu));
gtk_widget_destroy (palette->menu);
palette_create_palette_menu (palette, entries); 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_option_menu_remove_menu (GTK_OPTION_MENU (palette->option_menu));
gtk_widget_destroy (palette->menu);
entries = palette->entries; entries = palette->entries;
if (entries && entries->filename) if (entries && entries->filename)

2
app/palette.c
View File

@ -1007,7 +1007,6 @@ palette_add_entries_callback (GtkWidget *w,
palette_entries_list = palette_entries_insert_list (palette_entries_list, entries); palette_entries_list = palette_entries_insert_list (palette_entries_list, entries);
gtk_option_menu_remove_menu (GTK_OPTION_MENU (palette->option_menu)); gtk_option_menu_remove_menu (GTK_OPTION_MENU (palette->option_menu));
gtk_widget_destroy (palette->menu);
palette_create_palette_menu (palette, entries); 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_option_menu_remove_menu (GTK_OPTION_MENU (palette->option_menu));
gtk_widget_destroy (palette->menu);
entries = palette->entries; entries = palette->entries;
if (entries && entries->filename) if (entries && entries->filename)

2
app/widgets/gimppaletteeditor.c
View File

@ -1007,7 +1007,6 @@ palette_add_entries_callback (GtkWidget *w,
palette_entries_list = palette_entries_insert_list (palette_entries_list, entries); palette_entries_list = palette_entries_insert_list (palette_entries_list, entries);
gtk_option_menu_remove_menu (GTK_OPTION_MENU (palette->option_menu)); gtk_option_menu_remove_menu (GTK_OPTION_MENU (palette->option_menu));
gtk_widget_destroy (palette->menu);
palette_create_palette_menu (palette, entries); 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_option_menu_remove_menu (GTK_OPTION_MENU (palette->option_menu));
gtk_widget_destroy (palette->menu);
entries = palette->entries; entries = palette->entries;
if (entries && entries->filename) if (entries && entries->filename)

4
gimptool-1.2.in
View File

@ -78,7 +78,7 @@ while test $# -gt 0; do
case $1 in case $1 in
--install-bin) --install-bin)
install_cmd="@INSTALL@ @INSTALL_PROGRAM@" install_cmd="@INSTALL@ @INSTALL_PROGRAM@"
install_dir="$HOME/.gimp/plug-ins" install_dir="$HOME/@gimpdir@/plug-ins"
;; ;;
--install-admin-bin) --install-admin-bin)
install_cmd="@INSTALL@ @INSTALL_PROGRAM@" install_cmd="@INSTALL@ @INSTALL_PROGRAM@"
@ -115,7 +115,7 @@ while test $# -gt 0; do
--build) --build)
install_dir=. ;; install_dir=. ;;
--install) --install)
install_dir="$HOME/.gimp/plug-ins" ;; install_dir="$HOME/@gimpdir@/plug-ins" ;;
--install-admin) --install-admin)
install_dir="$plug_in_dir/plug-ins" ;; install_dir="$plug_in_dir/plug-ins" ;;
esac esac

4
gimptool.in
View File

@ -78,7 +78,7 @@ while test $# -gt 0; do
case $1 in case $1 in
--install-bin) --install-bin)
install_cmd="@INSTALL@ @INSTALL_PROGRAM@" install_cmd="@INSTALL@ @INSTALL_PROGRAM@"
install_dir="$HOME/.gimp/plug-ins" install_dir="$HOME/@gimpdir@/plug-ins"
;; ;;
--install-admin-bin) --install-admin-bin)
install_cmd="@INSTALL@ @INSTALL_PROGRAM@" install_cmd="@INSTALL@ @INSTALL_PROGRAM@"
@ -115,7 +115,7 @@ while test $# -gt 0; do
--build) --build)
install_dir=. ;; install_dir=. ;;
--install) --install)
install_dir="$HOME/.gimp/plug-ins" ;; install_dir="$HOME/@gimpdir@/plug-ins" ;;
--install-admin) --install-admin)
install_dir="$plug_in_dir/plug-ins" ;; install_dir="$plug_in_dir/plug-ins" ;;
esac esac