pidgin/pidgin

Manual merge changes from the release-2.x.y branch into default.

2014-07-07, Mark Doliner
e256e8133f37
Manual merge changes from the release-2.x.y branch into default.

- Easy change in certificate.h (conflict with new doc style).
- Easy change in ssl-gnutls.c (keep my huge debug statement and comment
from 2.x.y)
- I didn't copy any changes from de.po. I always assume translation changes
should not be propagated between the release-2.x.y branch and default.
Translators are responsible for updating both of their translation files
as desired.
- I completely dropped datallah's change to certificate.c from
https://hg.pidgin.im/pidgin/main/rev/2948449ffd12
The purple_certificate_display_x509() function no longer exists in default.
It was changed in https://hg.pidgin.im/pidgin/main/rev/d65261e7426e
and then removed in https://hg.pidgin.im/pidgin/main/rev/cf4c54e487bc
I might check whether we should make datallah's change in the new code in
default.
/*
* finch
*
* Finch 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 "finch.h"
#include "gntidle.h"
#include "gnt.h"
#include "gntwm.h"
#include "idle.h"
static time_t
finch_get_idle_time(void)
{
return gnt_wm_get_idle_time();
}
static PurpleIdleUiOps ui_ops =
{
finch_get_idle_time,
/* padding */
NULL,
NULL,
NULL,
NULL
};
PurpleIdleUiOps *
finch_idle_get_ui_ops()
{
return &ui_ops;
}