# HG changeset patch
# User Gary Kramlich <grim@reaperworld.com>
# Date 1588572180 0
# Node ID d0bd0ccdf2a249f782fa30282714e1d15012beb3
# Parent  d95d7489b945c6423c0669133e027d6bea01a6fe# Parent  09fd93c663deed032aabce905926ae63e5c4ee7b
Merged in default (pull request #687)

Fix the immediate issues with gevolution but disable it by default as it needs major work

Approved-by: Richard Laager

diff -r d95d7489b945 -r d0bd0ccdf2a2 meson_options.txt
--- a/meson_options.txt	Mon May 04 00:25:57 2020 -0500
+++ b/meson_options.txt	Mon May 04 06:03:00 2020 +0000
@@ -88,7 +88,7 @@
 option('gestures', type : 'boolean', value : true,
        description : 'compile with the gestures plugin')
 
-option('gevolution', type : 'feature',
+option('gevolution', type : 'feature', value : 'disabled',
        description : 'compile with the Evolution plugin')
 
 option('unity-integration', type : 'feature',
diff -r d95d7489b945 -r d0bd0ccdf2a2 pidgin/plugins/gevolution/assoc-buddy.c
--- a/pidgin/plugins/gevolution/assoc-buddy.c	Mon May 04 00:25:57 2020 -0500
+++ b/pidgin/plugins/gevolution/assoc-buddy.c	Mon May 04 06:03:00 2020 +0000
@@ -441,7 +441,7 @@
 					 G_CALLBACK(cancel_cb), dialog);
 
 	/* "Associate Buddy" button */
-	button = gtk_button_new_with_mnemonic(_("_Associate Buddy"));,
+	button = gtk_button_new_with_mnemonic(_("_Associate Buddy"));
 	dialog->assoc_button = button;
 	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
 	gtk_widget_set_sensitive(button, FALSE);
diff -r d95d7489b945 -r d0bd0ccdf2a2 pidgin/plugins/gevolution/gevolution.c
--- a/pidgin/plugins/gevolution/gevolution.c	Mon May 04 00:25:57 2020 -0500
+++ b/pidgin/plugins/gevolution/gevolution.c	Mon May 04 06:03:00 2020 +0000
@@ -31,8 +31,8 @@
 
 #include "gtkblist.h"
 #include "gtkconv.h"
-#include "gtkplugin.h"
 #include "gtkutils.h"
+#include "pidginplugininfo.h"
 
 #include "gevolution.h"