changeset
Merged in default (pull request #687)
Mon, 04 May 2020 06:03:00 +0000
- author
- Gary Kramlich <grim@reaperworld.com>
- date
- Mon, 04 May 2020 06:03:00 +0000
- changeset 40357
- d0bd0ccdf2a2
- parent 40355
- d95d7489b945 (current diff)
- parent 40356
- 09fd93c663de (diff)
- child 40362
- 1edaee25f763
- child 40363
- c8b010d1d430
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
--- 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',
--- 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);
--- 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"
