Merge with a fair number of conflicts. Nothing too crazy.
I didn't merge a lot of changes from 07e827917960
libpurple/protocols/gg/gg.c I think maybe that code has either been
removed or changed significantly in main.
/**
* @file notify.c Notification API
* @ingroup core
*/
/* 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
*/
#define _PURPLE_NOTIFY_C_
#include"internal.h"
#include"dbus-maybe.h"
#include"notify.h"
staticPurpleNotifyUiOps*notify_ui_ops=NULL;
staticGList*handles=NULL;
typedefstruct
{
PurpleNotifyTypetype;
void*handle;
void*ui_handle;
PurpleNotifyCloseCallbackcb;
gpointercb_user_data;
}PurpleNotifyInfo;
/**
* Definition of a user info entry
*/
struct_PurpleNotifyUserInfoEntry
{
char*label;
char*value;
PurpleNotifyUserInfoEntryTypetype;
};
struct_PurpleNotifyUserInfo
{
GQueueentries;
};
/**
* Single column of a search result.
*/
struct_PurpleNotifySearchColumn
{
char*title;/**< Title of the column. */
gbooleanvisible;/**< Should the column be visible to the user. Defaults to TRUE. */