Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 292305 Details for
Bug 385121
media-video/ogmrip refuses to install due to "poor programming practices"
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
ogmrip-0.13.6-deprecated.patch
ogmrip-0.13.6-deprecated.patch (text/plain), 38.81 KB, created by
Olivier Rolland
on 2011-11-12 17:23:29 UTC
(
hide
)
Description:
ogmrip-0.13.6-deprecated.patch
Filename:
MIME Type:
Creator:
Olivier Rolland
Created:
2011-11-12 17:23:29 UTC
Size:
38.81 KB
patch
obsolete
>diff -Naur ogmrip-0.13.6.orig/configure.in ogmrip-0.13.6/configure.in >--- ogmrip-0.13.6.orig/configure.in 2011-11-12 18:16:08.826882175 +0100 >+++ ogmrip-0.13.6/configure.in 2011-11-12 18:16:57.103342478 +0100 >@@ -38,7 +38,6 @@ > AM_MAINTAINER_MODE > > CFLAGS="$CFLAGS -g -I/usr/local/include -I.. -Wall -D_FORTIFY_SOURCE=2" >-CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" > CFLAGS="$CFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES" > > CPPFLAGS="$CPPFLAGS -I/usr/local/include -I.. -Wall -D_FORTIFY_SOURCE=2" >diff -Naur ogmrip-0.13.6.orig/libogmdvd/ogmdvd-disc.c ogmrip-0.13.6/libogmdvd/ogmdvd-disc.c >--- ogmrip-0.13.6.orig/libogmdvd/ogmdvd-disc.c 2011-11-12 18:16:08.804882421 +0100 >+++ ogmrip-0.13.6/libogmdvd/ogmdvd-disc.c 2011-11-12 18:16:57.104342467 +0100 >@@ -134,7 +134,7 @@ > return reader; > } > >-static G_CONST_RETURN gchar * >+static const gchar * > dvd_reader_get_id (dvd_reader_t *reader) > { > static gchar str[33]; >@@ -788,7 +788,7 @@ > * > * Returns: The label of the DVD, or NULL > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmdvd_disc_get_label (OGMDvdDisc *disc) > { > g_return_val_if_fail (disc != NULL, NULL); >@@ -804,7 +804,7 @@ > * > * Returns: The identifier, or NULL > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmdvd_disc_get_id (OGMDvdDisc *disc) > { > g_return_val_if_fail (disc != NULL, NULL); >@@ -820,7 +820,7 @@ > * > * Returns: The device of the DVD. > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmdvd_disc_get_device (OGMDvdDisc *disc) > { > g_return_val_if_fail (disc != NULL, NULL); >diff -Naur ogmrip-0.13.6.orig/libogmdvd/ogmdvd-disc.h ogmrip-0.13.6/libogmdvd/ogmdvd-disc.h >--- ogmrip-0.13.6.orig/libogmdvd/ogmdvd-disc.h 2011-11-12 18:16:08.804882421 +0100 >+++ ogmrip-0.13.6/libogmdvd/ogmdvd-disc.h 2011-11-12 18:16:57.104342467 +0100 >@@ -67,11 +67,11 @@ > > void ogmdvd_disc_ref (OGMDvdDisc *disc); > void ogmdvd_disc_unref (OGMDvdDisc *disc); >-G_CONST_RETURN >+const > gchar * ogmdvd_disc_get_label (OGMDvdDisc *disc); >-G_CONST_RETURN >+const > gchar * ogmdvd_disc_get_id (OGMDvdDisc *disc); >-G_CONST_RETURN >+const > gchar * ogmdvd_disc_get_device (OGMDvdDisc *disc); > gint64 ogmdvd_disc_get_vmg_size (OGMDvdDisc *disc); > gint ogmdvd_disc_get_n_titles (OGMDvdDisc *disc); >diff -Naur ogmrip-0.13.6.orig/libogmdvd/ogmdvd-labels.c ogmrip-0.13.6/libogmdvd/ogmdvd-labels.c >--- ogmrip-0.13.6.orig/libogmdvd/ogmdvd-labels.c 2011-11-12 18:16:08.804882421 +0100 >+++ ogmrip-0.13.6/libogmdvd/ogmdvd-labels.c 2011-11-12 18:16:57.105342456 +0100 >@@ -248,7 +248,7 @@ > * > * Returns: A constant string, or NULL > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmdvd_get_video_format_label (gint format) > { > static const gchar *video_format[] = >@@ -272,7 +272,7 @@ > * > * Returns: A constant string, or NULL > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmdvd_get_display_aspect_label (gint aspect) > { > static gchar *display_aspect[] = >@@ -296,7 +296,7 @@ > * > * Returns: A constant string, or NULL > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmdvd_get_audio_format_label (gint format) > { > static gchar *audio_format[] = >@@ -324,7 +324,7 @@ > * > * Returns: A constant string, or NULL > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmdvd_get_audio_channels_label (gint channels) > { > static gchar *audio_channels[] = >@@ -352,7 +352,7 @@ > * > * Returns: A constant string, or NULL > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmdvd_get_audio_quantization_label (gint quantization) > { > static gchar *audio_quantization[] = >@@ -376,7 +376,7 @@ > * > * Returns: A constant string, or NULL > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmdvd_get_audio_content_label (gint content) > { > static gchar *audio_content[] = >@@ -401,7 +401,7 @@ > * > * Returns: A constant string, or NULL > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmdvd_get_subp_content_label (gint content) > { > static gchar *subp_content[] = >@@ -437,7 +437,7 @@ > * > * Returns: A constant string, or NULL > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmdvd_get_language_label (gint code) > { > const gchar *lang; >@@ -460,7 +460,7 @@ > * > * Returns: A constant string, or NULL > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmdvd_get_language_iso639_1 (gint code) > { > static gchar lang[3]; >@@ -489,7 +489,7 @@ > * > * Returns: A constant string, or NULL > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmdvd_get_language_iso639_2 (gint code) > { > const gchar *lang; >diff -Naur ogmrip-0.13.6.orig/libogmdvd/ogmdvd-labels.h ogmrip-0.13.6/libogmdvd/ogmdvd-labels.h >--- ogmrip-0.13.6.orig/libogmdvd/ogmdvd-labels.h 2011-11-12 18:16:08.804882421 +0100 >+++ ogmrip-0.13.6/libogmdvd/ogmdvd-labels.h 2011-11-12 18:16:57.105342456 +0100 >@@ -23,16 +23,16 @@ > > G_BEGIN_DECLS > >-G_CONST_RETURN gchar * ogmdvd_get_video_format_label (gint format); >-G_CONST_RETURN gchar * ogmdvd_get_display_aspect_label (gint aspect); >-G_CONST_RETURN gchar * ogmdvd_get_audio_format_label (gint format); >-G_CONST_RETURN gchar * ogmdvd_get_audio_channels_label (gint channels); >-G_CONST_RETURN gchar * ogmdvd_get_audio_quantization_label (gint quantization); >-G_CONST_RETURN gchar * ogmdvd_get_audio_content_label (gint content); >-G_CONST_RETURN gchar * ogmdvd_get_subp_content_label (gint content); >-G_CONST_RETURN gchar * ogmdvd_get_language_label (gint code); >-G_CONST_RETURN gchar * ogmdvd_get_language_iso639_1 (gint code); >-G_CONST_RETURN gchar * ogmdvd_get_language_iso639_2 (gint code); >+const gchar * ogmdvd_get_video_format_label (gint format); >+const gchar * ogmdvd_get_display_aspect_label (gint aspect); >+const gchar * ogmdvd_get_audio_format_label (gint format); >+const gchar * ogmdvd_get_audio_channels_label (gint channels); >+const gchar * ogmdvd_get_audio_quantization_label (gint quantization); >+const gchar * ogmdvd_get_audio_content_label (gint content); >+const gchar * ogmdvd_get_subp_content_label (gint content); >+const gchar * ogmdvd_get_language_label (gint code); >+const gchar * ogmdvd_get_language_iso639_1 (gint code); >+const gchar * ogmdvd_get_language_iso639_2 (gint code); > > G_END_DECLS > >diff -Naur ogmrip-0.13.6.orig/libogmdvd/ogmdvd-title.c ogmrip-0.13.6/libogmdvd/ogmdvd-title.c >--- ogmrip-0.13.6.orig/libogmdvd/ogmdvd-title.c 2011-11-12 18:16:08.804882421 +0100 >+++ ogmrip-0.13.6/libogmdvd/ogmdvd-title.c 2011-11-12 18:16:57.106342445 +0100 >@@ -437,7 +437,7 @@ > * > * Returns: a constant array of 16 integers, or NULL > */ >-G_CONST_RETURN guint * >+const guint * > ogmdvd_title_get_palette (OGMDvdTitle *title) > { > g_return_val_if_fail (title != NULL, NULL); >diff -Naur ogmrip-0.13.6.orig/libogmdvd/ogmdvd-title.h ogmrip-0.13.6/libogmdvd/ogmdvd-title.h >--- ogmrip-0.13.6.orig/libogmdvd/ogmdvd-title.h 2011-11-12 18:16:08.804882421 +0100 >+++ ogmrip-0.13.6/libogmdvd/ogmdvd-title.h 2011-11-12 18:16:57.106342445 +0100 >@@ -54,7 +54,7 @@ > void ogmdvd_title_get_aspect_ratio (OGMDvdTitle *title, > guint *numerator, > guint *denominator); >-G_CONST_RETURN >+const > guint * ogmdvd_title_get_palette (OGMDvdTitle *title); > gint ogmdvd_title_get_n_angles (OGMDvdTitle *title); > gint ogmdvd_title_get_n_chapters (OGMDvdTitle *title); >diff -Naur ogmrip-0.13.6.orig/libogmrip/ogmrip-audio-codec.c ogmrip-0.13.6/libogmrip/ogmrip-audio-codec.c >--- ogmrip-0.13.6.orig/libogmrip/ogmrip-audio-codec.c 2011-11-12 18:16:08.801882454 +0100 >+++ ogmrip-0.13.6/libogmrip/ogmrip-audio-codec.c 2011-11-12 18:16:57.106342445 +0100 >@@ -465,7 +465,7 @@ > * > * Returns: the track name > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmrip_audio_codec_get_label (OGMRipAudioCodec *audio) > { > g_return_val_if_fail (OGMRIP_IS_AUDIO_CODEC (audio), NULL); >diff -Naur ogmrip-0.13.6.orig/libogmrip/ogmrip-audio-codec.h ogmrip-0.13.6/libogmrip/ogmrip-audio-codec.h >--- ogmrip-0.13.6.orig/libogmrip/ogmrip-audio-codec.h 2011-11-12 18:16:08.798882487 +0100 >+++ ogmrip-0.13.6/libogmrip/ogmrip-audio-codec.h 2011-11-12 18:16:57.107342433 +0100 >@@ -71,7 +71,7 @@ > gint ogmrip_audio_codec_get_sample_rate (OGMRipAudioCodec *audio); > void ogmrip_audio_codec_set_label (OGMRipAudioCodec *audio, > const gchar *label); >-G_CONST_RETURN >+const > gchar * ogmrip_audio_codec_get_label (OGMRipAudioCodec *audio); > gint ogmrip_audio_codec_get_samples_per_frame (OGMRipAudioCodec *audio); > >diff -Naur ogmrip-0.13.6.orig/libogmrip/ogmrip-chapters.c ogmrip-0.13.6/libogmrip/ogmrip-chapters.c >--- ogmrip-0.13.6.orig/libogmrip/ogmrip-chapters.c 2011-11-12 18:16:08.799882476 +0100 >+++ ogmrip-0.13.6/libogmrip/ogmrip-chapters.c 2011-11-12 18:16:57.107342433 +0100 >@@ -205,7 +205,7 @@ > * > * Returns: The label > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmrip_chapters_get_label (OGMRipChapters *chapters, guint n) > { > g_return_val_if_fail (OGMRIP_IS_CHAPTERS (chapters), NULL); >diff -Naur ogmrip-0.13.6.orig/libogmrip/ogmrip-chapters.h ogmrip-0.13.6/libogmrip/ogmrip-chapters.h >--- ogmrip-0.13.6.orig/libogmrip/ogmrip-chapters.h 2011-11-12 18:16:08.800882465 +0100 >+++ ogmrip-0.13.6/libogmrip/ogmrip-chapters.h 2011-11-12 18:16:57.108342421 +0100 >@@ -48,7 +48,7 @@ > GType ogmrip_chapters_get_type (void); > OGMJobSpawn * ogmrip_chapters_new (OGMDvdTitle *title, > const gchar *output); >-G_CONST_RETURN >+const > gchar * ogmrip_chapters_get_label (OGMRipChapters *chapters, > guint n); > void ogmrip_chapters_set_label (OGMRipChapters *chapters, >diff -Naur ogmrip-0.13.6.orig/libogmrip/ogmrip-codec.c ogmrip-0.13.6/libogmrip/ogmrip-codec.c >--- ogmrip-0.13.6.orig/libogmrip/ogmrip-codec.c 2011-11-12 18:16:08.800882465 +0100 >+++ ogmrip-0.13.6/libogmrip/ogmrip-codec.c 2011-11-12 18:16:57.109342410 +0100 >@@ -294,7 +294,7 @@ > * > * Returns: the filename, or NULL > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmrip_codec_get_output (OGMRipCodec *codec) > { > g_return_val_if_fail (OGMRIP_IS_CODEC (codec), NULL); >diff -Naur ogmrip-0.13.6.orig/libogmrip/ogmrip-codec.h ogmrip-0.13.6/libogmrip/ogmrip-codec.h >--- ogmrip-0.13.6.orig/libogmrip/ogmrip-codec.h 2011-11-12 18:16:08.798882487 +0100 >+++ ogmrip-0.13.6/libogmrip/ogmrip-codec.h 2011-11-12 18:16:57.109342410 +0100 >@@ -53,7 +53,7 @@ > }; > > GType ogmrip_codec_get_type (void); >-G_CONST_RETURN >+const > gchar * ogmrip_codec_get_output (OGMRipCodec *codec); > void ogmrip_codec_set_output (OGMRipCodec *codec, > const gchar *output); >diff -Naur ogmrip-0.13.6.orig/libogmrip/ogmrip-container.c ogmrip-0.13.6/libogmrip/ogmrip-container.c >--- ogmrip-0.13.6.orig/libogmrip/ogmrip-container.c 2011-11-12 18:16:08.802882443 +0100 >+++ ogmrip-0.13.6/libogmrip/ogmrip-container.c 2011-11-12 18:16:57.110342399 +0100 >@@ -325,7 +325,7 @@ > * > * Returns: The filename, or NULL > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmrip_container_get_output (OGMRipContainer *container) > { > g_return_val_if_fail (OGMRIP_IS_CONTAINER (container), NULL); >@@ -358,7 +358,7 @@ > * > * Returns: The label, or NULL > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmrip_container_get_label (OGMRipContainer *container) > { > g_return_val_if_fail (OGMRIP_IS_CONTAINER (container), NULL); >@@ -390,7 +390,7 @@ > * > * Returns: The FourCC, or NULL > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmrip_container_get_fourcc (OGMRipContainer *container) > { > g_return_val_if_fail (OGMRIP_IS_CONTAINER (container), NULL); >diff -Naur ogmrip-0.13.6.orig/libogmrip/ogmrip-container.h ogmrip-0.13.6/libogmrip/ogmrip-container.h >--- ogmrip-0.13.6.orig/libogmrip/ogmrip-container.h 2011-11-12 18:16:08.799882476 +0100 >+++ ogmrip-0.13.6/libogmrip/ogmrip-container.h 2011-11-12 18:16:57.110342399 +0100 >@@ -91,16 +91,16 @@ > void ogmrip_container_set_options (OGMRipContainer *container, > const gchar *section); > >-G_CONST_RETURN >+const > gchar * ogmrip_container_get_output (OGMRipContainer *container); > void ogmrip_container_set_output (OGMRipContainer *container, > const gchar *output); >-G_CONST_RETURN >+const > gchar * ogmrip_container_get_label (OGMRipContainer *container); > void ogmrip_container_set_label (OGMRipContainer *container, > const gchar *label); > >-G_CONST_RETURN >+const > gchar * ogmrip_container_get_fourcc (OGMRipContainer *container); > void ogmrip_container_set_fourcc (OGMRipContainer *container, > const gchar *fourcc); >diff -Naur ogmrip-0.13.6.orig/libogmrip/ogmrip-edl.c ogmrip-0.13.6/libogmrip/ogmrip-edl.c >--- ogmrip-0.13.6.orig/libogmrip/ogmrip-edl.c 2011-11-12 18:16:08.801882454 +0100 >+++ ogmrip-0.13.6/libogmrip/ogmrip-edl.c 2011-11-12 18:16:57.110342399 +0100 >@@ -217,7 +217,7 @@ > * > * Returns: The filename > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmrip_edl_get_filename (OGMRipEdl *edl) > { > g_return_val_if_fail (edl != NULL, NULL); >diff -Naur ogmrip-0.13.6.orig/libogmrip/ogmrip-edl.h ogmrip-0.13.6/libogmrip/ogmrip-edl.h >--- ogmrip-0.13.6.orig/libogmrip/ogmrip-edl.h 2011-11-12 18:16:08.798882487 +0100 >+++ ogmrip-0.13.6/libogmrip/ogmrip-edl.h 2011-11-12 18:16:57.110342399 +0100 >@@ -56,7 +56,7 @@ > void ogmrip_edl_ref (OGMRipEdl *edl); > void ogmrip_edl_unref (OGMRipEdl *edl); > >-G_CONST_RETURN >+const > gchar * ogmrip_edl_get_filename (OGMRipEdl *edl); > > void ogmrip_edl_add (OGMRipEdl *edl, >diff -Naur ogmrip-0.13.6.orig/libogmrip/ogmrip-encoding.c ogmrip-0.13.6/libogmrip/ogmrip-encoding.c >--- ogmrip-0.13.6.orig/libogmrip/ogmrip-encoding.c 2011-11-12 18:16:08.799882476 +0100 >+++ ogmrip-0.13.6/libogmrip/ogmrip-encoding.c 2011-11-12 18:16:57.113342366 +0100 >@@ -359,7 +359,7 @@ > return data1->nr - data2->nr; > } > >-static G_CONST_RETURN gchar * >+static const gchar * > ogmrip_encoding_get_device (OGMRipEncoding *encoding) > { > g_return_val_if_fail (OGMRIP_IS_ENCODING (encoding), NULL); >@@ -3558,7 +3558,7 @@ > * > * Returns: The id, or NULL > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmrip_encoding_get_id (OGMRipEncoding *encoding) > { > g_return_val_if_fail (OGMRIP_IS_ENCODING (encoding), NULL); >@@ -3590,7 +3590,7 @@ > * > * Returns: The profile' section, or NULL > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmrip_encoding_get_profile (OGMRipEncoding *encoding) > { > g_return_val_if_fail (OGMRIP_IS_ENCODING (encoding), NULL); >@@ -3630,7 +3630,7 @@ > * > * Returns: The name of the encoding, or NULL > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmrip_encoding_get_label (OGMRipEncoding *encoding) > { > g_return_val_if_fail (OGMRIP_IS_ENCODING (encoding), NULL); >@@ -3677,7 +3677,7 @@ > * > * Returns: The name of the chapter, or NULL > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmrip_encoding_get_chapter_label (OGMRipEncoding *encoding, guint nr) > { > OGMRipChapterData *data; >@@ -3837,7 +3837,7 @@ > * > * Returns: The output filename, or NULL > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmrip_encoding_get_filename (OGMRipEncoding *encoding) > { > g_return_val_if_fail (OGMRIP_IS_ENCODING (encoding), NULL); >@@ -3876,7 +3876,7 @@ > * > * Returns: The log filename, or NULL > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmrip_encoding_get_logfile (OGMRipEncoding *encoding) > { > g_return_val_if_fail (OGMRIP_IS_ENCODING (encoding), NULL); >@@ -4018,7 +4018,7 @@ > * > * Returns: The FourCC, or NULL > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmrip_encoding_get_fourcc (OGMRipEncoding *encoding) > { > g_return_val_if_fail (OGMRIP_IS_ENCODING (encoding), NULL); >diff -Naur ogmrip-0.13.6.orig/libogmrip/ogmrip-encoding.h ogmrip-0.13.6/libogmrip/ogmrip-encoding.h >--- ogmrip-0.13.6.orig/libogmrip/ogmrip-encoding.h 2011-11-12 18:16:08.798882487 +0100 >+++ ogmrip-0.13.6/libogmrip/ogmrip-encoding.h 2011-11-12 18:16:57.114342355 +0100 >@@ -362,16 +362,16 @@ > > guint32 ogmrip_encoding_get_flags (OGMRipEncoding *encoding); > >-G_CONST_RETURN >+const > gchar * ogmrip_encoding_get_id (OGMRipEncoding *encoding); > OGMDvdTitle * ogmrip_encoding_get_title (OGMRipEncoding *encoding); > >-G_CONST_RETURN >+const > gchar * ogmrip_encoding_get_profile (OGMRipEncoding *encoding); > void ogmrip_encoding_set_profile (OGMRipEncoding *encoding, > const gchar *profile); > >-G_CONST_RETURN >+const > gchar * ogmrip_encoding_get_label (OGMRipEncoding *encoding); > void ogmrip_encoding_set_label (OGMRipEncoding *encoding, > const gchar *label); >@@ -386,7 +386,7 @@ > gint ogmrip_encoding_get_chapters_language (OGMRipEncoding *encoding); > void ogmrip_encoding_set_chapters_language (OGMRipEncoding *encoding, > guint language); >-G_CONST_RETURN >+const > gchar * ogmrip_encoding_get_chapter_label (OGMRipEncoding *encoding, > guint nr); > void ogmrip_encoding_set_chapter_label (OGMRipEncoding *encoding, >@@ -404,11 +404,11 @@ > gboolean ogmrip_encoding_get_keep_tmp_files (OGMRipEncoding *encoding); > void ogmrip_encoding_set_keep_tmp_files (OGMRipEncoding *encoding, > gboolean keep_tmp_files); >-G_CONST_RETURN >+const > gchar * ogmrip_encoding_get_filename (OGMRipEncoding *encoding); > void ogmrip_encoding_set_filename (OGMRipEncoding *encoding, > const gchar *filename); >-G_CONST_RETURN >+const > gchar * ogmrip_encoding_get_logfile (OGMRipEncoding *encoding); > > gint ogmrip_encoding_get_threads (OGMRipEncoding *encoding); >@@ -423,7 +423,7 @@ > gboolean ogmrip_encoding_set_container_type (OGMRipEncoding *encoding, > GType type, > GError **error); >-G_CONST_RETURN >+const > gchar * ogmrip_encoding_get_fourcc (OGMRipEncoding *encoding); > void ogmrip_encoding_set_fourcc (OGMRipEncoding *encoding, > const gchar *fourcc); >diff -Naur ogmrip-0.13.6.orig/libogmrip/ogmrip-fs.c ogmrip-0.13.6/libogmrip/ogmrip-fs.c >--- ogmrip-0.13.6.orig/libogmrip/ogmrip-fs.c 2011-11-12 18:16:08.798882487 +0100 >+++ ogmrip-0.13.6/libogmrip/ogmrip-fs.c 2011-11-12 18:16:57.114342355 +0100 >@@ -51,7 +51,7 @@ > * > * Returns: The temporaty directory > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmrip_fs_get_tmp_dir (void) > { > if (!ogmrip_tmp_dir) >@@ -618,7 +618,7 @@ > * > * Returns: The extension, or NULL > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmrip_fs_get_extension (const gchar *filename) > { > gchar *dot; >diff -Naur ogmrip-0.13.6.orig/libogmrip/ogmrip-fs.h ogmrip-0.13.6/libogmrip/ogmrip-fs.h >--- ogmrip-0.13.6.orig/libogmrip/ogmrip-fs.h 2011-11-12 18:16:08.799882476 +0100 >+++ ogmrip-0.13.6/libogmrip/ogmrip-fs.h 2011-11-12 18:16:57.115342344 +0100 >@@ -30,7 +30,7 @@ > #define g_chdir chdir > #endif > >-G_CONST_RETURN >+const > gchar * ogmrip_fs_get_tmp_dir (void); > void ogmrip_fs_set_tmp_dir (const gchar *dir); > >@@ -71,7 +71,7 @@ > > gchar * ogmrip_fs_get_full_path (const gchar *filename); > >-G_CONST_RETURN >+const > gchar * ogmrip_fs_get_extension (const gchar *filename); > gchar * ogmrip_fs_set_extension (const gchar *filename, > const gchar *extension); >diff -Naur ogmrip-0.13.6.orig/libogmrip/ogmrip-lavc.c ogmrip-0.13.6/libogmrip/ogmrip-lavc.c >--- ogmrip-0.13.6.orig/libogmrip/ogmrip-lavc.c 2011-11-12 18:16:08.800882465 +0100 >+++ ogmrip-0.13.6/libogmrip/ogmrip-lavc.c 2011-11-12 18:16:57.115342344 +0100 >@@ -135,7 +135,7 @@ > return CLAMP (quantizer, 2, 31); > } > >-static G_CONST_RETURN gchar * >+static const gchar * > ogmrip_lavc_get_codec (OGMRipLavc *lavc) > { > OGMRipLavcClass *klass; >diff -Naur ogmrip-0.13.6.orig/libogmrip/ogmrip-lavc.h ogmrip-0.13.6/libogmrip/ogmrip-lavc.h >--- ogmrip-0.13.6.orig/libogmrip/ogmrip-lavc.h 2011-11-12 18:16:08.800882465 +0100 >+++ ogmrip-0.13.6/libogmrip/ogmrip-lavc.h 2011-11-12 18:16:57.116342333 +0100 >@@ -69,7 +69,7 @@ > OGMRipVideoCodecClass parent_class; > > /* vtable */ >- G_CONST_RETURN gchar * (* get_codec) (void); >+ const gchar * (* get_codec) (void); > }; > > /** >diff -Naur ogmrip-0.13.6.orig/libogmrip/ogmrip-plugin.c ogmrip-0.13.6/libogmrip/ogmrip-plugin.c >--- ogmrip-0.13.6.orig/libogmrip/ogmrip-plugin.c 2011-11-12 18:16:08.801882454 +0100 >+++ ogmrip-0.13.6/libogmrip/ogmrip-plugin.c 2011-11-12 18:16:57.116342333 +0100 >@@ -367,7 +367,7 @@ > return NULL; > } > >-static G_CONST_RETURN gchar * >+static const gchar * > ogmrip_plugin_get_codec_name (GSList *list, GType type) > { > OGMRipPlugin *plugin; >@@ -542,7 +542,7 @@ > * > * Returns: The name of the container, or NULL > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmrip_plugin_get_container_name (GType container) > { > OGMRipContainerPlugin *plugin; >@@ -740,7 +740,7 @@ > * > * Returns: The name of the video codec, or NULL > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmrip_plugin_get_video_codec_name (GType codec) > { > g_return_val_if_fail (g_type_is_a (codec, OGMRIP_TYPE_VIDEO_CODEC), NULL); >@@ -926,7 +926,7 @@ > * > * Returns: The name of the audio codec, or NULL > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmrip_plugin_get_audio_codec_name (GType codec) > { > g_return_val_if_fail (g_type_is_a (codec, OGMRIP_TYPE_AUDIO_CODEC), NULL); >@@ -1070,7 +1070,7 @@ > * > * Returns: The name of the subtitle codec, or NULL > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmrip_plugin_get_subp_codec_name (GType codec) > { > g_return_val_if_fail (g_type_is_a (codec, OGMRIP_TYPE_SUBP_CODEC), NULL); >diff -Naur ogmrip-0.13.6.orig/libogmrip/ogmrip-plugin.h ogmrip-0.13.6/libogmrip/ogmrip-plugin.h >--- ogmrip-0.13.6.orig/libogmrip/ogmrip-plugin.h 2011-11-12 18:16:08.799882476 +0100 >+++ ogmrip-0.13.6/libogmrip/ogmrip-plugin.h 2011-11-12 18:16:57.117342322 +0100 >@@ -196,7 +196,7 @@ > GType ogmrip_plugin_get_nth_container (guint n); > GType ogmrip_plugin_get_container_by_name (const gchar *name); > gint ogmrip_plugin_get_container_index (GType container); >-G_CONST_RETURN >+const > gchar * ogmrip_plugin_get_container_name (GType container); > gboolean ogmrip_plugin_get_container_bframes (GType container); > gint ogmrip_plugin_get_container_max_audio (GType container); >@@ -216,7 +216,7 @@ > GType ogmrip_plugin_get_nth_video_codec (guint n); > GType ogmrip_plugin_get_video_codec_by_name (const gchar *name); > gint ogmrip_plugin_get_video_codec_index (GType codec); >-G_CONST_RETURN >+const > gchar * ogmrip_plugin_get_video_codec_name (GType codec); > gint ogmrip_plugin_get_video_codec_format (GType codec); > gint ogmrip_plugin_get_video_codec_passes (GType codec); >@@ -236,7 +236,7 @@ > GType ogmrip_plugin_get_nth_audio_codec (guint n); > GType ogmrip_plugin_get_audio_codec_by_name (const gchar *name); > gint ogmrip_plugin_get_audio_codec_index (GType codec); >-G_CONST_RETURN >+const > gchar * ogmrip_plugin_get_audio_codec_name (GType codec); > gint ogmrip_plugin_get_audio_codec_format (GType codec); > GModule * ogmrip_plugin_get_audio_codec_module (GType codec); >@@ -254,7 +254,7 @@ > GType ogmrip_plugin_get_nth_subp_codec (guint n); > GType ogmrip_plugin_get_subp_codec_by_name (const gchar *name); > gint ogmrip_plugin_get_subp_codec_index (GType codec); >-G_CONST_RETURN >+const > gchar * ogmrip_plugin_get_subp_codec_name (GType codec); > gint ogmrip_plugin_get_subp_codec_format (GType codec); > gboolean ogmrip_plugin_get_subp_codec_text (GType codec); >diff -Naur ogmrip-0.13.6.orig/libogmrip/ogmrip-subp-codec.c ogmrip-0.13.6/libogmrip/ogmrip-subp-codec.c >--- ogmrip-0.13.6.orig/libogmrip/ogmrip-subp-codec.c 2011-11-12 18:16:08.800882465 +0100 >+++ ogmrip-0.13.6/libogmrip/ogmrip-subp-codec.c 2011-11-12 18:16:57.117342322 +0100 >@@ -347,7 +347,7 @@ > * > * Returns: the track name > */ >-G_CONST_RETURN gchar * >+const gchar * > ogmrip_subp_codec_get_label (OGMRipSubpCodec *subp) > { > g_return_val_if_fail (OGMRIP_IS_SUBP_CODEC (subp), NULL); >diff -Naur ogmrip-0.13.6.orig/libogmrip/ogmrip-subp-codec.h ogmrip-0.13.6/libogmrip/ogmrip-subp-codec.h >--- ogmrip-0.13.6.orig/libogmrip/ogmrip-subp-codec.h 2011-11-12 18:16:08.798882487 +0100 >+++ ogmrip-0.13.6/libogmrip/ogmrip-subp-codec.h 2011-11-12 18:16:57.118342310 +0100 >@@ -62,7 +62,7 @@ > gint ogmrip_subp_codec_get_newline (OGMRipSubpCodec *subp); > void ogmrip_subp_codec_set_label (OGMRipSubpCodec *subp, > const gchar *label); >-G_CONST_RETURN >+const > gchar * ogmrip_subp_codec_get_label (OGMRipSubpCodec *subp); > > G_END_DECLS >diff -Naur ogmrip-0.13.6.orig/libogmrip-gtk/ogmrip-source-chooser-widget.c ogmrip-0.13.6/libogmrip-gtk/ogmrip-source-chooser-widget.c >--- ogmrip-0.13.6.orig/libogmrip-gtk/ogmrip-source-chooser-widget.c 2011-11-12 18:16:08.759882924 +0100 >+++ ogmrip-0.13.6/libogmrip-gtk/ogmrip-source-chooser-widget.c 2011-11-12 18:16:57.118342310 +0100 >@@ -207,7 +207,12 @@ > gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); > gtk_widget_show (label); > >+#if GTK_CHECK_VERSION(2,24,0) >+ combo = gtk_combo_box_text_new (); >+#else > combo = gtk_combo_box_new_text (); >+#endif >+ > gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0); > gtk_widget_show (combo); > >@@ -231,7 +236,11 @@ > { > str = g_strdup_printf ("%s (%s)", ogmdvd_languages[i][OGMDVD_LANGUAGE_NAME], > ogmdvd_languages[i][OGMDVD_LANGUAGE_ISO639_1]); >+#if GTK_CHECK_VERSION(2,24,0) >+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), str); >+#else > gtk_combo_box_append_text (GTK_COMBO_BOX (combo), str); >+#endif > g_free (str); > > if (strncmp (ogmdvd_languages[i][OGMDVD_LANGUAGE_ISO639_1], lang, 2) == 0) >diff -Naur ogmrip-0.13.6.orig/libogmrip-gtk/ogmrip-x264-options.c ogmrip-0.13.6/libogmrip-gtk/ogmrip-x264-options.c >--- ogmrip-0.13.6.orig/libogmrip-gtk/ogmrip-x264-options.c 2011-11-12 18:16:08.759882924 +0100 >+++ ogmrip-0.13.6/libogmrip-gtk/ogmrip-x264-options.c 2011-11-12 18:20:30.412956127 +0100 >@@ -246,7 +246,9 @@ > NULL); > gtk_window_set_title (GTK_WINDOW (dialog), _("X264 Options")); > gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); >+#if !GTK_CHECK_VERSION(2,22,0) > gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); >+#endif > gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); > gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE); > gtk_window_set_icon_from_stock (GTK_WINDOW (dialog), GTK_STOCK_PREFERENCES); >@@ -297,8 +299,15 @@ > gtk_widget_set_sensitive (dialog->me_combo, x264_have_me); > > if (x264_have_me_tesa) >- gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->me_combo), >- _("Transformed Exhaustive search (tesa - even slower)")); >+ { >+ GtkTreeModel *model; >+ GtkTreeIter iter; >+ >+ model = gtk_combo_box_get_model (GTK_COMBO_BOX (dialog->me_combo)); >+ gtk_list_store_append (GTK_LIST_STORE (model), &iter); >+ gtk_list_store_set (GTK_LIST_STORE (model), &iter, >+ 0, _("Transformed Exhaustive search (tesa - even slower)"), -1); >+ } > > dialog->merange_spin = glade_xml_get_widget (xml, "merange-spin"); > gtk_widget_set_sensitive (dialog->merange_spin, x264_have_me); >diff -Naur ogmrip-0.13.6.orig/libogmrip-gtk/ogmrip-xvid-options.c ogmrip-0.13.6/libogmrip-gtk/ogmrip-xvid-options.c >--- ogmrip-0.13.6.orig/libogmrip-gtk/ogmrip-xvid-options.c 2011-11-12 18:16:08.759882924 +0100 >+++ ogmrip-0.13.6/libogmrip-gtk/ogmrip-xvid-options.c 2011-11-12 18:20:35.167902901 +0100 >@@ -165,7 +165,9 @@ > return; > } > >+#if !GTK_CHECK_VERSION(2,22,0) > gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); >+#endif > gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); > > gtk_window_set_title (GTK_WINDOW (dialog), _("XviD Options")); >diff -Naur ogmrip-0.13.6.orig/src/ogmrip-crop-dialog.c ogmrip-0.13.6/src/ogmrip-crop-dialog.c >--- ogmrip-0.13.6.orig/src/ogmrip-crop-dialog.c 2011-11-12 18:16:08.795882522 +0100 >+++ ogmrip-0.13.6/src/ogmrip-crop-dialog.c 2011-11-12 18:17:23.640045755 +0100 >@@ -218,17 +218,20 @@ > } > > static void >-ogmrip_crop_dialog_scale_value_changed (OGMRipCropDialog *dialog, GtkWidget *scale) >+ogmrip_crop_dialog_scale_button_released (OGMRipCropDialog *dialog, GdkEventButton *event, GtkWidget *scale) > { >- gulong frame; >- gchar *text; >+ if (!event || event->button == 1) >+ { >+ gulong frame; >+ gchar *text; > >- frame = (guint) gtk_range_get_value (GTK_RANGE (scale)); >- text = g_strdup_printf (_("Frame %lu of %lu"), frame, dialog->priv->length); >- gtk_label_set_text (GTK_LABEL (dialog->priv->label), text); >- g_free (text); >+ frame = (guint) gtk_range_get_value (GTK_RANGE (scale)); >+ text = g_strdup_printf (_("Frame %lu of %lu"), frame, dialog->priv->length); >+ gtk_label_set_text (GTK_LABEL (dialog->priv->label), text); >+ g_free (text); > >- ogmrip_crop_dialog_grab_frame (dialog, frame); >+ ogmrip_crop_dialog_grab_frame (dialog, frame); >+ } > } > > G_DEFINE_TYPE (OGMRipCropDialog, ogmrip_crop_dialog, GTK_TYPE_DIALOG) >@@ -291,9 +294,8 @@ > dialog->priv->label = glade_xml_get_widget (xml, "frame-label"); > > dialog->priv->scale = glade_xml_get_widget (xml, "frame-scale"); >- gtk_range_set_update_policy (GTK_RANGE (dialog->priv->scale), GTK_UPDATE_DELAYED); >- g_signal_connect_swapped (dialog->priv->scale, "value-changed", >- G_CALLBACK (ogmrip_crop_dialog_scale_value_changed), dialog); >+ g_signal_connect_swapped (dialog->priv->scale, "button-release-event", >+ G_CALLBACK (ogmrip_crop_dialog_scale_button_released), dialog); > > g_object_unref (xml); > } >@@ -352,6 +354,8 @@ > frame = g_random_int_range (1, dialog->priv->length); > gtk_range_set_value (GTK_RANGE (dialog->priv->scale), frame); > >+ ogmrip_crop_dialog_scale_button_released (dialog, NULL, dialog->priv->scale); >+ > return GTK_WIDGET (dialog); > } > >diff -Naur ogmrip-0.13.6.orig/src/ogmrip-pref-dialog.c ogmrip-0.13.6/src/ogmrip-pref-dialog.c >--- ogmrip-0.13.6.orig/src/ogmrip-pref-dialog.c 2011-11-12 18:16:08.794882533 +0100 >+++ ogmrip-0.13.6/src/ogmrip-pref-dialog.c 2011-11-12 18:20:39.739851722 +0100 >@@ -211,7 +211,9 @@ > gtk_dialog_add_buttons (GTK_DIALOG (dialog), > GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, > NULL); >+#if !GTK_CHECK_VERSION(2,22,0) > gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); >+#endif > gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); > gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE); > gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); >diff -Naur ogmrip-0.13.6.orig/src/ogmrip-profile-editor.c ogmrip-0.13.6/src/ogmrip-profile-editor.c >--- ogmrip-0.13.6.orig/src/ogmrip-profile-editor.c 2011-11-12 18:16:08.794882533 +0100 >+++ ogmrip-0.13.6/src/ogmrip-profile-editor.c 2011-11-12 18:18:22.648385792 +0100 >@@ -625,27 +625,27 @@ > static void > ogmrip_profile_editor_dialog_video_codec_combo_changed (OGMRipProfileEditorDialog *dialog, GtkWidget *combo) > { >- GtkTreeIter iter; >+ GType codec; > >- if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter)) >+ codec = ogmrip_combo_box_get_active_video_codec (GTK_COMBO_BOX (combo)); >+ if (codec != G_TYPE_NONE) > { >- GType codec; > GtkTreeModel *model; >+ GtkTreeIter iter; > gboolean exists; > gint active; >- gchar *name; > >- model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo)); >- gtk_tree_model_get (model, &iter, 1, &name, -1); >+ model = gtk_combo_box_get_model (GTK_COMBO_BOX (dialog->priv->video_preset_combo)); > >- codec = ogmrip_profile_editor_dialog_get_video_codec_type (dialog, name); >- g_free (name); >- >- gtk_combo_box_remove_text (GTK_COMBO_BOX (dialog->priv->video_preset_combo), OGMRIP_VIDEO_PRESET_USER); >+ if (gtk_tree_model_iter_nth_child (model, &iter, NULL, OGMRIP_VIDEO_PRESET_USER)) >+ gtk_list_store_remove (GTK_LIST_STORE (model), &iter); > > exists = ogmrip_options_plugin_exists (codec); > if (exists) >- gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->priv->video_preset_combo), _("User")); >+ { >+ gtk_list_store_append (GTK_LIST_STORE (model), &iter); >+ gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, _("User"), -1); >+ } > > active = gtk_combo_box_get_active (GTK_COMBO_BOX (dialog->priv->video_preset_combo)); > >@@ -660,21 +660,12 @@ > static void > ogmrip_profile_editor_dialog_audio_codec_combo_changed (OGMRipProfileEditorDialog *dialog, GtkWidget *combo) > { >- GtkTreeIter iter; >- >- if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter)) >+ if (dialog->priv->audio_options_button) > { > GType codec; >- GtkTreeModel *model; >- gchar *name; > >- model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo)); >- gtk_tree_model_get (model, &iter, 1, &name, -1); >- >- codec = ogmrip_profile_editor_dialog_get_audio_codec_type (dialog, name); >- g_free (name); >- >- if (dialog->priv->audio_options_button) >+ codec = ogmrip_combo_box_get_active_audio_codec (GTK_COMBO_BOX (combo)); >+ if (codec != G_TYPE_NONE) > gtk_widget_set_sensitive (dialog->priv->audio_options_button, > ogmrip_options_plugin_exists (codec)); > } >@@ -683,21 +674,12 @@ > static void > ogmrip_profile_editor_dialog_subp_codec_combo_changed (OGMRipProfileEditorDialog *dialog, GtkWidget *combo) > { >- GtkTreeIter iter; >- >- if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter)) >+ if (dialog->priv->subp_options_button) > { > GType codec; >- GtkTreeModel *model; >- gchar *name; >- >- model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo)); >- gtk_tree_model_get (model, &iter, 1, &name, -1); >- >- codec = ogmrip_profile_editor_dialog_get_subp_codec_type (dialog, name); >- g_free (name); > >- if (dialog->priv->subp_options_button) >+ codec = ogmrip_combo_box_get_active_subp_codec (GTK_COMBO_BOX (combo)); >+ if (codec != G_TYPE_NONE) > gtk_widget_set_sensitive (dialog->priv->subp_options_button, > ogmrip_options_plugin_exists (codec)); > } >@@ -754,7 +736,9 @@ > GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, > NULL); > gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); >+#if !GTK_CHECK_VERSION(2,22,0) > gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); >+#endif > gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); > gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE); > gtk_window_set_icon_from_stock (GTK_WINDOW (dialog), GTK_STOCK_PREFERENCES); >@@ -951,7 +935,7 @@ > dialog->priv->audio_quality_label = glade_xml_get_widget (xml, "audio-quality-label"); > dialog->priv->audio_quality_spin = glade_xml_get_widget (xml, "audio-quality-spin"); > ogmrip_settings_bind (settings, dialog->priv->profile_section, >- OGMRIP_GCONF_AUDIO_QUALITY, G_OBJECT (widget), "value"); >+ OGMRIP_GCONF_AUDIO_QUALITY, G_OBJECT (dialog->priv->audio_quality_spin), "value"); > > widget = glade_xml_get_widget (xml, "normalize-check"); > ogmrip_settings_bind (settings, dialog->priv->profile_section, >diff -Naur ogmrip-0.13.6.orig/src/ogmrip-profiles-dialog.c ogmrip-0.13.6/src/ogmrip-profiles-dialog.c >--- ogmrip-0.13.6.orig/src/ogmrip-profiles-dialog.c 2011-11-12 18:16:08.794882533 +0100 >+++ ogmrip-0.13.6/src/ogmrip-profiles-dialog.c 2011-11-12 18:20:45.576786381 +0100 >@@ -667,7 +667,9 @@ > gtk_dialog_add_buttons (GTK_DIALOG (dialog), > GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, > NULL); >+#if !GTK_CHECK_VERSION(2,22,0) > gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); >+#endif > gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); > gtk_window_set_default_size (GTK_WINDOW (dialog), 450, -1); > gtk_window_set_title (GTK_WINDOW (dialog), _("Edit Profiles")); >diff -Naur ogmrip-0.13.6.orig/src/ogmrip-progress-dialog.c ogmrip-0.13.6/src/ogmrip-progress-dialog.c >--- ogmrip-0.13.6.orig/src/ogmrip-progress-dialog.c 2011-11-12 18:16:08.795882522 +0100 >+++ ogmrip-0.13.6/src/ogmrip-progress-dialog.c 2011-11-12 18:20:49.797739390 +0100 >@@ -407,8 +407,9 @@ > gtk_window_set_default_size (GTK_WINDOW (dialog), 450, -1); > gtk_window_set_icon_from_stock (GTK_WINDOW (dialog), GTK_STOCK_EXECUTE); > gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL); >+#if !GTK_CHECK_VERSION(2,22,0) > gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); >- >+#endif > area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); > > root = glade_xml_get_widget (xml, OGMRIP_GLADE_ROOT); >diff -Naur ogmrip-0.13.6.orig/src/ogmrip-queue-dialog.c ogmrip-0.13.6/src/ogmrip-queue-dialog.c >--- ogmrip-0.13.6.orig/src/ogmrip-queue-dialog.c 2011-11-12 18:16:08.795882522 +0100 >+++ ogmrip-0.13.6/src/ogmrip-queue-dialog.c 2011-11-12 18:20:58.024648047 +0100 >@@ -611,7 +611,9 @@ > > gtk_window_set_title (GTK_WINDOW (dialog), _("Encoding Queue")); > gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 300); >+#if !GTK_CHECK_VERSION(2,22,0) > gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); >+#endif > gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); > gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT, FALSE); > gtk_window_set_icon_from_stock (GTK_WINDOW (dialog), GTK_STOCK_PROPERTIES); >diff -Naur ogmrip-0.13.6.orig/src/ogmrip-update-dialog.c ogmrip-0.13.6/src/ogmrip-update-dialog.c >--- ogmrip-0.13.6.orig/src/ogmrip-update-dialog.c 2011-11-12 18:16:08.794882533 +0100 >+++ ogmrip-0.13.6/src/ogmrip-update-dialog.c 2011-11-12 18:21:03.882583003 +0100 >@@ -130,7 +130,9 @@ > GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, > GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, > NULL); >+#if !GTK_CHECK_VERSION(2,22,0) > gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); >+#endif > gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); > gtk_window_set_default_size (GTK_WINDOW (dialog), 450, 350); > gtk_window_set_title (GTK_WINDOW (dialog), _("Update profiles"));
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=292305">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 385121
:
288401
|
288403
|
289395
|
291021
| 292305
