Hi Chris, gtk_signal_connect_full is also deprecated. Please refer to http://library.gnome.org/devel/gtk/stable/gtk-Signals.html#gtk-signal-connect-full. You should use g_signal_connect to replace gtk_singal_connect.
Regards, Jedy On Wed, 2008-07-16 at 13:04 +0800, C Wang wrote: > gimp-hdr is a new plugin we plan to ship on next build of Opensolaris. > Originally, user build it with gimptool, this require gimp to be > installed. I create a new Makefile.am to enable it build with gimp package. > In configure.in of gimp, it defined GTK_DISABLE_DEPRECATE, I also > changed deprecated interface gtk_signal_connect to > gtk_signal_connect_full in gimp-hdr, so it can build together with gimp. > > > > Chris > > plain text document attachment (gimp-02-gimphdr.diff) > --- gimp-2.4.6/plug-ins/gimp-hdrtools-0.1/Makefile.am.orig 2008-07-15 > 17:25:34.274730000 +0800 > +++ gimp-2.4.6/plug-ins/gimp-hdrtools-0.1/Makefile.am 2008-07-15 > 17:25:39.338535000 +0800 > @@ -0,0 +1,40 @@ > +## Process this file with automake to produce Makefile.in > + > +libgimpui = $(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la > +libgimpconfig = > $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la > +libgimpwidgets = > $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la > +libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la > +libgimpcolor = > $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la > +libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la > +libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la > + > + > +if OS_WIN32 > +mwindows = -mwindows > +endif > + > +AM_LDFLAGS = $(mwindows) > + > +libexecdir = $(gimpplugindir)/plug-ins > + > +libexec_PROGRAMS = hdrtools > + > +hdrtools_SOURCES = \ > + hdrtools.c > + > +INCLUDES = \ > + -I$(top_srcdir) \ > + $(GTK_CFLAGS) \ > + -I$(includedir) > + > +LDADD = \ > + $(libgimpui) \ > + $(libgimpwidgets) \ > + $(libgimpconfig) \ > + $(libgimp) \ > + $(libgimpcolor) \ > + $(libgimpmath) \ > + $(libgimpbase) \ > + $(GTK_LIBS) \ > + $(RT_LIBS) \ > + $(INTLLIBS) > --- gimp-2.4.6/plug-ins/gimp-hdrtools-0.1/hdrtools.c.orig 2007-01-20 > 02:42:18.000000000 +0800 > +++ gimp-2.4.6/plug-ins/gimp-hdrtools-0.1/hdrtools.c 2008-07-15 > 17:26:47.531862000 +0800 > @@ -1228,19 +1228,19 @@ > g_object_set_data(G_OBJECT(gamma_spin), "preview", preview); > > > - gtk_signal_connect(GTK_OBJECT(dlg), "response", > - GTK_SIGNAL_FUNC(dialog_response), 0); > - gtk_signal_connect(GTK_OBJECT(dlg), "destroy", > - GTK_SIGNAL_FUNC(gtk_main_quit), 0); > - gtk_signal_connect(GTK_OBJECT(preview), "invalidated", > - GTK_SIGNAL_FUNC(tonemap_image), > - drawable); > - gtk_signal_connect(GTK_OBJECT(exposure_spin), "value_changed", > - GTK_SIGNAL_FUNC(on_spin_changed), > - &g_tonemap_vals.exposure); > - gtk_signal_connect(GTK_OBJECT(gamma_spin), "value_changed", > - GTK_SIGNAL_FUNC(on_spin_changed), > - &g_tonemap_vals.gamma); > + gtk_signal_connect_full(GTK_OBJECT(dlg), "response", > + GTK_SIGNAL_FUNC(dialog_response), NULL, 0, NULL, 0, 0); > + gtk_signal_connect_full(GTK_OBJECT(dlg), "destroy", > + GTK_SIGNAL_FUNC(gtk_main_quit), NULL, 0, NULL, 0, 0); > + gtk_signal_connect_full(GTK_OBJECT(preview), "invalidated", > + GTK_SIGNAL_FUNC(tonemap_image), NULL, drawable, > + NULL, 0, 0); > + gtk_signal_connect_full(GTK_OBJECT(exposure_spin), "value_changed", > + GTK_SIGNAL_FUNC(on_spin_changed), NULL, > + &g_tonemap_vals.exposure, NULL, 0, 0); > + gtk_signal_connect_full(GTK_OBJECT(gamma_spin), "value_changed", > + GTK_SIGNAL_FUNC(on_spin_changed), NULL, > + &g_tonemap_vals.gamma, NULL, 0, 0); > > gtk_widget_show(dlg); > > @@ -1291,15 +1291,16 @@ > slider, 1, 0); > g_object_set_data(G_OBJECT(slider), "preview", preview); > > - gtk_signal_connect(GTK_OBJECT(dlg), "response", > - GTK_SIGNAL_FUNC(dialog_response), 0); > - gtk_signal_connect(GTK_OBJECT(dlg), "destroy", > - GTK_SIGNAL_FUNC(gtk_main_quit), 0); > - gtk_signal_connect(GTK_OBJECT(preview), "invalidated", > - GTK_SIGNAL_FUNC(convert_rgbe_to_rgbdiv8), drawable); > - gtk_signal_connect(GTK_OBJECT(slider), "value_changed", > - GTK_SIGNAL_FUNC(on_slider_changed), > - &g_rgbd8_vals.range); > + gtk_signal_connect_full(GTK_OBJECT(dlg), "response", > + GTK_SIGNAL_FUNC(dialog_response), NULL, 0, NULL, 0, 0); > + gtk_signal_connect_full(GTK_OBJECT(dlg), "destroy", > + GTK_SIGNAL_FUNC(gtk_main_quit), NULL, 0, NULL, 0, 0); > + gtk_signal_connect_full(GTK_OBJECT(preview), "invalidated", > + GTK_SIGNAL_FUNC(convert_rgbe_to_rgbdiv8), NULL, > + drawable, NULL, 0, 0); > + gtk_signal_connect_full(GTK_OBJECT(slider), "value_changed", > + GTK_SIGNAL_FUNC(on_slider_changed), NULL, > + &g_rgbd8_vals.range, NULL, 0, 0); > > gtk_widget_show(dlg); > > @@ -1389,22 +1390,22 @@ > g_object_set_data(G_OBJECT(uflchk), "exposure_spin", exposure_spin); > g_object_set_data(G_OBJECT(uflchk), "gamma_spin", gamma_spin); > > - gtk_signal_connect(GTK_OBJECT(dlg), "response", > - GTK_SIGNAL_FUNC(dialog_response), 0); > - gtk_signal_connect(GTK_OBJECT(dlg), "destroy", > - GTK_SIGNAL_FUNC(gtk_main_quit), 0); > - gtk_signal_connect(GTK_OBJECT(tmchk), "clicked", > - GTK_SIGNAL_FUNC(on_checkbox_clicked), > - &g_tonemap_vals.tonemap); > - gtk_signal_connect(GTK_OBJECT(uflchk), "clicked", > - GTK_SIGNAL_FUNC(on_file_levels_checked), > - &g_tonemap_vals.usefilelevels); > - gtk_signal_connect(GTK_OBJECT(exposure_spin), "value_changed", > - GTK_SIGNAL_FUNC(on_spin_changed), > - &g_tonemap_vals.exposure); > - gtk_signal_connect(GTK_OBJECT(gamma_spin), "value_changed", > - GTK_SIGNAL_FUNC(on_spin_changed), > - &g_tonemap_vals.gamma); > + gtk_signal_connect_full(GTK_OBJECT(dlg), "response", > + GTK_SIGNAL_FUNC(dialog_response), NULL, 0, NULL, 0, 0); > + gtk_signal_connect_full(GTK_OBJECT(dlg), "destroy", > + GTK_SIGNAL_FUNC(gtk_main_quit), NULL, 0, NULL, 0, 0); > + gtk_signal_connect_full(GTK_OBJECT(tmchk), "clicked", > + GTK_SIGNAL_FUNC(on_checkbox_clicked), NULL, > + &g_tonemap_vals.tonemap, NULL, 0, 0); > + gtk_signal_connect_full(GTK_OBJECT(uflchk), "clicked", > + GTK_SIGNAL_FUNC(on_file_levels_checked), NULL, > + &g_tonemap_vals.usefilelevels, NULL, 0, 0); > + gtk_signal_connect_full(GTK_OBJECT(exposure_spin), "value_changed", > + GTK_SIGNAL_FUNC(on_spin_changed), NULL, > + &g_tonemap_vals.exposure, NULL, 0, 0); > + gtk_signal_connect_full(GTK_OBJECT(gamma_spin), "value_changed", > + GTK_SIGNAL_FUNC(on_spin_changed), NULL, > + &g_tonemap_vals.gamma, NULL, 0, 0); > > gtk_widget_show(dlg); > > @@ -1494,22 +1495,22 @@ > g_object_set_data(G_OBJECT(wlchk), "exposure_spin", exposure_spin); > g_object_set_data(G_OBJECT(wlchk), "gamma_spin", gamma_spin); > > - gtk_signal_connect(GTK_OBJECT(dlg), "response", > - GTK_SIGNAL_FUNC(dialog_response), 0); > - gtk_signal_connect(GTK_OBJECT(dlg), "destroy", > - GTK_SIGNAL_FUNC(gtk_main_quit), 0); > - gtk_signal_connect(GTK_OBJECT(rlechk), "clicked", > - GTK_SIGNAL_FUNC(on_checkbox_clicked), > - &g_write_vals.rle); > - gtk_signal_connect(GTK_OBJECT(wlchk), "clicked", > - GTK_SIGNAL_FUNC(on_write_levels_checked), > - &g_write_vals.writelevels); > - gtk_signal_connect(GTK_OBJECT(exposure_spin), "value_changed", > - GTK_SIGNAL_FUNC(on_spin_changed), > - &g_write_vals.exposure); > - gtk_signal_connect(GTK_OBJECT(gamma_spin), "value_changed", > - GTK_SIGNAL_FUNC(on_spin_changed), > - &g_write_vals.gamma); > + gtk_signal_connect_full(GTK_OBJECT(dlg), "response", > + GTK_SIGNAL_FUNC(dialog_response), NULL,0, NULL, 0, 0); > + gtk_signal_connect_full(GTK_OBJECT(dlg), "destroy", > + GTK_SIGNAL_FUNC(gtk_main_quit), NULL, 0, NULL, 0, 0); > + gtk_signal_connect_full(GTK_OBJECT(rlechk), "clicked", > + GTK_SIGNAL_FUNC(on_checkbox_clicked), NULL, > + &g_write_vals.rle, NULL, 0, 0); > + gtk_signal_connect_full(GTK_OBJECT(wlchk), "clicked", > + GTK_SIGNAL_FUNC(on_write_levels_checked), NULL, > + &g_write_vals.writelevels, NULL, 0, 0); > + gtk_signal_connect_full(GTK_OBJECT(exposure_spin), "value_changed", > + GTK_SIGNAL_FUNC(on_spin_changed), NULL, > + &g_write_vals.exposure, NULL, 0, 0); > + gtk_signal_connect_full(GTK_OBJECT(gamma_spin), "value_changed", > + GTK_SIGNAL_FUNC(on_spin_changed), NULL, > + &g_write_vals.gamma, NULL, 0, 0); > > gtk_widget_show(dlg); > > --- gimp-2.4.6/plug-ins/Makefile.am.orig 2007-11-20 17:33:38.000000000 > +0800 > +++ gimp-2.4.6/plug-ins/Makefile.am 2008-07-15 17:25:57.482983000 +0800 > @@ -74,4 +74,5 @@ > $(winicon) \ > $(winsnap) \ > $(xjt) \ > - common > + common \ > + gimp-hdrtools-0.1 > --- gimp-2.4.6/configure.in.orig 2008-05-23 17:41:20.000000000 +0800 > +++ gimp-2.4.6/configure.in 2008-07-15 17:26:15.731301000 +0800 > @@ -1956,6 +1956,7 @@ > plug-ins/uri/Makefile > plug-ins/winicon/Makefile > plug-ins/winsnap/Makefile > +plug-ins/gimp-hdrtools-0.1/Makefile > modules/Makefile > devel-docs/Makefile > devel-docs/app/Makefile > plain text document attachment (gimp.diff) > Index: gimp.spec > =================================================================== > --- gimp.spec (revision 14532) > +++ gimp.spec (working copy) > @@ -25,8 +25,11 @@ > %if %build_l10n > Source2: l10n-configure.sh > %endif > +Source3: > http://nifelheim.dyndns.org/~cocidius/hdrtools/gimp-hdrtools-0.1.tar.bz2 > # date:2003-07-17 owner:gman type:branding > Patch1: gimp-01-menu-entry.diff > +# date:2008-07-15 owner:bewitche type:feature > +Patch2: gimp-02-gimphdr.diff > URL: http://www.gimp.org > BuildRoot: %{_tmppath}/%{name}-%{version}-build > Docdir: %{_defaultdocdir}/doc > @@ -97,7 +100,10 @@ > bzcat %SOURCE1 | tar xf - > cd po-sun; make; cd .. > %endif > +bzcat %SOURCE3 | tar -xf - > +mv gimp-hdrtools-0.1 plug-ins > %patch1 -p1 > +%patch2 -p1 > > %build > %ifos linux > @@ -152,7 +158,6 @@ > #rm $RPM_BUILD_ROOT%{_libdir}/gimp/%{subver_install}/python/lib*.la > rm $RPM_BUILD_ROOT%{_libdir}/%{name}/%{subver_install}/python/*.la > #rm $RPM_BUILD_ROOT%{_libdir}/%{name}/%{subver_install}/python/*.a > - > %clean > rm -rf $RPM_BUILD_ROOT
