pidgin/pidgin

Make the unity plugin compile again and add stuff to ci ubuntu builds

2021-06-12, Gary Kramlich
4169f8090a0e
Parents f3bb3efca77b
Children 2c312f084d84
Make the unity plugin compile again and add stuff to ci ubuntu builds

Testing Done:
Compile only

Reviewed at https://reviews.imfreedom.org/r/745/
2 files changed, 13 insertions(+), 4 deletions(-)
  • +4 -0
    convey.yaml
  • +9 -4
    pidgin/plugins/unity.c
    • --- a/convey.yaml Sat Jun 12 02:19:17 2021 -0500
    +++ b/convey.yaml Sat Jun 12 19:10:06 2021 -0500
    @@ -76,3 +76,7 @@
    stages:
    - tasks: [import, build-target]
    + ubuntu:
    + environment: [TARGET=ubuntu-hirsute-amd64]
    + stages:
    + - tasks: [import, build-target]
    --- a/pidgin/plugins/unity.c Sat Jun 12 02:19:17 2021 -0500
    +++ b/pidgin/plugins/unity.c Sat Jun 12 19:10:06 2021 -0500
    @@ -16,10 +16,15 @@
    * along with this program; if not, write to the Free Software
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#include <glib.h>
    +#include <glib/gi18n-lib.h>
    +
    #include <purple.h>
    #include <pidgin.h>
    +#include <talkatu.h>
    +
    #include <unity.h>
    #include <messaging-menu.h>
    @@ -396,9 +401,9 @@
    G_CALLBACK(unalert_cb), conv);
    g_object_set_data(G_OBJECT(conv), "unity-entry-signal", GUINT_TO_POINTER(id));
    - id = g_signal_connect(G_OBJECT(gtkconv->webview), "focus-in-event",
    + id = g_signal_connect(G_OBJECT(gtkconv->history), "focus-in-event",
    G_CALLBACK(unalert_cb), conv);
    - g_object_set_data(G_OBJECT(conv), "unity-webview-signal", GUINT_TO_POINTER(id));
    + g_object_set_data(G_OBJECT(conv), "unity-history-signal", GUINT_TO_POINTER(id));
    return 0;
    }
    @@ -412,8 +417,8 @@
    if (!gtkconv)
    return;
    - id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(conv), "unity-webview-signal"));
    - g_signal_handler_disconnect(gtkconv->webview, id);
    + id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(conv), "unity-history-signal"));
    + g_signal_handler_disconnect(gtkconv->history, id);
    id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(conv), "unity-entry-signal"));
    g_signal_handler_disconnect(gtkconv->entry, id);