Commit 8915bbad authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files

don't update the fields here...

2004-01-25  Sven Neumann  <sven@gimp.org>

	* app/gui/info-window.c (info_window_create): don't update the fields
	here...

	* app/gui/view-commands.c (view_info_window_cmd_callback): ... but
	here when the info window is connected to the display shell. Patch
	from Shlomi Fish; fixes bug #132329.

	* app/gui/info-window.c (info_window_update_extended): fixed update
	of info window in automatic mode. Bug #118084, patch by Shlomi Fish.

	* autogen.sh: check for automake-1.8 also.

	* HACKING: note that automake-1.8 should work as well.
parent 00c525ab
...@@ -5,7 +5,7 @@ to have the following packages (or newer versions) installed: ...@@ -5,7 +5,7 @@ to have the following packages (or newer versions) installed:
* GNU autoconf 2.52 * GNU autoconf 2.52
- ftp://ftp.gnu.org/gnu/autoconf/ - ftp://ftp.gnu.org/gnu/autoconf/
* GNU automake 1.7 (1.6 will also work) * GNU automake 1.7 (1.8 and 1.6 will also work)
- ftp://ftp.gnu.org/gnu/automake/ - ftp://ftp.gnu.org/gnu/automake/
* GNU libtool 1.3.4 (1.5.0 if you are compiling on Win32) * GNU libtool 1.3.4 (1.5.0 if you are compiling on Win32)
- ftp://ftp.gnu.org/gnu/libtool/ - ftp://ftp.gnu.org/gnu/libtool/
......
...@@ -173,6 +173,11 @@ view_info_window_cmd_callback (GtkWidget *widget, ...@@ -173,6 +173,11 @@ view_info_window_cmd_callback (GtkWidget *widget,
if (! shell->info_dialog) if (! shell->info_dialog)
shell->info_dialog = info_window_create (gdisp); shell->info_dialog = info_window_create (gdisp);
/* To update the fields of the info window for the first time. *
* It's no use updating it in info_window_create() because the *
* pointer of the info window is not present in the shell yet. */
info_window_update (gdisp);
info_dialog_present (shell->info_dialog); info_dialog_present (shell->info_dialog);
} }
else else
......
...@@ -270,9 +270,6 @@ info_window_create (GimpDisplay *gdisp) ...@@ -270,9 +270,6 @@ info_window_create (GimpDisplay *gdisp)
/* Add extra tabs */ /* Add extra tabs */
info_window_create_extended (info_win, gdisp->gimage->gimp); info_window_create_extended (info_win, gdisp->gimage->gimp);
/* update the fields */
info_window_update (gdisp);
return info_win; return info_win;
} }
...@@ -356,12 +353,15 @@ info_window_update_extended (GimpDisplay *gdisp, ...@@ -356,12 +353,15 @@ info_window_update_extended (GimpDisplay *gdisp,
iwd = (InfoWinData *) info_win->user_data; iwd = (InfoWinData *) info_win->user_data;
if (iwd->gdisp != gdisp) if (info_window_auto)
{ {
iwd->gdisp = gdisp;
gimp_viewable_dialog_set_viewable (GIMP_VIEWABLE_DIALOG (info_window_auto->shell), gimp_viewable_dialog_set_viewable (GIMP_VIEWABLE_DIALOG (info_window_auto->shell),
GIMP_VIEWABLE (gdisp->gimage)); GIMP_VIEWABLE (gdisp->gimage));
}
if (iwd->gdisp != gdisp)
{
iwd->gdisp = gdisp;
info_window_update (gdisp); info_window_update (gdisp);
} }
......
...@@ -270,9 +270,6 @@ info_window_create (GimpDisplay *gdisp) ...@@ -270,9 +270,6 @@ info_window_create (GimpDisplay *gdisp)
/* Add extra tabs */ /* Add extra tabs */
info_window_create_extended (info_win, gdisp->gimage->gimp); info_window_create_extended (info_win, gdisp->gimage->gimp);
/* update the fields */
info_window_update (gdisp);
return info_win; return info_win;
} }
...@@ -356,12 +353,15 @@ info_window_update_extended (GimpDisplay *gdisp, ...@@ -356,12 +353,15 @@ info_window_update_extended (GimpDisplay *gdisp,
iwd = (InfoWinData *) info_win->user_data; iwd = (InfoWinData *) info_win->user_data;
if (iwd->gdisp != gdisp) if (info_window_auto)
{ {
iwd->gdisp = gdisp;
gimp_viewable_dialog_set_viewable (GIMP_VIEWABLE_DIALOG (info_window_auto->shell), gimp_viewable_dialog_set_viewable (GIMP_VIEWABLE_DIALOG (info_window_auto->shell),
GIMP_VIEWABLE (gdisp->gimage)); GIMP_VIEWABLE (gdisp->gimage));
}
if (iwd->gdisp != gdisp)
{
iwd->gdisp = gdisp;
info_window_update (gdisp); info_window_update (gdisp);
} }
......
...@@ -173,6 +173,11 @@ view_info_window_cmd_callback (GtkWidget *widget, ...@@ -173,6 +173,11 @@ view_info_window_cmd_callback (GtkWidget *widget,
if (! shell->info_dialog) if (! shell->info_dialog)
shell->info_dialog = info_window_create (gdisp); shell->info_dialog = info_window_create (gdisp);
/* To update the fields of the info window for the first time. *
* It's no use updating it in info_window_create() because the *
* pointer of the info window is not present in the shell yet. */
info_window_update (gdisp);
info_dialog_present (shell->info_dialog); info_dialog_present (shell->info_dialog);
} }
else else
......
...@@ -79,12 +79,15 @@ else ...@@ -79,12 +79,15 @@ else
echo echo
echo " You must have autoconf installed to compile $PROJECT." echo " You must have autoconf installed to compile $PROJECT."
echo " Download the appropriate package for your distribution," echo " Download the appropriate package for your distribution,"
echo " or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" echo " or get the source tarball at ftp://ftp.gnu.org/pub/gnu/autoconf/"
DIE=1; DIE=1;
fi fi
echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... " echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
if (automake-1.7 --version) < /dev/null > /dev/null 2>&1; then if (automake-1.8 --version) < /dev/null > /dev/null 2>&1; then
AUTOMAKE=automake-1.8
ACLOCAL=aclocal-1.8
elif (automake-1.7 --version) < /dev/null > /dev/null 2>&1; then
AUTOMAKE=automake-1.7 AUTOMAKE=automake-1.7
ACLOCAL=aclocal-1.7 ACLOCAL=aclocal-1.7
elif (automake-1.6 --version) < /dev/null > /dev/null 2>&1; then elif (automake-1.6 --version) < /dev/null > /dev/null 2>&1; then
...@@ -92,9 +95,9 @@ elif (automake-1.6 --version) < /dev/null > /dev/null 2>&1; then ...@@ -92,9 +95,9 @@ elif (automake-1.6 --version) < /dev/null > /dev/null 2>&1; then
ACLOCAL=aclocal-1.6 ACLOCAL=aclocal-1.6
else else
echo echo
echo " You must have automake 1.6 or 1.7 installed to compile $PROJECT." echo " You must have automake 1.6 or newer installed to compile $PROJECT."
echo " Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.7.3.tar.gz" echo " Download the appropriate package for your distribution,"
echo " (or a newer version if it is available)" echo " or get the source tarball at ftp://ftp.gnu.org/pub/gnu/automake/"
DIE=1 DIE=1
fi fi
......
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