pidgin/pidgin

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

2020-05-02, Gary Kramlich
09fd93c663de
Parents 7281920d8a66
Children d0bd0ccdf2a2
Fix the immediate issues with gevolution but disable it by default as it needs major work
3 files changed, 3 insertions(+), 3 deletions(-)
  • +1 -1
    meson_options.txt
  • +1 -1
    pidgin/plugins/gevolution/assoc-buddy.c
  • +1 -1
    pidgin/plugins/gevolution/gevolution.c
    • --- a/meson_options.txt Fri May 01 03:09:57 2020 -0500
    +++ b/meson_options.txt Sat May 02 05:09:28 2020 -0500
    @@ -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 Fri May 01 03:09:57 2020 -0500
    +++ b/pidgin/plugins/gevolution/assoc-buddy.c Sat May 02 05:09:28 2020 -0500
    @@ -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 Fri May 01 03:09:57 2020 -0500
    +++ b/pidgin/plugins/gevolution/gevolution.c Sat May 02 05:09:28 2020 -0500
    @@ -31,8 +31,8 @@
    #include "gtkblist.h"
    #include "gtkconv.h"
    -#include "gtkplugin.h"
    #include "gtkutils.h"
    +#include "pidginplugininfo.h"
    #include "gevolution.h"