Attachment #157669 for bug #228417

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

Lines 306-312 Link Here

(-)kazehakase-0.5.4.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

Lines 8-14 Link Here

(-)kazehakase-0.5.4.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 25-30 Link Here

(-)kazehakase-0.5.4.orig/module/embed/gecko/mozilla.cpp (+5 lines)
25		25
26	#define MOZILLA_CLIENT	26	#define MOZILLA_CLIENT
27		27
		28	#include <mozilla-config.h>
28	#include <gtkmozembed.h>	29	#include <gtkmozembed.h>
29	#include <nsXPCOM.h>	30	#include <nsXPCOM.h>
30	#include <nsIGenericFactory.h>	31	#include <nsIGenericFactory.h>
Lines 50-55 Link Here
50	#include <gtkmozembed_glue.cpp>	51	#include <gtkmozembed_glue.cpp>
51	#include <nsGenericFactory.h>	52	#include <nsGenericFactory.h>
52	#endif	53	#endif
		54	#ifdef HAVE_GECKO_1_9
		55	#include <nsComponentManagerUtils.h>
		56	#endif
		57
53		58
54	NS_GENERIC_FACTORY_CONSTRUCTOR(KzFilePicker)	59	NS_GENERIC_FACTORY_CONSTRUCTOR(KzFilePicker)
55	NS_GENERIC_FACTORY_CONSTRUCTOR(KzContentHandler)	60	NS_GENERIC_FACTORY_CONSTRUCTOR(KzContentHandler)

Lines 76-81 Link Here

(-)kazehakase-0.5.4.orig/module/embed/gecko/kz-mozlauncher.cpp (+3 lines)
76	nsISupports *aWindowContext,	76	nsISupports *aWindowContext,
77	const PRUnichar *aDefaultFile,	77	const PRUnichar *aDefaultFile,
78	const PRUnichar *aSuggestedFileExtension,	78	const PRUnichar *aSuggestedFileExtension,
		79	#ifdef HAVE_GECKO_1_9
		80	PRBool aForcePrompt,
		81	#endif
79	nsILocalFile **_retval)	82	nsILocalFile **_retval)
80	{	83	{
81	nsresult rv;	84	nsresult rv;




        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;
}

Return to bug 228417

Lines 306-331 Link Here

(-)kazehakase-0.5.4.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	}