rpms/kdebase/F-8 kdebase-3.5.8-flash.patch,1.2,1.3
Lukas Tinkl (ltinkl)
fedora-extras-commits at redhat.com
Wed Feb 6 15:01:44 UTC 2008
Author: ltinkl
Update of /cvs/extras/rpms/kdebase/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32548/F-8
Modified Files:
kdebase-3.5.8-flash.patch
Log Message:
fix the patches to include missing glibevents.* files
kdebase-3.5.8-flash.patch:
Index: kdebase-3.5.8-flash.patch
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-8/kdebase-3.5.8-flash.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdebase-3.5.8-flash.patch 29 Jan 2008 15:03:32 -0000 1.2
+++ kdebase-3.5.8-flash.patch 6 Feb 2008 15:01:33 -0000 1.3
@@ -1,4 +1,9 @@
-diff -ur kdebase-orig/nsplugins/NSPluginCallbackIface.h kdebase-3.5.8/nsplugins/NSPluginCallbackIface.h
+diff -urN kdebase-orig/nsplugins/configure.in.in kdebase-3.5.8/nsplugins/configure.in.in
+--- kdebase-orig/nsplugins/configure.in.in 1970-01-01 01:00:00.000000000 +0100
++++ kdebase-3.5.8/nsplugins/configure.in.in 2008-01-29 15:51:04.000000000 +0100
+@@ -0,0 +1 @@
++KDE_PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 0.21 )
+diff -urN kdebase-orig/nsplugins/NSPluginCallbackIface.h kdebase-3.5.8/nsplugins/NSPluginCallbackIface.h
--- kdebase-orig/nsplugins/NSPluginCallbackIface.h 2005-10-10 17:04:05.000000000 +0200
+++ kdebase-3.5.8/nsplugins/NSPluginCallbackIface.h 2008-01-29 15:51:20.000000000 +0100
@@ -37,7 +37,7 @@
@@ -10,7 +15,7 @@
};
-diff -ur kdebase-orig/nsplugins/nspluginloader.cpp kdebase-3.5.8/nsplugins/nspluginloader.cpp
+diff -urN kdebase-orig/nsplugins/nspluginloader.cpp kdebase-3.5.8/nsplugins/nspluginloader.cpp
--- kdebase-orig/nsplugins/nspluginloader.cpp 2006-10-01 19:31:58.000000000 +0200
+++ kdebase-3.5.8/nsplugins/nspluginloader.cpp 2008-01-29 15:51:20.000000000 +0100
@@ -41,6 +41,7 @@
@@ -172,7 +177,7 @@
return plugin;
}
-diff -ur kdebase-orig/nsplugins/nspluginloader.h kdebase-3.5.8/nsplugins/nspluginloader.h
+diff -urN kdebase-orig/nsplugins/nspluginloader.h kdebase-3.5.8/nsplugins/nspluginloader.h
--- kdebase-orig/nsplugins/nspluginloader.h 2006-10-01 19:31:58.000000000 +0200
+++ kdebase-3.5.8/nsplugins/nspluginloader.h 2008-01-29 15:51:20.000000000 +0100
@@ -43,13 +43,16 @@
@@ -210,7 +215,7 @@
};
-diff -ur kdebase-orig/nsplugins/sdk/jni_md.h kdebase-3.5.8/nsplugins/sdk/jni_md.h
+diff -urN kdebase-orig/nsplugins/sdk/jni_md.h kdebase-3.5.8/nsplugins/sdk/jni_md.h
--- kdebase-orig/nsplugins/sdk/jni_md.h 2007-10-08 11:51:23.000000000 +0200
+++ kdebase-3.5.8/nsplugins/sdk/jni_md.h 2008-01-29 15:51:20.000000000 +0100
@@ -1,23 +1,40 @@
@@ -268,7 +273,7 @@
*
*
* This Original Code has been modified by IBM Corporation.
-diff -ur kdebase-orig/nsplugins/sdk/npapi.h kdebase-3.5.8/nsplugins/sdk/npapi.h
+diff -urN kdebase-orig/nsplugins/sdk/npapi.h kdebase-3.5.8/nsplugins/sdk/npapi.h
--- kdebase-orig/nsplugins/sdk/npapi.h 2007-10-08 11:51:23.000000000 +0200
+++ kdebase-3.5.8/nsplugins/sdk/npapi.h 2008-01-29 15:51:20.000000000 +0100
@@ -38,7 +38,7 @@
@@ -335,8 +340,410 @@
#endif /* XP_UNIX */
NPWindowType type; /* Is this a window or a drawable? */
} NPWindow;
-Pouze v kdebase-3.5.8/nsplugins/sdk: npruntime.h
-diff -ur kdebase-orig/nsplugins/sdk/npupp.h kdebase-3.5.8/nsplugins/sdk/npupp.h
+diff -urN kdebase-orig/nsplugins/sdk/npruntime.h kdebase-3.5.8/nsplugins/sdk/npruntime.h
+--- kdebase-orig/nsplugins/sdk/npruntime.h 1970-01-01 01:00:00.000000000 +0100
++++ kdebase-3.5.8/nsplugins/sdk/npruntime.h 2008-01-29 15:51:04.000000000 +0100
+@@ -0,0 +1,399 @@
++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/*
++ * Copyright � 2004, Apple Computer, Inc. and The Mozilla Foundation.
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are
++ * met:
++ *
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ * 3. Neither the names of Apple Computer, Inc. ("Apple") or The Mozilla
++ * Foundation ("Mozilla") nor the names of their contributors may be used
++ * to endorse or promote products derived from this software without
++ * specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY APPLE, MOZILLA AND THEIR CONTRIBUTORS "AS
++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
++ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
++ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE, MOZILLA OR
++ * THEIR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
++ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ *
++ * Revision 1 (March 4, 2004):
++ * Initial proposal.
++ *
++ * Revision 2 (March 10, 2004):
++ * All calls into script were made asynchronous. Results are
++ * provided via the NPScriptResultFunctionPtr callback.
++ *
++ * Revision 3 (March 10, 2004):
++ * Corrected comments to not refer to class retain/release FunctionPtrs.
++ *
++ * Revision 4 (March 11, 2004):
++ * Added additional convenience NPN_SetExceptionWithUTF8().
++ * Changed NPHasPropertyFunctionPtr and NPHasMethodFunctionPtr to take NPClass
++ * pointers instead of NPObject pointers.
++ * Added NPIsValidIdentifier().
++ *
++ * Revision 5 (March 17, 2004):
++ * Added context parameter to result callbacks from ScriptObject functions.
++ *
++ * Revision 6 (March 29, 2004):
++ * Renamed functions implemented by user agent to NPN_*. Removed _ from
++ * type names.
++ * Renamed "JavaScript" types to "Script".
++ *
++ * Revision 7 (April 21, 2004):
++ * NPIdentifier becomes a void*, was int32_t
++ * Remove NP_IsValidIdentifier, renamed NP_IdentifierFromUTF8 to NP_GetIdentifier
++ * Added NPVariant and modified functions to use this new type.
++ *
++ * Revision 8 (July 9, 2004):
++ * Updated to joint Apple-Mozilla license.
++ *
++ */
++#ifndef _NP_RUNTIME_H_
++#define _NP_RUNTIME_H_
++
++#include <qglobal.h>
++typedef Q_UINT32 uint32_t;
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++
++/*
++ This API is used to facilitate binding code written in C to script
++ objects. The API in this header does not assume the presence of a
++ user agent. That is, it can be used to bind C code to scripting
++ environments outside of the context of a user agent.
++
++ However, the normal use of the this API is in the context of a
++ scripting environment running in a browser or other user agent.
++ In particular it is used to support the extended Netscape
++ script-ability API for plugins (NP-SAP). NP-SAP is an extension
++ of the Netscape plugin API. As such we have adopted the use of
++ the "NP" prefix for this API.
++
++ The following NP{N|P}Variables were added to the Netscape plugin
++ API (in npapi.h):
++
++ NPNVWindowNPObject
++ NPNVPluginElementNPObject
++ NPPVpluginScriptableNPObject
++
++ These variables are exposed through NPN_GetValue() and
++ NPP_GetValue() (respectively) and are used to establish the
++ initial binding between the user agent and native code. The DOM
++ objects in the user agent can be examined and manipulated using
++ the NPN_ functions that operate on NPObjects described in this
++ header.
++
++ To the extent possible the assumptions about the scripting
++ language used by the scripting environment have been minimized.
++*/
++
++#define NP_BEGIN_MACRO do {
++#define NP_END_MACRO } while (0)
++
++/*
++ Objects (non-primitive data) passed between 'C' and script is
++ always wrapped in an NPObject. The 'interface' of an NPObject is
++ described by an NPClass.
++*/
++typedef struct NPObject NPObject;
++typedef struct NPClass NPClass;
++
++typedef char NPUTF8;
++typedef struct _NPString {
++ const NPUTF8 *utf8characters;
++ uint32_t utf8length;
++} NPString;
++
++typedef enum {
++ NPVariantType_Void,
++ NPVariantType_Null,
++ NPVariantType_Bool,
++ NPVariantType_Int32,
++ NPVariantType_Double,
++ NPVariantType_String,
++ NPVariantType_Object
++} NPVariantType;
++
++typedef struct _NPVariant {
++ NPVariantType type;
++ union {
++ bool boolValue;
++ uint32_t intValue;
++ double doubleValue;
++ NPString stringValue;
++ NPObject *objectValue;
++ } value;
++} NPVariant;
++
++/*
++ NPN_ReleaseVariantValue is called on all 'out' parameters
++ references. Specifically it is to be called on variants that own
++ their value, as is the case with all non-const NPVariant*
++ arguments after a successful call to any methods (except this one)
++ in this API.
++
++ After calling NPN_ReleaseVariantValue, the type of the variant
++ will be NPVariantType_Void.
++*/
++void NPN_ReleaseVariantValue(NPVariant *variant);
++
++#define NPVARIANT_IS_VOID(_v) ((_v).type == NPVariantType_Void)
++#define NPVARIANT_IS_NULL(_v) ((_v).type == NPVariantType_Null)
++#define NPVARIANT_IS_BOOLEAN(_v) ((_v).type == NPVariantType_Bool)
++#define NPVARIANT_IS_INT32(_v) ((_v).type == NPVariantType_Int32)
++#define NPVARIANT_IS_DOUBLE(_v) ((_v).type == NPVariantType_Double)
++#define NPVARIANT_IS_STRING(_v) ((_v).type == NPVariantType_String)
++#define NPVARIANT_IS_OBJECT(_v) ((_v).type == NPVariantType_Object)
++
++#define NPVARIANT_TO_BOOLEAN(_v) ((_v).value.boolValue)
++#define NPVARIANT_TO_INT32(_v) ((_v).value.intValue)
++#define NPVARIANT_TO_DOUBLE(_v) ((_v).value.doubleValue)
++#define NPVARIANT_TO_STRING(_v) ((_v).value.stringValue)
++#define NPVARIANT_TO_OBJECT(_v) ((_v).value.objectValue)
++
++#define VOID_TO_NPVARIANT(_v) \
++NP_BEGIN_MACRO \
++ (_v).type = NPVariantType_Void; \
++ (_v).value.objectValue = NULL; \
++NP_END_MACRO
++
++#define NULL_TO_NPVARIANT(_v) \
++NP_BEGIN_MACRO \
++ (_v).type = NPVariantType_Null; \
++ (_v).value.objectValue = NULL; \
++NP_END_MACRO
++
++#define BOOLEAN_TO_NPVARIANT(_val, _v) \
++NP_BEGIN_MACRO \
++ (_v).type = NPVariantType_Bool; \
++ (_v).value.boolValue = !!(_val); \
++NP_END_MACRO
++
++#define INT32_TO_NPVARIANT(_val, _v) \
++NP_BEGIN_MACRO \
++ (_v).type = NPVariantType_Int32; \
++ (_v).value.intValue = _val; \
++NP_END_MACRO
++
++#define DOUBLE_TO_NPVARIANT(_val, _v) \
++NP_BEGIN_MACRO \
++ (_v).type = NPVariantType_Double; \
++ (_v).value.doubleValue = _val; \
++NP_END_MACRO
++
++#define STRINGZ_TO_NPVARIANT(_val, _v) \
++NP_BEGIN_MACRO \
++ (_v).type = NPVariantType_String; \
++ NPString str = { _val, strlen(_val) }; \
++ (_v).value.stringValue = str; \
++NP_END_MACRO
++
++#define STRINGN_TO_NPVARIANT(_val, _len, _v) \
++NP_BEGIN_MACRO \
++ (_v).type = NPVariantType_String; \
++ NPString str = { _val, _len }; \
++ (_v).value.stringValue = str; \
++NP_END_MACRO
++
++#define OBJECT_TO_NPVARIANT(_val, _v) \
++NP_BEGIN_MACRO \
++ (_v).type = NPVariantType_Object; \
++ (_v).value.objectValue = _val; \
++NP_END_MACRO
++
++
++/*
++ Type mappings (JavaScript types have been used for illustration
++ purposes):
++
++ JavaScript to C (NPVariant with type:)
++ undefined NPVariantType_Void
++ null NPVariantType_Null
++ Boolean NPVariantType_Bool
++ Number NPVariantType_Double or NPVariantType_Int32
++ String NPVariantType_String
++ Object NPVariantType_Object
++
++ C (NPVariant with type:) to JavaScript
++ NPVariantType_Void undefined
++ NPVariantType_Null null
++ NPVariantType_Bool Boolean
++ NPVariantType_Int32 Number
++ NPVariantType_Double Number
++ NPVariantType_String String
++ NPVariantType_Object Object
++*/
++
++typedef void *NPIdentifier;
++
++/*
++ NPObjects have methods and properties. Methods and properties are
++ identified with NPIdentifiers. These identifiers may be reflected
++ in script. NPIdentifiers can be either strings or integers, IOW,
++ methods and properties can be identified by either strings or
++ integers (i.e. foo["bar"] vs foo[1]). NPIdentifiers can be
++ compared using ==. In case of any errors, the requested
++ NPIdentifier(s) will be NULL.
++*/
++NPIdentifier NPN_GetStringIdentifier(const NPUTF8 *name);
++void NPN_GetStringIdentifiers(const NPUTF8 **names, int32_t nameCount,
++ NPIdentifier *identifiers);
++NPIdentifier NPN_GetIntIdentifier(int32_t intid);
++bool NPN_IdentifierIsString(NPIdentifier identifier);
++
++/*
++ The NPUTF8 returned from NPN_UTF8FromIdentifier SHOULD be freed.
++*/
++NPUTF8 *NPN_UTF8FromIdentifier(NPIdentifier identifier);
++
++/*
++ Get the integer represented by identifier. If identifier is not an
++ integer identifier, the behaviour is undefined.
++*/
++int32_t NPN_IntFromIdentifier(NPIdentifier identifier);
++
++/*
++ NPObject behavior is implemented using the following set of
++ callback functions.
++
++ The NPVariant *result argument of these functions (where
++ applicable) should be released using NPN_ReleaseVariantValue().
++*/
++typedef NPObject *(*NPAllocateFunctionPtr)(NPP npp, NPClass *aClass);
++typedef void (*NPDeallocateFunctionPtr)(NPObject *npobj);
++typedef void (*NPInvalidateFunctionPtr)(NPObject *npobj);
++typedef bool (*NPHasMethodFunctionPtr)(NPObject *npobj, NPIdentifier name);
++typedef bool (*NPInvokeFunctionPtr)(NPObject *npobj, NPIdentifier name,
++ const NPVariant *args, uint32_t argCount,
++ NPVariant *result);
++typedef bool (*NPInvokeDefaultFunctionPtr)(NPObject *npobj,
++ const NPVariant *args,
++ uint32_t argCount,
++ NPVariant *result);
++typedef bool (*NPHasPropertyFunctionPtr)(NPObject *npobj, NPIdentifier name);
++typedef bool (*NPGetPropertyFunctionPtr)(NPObject *npobj, NPIdentifier name,
++ NPVariant *result);
++typedef bool (*NPSetPropertyFunctionPtr)(NPObject *npobj, NPIdentifier name,
++ const NPVariant *value);
++typedef bool (*NPRemovePropertyFunctionPtr)(NPObject *npobj,
++ NPIdentifier name);
++
++/*
++ NPObjects returned by create, retain, invoke, and getProperty pass
++ a reference count to the caller. That is, the callee adds a
++ reference count which passes to the caller. It is the caller's
++ responsibility to release the returned object.
++
++ NPInvokeFunctionPtr function may return 0 to indicate a void
++ result.
++
++ NPInvalidateFunctionPtr is called by the scripting environment
++ when the native code is shutdown. Any attempt to message a
++ NPObject instance after the invalidate callback has been
++ called will result in undefined behavior, even if the native code
++ is still retaining those NPObject instances. (The runtime
++ will typically return immediately, with 0 or NULL, from an attempt
++ to dispatch to a NPObject, but this behavior should not be
++ depended upon.)
++*/
++struct NPClass
++{
++ uint32_t structVersion;
++ NPAllocateFunctionPtr allocate;
++ NPDeallocateFunctionPtr deallocate;
++ NPInvalidateFunctionPtr invalidate;
++ NPHasMethodFunctionPtr hasMethod;
++ NPInvokeFunctionPtr invoke;
++ NPInvokeDefaultFunctionPtr invokeDefault;
++ NPHasPropertyFunctionPtr hasProperty;
++ NPGetPropertyFunctionPtr getProperty;
++ NPSetPropertyFunctionPtr setProperty;
++ NPRemovePropertyFunctionPtr removeProperty;
++};
++
++#define NP_CLASS_STRUCT_VERSION 1
++
++struct NPObject {
++ NPClass *_class;
++ uint32_t referenceCount;
++ /*
++ * Additional space may be allocated here by types of NPObjects
++ */
++};
++
++/*
++ If the class has an allocate function, NPN_CreateObject invokes
++ that function, otherwise a NPObject is allocated and
++ returned. This method will initialize the referenceCount member of
++ the NPObject to 1.
++*/
++NPObject *NPN_CreateObject(NPP npp, NPClass *aClass);
++
++/*
++ Increment the NPObject's reference count.
++*/
++NPObject *NPN_RetainObject(NPObject *npobj);
++
++/*
++ Decremented the NPObject's reference count. If the reference
++ count goes to zero, the class's destroy function is invoke if
++ specified, otherwise the object is freed directly.
++*/
++void NPN_ReleaseObject(NPObject *npobj);
++
++/*
++ Functions to access script objects represented by NPObject.
++
++ Calls to script objects are synchronous. If a function returns a
++ value, it will be supplied via the result NPVariant
++ argument. Successful calls will return true, false will be
++ returned in case of an error.
++
++ Calls made from plugin code to script must be made from the thread
++ on which the plugin was initialized.
++*/
++
++bool NPN_Invoke(NPP npp, NPObject *npobj, NPIdentifier methodName,
++ const NPVariant *args, uint32_t argCount, NPVariant *result);
++bool NPN_InvokeDefault(NPP npp, NPObject *npobj, const NPVariant *args,
++ uint32_t argCount, NPVariant *result);
++bool NPN_Evaluate(NPP npp, NPObject *npobj, NPString *script,
++ NPVariant *result);
++bool NPN_GetProperty(NPP npp, NPObject *npobj, NPIdentifier propertyName,
++ NPVariant *result);
++bool NPN_SetProperty(NPP npp, NPObject *npobj, NPIdentifier propertyName,
++ const NPVariant *value);
++bool NPN_RemoveProperty(NPP npp, NPObject *npobj, NPIdentifier propertyName);
++bool NPN_HasProperty(NPP npp, NPObject *npobj, NPIdentifier propertyName);
++bool NPN_HasMethod(NPP npp, NPObject *npobj, NPIdentifier methodName);
++
++/*
++ NPN_SetException may be called to trigger a script exception upon
++ return from entry points into NPObjects. Typical usage:
++
++ NPN_SetException (npobj, message);
++*/
++void NPN_SetException(NPObject *npobj, const NPUTF8 *message);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+diff -urN kdebase-orig/nsplugins/sdk/npupp.h kdebase-3.5.8/nsplugins/sdk/npupp.h
--- kdebase-orig/nsplugins/sdk/npupp.h 2007-10-08 11:51:23.000000000 +0200
+++ kdebase-3.5.8/nsplugins/sdk/npupp.h 2008-01-29 15:51:20.000000000 +0100
@@ -1,11 +1,11 @@
@@ -1032,7 +1439,7 @@
} NPNetscapeFuncs;
#ifdef XP_MAC
-diff -ur kdebase-orig/nsplugins/sdk/prcpucfg.h kdebase-3.5.8/nsplugins/sdk/prcpucfg.h
+diff -urN kdebase-orig/nsplugins/sdk/prcpucfg.h kdebase-3.5.8/nsplugins/sdk/prcpucfg.h
--- kdebase-orig/nsplugins/sdk/prcpucfg.h 2007-10-08 11:51:23.000000000 +0200
+++ kdebase-3.5.8/nsplugins/sdk/prcpucfg.h 2008-01-29 15:51:20.000000000 +0100
@@ -276,7 +276,7 @@
@@ -1063,9 +1470,99 @@
#define BITS_PER_FLOAT PR_BITS_PER_FLOAT
#define BITS_PER_DOUBLE PR_BITS_PER_DOUBLE
#define BITS_PER_WORD PR_BITS_PER_WORD
-Pouze v kdebase-3.5.8/nsplugins/viewer: glibevents.cpp
-Pouze v kdebase-3.5.8/nsplugins/viewer: glibevents.h
-diff -ur kdebase-orig/nsplugins/viewer/Makefile.am kdebase-3.5.8/nsplugins/viewer/Makefile.am
+diff -urN kdebase-orig/nsplugins/viewer/glibevents.cpp kdebase-3.5.8/nsplugins/viewer/glibevents.cpp
+--- kdebase-orig/nsplugins/viewer/glibevents.cpp 1970-01-01 01:00:00.000000000 +0100
++++ kdebase-3.5.8/nsplugins/viewer/glibevents.cpp 2008-01-29 15:51:04.000000000 +0100
+@@ -0,0 +1,43 @@
++/*
++ Copyright (c) 2007 Lubos Lunak <l.lunak at suse.cz>
++
++ 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 02110-1301, USA.
++
++*/
++
++#include "glibevents.h"
++
++#include <qapplication.h>
++
++GlibEvents::GlibEvents()
++ {
++ g_main_context_ref( g_main_context_default());
++ connect( &timer, SIGNAL( timeout()), SLOT( process()));
++ // TODO Poll for now
++ timer.start( 10 );
++ }
++
++GlibEvents::~GlibEvents()
++ {
++ g_main_context_unref( g_main_context_default());
++ }
++
++void GlibEvents::process()
++ {
++ while( g_main_context_pending( g_main_context_default()))
++ g_main_context_iteration( g_main_context_default(), false );
++ }
++
++#include "glibevents.moc"
+diff -urN kdebase-orig/nsplugins/viewer/glibevents.h kdebase-3.5.8/nsplugins/viewer/glibevents.h
+--- kdebase-orig/nsplugins/viewer/glibevents.h 1970-01-01 01:00:00.000000000 +0100
++++ kdebase-3.5.8/nsplugins/viewer/glibevents.h 2008-01-29 15:51:04.000000000 +0100
+@@ -0,0 +1,41 @@
++/*
++ Copyright (c) 2007 Lubos Lunak <l.lunak at suse.cz>
++
++ 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 02110-1301, USA.
++
++*/
++
++#ifndef GLIBEVENTS_H
++#define GLIBEVENTS_H
++
++#include <qwidget.h>
++#include <qtimer.h>
++
++#include <glib.h>
++
++class GlibEvents
++ : public QWidget
++ {
++ Q_OBJECT
++ public:
++ GlibEvents();
++ virtual ~GlibEvents();
++ private slots:
++ void process();
++ private:
++ QTimer timer;
++ };
++
++#endif
+diff -urN kdebase-orig/nsplugins/viewer/Makefile.am kdebase-3.5.8/nsplugins/viewer/Makefile.am
--- kdebase-orig/nsplugins/viewer/Makefile.am 2005-09-10 10:25:39.000000000 +0200
+++ kdebase-3.5.8/nsplugins/viewer/Makefile.am 2008-01-29 15:51:20.000000000 +0100
@@ -1,12 +1,11 @@
@@ -1085,7 +1582,7 @@
NSPluginCallbackIface_DIR = $(srcdir)/..
-
-diff -ur kdebase-orig/nsplugins/viewer/NSPluginClassIface.h kdebase-3.5.8/nsplugins/viewer/NSPluginClassIface.h
+diff -urN kdebase-orig/nsplugins/viewer/NSPluginClassIface.h kdebase-3.5.8/nsplugins/viewer/NSPluginClassIface.h
--- kdebase-orig/nsplugins/viewer/NSPluginClassIface.h 2005-11-19 12:08:29.000000000 +0100
+++ kdebase-3.5.8/nsplugins/viewer/NSPluginClassIface.h 2008-01-29 15:51:20.000000000 +0100
@@ -47,10 +47,10 @@
@@ -1117,7 +1614,7 @@
virtual void displayPlugin() = 0;
};
-diff -ur kdebase-orig/nsplugins/viewer/nsplugin.cpp kdebase-3.5.8/nsplugins/viewer/nsplugin.cpp
+diff -urN kdebase-orig/nsplugins/viewer/nsplugin.cpp kdebase-3.5.8/nsplugins/viewer/nsplugin.cpp
--- kdebase-orig/nsplugins/viewer/nsplugin.cpp 2006-10-01 19:31:58.000000000 +0200
+++ kdebase-3.5.8/nsplugins/viewer/nsplugin.cpp 2008-01-29 15:51:21.000000000 +0100
@@ -180,6 +180,12 @@
@@ -1458,7 +1955,7 @@
}
-diff -ur kdebase-orig/nsplugins/viewer/nsplugin.h kdebase-3.5.8/nsplugins/viewer/nsplugin.h
+diff -urN kdebase-orig/nsplugins/viewer/nsplugin.h kdebase-3.5.8/nsplugins/viewer/nsplugin.h
--- kdebase-orig/nsplugins/viewer/nsplugin.h 2007-10-08 11:51:23.000000000 +0200
+++ kdebase-3.5.8/nsplugins/viewer/nsplugin.h 2008-01-29 15:51:21.000000000 +0100
@@ -165,16 +165,16 @@
@@ -1505,7 +2002,7 @@
void destroyInstance( NSPluginInstance* inst );
bool error() { return _error; }
-diff -ur kdebase-orig/nsplugins/viewer/qxteventloop.cpp kdebase-3.5.8/nsplugins/viewer/qxteventloop.cpp
+diff -urN kdebase-orig/nsplugins/viewer/qxteventloop.cpp kdebase-3.5.8/nsplugins/viewer/qxteventloop.cpp
--- kdebase-orig/nsplugins/viewer/qxteventloop.cpp 2007-05-14 09:55:42.000000000 +0200
+++ kdebase-3.5.8/nsplugins/viewer/qxteventloop.cpp 2008-01-29 15:51:21.000000000 +0100
@@ -72,7 +72,7 @@
@@ -1548,7 +2045,7 @@
if ( ttw != -1 ) {
d->timerid =
XtAppAddTimeOut( d->appContext, ttw,
-diff -ur kdebase-orig/nsplugins/viewer/resolve.h kdebase-3.5.8/nsplugins/viewer/resolve.h
+diff -urN kdebase-orig/nsplugins/viewer/resolve.h kdebase-3.5.8/nsplugins/viewer/resolve.h
--- kdebase-orig/nsplugins/viewer/resolve.h 2005-10-10 17:04:05.000000000 +0200
+++ kdebase-3.5.8/nsplugins/viewer/resolve.h 2008-01-29 15:51:21.000000000 +0100
@@ -40,7 +40,7 @@
@@ -1560,7 +2057,7 @@
return error;
-diff -ur kdebase-orig/nsplugins/viewer/viewer.cpp kdebase-3.5.8/nsplugins/viewer/viewer.cpp
+diff -urN kdebase-orig/nsplugins/viewer/viewer.cpp kdebase-3.5.8/nsplugins/viewer/viewer.cpp
--- kdebase-orig/nsplugins/viewer/viewer.cpp 2006-01-19 18:01:49.000000000 +0100
+++ kdebase-3.5.8/nsplugins/viewer/viewer.cpp 2008-01-29 15:51:04.000000000 +0100
@@ -52,8 +52,13 @@
More information about the fedora-extras-commits
mailing list