Attachment #179298 for bug #251449

View | Details | Raw Unified | Return to bug 251449
Collapse All | Expand All

Lines 8-15 Link Here

(-)xchatosd-5.19/my_xosd.h.orig (-2 / +2 lines)
8		8
9	class XOsd {	9	class XOsd {
10	public:	10	public:
11	XOsd::XOsd(int);	11	XOsd(int);
12	XOsd::~XOsd();	12	~XOsd();
13	int setPos(string);	13	int setPos(string);
14	int setVOffset(int);	14	int setVOffset(int);
15	int setHOffset(int);	15	int setHOffset(int);

Lines 11-18 Link Here

(-)xchatosd-5.19/xchatosd_conf.h.orig (-2 / +2 lines)
11		11
12	class XOsdConf {	12	class XOsdConf {
13	public:	13	public:
14	XOsdConf::XOsdConf();	14	XOsdConf();
15	XOsdConf::~XOsdConf();	15	~XOsdConf();
16	int read(string);	16	int read(string);
17	int write(string);	17	int write(string);
18	int getiValue(string);	18	int getiValue(string);

Lines 1-4 Link Here

(-)xchatosd-5.19b/xchatosd_conf.cpp (+2 lines)
1	#include "xchatosd_conf.h"	1	#include "xchatosd_conf.h"
		2	#include <cstdlib>
		3	#include <cstring>
2		4
3	XOsdConf::XOsdConf()	5	XOsdConf::XOsdConf()
4	{	6	{




#include <fstream>
#include <iostream>
#include <xosd.h>
#include <cstring>
#include <stdlib.h>
#include <langinfo.h>
#include "xchatosd.h"
#include "xchatosd_lang.h"

static xchat_plugin *ph;
static XOsd *osd = NULL;
static XOsdConf config;
static char const *codepage;
#ifdef ICONV_LIB
static iconv_t iconv_desc = (iconv_t) (-1);
#endif


extern "C" { int
xchat_plugin_init(xchat_plugin * plugin_handle,
		  char const **plugin_name,
		  char const **plugin_desc, char const **plugin_version, char *arg)
{
	ph = plugin_handle;
	XOSDconfRead();

Return to bug 251449

Lines 3-10 Link Here

(-)xchatosd-5.19b/xchatosd.cpp (-5 / +4 lines)
3	#include <fstream>	3	#include <fstream>
4	#include <iostream>	4	#include <iostream>
5	#include <xosd.h>	5	#include <xosd.h>
6	#include <stdio.h>	6	#include <cstring>
7	#include <stdlib.h>
8	#include <langinfo.h>	7	#include <langinfo.h>
9	#include "xchatosd.h"	8	#include "xchatosd.h"
10	#include "xchatosd_lang.h"	9	#include "xchatosd_lang.h"
Lines 22-28 Link Here
22	static xchat_plugin *ph;	21	static xchat_plugin *ph;
23	static XOsd *osd = NULL;	22	static XOsd *osd = NULL;
24	static XOsdConf config;	23	static XOsdConf config;
25	static char *codepage;	24	static char const *codepage;
26	#ifdef ICONV_LIB	25	#ifdef ICONV_LIB
27	static iconv_t iconv_desc = (iconv_t) (-1);	26	static iconv_t iconv_desc = (iconv_t) (-1);
28	#endif	27	#endif
Lines 445-452 Link Here
445		444
446	extern "C" { int	445	extern "C" { int
447	xchat_plugin_init(xchat_plugin * plugin_handle,	446	xchat_plugin_init(xchat_plugin * plugin_handle,
448	char **plugin_name,	447	char const **plugin_name,
449	char plugin_desc, char plugin_version, char *arg)	448	char const plugin_desc, char const plugin_version, char *arg)
450	{	449	{
451	ph = plugin_handle;	450	ph = plugin_handle;
452	XOSDconfRead();	451	XOSDconfRead();