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

define GIMP_APP_VERSION. 

2006-04-29  Sven Neumann  <sven@gimp.org>

	* app/core/Makefile.am (AM_CPP_FLAGS): define GIMP_APP_VERSION.

	* app/core/gimp-user-install.c: use GIMP_APP_VERSION instead of
	hardcoding it.
This commit is contained in:
Sven Neumann 2006-04-29 00:47:53 +00:00 committed by Sven Neumann
parent 0d50b523bc
commit 7debd74dc6
4 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2006-04-29 Sven Neumann <sven@gimp.org>
* app/core/Makefile.am (AM_CPP_FLAGS): define GIMP_APP_VERSION.
* app/core/gimp-user-install.c: use GIMP_APP_VERSION instead of
hardcoding it.
2006-04-29 Sven Neumann <sven@gimp.org>
* app/core/Makefile.am

25
app/app_procs.c
View File

@ -41,6 +41,7 @@
#include "base/base.h"
#include "core/gimp.h"
#include "core/gimp-user-install.h"
#include "plug-in/gimppluginmanager.h"
@ -219,26 +220,18 @@ app_run (const gchar *full_prog_name,
*/
if (! g_file_test (gimp_directory (), G_FILE_TEST_IS_DIR))
{
/* not properly installed */
GimpUserInstall *install = gimp_user_install_new ();
#ifndef GIMP_CONSOLE_COMPILATION
#ifdef GIMP_CONSOLE_COMPILATION
gimp_user_install_run (install, FALSE);
#else
if (no_interface)
#endif
{
const gchar *msg;
msg = _("GIMP is not properly installed for the current user.\n"
"User installation was skipped because the '--no-interface' flag was used.\n"
"To perform user installation, run the GIMP without the '--no-interface' flag.");
g_printerr ("%s\n\n", msg);
}
#ifndef GIMP_CONSOLE_COMPILATION
gimp_user_install_run (install, FALSE);
else
{
user_install_dialog_run (be_verbose);
}
user_install_dialog_run (install);
#endif
gimp_user_install_free (install);
}
#if defined G_OS_WIN32 && !defined GIMP_CONSOLE_COMPILATION

5
app/core/Makefile.am
View File

@ -1,7 +1,8 @@
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Core\" \
-DGIMP_APP_VERSION=\"$(GIMP_APP_VERSION)\" \
-DG_LOG_DOMAIN=\"Gimp-Core\" \
@GTHREAD_CFLAGS@
INCLUDES = \
@ -40,6 +41,8 @@ libappcore_a_sources = \
gimp-transform-utils.h \
gimp-units.c \
gimp-units.h \
gimp-user-install.c \
gimp-user-install.h \
gimp-utils.c \
gimp-utils.h \
gimparea.c \

11
app/core/gimp-user-install.c
View File

@ -130,10 +130,15 @@ gimp_user_install_new ()
dir = g_strdup (gimp_directory ());
/* FIXME */
version = strstr (dir, "2.3");
version = strstr (dir, GIMP_APP_VERSION);
g_assert (version != NULL);
if (! version)
{
g_free (dir);
return install;
}
/* we assume that GIMP_APP_VERSION is in the form '2.x' */
version[2] = '2';