Attachment #162652 for bug #234416

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

Lines 8-14 Link Here

(-)kazehakase-0.5.5.orig/ext/ruby/Makefile.am (-2 lines)
8	-DG_DISABLE_DEPRECATED=1	8	-DG_DISABLE_DEPRECATED=1
9		9
10	INCLUDES = \	10	INCLUDES = \
11	$(MOZILLA_COMPONENT_CFLAGS) \
12	$(GTK_CFLAGS) \	11	$(GTK_CFLAGS) \
13	$(LIBGNUTLS_CFLAGS) \	12	$(LIBGNUTLS_CFLAGS) \
14	$(RUBY_CFLAGS) \	13	$(RUBY_CFLAGS) \
Lines 63-67 Link Here
63	$(GTK_LIBS) \	62	$(GTK_LIBS) \
64	$(LIBGNUTLS_LIBS) \	63	$(LIBGNUTLS_LIBS) \
65	$(RUBY_LIBS) \	64	$(RUBY_LIBS) \
66	$(MOZILLA_COMPONENT_LIBS) \
67	$(top_builddir)/src/libkazehakase.la	65	$(top_builddir)/src/libkazehakase.la

Lines 306-312 Link Here

(-)kazehakase-0.5.5.orig/ext/ruby/Makefile.in (-2 lines)
306	top_srcdir = @top_srcdir@	306	top_srcdir = @top_srcdir@
307	ext_LTLIBRARIES = ruby.la	307	ext_LTLIBRARIES = ruby.la
308	INCLUDES = \	308	INCLUDES = \
309	$(MOZILLA_COMPONENT_CFLAGS) \
310	$(GTK_CFLAGS) \	309	$(GTK_CFLAGS) \
311	$(LIBGNUTLS_CFLAGS) \	310	$(LIBGNUTLS_CFLAGS) \
312	$(RUBY_CFLAGS) \	311	$(RUBY_CFLAGS) \
Lines 354-360 Link Here
354	$(GTK_LIBS) \	353	$(GTK_LIBS) \
355	$(LIBGNUTLS_LIBS) \	354	$(LIBGNUTLS_LIBS) \
356	$(RUBY_LIBS) \	355	$(RUBY_LIBS) \
357	$(MOZILLA_COMPONENT_LIBS) \
358	$(top_builddir)/src/libkazehakase.la	356	$(top_builddir)/src/libkazehakase.la
359		357
360	all: all-am	358	all: all-am




        rv = EnsureProfileFileExists(localFile, domainDir);
    }
  }
  else if (strcmp(prop, NS_APP_MAIL_50_DIR) == 0) {
    rv = domainDir->Clone(getter_AddRefs(localFile));
    if (NS_SUCCEEDED(rv))
      rv = localFile->AppendNative(MAIL_DIR_50_NAME);
  }
  else if (strcmp(prop, NS_APP_IMAP_MAIL_50_DIR) == 0) {
    rv = domainDir->Clone(getter_AddRefs(localFile));
    if (NS_SUCCEEDED(rv))
      rv = localFile->AppendNative(IMAP_MAIL_DIR_50_NAME);
  }
  else if (strcmp(prop, NS_APP_NEWS_50_DIR) == 0) {
    rv = domainDir->Clone(getter_AddRefs(localFile));
    if (NS_SUCCEEDED(rv))
      rv = localFile->AppendNative(NEWS_DIR_50_NAME);
  }
  else if (strcmp(prop, NS_APP_MESSENGER_FOLDER_CACHE_50_DIR) == 0) {
    rv = domainDir->Clone(getter_AddRefs(localFile));
    if (NS_SUCCEEDED(rv))
      rv = localFile->AppendNative(MSG_FOLDER_CACHE_DIR_50_NAME);
  }
  else if (strcmp(prop, NS_APP_STORAGE_50_FILE) == 0) {
    rv = domainDir->Clone(getter_AddRefs(localFile));
    if (NS_SUCCEEDED(rv))

  (void) directoryService->Undefine(NS_APP_BOOKMARKS_50_FILE);
  (void) directoryService->Undefine(NS_APP_DOWNLOADS_50_FILE);
  (void) directoryService->Undefine(NS_APP_SEARCH_50_FILE);
  (void) directoryService->Undefine(NS_APP_MAIL_50_DIR);
  (void) directoryService->Undefine(NS_APP_IMAP_MAIL_50_DIR);
  (void) directoryService->Undefine(NS_APP_NEWS_50_DIR);
  (void) directoryService->Undefine(NS_APP_MESSENGER_FOLDER_CACHE_50_DIR);

  return NS_OK;
}




 *
 * ***** END LICENSE BLOCK ***** */

#include "config.h"
#include "GtkPromptService.h"
#include <nsIWindowWatcher.h>
#include <nsIWebBrowserChrome.h>

#include <nsIDOMCharacterData.h>
#include <nsIDOMText.h>
#include <nsMemory.h>
#ifdef HAVE_GECKO_1_9
#include <nsIAuthInformation.h>
#include <nsIStringBundle.h>
#include <nsServiceManagerUtils.h>
/* That is ugly but I didn't find another way, except including
 * NS_GetAuthHostPort */
#define kNotFound -1
NS_COM void AppendUTF16toUTF8( const nsAString& aSource, nsACString& aDest );
#include <nsStringAPI.h>
#include <nsIProxiedChannel.h>
#include <nsIProxyInfo.h>
#include <nsIIDNService.h>
#include <nsNetCID.h>
#include <nsIURI.h>
#include <nsNetUtil.h>
#include <nsPromptUtils.h>
#endif

#include <glib/gi18n.h>
#include "kz-prompt-dialog.h"

{
}

#ifdef HAVE_GECKO_1_9
NS_IMPL_ISUPPORTS2(GtkPromptService, nsIPromptService, nsIPromptService2)
#else
NS_IMPL_ISUPPORTS1(GtkPromptService, nsIPromptService)
#endif

NS_IMETHODIMP
GtkPromptService::Alert(nsIDOMWindow* aParent, const PRUnichar* aDialogTitle, 

	KzPromptDialog *prompt = KZ_PROMPT_DIALOG(kz_prompt_dialog_new_with_parent
	    						(TYPE_PROMPT_USER_PASS,
	    					         GTK_WINDOW(GetGtkWindowForDOMWindow(aParent))));
#ifndef HAVE_GECKO_1_9
	gchar *host = GetURIForDOMWindow(aParent);
	kz_prompt_dialog_set_host (prompt, host);
	if (host)
		g_free(host);
#endif
	kz_prompt_dialog_set_title(prompt,
	    			   aDialogTitle ? cTitle.get() : _("Prompt"));
	kz_prompt_dialog_set_message_text(prompt, cText.get());

	KzPromptDialog *prompt = KZ_PROMPT_DIALOG(kz_prompt_dialog_new_with_parent
	    						(TYPE_PROMPT_PASS,
	    					         GTK_WINDOW(GetGtkWindowForDOMWindow(aParent))));
#ifndef HAVE_GECKO_1_9
	gchar *host = GetURIForDOMWindow(aParent);
	kz_prompt_dialog_set_host (prompt, host);
	if (host)
		g_free(host);
#endif
	kz_prompt_dialog_set_title(prompt,
	    			   aDialogTitle ? cTitle.get() : _("Prompt"));
	kz_prompt_dialog_set_message_text(prompt, cText.get());

	NS_UTF16ToCString(uri, NS_CSTRING_ENCODING_UTF8, c_uri);
	return g_strdup(c_uri.get());
}

#ifdef HAVE_GECKO_1_9
static nsresult
MakeDialogText(nsIChannel* aChannel, nsIAuthInformation* aAuthInfo,
               nsString& message)
{
  nsresult rv;
  nsCOMPtr<nsIStringBundleService> bundleSvc =
    do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
  NS_ENSURE_SUCCESS(rv, rv);

  nsCOMPtr<nsIStringBundle> bundle;
  rv = bundleSvc->CreateBundle("chrome://global/locale/prompts.properties",
                               getter_AddRefs(bundle));
  NS_ENSURE_SUCCESS(rv, rv);

  // figure out what message to display...
  nsCAutoString host;
  PRInt32 port;
  NS_GetAuthHostPort(aChannel, aAuthInfo, PR_FALSE, host, &port);

  nsAutoString displayHost;
  CopyUTF8toUTF16(host, displayHost);

  nsCOMPtr<nsIURI> uri;
  aChannel->GetURI(getter_AddRefs(uri));

  nsCAutoString scheme;
  uri->GetScheme(scheme);

  nsAutoString username;
  aAuthInfo->GetUsername(username);

  PRUint32 flags;
  aAuthInfo->GetFlags(&flags);
  PRBool proxyAuth = (flags & nsIAuthInformation::AUTH_PROXY) != 0;

  nsAutoString realm;
  aAuthInfo->GetRealm(realm);

  // Append the port if it was specified
  if (port != -1) {
    displayHost.Append(PRUnichar(':'));
    displayHost.AppendInt(port);
  }

  NS_NAMED_LITERAL_STRING(proxyText, "EnterLoginForProxy");
  NS_NAMED_LITERAL_STRING(originText, "EnterLoginForRealm");
  NS_NAMED_LITERAL_STRING(noRealmText, "EnterUserPasswordFor");
  NS_NAMED_LITERAL_STRING(passwordText, "EnterPasswordFor");

  const PRUnichar *text;
  if (proxyAuth) {
    text = proxyText.get();
  } else {
    text = originText.get();

    // prepend "scheme://"
    nsAutoString schemeU;
    CopyASCIItoUTF16(scheme, schemeU);
    schemeU.AppendLiteral("://");
    displayHost.Insert(schemeU, 0);
  }

  const PRUnichar *strings[] = { realm.get(), displayHost.get() };
  PRUint32 count = NS_ARRAY_LENGTH(strings);

  if (flags & nsIAuthInformation::ONLY_PASSWORD) {
    text = passwordText.get();
    strings[0] = username.get();
  } else if (!proxyAuth && realm.IsEmpty()) {
    text = noRealmText.get();
    count--;
    strings[0] = strings[1];
  }

  rv = bundle->FormatStringFromName(text, strings, count, getter_Copies(message));
  return rv;
}

NS_METHOD
GtkPromptService::PromptAuth(nsIDOMWindow *aParent,
                              nsIChannel *aChannel,
                              PRUint32 level,
                              nsIAuthInformation *authInfo,
                              const PRUnichar *checkboxLabel,
                              PRBool *checkValue,
                              PRBool *retval)
{
	NS_ENSURE_ARG_POINTER (retval);
	NS_ENSURE_ARG_POINTER (authInfo);

  nsString message;
  MakeDialogText(aChannel, authInfo, message);

  nsAutoString defaultUser, defaultDomain, defaultPass;
  authInfo->GetUsername(defaultUser);
  authInfo->GetDomain(defaultDomain);
  authInfo->GetPassword(defaultPass);

  PRUint32 flags;
  authInfo->GetFlags(&flags);

  if ((flags & nsIAuthInformation::NEED_DOMAIN) && !defaultDomain.IsEmpty()) {
    defaultDomain.Append(PRUnichar('\\'));
    defaultUser.Insert(defaultDomain, 0);
  }

  // NOTE: Allocation failure is not fatal here (just default to empty string
  // if allocation fails)
  PRUnichar *user = ToNewUnicode(defaultUser),
    *pass = ToNewUnicode(defaultPass);
  nsresult rv;
  if (flags & nsIAuthInformation::ONLY_PASSWORD)
    rv = PromptPassword(aParent, nsnull, message.get(),
                                  &pass, checkboxLabel,
                                  checkValue, retval);
  else
    rv = PromptUsernameAndPassword(aParent, nsnull, message.get(),
                                             &user, &pass, checkboxLabel,
                                             checkValue, retval);

  nsString userStr(user);
  nsString passStr(pass);
  authInfo->SetUsername(userStr);
  authInfo->SetPassword(passStr);

  return rv;
}

NS_METHOD GtkPromptService::AsyncPromptAuth(nsIDOMWindow *aParent,
                                            nsIChannel *aChannel,
                                            nsIAuthPromptCallback *aCallback,
                                            nsISupports *aContext,
                                            PRUint32 level,
                                            nsIAuthInformation *authInfo,
                                            const PRUnichar *checkboxLabel,
                                            PRBool *checkValue,
                                            nsICancelable **retval)
{
  return NS_ERROR_NOT_IMPLEMENTED;
}

#endif

Lines 37-43 Link Here

(-)kazehakase-0.5.5.orig/module/embed/gecko/GtkPromptService.h (-1 / +13 lines)
37	*	37	*
38	* *** END LICENSE BLOCK *** */	38	* *** END LICENSE BLOCK *** */
39		39
		40	#ifdef HAVE_GECKO_1_9
		41	#include <nsIPromptService2.h>
		42	#else
40	#include <nsIPromptService.h>	43	#include <nsIPromptService.h>
		44	#endif
41	#include <gtk/gtk.h>	45	#include <gtk/gtk.h>
42		46
43	#define NS_PROMPTSERVICE_CID \	47	#define NS_PROMPTSERVICE_CID \
Lines 45-51 Link Here
45		49
46	class nsIDOMWindow;	50	class nsIDOMWindow;
47		51
48	class GtkPromptService : public nsIPromptService	52	class GtkPromptService :
		53	#ifdef HAVE_GECKO_1_9
		54	public nsIPromptService2
		55	#else
		56	public nsIPromptService
		57	#endif
49	{	58	{
50	public:	59	public:
51	GtkPromptService();	60	GtkPromptService();
Lines 53-58 Link Here
53		62
54	NS_DECL_ISUPPORTS	63	NS_DECL_ISUPPORTS
55	NS_DECL_NSIPROMPTSERVICE	64	NS_DECL_NSIPROMPTSERVICE
		65	#ifdef HAVE_GECKO_1_9
		66	NS_DECL_NSIPROMPTSERVICE2
		67	#endif
56		68
57	private:	69	private:
58	const char *GetButtonLabel(PRUint32 aFlags, PRUint32 aPos,	70	const char *GetButtonLabel(PRUint32 aFlags, PRUint32 aPos,

Lines 49-54 Link Here

(-)kazehakase-0.5.5.orig/module/embed/gecko/kz-mozutils.h (-1 / +3 lines)
49	* The following functions is taken from include/necko/nsNetUtils.h in mozilla	49	* The following functions is taken from include/necko/nsNetUtils.h in mozilla
50	*/	50	*/
51		51
		52	#ifndef nsNetUtil_h__
		53
52	inline nsresult	54	inline nsresult
53	GetIOService (nsIIOService **ioService)	55	GetIOService (nsIIOService **ioService)
54	{	56	{
Lines 245-250 Link Here
245		247
246	return resultBuffer;	248	return resultBuffer;
247	}	249	}
248		250	#endif
249		251
250	#endif /* __KZ_MOZ_UTILS_H__ */	252	#endif /* __KZ_MOZ_UTILS_H__ */

Return to bug 234416

Lines 306-331 Link Here

(-)kazehakase-0.5.5.orig/module/embed/gecko/gtkmozembed/nsProfileDirServiceProvider2.cpp (-24 lines)
306	rv = EnsureProfileFileExists(localFile, domainDir);	306	rv = EnsureProfileFileExists(localFile, domainDir);
307	}	307	}
308	}	308	}
309	else if (strcmp(prop, NS_APP_MAIL_50_DIR) == 0) {
310	rv = domainDir->Clone(getter_AddRefs(localFile));
311	if (NS_SUCCEEDED(rv))
312	rv = localFile->AppendNative(MAIL_DIR_50_NAME);
313	}
314	else if (strcmp(prop, NS_APP_IMAP_MAIL_50_DIR) == 0) {
315	rv = domainDir->Clone(getter_AddRefs(localFile));
316	if (NS_SUCCEEDED(rv))
317	rv = localFile->AppendNative(IMAP_MAIL_DIR_50_NAME);
318	}
319	else if (strcmp(prop, NS_APP_NEWS_50_DIR) == 0) {
320	rv = domainDir->Clone(getter_AddRefs(localFile));
321	if (NS_SUCCEEDED(rv))
322	rv = localFile->AppendNative(NEWS_DIR_50_NAME);
323	}
324	else if (strcmp(prop, NS_APP_MESSENGER_FOLDER_CACHE_50_DIR) == 0) {
325	rv = domainDir->Clone(getter_AddRefs(localFile));
326	if (NS_SUCCEEDED(rv))
327	rv = localFile->AppendNative(MSG_FOLDER_CACHE_DIR_50_NAME);
328	}
329	else if (strcmp(prop, NS_APP_STORAGE_50_FILE) == 0) {	309	else if (strcmp(prop, NS_APP_STORAGE_50_FILE) == 0) {
330	rv = domainDir->Clone(getter_AddRefs(localFile));	310	rv = domainDir->Clone(getter_AddRefs(localFile));
331	if (NS_SUCCEEDED(rv))	311	if (NS_SUCCEEDED(rv))
Lines 518-527 Link Here
518	(void) directoryService->Undefine(NS_APP_BOOKMARKS_50_FILE);	498	(void) directoryService->Undefine(NS_APP_BOOKMARKS_50_FILE);
519	(void) directoryService->Undefine(NS_APP_DOWNLOADS_50_FILE);	499	(void) directoryService->Undefine(NS_APP_DOWNLOADS_50_FILE);
520	(void) directoryService->Undefine(NS_APP_SEARCH_50_FILE);	500	(void) directoryService->Undefine(NS_APP_SEARCH_50_FILE);
521	(void) directoryService->Undefine(NS_APP_MAIL_50_DIR);
522	(void) directoryService->Undefine(NS_APP_IMAP_MAIL_50_DIR);
523	(void) directoryService->Undefine(NS_APP_NEWS_50_DIR);
524	(void) directoryService->Undefine(NS_APP_MESSENGER_FOLDER_CACHE_50_DIR);
525		501
526	return NS_OK;	502	return NS_OK;
527	}	503	}