forked from AuroraMiddleware/gtk
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)
This commit is contained in:
parent
d319b8f926
commit
6baa9c8f30
@ -1,3 +1,9 @@
|
||||
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)
|
||||
|
||||
2004-07-14 Federico Mena Quintero <federico@ximian.com>
|
||||
|
||||
Fix #144405, patch by Padraig O'Briain <padraig.obriain@sun.com>:
|
||||
|
@ -1,3 +1,9 @@
|
||||
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)
|
||||
|
||||
2004-07-14 Federico Mena Quintero <federico@ximian.com>
|
||||
|
||||
Fix #144405, patch by Padraig O'Briain <padraig.obriain@sun.com>:
|
||||
|
@ -1,3 +1,9 @@
|
||||
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)
|
||||
|
||||
2004-07-14 Federico Mena Quintero <federico@ximian.com>
|
||||
|
||||
Fix #144405, patch by Padraig O'Briain <padraig.obriain@sun.com>:
|
||||
|
@ -1,3 +1,9 @@
|
||||
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)
|
||||
|
||||
2004-07-14 Federico Mena Quintero <federico@ximian.com>
|
||||
|
||||
Fix #144405, patch by Padraig O'Briain <padraig.obriain@sun.com>:
|
||||
|
@ -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)))
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user