Commit da9eb037 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

define G_DISABLE_DEPRECATED unless glib >= 2.9.0.

2005-08-16  Sven Neumann  <sven@gimp.org>

	* configure.in: define G_DISABLE_DEPRECATED unless glib >= 2.9.0.

	* app/core/gimpscanconvert.c: added missing include.

	* app/text/gimp-fonts.c
	* libgimp/gimp.c
	* libgimpwidgets/gimpcolornotebook.c
	* plug-ins/helpbrowser/dialog.c: fixed signedness warnings.

	* plug-ins/bmp/bmpread.c (ReadBMP): initialize variable.
parent 605887d0
2005-08-16 Sven Neumann <sven@gimp.org>
* configure.in: define G_DISABLE_DEPRECATED unless glib >= 2.9.0.
* app/core/gimpscanconvert.c: added missing include.
* app/text/gimp-fonts.c
* libgimp/gimp.c
* libgimpwidgets/gimpcolornotebook.c
* plug-ins/helpbrowser/dialog.c: fixed signedness warnings.
* plug-ins/bmp/bmpread.c (ReadBMP): initialize variable.
2005-08-15 Manish Singh <yosh@gimp.org>
* configure.in: fix reversed libgnomeui conditional test for
......
......@@ -33,6 +33,7 @@
#include "base/tile-manager.h"
#include "gimpscanconvert.h"
#include "gimp-utils.h"
struct _GimpScanConvert
......
......@@ -128,7 +128,7 @@ gimp_fonts_load_fonts_conf (FcConfig *config,
{
gboolean ret = TRUE;
if (! FcConfigParseAndLoad (config, fonts_conf, FcFalse))
if (! FcConfigParseAndLoad (config, (const guchar *) fonts_conf, FcFalse))
{
FcConfigDestroy (config);
ret = FALSE;
......@@ -152,7 +152,7 @@ gimp_fonts_add_directories (FcConfig *config,
path = gimp_path_parse (path_str, 256, TRUE, NULL);
for (list = path; list; list = list->next)
FcConfigAppFontAddDir (config, (gchar *) list->data);
FcConfigAppFontAddDir (config, (const guchar *) list->data);
gimp_path_free (path);
}
......
......@@ -390,13 +390,13 @@ AM_PATH_GLIB_2_0(glib_required_version, :,
PKG_CHECK_MODULES(GMODULE, gmodule-2.0 gobject-2.0)
AC_MSG_CHECKING([if GLib is version 2.7.0 or newer])
if $PKG_CONFIG --atleast-version=2.7.0 glib-2.0; then
have_glib_2_7=yes
AC_MSG_CHECKING([if GLib is version 2.9.0 or newer])
if $PKG_CONFIG --atleast-version=2.9.0 glib-2.0; then
have_glib_2_9=yes
else
have_glib_2_7=no
have_glib_2_9=no
fi
AC_MSG_RESULT($have_glib_2_7)
AC_MSG_RESULT($have_glib_2_9)
dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
gimp_save_LIBS=$LIBS
......@@ -1581,7 +1581,7 @@ CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED"
# Default to disable deprecated GTK+ stuff for 2.4.x and 2.6.x
##############################################################
if test "x$have_glib_2_7" != "xyes"; then
if test "x$have_glib_2_9" != "xyes"; then
CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED"
fi
......
......@@ -186,8 +186,8 @@ static gchar *_display_name = NULL;
static gint _monitor_number = 0;
static const gchar *progname = NULL;
static guint8 write_buffer[WRITE_BUFFER_SIZE];
static guint write_buffer_index = 0;
static gchar write_buffer[WRITE_BUFFER_SIZE];
static gulong write_buffer_index = 0;
static GimpStackTraceMode stack_trace_mode = GIMP_STACK_TRACE_NEVER;
......
......@@ -150,8 +150,8 @@ static void
gimp_color_notebook_init (GimpColorNotebook *notebook)
{
GType *selector_types;
gint n_selector_types;
gint i;
guint n_selector_types;
guint i;
notebook->notebook = gtk_notebook_new ();
gtk_box_pack_start (GTK_BOX (notebook), notebook->notebook, TRUE, TRUE, 0);
......
......@@ -138,7 +138,7 @@ ReadBMP (const gchar *name)
FILE *fd;
guchar buffer[64];
gint ColormapSize, rowbytes, Maps;
gboolean Grey;
gboolean Grey = FALSE;
guchar ColorMap[256][3];
gint32 image_ID;
gchar magick[2];
......
......@@ -767,7 +767,7 @@ drag_data_get (GtkWidget *widget,
{
gtk_selection_data_set (selection_data,
selection_data->target,
8, current_uri, strlen (current_uri));
8, (guchar *) current_uri, strlen (current_uri));
}
}
......
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