summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meson_options.txt2
-rw-r--r--pidgin/plugins/gevolution/assoc-buddy.c2
-rw-r--r--pidgin/plugins/gevolution/gevolution.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/meson_options.txt b/meson_options.txt
index 12ffd1b241..c0f33ec219 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -88,7 +88,7 @@ option('console-logging', type : 'boolean', value : false,
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 --git a/pidgin/plugins/gevolution/assoc-buddy.c b/pidgin/plugins/gevolution/assoc-buddy.c
index b28f2e0120..c5ef12e839 100644
--- a/pidgin/plugins/gevolution/assoc-buddy.c
+++ b/pidgin/plugins/gevolution/assoc-buddy.c
@@ -441,7 +441,7 @@ gevo_associate_buddy_dialog_new(PurpleBuddy *buddy)
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 --git a/pidgin/plugins/gevolution/gevolution.c b/pidgin/plugins/gevolution/gevolution.c
index f7ff74db37..558396bfd8 100644
--- a/pidgin/plugins/gevolution/gevolution.c
+++ b/pidgin/plugins/gevolution/gevolution.c
@@ -31,8 +31,8 @@
#include "gtkblist.h"
#include "gtkconv.h"
-#include "gtkplugin.h"
#include "gtkutils.h"
+#include "pidginplugininfo.h"
#include "gevolution.h"