diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2004-07-14 17:19:04 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2004-07-14 17:19:04 +0000 |
| commit | 6baa9c8f301adf3eb2acf50d85ea3d0b1a836363 (patch) | |
| tree | d5028ef3d1af62c4ca87bdc64515ab5d1215f0d0 /gtk/gtkaboutdialog.c | |
| parent | d319b8f926ae25f219d7bdfa31cea1722bb654d9 (diff) | |
| download | gdk-pixbuf-6baa9c8f301adf3eb2acf50d85ea3d0b1a836363.tar.gz | |
Don't use gcc extensions for the ternary ?: operator. (#147590, Damien
2004-07-14 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkaboutdialog.c (add_credits_page): Don't use
gcc extensions for the ternary ?: operator. (#147590,
Damien Carbery)
Diffstat (limited to 'gtk/gtkaboutdialog.c')
| -rw-r--r-- | gtk/gtkaboutdialog.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c index f5df56128..2d3ddeb3b 100644 --- a/gtk/gtkaboutdialog.c +++ b/gtk/gtkaboutdialog.c @@ -1572,7 +1572,14 @@ add_credits_page (GtkAboutDialog *about, q1 = linkify_email ? strchr (q0, '<') : NULL; q2 = q1 ? strchr (q1, '>') : NULL; r1 = linkify_urls ? strstr (q0, "http://") : NULL; - r2 = r1 ? (strpbrk (r1, " \n\t") ? : strchr (r1, '\0')) : NULL; + if (r1) + { + r2 = strpbrk (r1, " \n\t"); + if (!r2) + r2 = strchr (r1, '\0'); + } + else + r2 = NULL; if (r1 && r2 && (!q1 || !q2 || (r1 < q1))) { |