mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-22 00:06:36 +00:00
Code Issues 1 Projects Releases Wiki Activity
3262 commits 44 branches 1510 tags 505 MiB
Commit graph

545 commits

Author SHA1 Message Date
Wim Taymans
45671a20ea Add working plugins to build. 
Original commit message from CVS:
* configure.ac:
* ext/sidplay/gstsiddec.cc:
Add working plugins to build.
Make sidplay compile again.
 2005-05-12 20:05:18 +00:00
Arwed v. Merkatz
1795f7782a Ported esdsink plugin. 
Original commit message from CVS:
Ported esdsink plugin.
 2005-05-10 20:10:43 +00:00
Zaheer Abbas Merali
1987170ab6 Port shout2 plugin 
Original commit message from CVS:
2005-05-09  Zaheer Abbas Merali  <zaheerabbas at merali dot org>

* PORTED_09:
* configure.ac:
* ext/Makefile.am:
* ext/shout2/Makefile.am:
* ext/shout2/gstshout2.c: (gst_shout2send_get_type),
(gst_shout2send_base_init), (gst_shout2send_class_init),
(gst_shout2send_init), (gst_shout2send_event),
(gst_shout2send_render), (gst_shout2send_set_property),
(gst_shout2send_get_property), (gst_shout2send_setcaps),
(gst_shout2send_change_state):
* ext/shout2/gstshout2.h:

Port shout2 plugin
 2005-05-09 20:09:44 +00:00
Zeeshan Ali
5db0509196 Ported the libcaca plugin. 
Original commit message from CVS:
Ported the libcaca plugin.
 2005-05-08 12:22:04 +00:00
Zeeshan Ali
48134a2370 Fixed a few things to enable the mad and effectv to be able to find the headers in the gst-plugins-base/gst-libs and ... 
Original commit message from CVS:
Fixed a few things to enable the mad and effectv to be able to find the headers in the gst-plugins-base/gst-libs and to link against the libs in there.
 2005-05-07 20:27:10 +00:00
Zeeshan Ali
98ebed4750 Fixed the build by fixing a small mistake of Wim. 
Original commit message from CVS:
Fixed the build by fixing a small mistake of Wim.
 2005-05-07 18:50:39 +00:00
Wim Taymans
556e8a6239 Ported 2 more plugins. usgly hack in the Makefile.am though, I'm sure someone will fix it. 
Original commit message from CVS:
* configure.ac:
* ext/aalib/Makefile.am:
* ext/aalib/gstaasink.c: (gst_aasink_get_type),
(gst_aasink_class_init), (gst_aasink_fixate), (gst_aasink_setcaps),
(gst_aasink_init), (gst_aasink_get_times), (gst_aasink_render),
(gst_aasink_set_property), (gst_aasink_get_property),
(gst_aasink_open), (gst_aasink_close), (gst_aasink_change_state):
* ext/aalib/gstaasink.h:
* gst/smpte/Makefile.am:
* gst/smpte/gstsmpte.c: (gst_smpte_setcaps), (gst_smpte_init),
(gst_smpte_collected):
* gst/smpte/gstsmpte.h:
Ported 2 more plugins. usgly hack in the Makefile.am though, I'm
sure someone will fix it.
 2005-05-06 19:55:22 +00:00
Christian Schaller
bc885a1aea some sidplay fixoring 
Original commit message from CVS:
some sidplay fixoring
 2005-05-06 19:11:14 +00:00
Christian Schaller
04b2afd5a3 add gst-plugins-libs 
Original commit message from CVS:
add gst-plugins-libs
 2005-05-06 18:00:56 +00:00
Wim Taymans
477088372f Ported sidplay. 
Original commit message from CVS:
* configure.ac:
* ext/sidplay/gstsiddec.cc:
* ext/sidplay/gstsiddec.h:
Ported sidplay.
 2005-05-06 17:24:44 +00:00
Christian Schaller
67802e8048 make mad and effectv work with gst-register 
Original commit message from CVS:
make mad and effectv work with gst-register
 2005-05-06 14:54:23 +00:00
Christian Schaller
6dbe8b46a7 various fixes to make it possible to build rpms from gst-plugins head 
Original commit message from CVS:
various fixes to make it possible to build rpms from gst-plugins head
 2005-05-06 12:43:59 +00:00
Christian Schaller
012d4c6577 add ported videofilter to cvs head 
Original commit message from CVS:
add ported videofilter to cvs head
 2005-05-06 11:25:56 +00:00
Christian Schaller
08b451f17f add law plugin to build 
Original commit message from CVS:
add law plugin to build
 2005-05-06 11:12:18 +00:00
Christian Schaller
0751f73733 ported mad and effectv plugins 
Original commit message from CVS:
ported mad and effectv plugins
 2005-05-06 11:04:30 +00:00
Zaheer Abbas Merali
08616b7531 configure.ac: fix typo 
Original commit message from CVS:
2005-05-06  Zaheer Abbas Merali  <zaheerabbas at merali dot org>

* configure.ac:
fix typo
 2005-05-06 10:28:49 +00:00
Christian Schaller
4bfaf808b9 gst-plugins 0.9 cvs head now compiles (only effectv left compiling) 
Original commit message from CVS:
gst-plugins 0.9 cvs head now compiles (only effectv left compiling)
 2005-05-06 10:02:53 +00:00
Christian Schaller
886110240a updates to make this closer to compile 
Original commit message from CVS:
updates to make this closer to compile
 2005-05-05 16:35:52 +00:00
Christian Schaller
9e07c0ac3c remove gettext for now 
Original commit message from CVS:
remove gettext for now
 2005-05-05 10:03:23 +00:00
Christian Schaller
be52c709a4 make this module a bit more 0.9 friendly 
Original commit message from CVS:
make this module a bit more 0.9 friendly
 2005-05-05 09:10:38 +00:00
Thomas Vander Stichele
98d6f5e7af hunting season on 0.9 is now OPEN 
Original commit message from CVS:
hunting season on 0.9 is now OPEN
 2005-02-22 16:48:58 +00:00
Tim-Philipp Müller
c76c257f4a Since dirac 0.5.0 the framerate in dirac is expressed as a rational number. Fix build and up requirement to 0.5.0, an... 
Original commit message from CVS:
Since dirac 0.5.0 the framerate in dirac is expressed as a rational number. Fix build and up requirement to 0.5.0, and also pass parameters to gst_diracdec_link in the right order. (fixes #167959)
 2005-02-21 23:41:23 +00:00
Arwed v. Merkatz
e3d01e9d19 support libvisual 0.2.0 
Original commit message from CVS:
support libvisual 0.2.0
 2005-02-19 17:08:27 +00:00
David Schleef
01c2c8923f configure.ac: Pull in librfb from my CVS tree, because it is too small and annoying to be separate. Move rfbsrc plug... 
Original commit message from CVS:
* configure.ac: Pull in librfb from my CVS tree, because it is
too small and annoying to be separate.  Move rfbsrc plugin
to gst/.
* ext/Makefile.am:
* ext/librfb/Makefile.am:
* ext/librfb/gstrfbsrc.c:
* gst/librfb/Makefile.am:
* gst/librfb/gstrfbsrc.c:
* gst/librfb/rfb.c:
* gst/librfb/rfb.h:
* gst/librfb/rfbbuffer.c:
* gst/librfb/rfbbuffer.h:
* gst/librfb/rfbbytestream.c:
* gst/librfb/rfbbytestream.h:
* gst/librfb/rfbcontext.h:
* gst/librfb/rfbdecoder.c:
* gst/librfb/rfbdecoder.h:
* gst/librfb/rfbutil.h:
 2005-02-11 22:01:19 +00:00
Jan Schmidt
5ab3df2846 configure.ac: Add dvdlpcmdec 
Original commit message from CVS:

* configure.ac:
Add dvdlpcmdec

* ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_reset),
(free_all_buffers), (gst_mpeg2dec_alloc_buffer):
Don't push buffers if the src pad isn't negotiated yet.

* gst/audioconvert/gstaudioconvert.c:
(gst_audio_convert_buffer_to_default_format),
(gst_audio_convert_buffer_from_default_format):
Add support for 24-bit width.

* gst/dvdlpcmdec/.cvsignore:
* gst/dvdlpcmdec/Makefile.am:
* gst/dvdlpcmdec/gstdvdlpcmdec.c: (gst_dvdlpcmdec_get_type),
(gst_dvdlpcmdec_base_init), (gst_dvdlpcmdec_class_init),
(gst_dvdlpcm_reset), (gst_dvdlpcmdec_init), (gst_dvdlpcmdec_link),
(gst_dvdlpcmdec_chain), (gst_dvdlpcmdec_change_state),
(plugin_init):
* gst/dvdlpcmdec/gstdvdlpcmdec.h:
New decoder for rearranging DVD LPCM into our audio/x-raw-int
format. Needs support for the channels maps if someone can find
a DVD LPCM track with > 2 channels.

* gst/mpegstream/gstdvddemux.c: (gst_dvd_demux_handle_dvd_event),
(gst_dvd_demux_send_discont), (gst_dvd_demux_handle_discont),
(gst_dvd_demux_get_audio_stream), (gst_dvd_demux_process_private):
* gst/mpegstream/gstdvddemux.h:
* gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_send_discont),
(gst_mpeg_demux_new_output_pad), (gst_mpeg_demux_init_stream),
(gst_mpeg_demux_send_subbuffer), (gst_mpeg_demux_handle_src_query):
* gst/mpegstream/gstmpegdemux.h:
* gst/mpegstream/gstmpegparse.c: (gst_mpeg_parse_reset),
(gst_mpeg_parse_parse_packhead), (gst_mpeg_parse_loop),
(gst_mpeg_parse_get_rate), (gst_mpeg_parse_convert_src),
(gst_mpeg_parse_handle_src_query),
(gst_mpeg_parse_handle_src_event):
Use audio/x-dvd-lpcm for LPCM output.
Add DTS output.
 2005-02-08 11:08:15 +00:00
David Schleef
38253a1bc8 configure.ac: Put DEFAULT_AUDIOSINK in config.h and use whereever possible. (Fixes #165997) 
Original commit message from CVS:
* configure.ac: Put DEFAULT_AUDIOSINK in config.h and use
whereever possible.  (Fixes #165997)
* examples/capsfilter/capsfilter1.c: (main):
* examples/dynparams/filter.c: (create_ui):
* examples/seeking/cdparanoia.c: (get_track_info), (main):
* examples/seeking/chained.c: (main):
* examples/seeking/seek.c: (make_mod_pipeline), (make_dv_pipeline),
(make_wav_pipeline), (make_flac_pipeline), (make_sid_pipeline),
(make_vorbis_pipeline), (make_mp3_pipeline), (make_avi_pipeline),
(make_mpeg_pipeline), (make_mpegnt_pipeline):
* examples/seeking/spider_seek.c: (make_spider_pipeline):
* examples/switch/switcher.c: (main):
* ext/dv/demo-play.c: (main):
* ext/faad/gstfaad.c: (gst_faad_change_state):
* ext/mad/gstmad.c: (gst_mad_chain):
* ext/smoothwave/demo-osssrc.c: (main):
* gst-libs/gst/gconf/gconf.c: (gst_gconf_set_string),
(gst_gconf_render_bin_from_description),
(gst_gconf_get_default_audio_sink),
(gst_gconf_get_default_video_sink),
(gst_gconf_get_default_audio_src),
(gst_gconf_get_default_video_src),
(gst_gconf_get_default_visualization_element):
* gst/level/demo.c: (main):
* gst/level/plot.c: (main):
* gst/playback/gstplaybin.c: (gen_video_element),
(gen_audio_element):
* gst/playback/test.c: (gen_video_element), (gen_audio_element):
* gst/playondemand/demo-mp3.c: (setup_pipeline):
* gst/sine/demo-dparams.c: (main):
* gst/spectrum/demo-osssrc.c: (main):
* gst/speed/demo-mp3.c: (main):
* gst/volume/demo.c: (main):
* testsuite/embed/embed.c: (main):
 2005-02-02 08:14:01 +00:00
Ronald S. Bultje
62f918a93b Update to 1.1 API (#165446). 
Original commit message from CVS:
* configure.ac:
* ext/musepack/Makefile.am:
* ext/musepack/gstmusepackdec.c: (gst_musepackdec_class_init),
(gst_musepackdec_init), (gst_musepackdec_dispose),
(gst_musepackdec_src_query), (gst_musepackdec_src_convert),
(gst_musepack_stream_init), (gst_musepackdec_loop),
(gst_musepackdec_change_state):
* ext/musepack/gstmusepackdec.cpp:
* ext/musepack/gstmusepackdec.h:
* ext/musepack/gstmusepackreader.c: (gst_musepack_reader_peek),
(gst_musepack_reader_read), (gst_musepack_reader_seek),
(gst_musepack_reader_tell), (gst_musepack_reader_get_size),
(gst_musepack_reader_canseek), (gst_musepack_init_reader):
* ext/musepack/gstmusepackreader.cpp:
* ext/musepack/gstmusepackreader.h:
Update to 1.1 API (#165446).
 2005-01-29 01:28:34 +00:00
Ronald S. Bultje
d1fc8e9747 Add support for AMR-NB (mobile phone audio format; #155163, #163286). 
Original commit message from CVS:
* configure.ac:
* ext/Makefile.am:
* ext/amrnb/Makefile.am:
* ext/amrnb/amrnb.c: (plugin_init):
* ext/amrnb/amrnbdec.c: (gst_amrnbdec_get_type),
(gst_amrnbdec_base_init), (gst_amrnbdec_class_init),
(gst_amrnbdec_init), (gst_amrnbdec_link), (gst_amrnbdec_chain),
(gst_amrnbdec_state_change):
* ext/amrnb/amrnbdec.h:
* ext/amrnb/amrnbparse.c: (gst_amrnbparse_get_type),
(gst_amrnbparse_base_init), (gst_amrnbparse_class_init),
(gst_amrnbparse_init), (gst_amrnbparse_formats),
(gst_amrnbparse_querytypes), (gst_amrnbparse_query),
(gst_amrnbparse_handle_event), (gst_amrnbparse_reserve),
(gst_amrnbparse_loop), (gst_amrnbparse_state_change):
* ext/amrnb/amrnbparse.h:
Add support for AMR-NB (mobile phone audio format; #155163, #163286).
* gst/typefind/gsttypefindfunctions.c: (plugin_init):
Add AMR-NB/-WB raw formats.
* ext/alsa/gstalsa.c: (gst_alsa_link):
Keep valid time when changing format.
* gst/qtdemux/qtdemux.c: (gst_qtdemux_loop_header),
(qtdemux_parse_trak):
Add some more format-specific options (#140141, #143555, #155163).
 2005-01-28 10:36:12 +00:00
Ronald S. Bultje
3fc57b4be5 Update for API change in flac-1.1.1. Update requirement in configure.ac. Fixes #162974. 
Original commit message from CVS:
* configure.ac:
* ext/flac/gstflacenc.c: (gst_flacenc_init),
(gst_flacenc_seek_callback), (gst_flacenc_write_callback),
(gst_flacenc_tell_callback), (gst_flacenc_chain),
(gst_flacenc_change_state):
* ext/flac/gstflacenc.h:
Update for API change in flac-1.1.1. Update requirement in
configure.ac. Fixes #162974.
 2005-01-09 20:01:59 +00:00
Ronald S. Bultje
741360c638 Remove all references to xvideosink, fix examples (#140845). 
Original commit message from CVS:
* configure.ac:
* examples/capsfilter/capsfilter1.c: (main):
* examples/seeking/spider_seek.c: (make_spider_pipeline):
* ext/dvdread/Makefile.am:
* ext/dvdread/demo-play:
* ext/dvdread/demo-play.c:
* gconf/gstreamer.schemas.in:
* gst-libs/gst/gconf/gconf.c:
* sys/v4l/TODO:
* testsuite/Makefile.am:
* testsuite/embed/Makefile.am:
* testsuite/embed/embed.c: (cb_expose), (main):
Remove all references to xvideosink, fix examples (#140845).
* gst/playback/gstplaybasebin.c: (group_destroy):
Apparently, disposal does not unlink - so do explicitely.
* ext/alsa/gstalsasink.c: (gst_alsa_sink_check_event):
Add debug.
 2005-01-09 14:53:58 +00:00
Ronald S. Bultje
8891a9b983 configure.ac: Since we use functions from CVS, up requirement. 
Original commit message from CVS:
* configure.ac:
Since we use functions from CVS, up requirement.
 2005-01-08 18:47:23 +00:00
Ronald S. Bultje
65262fe081 OGM text support, Matroska UTF-8 text support, deadlock fixes all over the place, subtitle awareness in decodebin/pla... 
Original commit message from CVS:
* configure.ac:
* ext/ogg/gstoggdemux.c: (gst_ogg_pad_new):
* ext/ogg/gstogmparse.c: (gst_ogm_text_parse_get_type),
(gst_ogm_text_parse_base_init), (gst_ogm_text_parse_init),
(gst_ogm_parse_get_sink_querytypes), (gst_ogm_parse_sink_convert),
(gst_ogm_parse_sink_query), (gst_ogm_parse_chain),
(gst_ogm_parse_plugin_init):
* ext/pango/gsttextoverlay.c: (gst_textoverlay_linkedpads),
(gst_textoverlay_link), (gst_textoverlay_getcaps),
(gst_textoverlay_event), (gst_textoverlay_video_chain),
(gst_textoverlay_loop), (gst_textoverlay_init), (plugin_init):
* ext/pango/gsttextoverlay.h:
* gst/matroska/matroska-demux.c: (gst_matroska_demux_add_stream),
(gst_matroska_demux_handle_seek_event),
(gst_matroska_demux_sync_streams),
(gst_matroska_demux_parse_blockgroup),
(gst_matroska_demux_subtitle_caps),
(gst_matroska_demux_plugin_init):
* gst/matroska/matroska-ids.h:
* gst/playback/gstdecodebin.c: (close_pad_link):
* gst/playback/gstplaybasebin.c: (gst_play_base_bin_init),
(gen_preroll_element), (remove_groups), (add_stream),
(new_decoded_pad), (setup_subtitles), (gen_source_element),
(setup_source):
* gst/playback/gstplaybasebin.h:
* gst/playback/gstplaybin.c: (gen_text_element), (setup_sinks):
* gst/subparse/Makefile.am:
* gst/subparse/gstsubparse.c: (gst_subparse_get_type),
(gst_subparse_base_init), (gst_subparse_class_init),
(gst_subparse_init), (gst_subparse_formats),
(gst_subparse_eventmask), (gst_subparse_event),
(gst_subparse_handle_event), (convert_encoding), (get_next_line),
(parse_mdvdsub), (parse_mdvdsub_init), (parse_subrip),
(parse_subrip_deinit), (parse_subrip_init), (parse_mpsub),
(parse_mpsub_deinit), (parse_mpsub_init),
(gst_subparse_buffer_format_autodetect),
(gst_subparse_format_autodetect), (gst_subparse_loop),
(gst_subparse_change_state), (gst_subparse_type_find),
(plugin_init):
* gst/subparse/gstsubparse.h:
* gst/typefind/gsttypefindfunctions.c: (ogmtext_type_find),
(plugin_init):
Add subtitle support, .sub parser (supports SRT and MPsub),
OGM text support, Matroska UTF-8 text support, deadlock fixes
all over the place, subtitle awareness in decodebin/playbin
and some fixes to textoverlay to handle subtitles in a stream
correctly. Fixes #100931.
 2005-01-08 18:22:41 +00:00
Benjamin Otte
12669065ce add a puzzle game with... 
Original commit message from CVS:
* configure.ac:
* gst/games/Makefile.am:
* gst/games/gstpuzzle.c:
add a puzzle game with...
* gst/games/gstvideoimage.c:
* gst/games/gstvideoimage.h:
... full colorspace support (that includes YUV9 and RGB16)) stolen
from videotestsrc and made into something that would be a nice
library for a lot of other plugins.
 2005-01-06 06:48:01 +00:00
Stéphane Loeuillet
1db79514b4 configure.ac: don't compile faad plugin if a RC of 2.0 is found 
Original commit message from CVS:

* configure.ac:
don't compile faad plugin if a RC of 2.0 is found

* gst/asfdemux/gstasfdemux.c:
(gst_asf_demux_process_ext_content_desc):
try to make Solaris compiler happier
 2005-01-05 23:38:23 +00:00
Thomas Vander Stichele
b1a2ec15cc back to cvs 
Original commit message from CVS:
back to cvs
 2005-01-05 13:18:43 +00:00
Thomas Vander Stichele
c8bbf2371c releasing 
Original commit message from CVS:
releasing
 2005-01-05 12:19:52 +00:00
Thomas Vander Stichele
c74ab62380 try 2 
Original commit message from CVS:
try 2
 2005-01-04 11:22:04 +00:00
Thomas Vander Stichele
a591511df3 prerelease 
Original commit message from CVS:
prerelease
 2005-01-03 16:17:19 +00:00
Ronald S. Bultje
8f56dce24d configure.ac: Fix indentation, fix v4l2 plugin detection. 
Original commit message from CVS:
* configure.ac:
Fix indentation, fix v4l2 plugin detection.
* ext/Makefile.am:
Fix libmms location (Maciej, use diff -u!).
* ext/alsa/gstalsa.c: (gst_alsa_init):
Initialize caps cache to NULL.
* gst/playback/gstplaybin.c: (gst_play_bin_change_state):
Only change state on audiosink if it exists.
 2004-12-29 13:27:45 +00:00
Thomas Vander Stichele
5a643b5e72 disable docs again until it passes make distcheck 
Original commit message from CVS:
disable docs again until it passes make distcheck
 2004-12-24 13:09:48 +00:00
Thomas Vander Stichele
5701e846db Fixes #158382. Make speex plugin compatible with both 1.0 and 1.1. 
Original commit message from CVS:

* configure.ac:
* ext/speex/gstspeexdec.h:
* ext/speex/gstspeexenc.h:
Fixes #158382.  Make speex plugin compatible with both 1.0 and 1.1.
Fix detection code in configure.ac
 2004-12-23 14:45:25 +00:00
Thomas Vander Stichele
83b681f127 configure.ac: Put additional LAME check inside the conditional. Fixes #152339 
Original commit message from CVS:
* configure.ac:
Put additional LAME check inside the conditional.  Fixes #152339
 2004-12-23 12:43:31 +00:00
Ronald S. Bultje
9635fb8dc8 configure.ac: Fix up. 
Original commit message from CVS:
* configure.ac:
Fix up.
 2004-12-22 19:53:26 +00:00
Maciej Katafiasz
9322182ecd Add gstmms 
Original commit message from CVS:
Add gstmms
 2004-12-22 19:09:41 +00:00
Stefan Kost
87f2c8b770 Added boilerplate gtk-doc files for plugin-libs documentation. 
Original commit message from CVS:
Added boilerplate gtk-doc files for plugin-libs documentation.
 2004-12-20 16:29:05 +00:00
David Schleef
4426ebf5e2 configure.ac: look for musepack headers as musepack/*.h (fixes #159847) 
Original commit message from CVS:
* configure.ac: look for musepack headers as musepack/*.h
(fixes #159847)
* ext/musepack/gstmusepackdec.h: use <musepack/*.h>
* ext/musepack/gstmusepackreader.h: same
 2004-12-17 01:10:30 +00:00
David Schleef
0163a876c0 configure.ac: add audioresample and cairo plugins. Remove 
Original commit message from CVS:
* configure.ac: add audioresample and cairo plugins.  Remove
HAVE_MMX stuff, because it's not used.
* ext/Makefile.am: same
* ext/audioresample/Makefile.am: You are not ready for an
audio resampling element based on audioresample.
* ext/audioresample/gstaudioresample.c:
* ext/audioresample/gstaudioresample.h:
* ext/cairo/Makefile.am: You are not ready for overlay elements
based on cairo.  Don't look too closely, these elements kinda
suck right now.
* ext/cairo/gstcairo.c: new
* ext/cairo/gsttextoverlay.c: new
* ext/cairo/gsttextoverlay.h: new
* ext/cairo/gsttimeoverlay.c: new
* ext/cairo/gsttimeoverlay.h: new
* gst-libs/gst/media-info/media-info-priv.h: fix compile
problem with compilers that don't support variadic macros.
 2004-12-16 05:32:07 +00:00
David Schleef
058d9f42b3 configure.ac: Applied patch from bug #143659, making default and added code for OS/X. 
Original commit message from CVS:
* configure.ac:  Applied patch from bug #143659, making default
sources and sinks OS-dependent (for Solaris), and added code
for OS/X.
* gconf/gstreamer.schemas.in: use OS-dependent sinks in gconf.
 2004-12-14 06:43:30 +00:00
Christian Schaller
fd1a08e15f merge patch from 158258 
Original commit message from CVS:
merge patch from 158258
 2004-12-12 12:05:38 +00:00
Thomas Vander Stichele
cc1acabb93 configure.ac: move GCONF macro outside conditional for the am conditional. Fixes #160439 
Original commit message from CVS:
2004-12-09  Thomas Vander Stichele  <thomas at apestaart dot org>

* configure.ac: move GCONF macro outside conditional for the am
conditional. Fixes #160439
 2004-12-09 11:54:10 +00:00