Commit 3fcc3611 authored by Manish Singh's avatar Manish Singh
Browse files

app/gradient.c s/gtk_clist_set_border/gtk_clist_set_shadow_type/

* app/gradient.c
* app/gradient_select.c:
s/gtk_clist_set_border/gtk_clist_set_shadow_type/

* configure.in
* libgimp/Makefile.am
* app/Makefile.am: use GIMP_THREAD_FOO substitution

* app/gimage_cmds.c: initialize some vars to quell warnings

-Yosh
parent 4431d91f
Tue Dec 1 15:12:29 PST 1998 Manish Singh <yosh@gimp.org>
* app/gradient.c
* app/gradient_select.c:
s/gtk_clist_set_border/gtk_clist_set_shadow_type/
* configure.in
* libgimp/Makefile.am
* app/Makefile.am: use GIMP_THREAD_FOO substitution
* app/gimage_cmds.c: initialize some vars to quell warnings
Fri Nov 27 22:44:01 PST 1998 Manish Singh <yosh@gimp.org>
* plug-ins/dbbrowser/dbbrowser_utils.c: scrolled window fix
......
......@@ -330,8 +330,9 @@ EXTRA_DIST = \
CPPFLAGS = \
-DLIBDIR=\""$(gimpplugindir)"\" \
-DDATADIR=\""$(gimpdatadir)"\" \
-DGIMPDIR=\""$(gimpdir)"\" \
-DLOCALEDIR=\""$(localedir)"\"
-DGIMPDIR=\""$(gimpdir)"\" \
-DLOCALEDIR=\""$(localedir)"\" \
@GIMP_THREAD_FLAGS@
INCLUDES = \
-I$(top_srcdir) \
......@@ -343,7 +344,7 @@ LDADD = \
libgimpim.a \
$(top_builddir)/libgimp/libgimpi.a \
$(GTK_LIBS) \
$(THREAD_LIBS) \
$(GIMP_THREAD_LIBS) \
$(INTLLIBS)
DEPS = \
......
......@@ -4822,7 +4822,7 @@ gimp_image_get_layer_by_tattoo_invoker (Argument *args)
GImage *gimage;
Tattoo tattoo;
Argument *return_args;
Layer *layer;
Layer *layer = NULL;
/* the gimage */
if (success)
......@@ -4911,7 +4911,7 @@ gimp_image_get_channel_by_tattoo_invoker (Argument *args)
GImage *gimage;
Tattoo tattoo;
Argument *return_args;
Channel *channel;
Channel *channel = NULL;
/* the gimage */
if (success)
......
......@@ -678,7 +678,7 @@ grad_create_gradient_editor_init(gint need_show)
scrolled_win = gtk_scrolled_window_new (NULL, NULL);
g_editor->clist = gtk_clist_new(2);
gtk_clist_set_border(GTK_CLIST(g_editor->clist), GTK_SHADOW_IN);
gtk_clist_set_shadow_type(GTK_CLIST(g_editor->clist), GTK_SHADOW_IN);
gtk_clist_set_row_height(GTK_CLIST(g_editor->clist), 18);
......
......@@ -678,7 +678,7 @@ grad_create_gradient_editor_init(gint need_show)
scrolled_win = gtk_scrolled_window_new (NULL, NULL);
g_editor->clist = gtk_clist_new(2);
gtk_clist_set_border(GTK_CLIST(g_editor->clist), GTK_SHADOW_IN);
gtk_clist_set_shadow_type(GTK_CLIST(g_editor->clist), GTK_SHADOW_IN);
gtk_clist_set_row_height(GTK_CLIST(g_editor->clist), 18);
......
......@@ -474,7 +474,7 @@ gsel_new_selection(gchar * title,
scrolled_win = gtk_scrolled_window_new (NULL, NULL);
gsp->clist = gtk_clist_new(2);
gtk_clist_set_border(GTK_CLIST(gsp->clist), GTK_SHADOW_IN);
gtk_clist_set_shadow_type(GTK_CLIST(gsp->clist), GTK_SHADOW_IN);
gtk_clist_set_row_height(GTK_CLIST(gsp->clist), 18);
......
......@@ -678,7 +678,7 @@ grad_create_gradient_editor_init(gint need_show)
scrolled_win = gtk_scrolled_window_new (NULL, NULL);
g_editor->clist = gtk_clist_new(2);
gtk_clist_set_border(GTK_CLIST(g_editor->clist), GTK_SHADOW_IN);
gtk_clist_set_shadow_type(GTK_CLIST(g_editor->clist), GTK_SHADOW_IN);
gtk_clist_set_row_height(GTK_CLIST(g_editor->clist), 18);
......
......@@ -474,7 +474,7 @@ gsel_new_selection(gchar * title,
scrolled_win = gtk_scrolled_window_new (NULL, NULL);
gsp->clist = gtk_clist_new(2);
gtk_clist_set_border(GTK_CLIST(gsp->clist), GTK_SHADOW_IN);
gtk_clist_set_shadow_type(GTK_CLIST(gsp->clist), GTK_SHADOW_IN);
gtk_clist_set_row_height(GTK_CLIST(gsp->clist), 18);
......
......@@ -678,7 +678,7 @@ grad_create_gradient_editor_init(gint need_show)
scrolled_win = gtk_scrolled_window_new (NULL, NULL);
g_editor->clist = gtk_clist_new(2);
gtk_clist_set_border(GTK_CLIST(g_editor->clist), GTK_SHADOW_IN);
gtk_clist_set_shadow_type(GTK_CLIST(g_editor->clist), GTK_SHADOW_IN);
gtk_clist_set_row_height(GTK_CLIST(g_editor->clist), 18);
......
......@@ -369,20 +369,25 @@ if test "$have_glib_inline" = "no"; then
AC_C_INLINE
fi
CPPFLAGS="$gimp_save_CPPFLAGS"
LDFLAGS="$gimp_save_LDFLAGS"
LIBS="$gimp_save_LIBS"
dnl Threads
AC_ARG_WITH(threads, [ --with-threads=[posix] support threading ])
THREAD_LIBS=
GIMP_THREAD_LIBS=
if test "x$with_threads" = "xposix" || test "x$with_threads" = "xyes"; then
AC_CHECK_LIB(pthread, pthread_attr_init,
AC_DEFINE(USE_PTHREADS)
CFLAGS="$CFLAGS -D_REENTRANT"
THREAD_LIBS="-lpthread")
AC_CHECK_LIB(pthread, pthread_attr_init,
[AC_DEFINE(USE_PTHREADS)
GIMP_THREAD_LIBS="-lpthread"
GIMP_THREAD_FLAGS="-D_REENTRANT"],
# AIX has libpthreads, cause they're special. Special friends (TM)
AC_CHECK_LIB(pthreads, pthread_attr_init,
[AC_DEFINE(USE_PTHREADS)
GIMP_THREAD_LIBS="-lpthreads"
GIMP_THREAD_FLAGS="-D_REENTRANT -D_THREAD_SAFE"]))
fi
CPPFLAGS="$gimp_save_CPPFLAGS"
LDFLAGS="$gimp_save_LDFLAGS"
LIBS="$gimp_save_LIBS"
gimpdatadir=$datadir/gimp
gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
localedir=$datadir/locale
......@@ -582,7 +587,8 @@ AC_SUBST(LPSTAT_DEF)
AC_SUBST(LPR_DEF)
AC_SUBST(LPC_DEF)
AC_SUBST(MAILER)
AC_SUBST(THREAD_LIBS)
AC_SUBST(GIMP_THREAD_FLAGS)
AC_SUBST(GIMP_THREAD_LIBS)
AC_SUBST(GIMP_PERL)
AC_SUBST(GIMPDOCS)
......
......@@ -78,7 +78,8 @@ libgimpui_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
CPPFLAGS = \
-DGIMPDIR=\""$(gimpdir)"\"
-DGIMPDIR=\""$(gimpdir)"\" \
@GIMP_THREAD_FLAGS@
INCLUDES = \
-I$(top_srcdir) \
......
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