[OTR-dev] Gaim 2.0.0beta4

[Paul Wouters]

On Tue, 24 Oct 2006, Wesley T Allen wrote:

> I've got the latest ubuntu (dapper) libgtk2 not sure if that's the same
> versioning as "vanilla" releases (the ubuntu release is 2.8.20-ubuntu1).
>
> I found gtkstock.h in the libgtk2-dev package (thanks for the tip there) - but
> then I get this error:

for fedora I had to change the path to the gtk include files manually.

Ian: any change for a configure option for that the gtk2 includes? Fedora
now puts it in /usr/include/gtk-2.0/gtk

> gtk-dialog.c: In function 'create_dialog':
> gtk-dialog.c:651: error: 'GAIM_STOCK_DIALOG_ERROR' undeclared (first use in
> this function)
> gtk-dialog.c:651: error: (Each undeclared identifier is reported only once
> gtk-dialog.c:651: error: for each function it appears in.)
> gtk-dialog.c:655: error: 'GAIM_STOCK_DIALOG_WARNING' undeclared (first use in
> this function)
> gtk-dialog.c:659: error: 'GAIM_STOCK_DIALOG_INFO' undeclared (first use in
> this function)
> make[1]: *** [gtk-dialog.lo] Error 1
> make[1]: Leaving directory `/home/wallen/downloads/gaim/gaim-otr-3.0.0'
> make: *** [all] Error 2

Those moved from gaim to gtk, try this patch:

diff -r -c -N gaim-otr/gtk-dialog.c gaim-otr-new/gtk-dialog.c
*** gaim-otr/gtk-dialog.c       2005-12-18 13:33:48.000000000 -0500
--- gaim-otr-new/gtk-dialog.c   2006-10-28 02:01:00.000000000 -0400
***************
*** 30,36 ****
  #if GAIM_MAJOR_VERSION < 2
  #include "stock.h"
  #else
! #include "gtkstock.h"
  #endif
  #include "plugin.h"
  #include "notify.h"
--- 30,36 ----
  #if GAIM_MAJOR_VERSION < 2
  #include "stock.h"
  #else
! #include <gtk/gtkstock.h>
  #endif
  #include "plugin.h"
  #include "notify.h"
***************
*** 648,662 ****

      switch (type) {
        case GAIM_NOTIFY_MSG_ERROR:
!           icon_name = GAIM_STOCK_DIALOG_ERROR;
            break;

        case GAIM_NOTIFY_MSG_WARNING:
!           icon_name = GAIM_STOCK_DIALOG_WARNING;
            break;

        case GAIM_NOTIFY_MSG_INFO:
!           icon_name = GAIM_STOCK_DIALOG_INFO;
            break;

        default:
--- 648,662 ----

      switch (type) {
        case GAIM_NOTIFY_MSG_ERROR:
!           icon_name = GTK_STOCK_DIALOG_ERROR;
            break;

        case GAIM_NOTIFY_MSG_WARNING:
!           icon_name = GTK_STOCK_DIALOG_WARNING;
            break;

        case GAIM_NOTIFY_MSG_INFO:
!           icon_name = GTK_STOCK_DIALOG_INFO;
            break;

        default:

I haven't tried if it works, but it compiles. It seems that gaim doesn't properly
work when using ssh and X11 forwarding, so I can't actually test it right now.

Paul