Attachment #224417 for bug #310411

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




#include <nsCOMPtr.h>
#include <nsNetCID.h>
#include <nsIIOService.h>
#include <nsIJVMManager.h>
#include <nsIFontEnumerator.h>
#include <nsISupportsPrimitives.h>
#include <nsIPermissionManager.h>

	MozillaEncodings *encodings;
};

static NS_DEFINE_CID(kJVMManagerCID, NS_JVMMANAGER_CID);

G_DEFINE_TYPE (MozillaEmbedShell, mozilla_embed_shell, GALEON_TYPE_EMBED_SHELL);

static gboolean

static void
impl_show_java_console (GaleonEmbedShell *shell)
{
        nsCOMPtr<nsIJVMManager> JVMManager = do_GetService (kJVMManagerCID);
	if (JVMManager)
	{
		JVMManager->ShowJavaConsole ();
	}
}

static GaleonEncodings *

Lines 76-83 Link Here

(-)galeon-2.0.7.nojsconsole/ui/galeon-egg-ui.xml (-2 lines)
76	<separator name="WSep3" />	76	<separator name="WSep3" />
77	<menuitem name="WebAllowJava" action="WebAllowJavaAction" />	77	<menuitem name="WebAllowJava" action="WebAllowJavaAction" />
78	<menuitem name="WebAllowJS" action="WebAllowJSAction" />	78	<menuitem name="WebAllowJS" action="WebAllowJSAction" />
79	<separator name="WSep4" />
80	<menuitem name="WebJSConsole" action="WebJSConsoleAction" />
81	</menu>	79	</menu>
82	<menu name="Go" action="GoMenuAction">	80	<menu name="Go" action="GoMenuAction">
83	<menuitem name="GoBack" action="GoBack" />	81	<menuitem name="GoBack" action="GoBack" />

Return to bug 310411

Lines 62-68 Link Here

(-)galeon-2.0.7.nojsconsole/mozilla/mozilla-embed-shell.cpp (-8 lines)
62	#include <nsCOMPtr.h>	62	#include <nsCOMPtr.h>
63	#include <nsNetCID.h>	63	#include <nsNetCID.h>
64	#include <nsIIOService.h>	64	#include <nsIIOService.h>
65	#include <nsIJVMManager.h>
66	#include <nsIFontEnumerator.h>	65	#include <nsIFontEnumerator.h>
67	#include <nsISupportsPrimitives.h>	66	#include <nsISupportsPrimitives.h>
68	#include <nsIPermissionManager.h>	67	#include <nsIPermissionManager.h>
Lines 118-125 Link Here
118	MozillaEncodings *encodings;	117	MozillaEncodings *encodings;
119	};	118	};
120		119
121	static NS_DEFINE_CID(kJVMManagerCID, NS_JVMMANAGER_CID);
122
123	G_DEFINE_TYPE (MozillaEmbedShell, mozilla_embed_shell, GALEON_TYPE_EMBED_SHELL);	120	G_DEFINE_TYPE (MozillaEmbedShell, mozilla_embed_shell, GALEON_TYPE_EMBED_SHELL);
124		121
125	static gboolean	122	static gboolean
Lines 514-524 Link Here
514	static void	511	static void
515	impl_show_java_console (GaleonEmbedShell *shell)	512	impl_show_java_console (GaleonEmbedShell *shell)
516	{	513	{
517	nsCOMPtr<nsIJVMManager> JVMManager = do_GetService (kJVMManagerCID);
518	if (JVMManager)
519	{
520	JVMManager->ShowJavaConsole ();
521	}
522	}	514	}
523		515
524	static GaleonEncodings *	516	static GaleonEncodings *