[Freeciv-Dev] Re: (PR#14521) configure check for GTK >= 2.4 should be 2.6 or 2.8

["Vasco Alexandre da Silva Costa" <vasco.costa@xxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=14521 >

On 11/1/05, Jason Short <jdorje@xxxxxxxxxxxxxxxxxxxxx> wrote:
>
> <URL: http://bugs.freeciv.org/Ticket/Display.html?id=14521 >
>
> Mateusz Stefek wrote:
> > <URL: http://bugs.freeciv.org/Ticket/Display.html?id=14521 >
> >
> > I don't think that we should upgrade our requirements to >=2.6.0, just
> > to display new icon on the "Accept treaty" button.
>
> Clearly not.  It's easy to make this icon optional (#ifdef
> GTK_STOCK_EDIT), we just need a fallback.

None of the stock items is perfect, so I rather not use #ifdefs. Here is a patch
which switches the stock item to GTK_STOCK_DND.

-Vasco Alexandre da Silva Costa

Index: client/gui-gtk-2.0/diplodlg.c
===================================================================
--- client/gui-gtk-2.0/diplodlg.c       (revision 11228)
+++ client/gui-gtk-2.0/diplodlg.c       (working copy)
@@ -474,7 +474,7 @@
 
   gui_dialog_add_stockbutton(pdialog->dialog, GTK_STOCK_CANCEL,
                             _("_Cancel meeting"), RESPONSE_CANCEL_MEETING);
-  gui_dialog_add_stockbutton(pdialog->dialog, GTK_STOCK_EDIT,
+  gui_dialog_add_stockbutton(pdialog->dialog, GTK_STOCK_DND,
                             _("Accept _treaty"), GTK_RESPONSE_ACCEPT);
 
   vbox = pdialog->dialog->vbox;