mirror of https://github.com/GNOME/gimp.git
removed the gtk+ sanity check here ...
2004-07-12 Sven Neumann <sven@gimp.org> * app/sanity.[ch]: removed the gtk+ sanity check here ... * app/gui/gui.c: ... and do it here from gui_libs_init(). * app/main.c: changed accordingly.
This commit is contained in:
parent
3b553547db
commit
1abeb90523
|
@ -1,3 +1,11 @@
|
|||
2004-07-12 Sven Neumann <sven@gimp.org>
|
||||
|
||||
* app/sanity.[ch]: removed the gtk+ sanity check here ...
|
||||
|
||||
* app/gui/gui.c: ... and do it here from gui_libs_init().
|
||||
|
||||
* app/main.c: changed accordingly.
|
||||
|
||||
2004-07-12 Sven Neumann <sven@gimp.org>
|
||||
|
||||
* app/app_procs.s: don't use gtk_main() / gtk_main_quit() but run
|
||||
|
|
|
@ -76,6 +76,7 @@
|
|||
|
||||
/* local function prototypes */
|
||||
|
||||
static gchar * gui_sanity_check (void);
|
||||
static void gui_help_func (const gchar *help_id,
|
||||
gpointer help_data);
|
||||
static gboolean gui_get_background_func (GimpRGB *color);
|
||||
|
@ -122,12 +123,21 @@ gboolean
|
|||
gui_libs_init (gint *argc,
|
||||
gchar ***argv)
|
||||
{
|
||||
gchar *abort_message;
|
||||
|
||||
g_return_val_if_fail (argc != NULL, FALSE);
|
||||
g_return_val_if_fail (argv != NULL, FALSE);
|
||||
|
||||
if (! gtk_init_check (argc, argv))
|
||||
return FALSE;
|
||||
|
||||
abort_message = gui_sanity_check ();
|
||||
if (abort_message)
|
||||
{
|
||||
gui_abort (abort_message);
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
gimp_widgets_init (gui_help_func,
|
||||
gui_get_foreground_func,
|
||||
gui_get_background_func,
|
||||
|
@ -211,6 +221,40 @@ gui_post_init (Gimp *gimp)
|
|||
|
||||
/* private functions */
|
||||
|
||||
static gchar *
|
||||
gui_sanity_check (void)
|
||||
{
|
||||
const gchar *mismatch;
|
||||
|
||||
#define GTK_REQUIRED_MAJOR 2
|
||||
#define GTK_REQUIRED_MINOR 4
|
||||
#define GTK_REQUIRED_MICRO 1
|
||||
|
||||
mismatch = gtk_check_version (GTK_REQUIRED_MAJOR,
|
||||
GTK_REQUIRED_MINOR,
|
||||
GTK_REQUIRED_MICRO);
|
||||
|
||||
if (mismatch)
|
||||
return g_strdup_printf
|
||||
("%s\n\n"
|
||||
"The GIMP requires Gtk+ version %d.%d.%d or later.\n"
|
||||
"Installed Gtk+ version is %d.%d.%d.\n\n"
|
||||
"Somehow you or your software packager managed\n"
|
||||
"to install The GIMP with an older Gtk+ version.\n\n"
|
||||
"Please upgrade to Gtk+ version %d.%d.%d or later.",
|
||||
mismatch,
|
||||
GTK_REQUIRED_MAJOR, GTK_REQUIRED_MINOR, GTK_REQUIRED_MICRO,
|
||||
gtk_major_version, gtk_minor_version, gtk_micro_version,
|
||||
GTK_REQUIRED_MAJOR, GTK_REQUIRED_MINOR, GTK_REQUIRED_MICRO);
|
||||
|
||||
#undef GTK_REQUIRED_MAJOR
|
||||
#undef GTK_REQUIRED_MINOR
|
||||
#undef GTK_REQUIRED_MICRO
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
gui_help_func (const gchar *help_id,
|
||||
gpointer help_data)
|
||||
|
|
|
@ -226,7 +226,7 @@ main (int argc,
|
|||
gimp_text_console_exit (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
abort_message = sanity_check (no_interface);
|
||||
abort_message = sanity_check ();
|
||||
|
||||
if (abort_message)
|
||||
{
|
||||
|
|
81
app/sanity.c
81
app/sanity.c
|
@ -18,7 +18,7 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
#include <glib.h>
|
||||
#include <fontconfig/fontconfig.h>
|
||||
#include <pango/pangoft2.h>
|
||||
|
||||
|
@ -26,74 +26,39 @@
|
|||
|
||||
|
||||
const gchar *
|
||||
sanity_check (gboolean no_interface)
|
||||
sanity_check (void)
|
||||
{
|
||||
gchar *abort_message = NULL;
|
||||
gchar *abort_message = NULL;
|
||||
|
||||
if (! no_interface)
|
||||
{
|
||||
const gchar *mismatch;
|
||||
|
||||
#define GTK_REQUIRED_MAJOR 2
|
||||
#define GTK_REQUIRED_MINOR 4
|
||||
#define GTK_REQUIRED_MICRO 1
|
||||
|
||||
mismatch = gtk_check_version (GTK_REQUIRED_MAJOR,
|
||||
GTK_REQUIRED_MINOR,
|
||||
GTK_REQUIRED_MICRO);
|
||||
|
||||
if (mismatch)
|
||||
{
|
||||
abort_message =
|
||||
g_strdup_printf
|
||||
("%s\n\n"
|
||||
"The GIMP requires Gtk+ version %d.%d.%d or later.\n"
|
||||
"Installed Gtk+ version is %d.%d.%d.\n\n"
|
||||
"Somehow you or your software packager managed\n"
|
||||
"to install The GIMP with an older Gtk+ version.\n\n"
|
||||
"Please upgrade to Gtk+ version %d.%d.%d or later.",
|
||||
mismatch,
|
||||
GTK_REQUIRED_MAJOR, GTK_REQUIRED_MINOR, GTK_REQUIRED_MICRO,
|
||||
gtk_major_version, gtk_minor_version, gtk_micro_version,
|
||||
GTK_REQUIRED_MAJOR, GTK_REQUIRED_MINOR, GTK_REQUIRED_MICRO);
|
||||
}
|
||||
|
||||
#undef GTK_REQUIRED_MAJOR
|
||||
#undef GTK_REQUIRED_MINOR
|
||||
#undef GTK_REQUIRED_MICRO
|
||||
}
|
||||
|
||||
if (! abort_message)
|
||||
{
|
||||
gint fc_version = FcGetVersion ();
|
||||
gint fc_major_version = fc_version / 100 / 100;
|
||||
gint fc_minor_version = fc_version / 100 % 100;
|
||||
gint fc_micro_version = fc_version % 100;
|
||||
gint fc_version = FcGetVersion ();
|
||||
gint fc_major_version = fc_version / 100 / 100;
|
||||
gint fc_minor_version = fc_version / 100 % 100;
|
||||
gint fc_micro_version = fc_version % 100;
|
||||
|
||||
#define FC_REQUIRED_MAJOR 2
|
||||
#define FC_REQUIRED_MINOR 2
|
||||
#define FC_REQUIRED_MICRO 0
|
||||
|
||||
if (fc_version < ((FC_REQUIRED_MAJOR * 10000) +
|
||||
(FC_REQUIRED_MINOR * 100) +
|
||||
(FC_REQUIRED_MICRO * 1)))
|
||||
{
|
||||
abort_message =
|
||||
g_strdup_printf
|
||||
("The Fontconfig version being used is too old!\n\n"
|
||||
"The GIMP requires Fontconfig version %d.%d.%d or later.\n"
|
||||
"The Fontconfig version loaded by The GIMP is %d.%d.%d.\n\n"
|
||||
"This may be caused by another instance of libfontconfig.so.1\n"
|
||||
"being installed in the system, probably in /usr/X11R6/lib.\n"
|
||||
"Please correct the situation or report it to someone who can.",
|
||||
FC_REQUIRED_MAJOR, FC_REQUIRED_MINOR, FC_REQUIRED_MICRO,
|
||||
fc_major_version, fc_minor_version, fc_micro_version);
|
||||
}
|
||||
if (fc_version < ((FC_REQUIRED_MAJOR * 10000) +
|
||||
(FC_REQUIRED_MINOR * 100) +
|
||||
(FC_REQUIRED_MICRO * 1)))
|
||||
{
|
||||
abort_message =
|
||||
g_strdup_printf
|
||||
("The Fontconfig version being used is too old!\n\n"
|
||||
"The GIMP requires Fontconfig version %d.%d.%d or later.\n"
|
||||
"The Fontconfig version loaded by The GIMP is %d.%d.%d.\n\n"
|
||||
"This may be caused by another instance of libfontconfig.so.1\n"
|
||||
"being installed in the system, probably in /usr/X11R6/lib.\n"
|
||||
"Please correct the situation or report it to someone who can.",
|
||||
FC_REQUIRED_MAJOR, FC_REQUIRED_MINOR, FC_REQUIRED_MICRO,
|
||||
fc_major_version, fc_minor_version, fc_micro_version);
|
||||
}
|
||||
|
||||
#undef FC_REQUIRED_MAJOR
|
||||
#undef FC_REQUIRED_MINOR
|
||||
#undef FC_REQUIRED_MICRO
|
||||
}
|
||||
|
||||
|
||||
#if 0
|
||||
/* disabled until we definitely figured if and how freetype causes
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#endif
|
||||
|
||||
|
||||
const gchar * sanity_check (gboolean no_interface);
|
||||
const gchar * sanity_check (void);
|
||||
|
||||
|
||||
#endif /* __SANITY_H__ */
|
||||
|
|
Loading…
Reference in New Issue