pidgin/pidgin

Increase timeout for initial XDP portal session to 2s
release-2.x.y
2020-04-05, David Woodhouse
87d96850a2d7
Increase timeout for initial XDP portal session to 2s

It should still fail immediately when the portal isn't available, but
in my test VM with systemd automatically activating the portal when it's
first accessed, it can take 800ms or so. Wait for it instead of falling
back after 200ms.
/*
* purple
*
* Purple is the legal property of its developers, whose names are too numerous
* to list here. Please refer to the COPYRIGHT file distributed with this
* source distribution.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*
*/
#include "internal.h"
#include "whiteboard.h"
#include "prpl.h"
/******************************************************************************
* Globals
*****************************************************************************/
static PurpleWhiteboardUiOps *whiteboard_ui_ops = NULL;
/* static PurpleWhiteboardPrplOps *whiteboard_prpl_ops = NULL; */
static GList *wbList = NULL;
/*static gboolean auto_accept = TRUE; */
/******************************************************************************
* API
*****************************************************************************/
void purple_whiteboard_set_ui_ops(PurpleWhiteboardUiOps *ops)
{
whiteboard_ui_ops = ops;
}
void purple_whiteboard_set_prpl_ops(PurpleWhiteboard *wb, PurpleWhiteboardPrplOps *ops)
{
wb->prpl_ops = ops;
}
PurpleWhiteboard *purple_whiteboard_create(PurpleAccount *account, const char *who, int state)
{
PurplePluginProtocolInfo *prpl_info;
PurpleWhiteboard *wb = g_new0(PurpleWhiteboard, 1);
wb->account = account;
wb->state = state;
wb->who = g_strdup(who);
prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(
purple_account_get_connection(account)));
purple_whiteboard_set_prpl_ops(wb, prpl_info->whiteboard_prpl_ops);
/* Start up protocol specifics */
if(wb->prpl_ops && wb->prpl_ops->start)
wb->prpl_ops->start(wb);
wbList = g_list_append(wbList, wb);
return wb;
}
void purple_whiteboard_destroy(PurpleWhiteboard *wb)
{
g_return_if_fail(wb != NULL);
if(wb->ui_data)
{
/* Destroy frontend */
if(whiteboard_ui_ops && whiteboard_ui_ops->destroy)
whiteboard_ui_ops->destroy(wb);
}
/* Do protocol specific session ending procedures */
if(wb->prpl_ops && wb->prpl_ops->end)
wb->prpl_ops->end(wb);
g_free(wb->who);
wbList = g_list_remove(wbList, wb);
g_free(wb);
}
void purple_whiteboard_start(PurpleWhiteboard *wb)
{
/* Create frontend for whiteboard */
if(whiteboard_ui_ops && whiteboard_ui_ops->create)
whiteboard_ui_ops->create(wb);
}
/* Looks through the list of whiteboard sessions for one that is between
* usernames 'me' and 'who'. Returns a pointer to a matching whiteboard
* session; if none match, it returns NULL.
*/
PurpleWhiteboard *purple_whiteboard_get_session(const PurpleAccount *account, const char *who)
{
PurpleWhiteboard *wb;
GList *l = wbList;
/* Look for a whiteboard session between the local user and the remote user
*/
while(l != NULL)
{
wb = l->data;
if(wb->account == account && purple_strequal(wb->who, who))
return wb;
l = l->next;
}
return NULL;
}
void purple_whiteboard_draw_list_destroy(GList *draw_list)
{
g_list_free(draw_list);
}
gboolean purple_whiteboard_get_dimensions(const PurpleWhiteboard *wb, int *width, int *height)
{
PurpleWhiteboardPrplOps *prpl_ops = wb->prpl_ops;
if (prpl_ops && prpl_ops->get_dimensions)
{
prpl_ops->get_dimensions(wb, width, height);
return TRUE;
}
return FALSE;
}
void purple_whiteboard_set_dimensions(PurpleWhiteboard *wb, int width, int height)
{
if(whiteboard_ui_ops && whiteboard_ui_ops->set_dimensions)
whiteboard_ui_ops->set_dimensions(wb, width, height);
}
void purple_whiteboard_send_draw_list(PurpleWhiteboard *wb, GList *list)
{
PurpleWhiteboardPrplOps *prpl_ops = wb->prpl_ops;
if (prpl_ops && prpl_ops->send_draw_list)
prpl_ops->send_draw_list(wb, list);
}
void purple_whiteboard_draw_point(PurpleWhiteboard *wb, int x, int y, int color, int size)
{
if(whiteboard_ui_ops && whiteboard_ui_ops->draw_point)
whiteboard_ui_ops->draw_point(wb, x, y, color, size);
}
void purple_whiteboard_draw_line(PurpleWhiteboard *wb, int x1, int y1, int x2, int y2, int color, int size)
{
if(whiteboard_ui_ops && whiteboard_ui_ops->draw_line)
whiteboard_ui_ops->draw_line(wb, x1, y1, x2, y2, color, size);
}
void purple_whiteboard_clear(PurpleWhiteboard *wb)
{
if(whiteboard_ui_ops && whiteboard_ui_ops->clear)
whiteboard_ui_ops->clear(wb);
}
void purple_whiteboard_send_clear(PurpleWhiteboard *wb)
{
PurpleWhiteboardPrplOps *prpl_ops = wb->prpl_ops;
if (prpl_ops && prpl_ops->clear)
prpl_ops->clear(wb);
}
void purple_whiteboard_send_brush(PurpleWhiteboard *wb, int size, int color)
{
PurpleWhiteboardPrplOps *prpl_ops = wb->prpl_ops;
if (prpl_ops && prpl_ops->set_brush)
prpl_ops->set_brush(wb, size, color);
}
gboolean purple_whiteboard_get_brush(const PurpleWhiteboard *wb, int *size, int *color)
{
PurpleWhiteboardPrplOps *prpl_ops = wb->prpl_ops;
if (prpl_ops && prpl_ops->get_brush)
{
prpl_ops->get_brush(wb, size, color);
return TRUE;
}
return FALSE;
}
void purple_whiteboard_set_brush(PurpleWhiteboard *wb, int size, int color)
{
if (whiteboard_ui_ops && whiteboard_ui_ops->set_brush)
whiteboard_ui_ops->set_brush(wb, size, color);
}