[OTR-users] Gaim 2b6 and OTR Breakage **MY FIX**

[Christopher Downs]

Ian,
    I created a patch from your suggestion and included it on the 
ArchLinux aur system. I've pasted my email below.

[wopr@~/public_html/ArchLinux/gaim-otr] : cat gtk-dialog.c.patch
--- gtk-dialog.c        2007-02-10 13:53:21.000000000 -0600
+++ gtk-dialog.diff     2007-02-10 13:55:22.000000000 -0600
@@ -30,7 +30,7 @@
 #if GAIM_MAJOR_VERSION < 2
 #include "stock.h"
 #else
-#include "gtkstock.h"
+#include "/usr/include/gtk-2.0/gtk/gtkstock.h"
 #endif
 #include "plugin.h"
 #include "notify.h"
@@ -38,6 +38,8 @@
 #include "gtkutils.h"
 #include "gtkimhtml.h"
 #include "util.h"
+/* compile with ./configure --includedir=/usr/include */
+#include "gaimstock.h"
 
 /* libotr headers */
 #include <libotr/dh.h>
[wopr@~/public_html/ArchLinux/gaim-otr] :
   
    thanks.
   
    Sincerely,
       Christopher M Downs

/*|Sat Feb 10 14:45:01 CST 2007
gaim-otr patch for Gaim02.0.0 Beta 6

ArchPackage: gaim 2.0.0b6-1

PKGBUILD
http://wopr.drippingdead.com/~cdowns/ArchLinux/gaim-otr/PKGBUILD

gaim2b2-otr.diff
http://wopr.drippingdead.com/~cdowns/ArchLinux/gaim-otr/gaim2b2-otr.diff

gtk-dialog.c.patch
http://wopr.drippingdead.com/~cdowns/ArchLinux/gaim-otr/gtk-dialog.c.patch

Or grab all in a tar file
http://wopr.drippingdead.com/~cdowns/ArchLinux/gaim-otr/gaim-otr-2.0.0b6.tar 


gaim-otr is happy and working again now.Obviously make sure you install 
libotr first !

~!>D|*/

Ian Goldberg wrote:
> On Sat, Feb 10, 2007 at 01:01:21AM -0800, Scott wrote:
>   
>> I got OTR to compile and work with gaim 2b6 using the following defines
>> in gtk-dialog.c
>>
>> /* gaim headers */
>> #include "version.h"
>> #if GAIM_MAJOR_VERSION < 2
>> #include "stock.h"
>> #else
>> #include "/usr/include/gtk-2.0/gtk/gtkstock.h"
>> #endif
>> #include "/usr/include/gaim/gaimstock.h"
>> #include "plugin.h"
>> #include "notify.h"
>> #include "gtkconv.h"
>> #include "gtkutils.h"
>> #include "gtkimhtml.h"
>> #include "util.h"
>>     
>
> The gaimstock.h patch is already in CVS.  Do you happen to have a fix
> for the OTR button having disappeared in beta 6 (as compared to beta 5)?
>
> Thanks,
>
>     - Ian
> _______________________________________________
> OTR-users mailing list
> OTR-users at lists.cypherpunks.ca
> http://lists.cypherpunks.ca/mailman/listinfo/otr-users
>