2186 else |
2186 else |
2187 diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp |
2187 diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp |
2188 new file mode 100644 |
2188 new file mode 100644 |
2189 --- /dev/null |
2189 --- /dev/null |
2190 +++ b/toolkit/xre/nsKDEUtils.cpp |
2190 +++ b/toolkit/xre/nsKDEUtils.cpp |
2191 @@ -0,0 +1,373 @@ |
2191 @@ -0,0 +1,341 @@ |
2192 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ |
2192 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ |
2193 +/* ***** BEGIN LICENSE BLOCK ***** |
2193 +/* This Source Code Form is subject to the terms of the Mozilla Public |
2194 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
2194 + * License, v. 2.0. If a copy of the MPL was not distributed with this |
2195 + * |
2195 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
2196 + * The contents of this file are subject to the Mozilla Public License Version |
|
2197 + * 1.1 (the "License"); you may not use this file except in compliance with |
|
2198 + * the License. You may obtain a copy of the License at |
|
2199 + * http://www.mozilla.org/MPL/ |
|
2200 + * |
|
2201 + * Software distributed under the License is distributed on an "AS IS" basis, |
|
2202 + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License |
|
2203 + * for the specific language governing rights and limitations under the |
|
2204 + * License. |
|
2205 + * |
|
2206 + * The Original Code is Unix Native App Support. |
|
2207 + * |
|
2208 + * The Initial Developer of the Original Code is |
|
2209 + * Mozilla Corporation. |
|
2210 + * Portions created by the Initial Developer are Copyright (C) 2007 |
|
2211 + * the Initial Developer. All Rights Reserved. |
|
2212 + * |
|
2213 + * Contributor(s): |
|
2214 + * |
|
2215 + * Alternatively, the contents of this file may be used under the terms of |
|
2216 + * either the GNU General Public License Version 2 or later (the "GPL"), or |
|
2217 + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), |
|
2218 + * in which case the provisions of the GPL or the LGPL are applicable instead |
|
2219 + * of those above. If you wish to allow use of your version of this file only |
|
2220 + * under the terms of either the GPL or the LGPL, and not to allow others to |
|
2221 + * use your version of this file under the terms of the MPL, indicate your |
|
2222 + * decision by deleting the provisions above and replace them with the notice |
|
2223 + * and other provisions required by the GPL or the LGPL. If you do not delete |
|
2224 + * the provisions above, a recipient may use your version of this file under |
|
2225 + * the terms of any one of the MPL, the GPL or the LGPL. |
|
2226 + * |
|
2227 + * ***** END LICENSE BLOCK ***** */ |
|
2228 + |
2196 + |
2229 +#include "nsKDEUtils.h" |
2197 +#include "nsKDEUtils.h" |
2230 +#include "nsIWidget.h" |
2198 +#include "nsIWidget.h" |
2231 +#include "nsISupportsPrimitives.h" |
2199 +#include "nsISupportsPrimitives.h" |
2232 +#include "nsIMutableArray.h" |
2200 +#include "nsIMutableArray.h" |
2564 + } |
2532 + } |
2565 diff --git a/toolkit/xre/nsKDEUtils.h b/toolkit/xre/nsKDEUtils.h |
2533 diff --git a/toolkit/xre/nsKDEUtils.h b/toolkit/xre/nsKDEUtils.h |
2566 new file mode 100644 |
2534 new file mode 100644 |
2567 --- /dev/null |
2535 --- /dev/null |
2568 +++ b/toolkit/xre/nsKDEUtils.h |
2536 +++ b/toolkit/xre/nsKDEUtils.h |
2569 @@ -0,0 +1,81 @@ |
2537 @@ -0,0 +1,48 @@ |
2570 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- |
2538 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
2571 + * |
2539 +/* This Source Code Form is subject to the terms of the Mozilla Public |
2572 + * ***** BEGIN LICENSE BLOCK ***** |
2540 + * License, v. 2.0. If a copy of the MPL was not distributed with this |
2573 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
2541 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
2574 + * |
|
2575 + * The contents of this file are subject to the Mozilla Public License Version |
|
2576 + * 1.1 (the "License"); you may not use this file except in compliance with |
|
2577 + * the License. You may obtain a copy of the License at |
|
2578 + * http://www.mozilla.org/MPL/ |
|
2579 + * |
|
2580 + * Software distributed under the License is distributed on an "AS IS" basis, |
|
2581 + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License |
|
2582 + * for the specific language governing rights and limitations under the |
|
2583 + * License. |
|
2584 + * |
|
2585 + * The Original Code is Mozilla Communicator client code. |
|
2586 + * |
|
2587 + * The Initial Developer of the Original Code is |
|
2588 + * Netscape Communications Corporation. |
|
2589 + * Portions created by the Initial Developer are Copyright (C) 1998 |
|
2590 + * the Initial Developer. All Rights Reserved. |
|
2591 + * |
|
2592 + * Contributor(s): |
|
2593 + * |
|
2594 + * Alternatively, the contents of this file may be used under the terms of |
|
2595 + * either of the GNU General Public License Version 2 or later (the "GPL"), |
|
2596 + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), |
|
2597 + * in which case the provisions of the GPL or the LGPL are applicable instead |
|
2598 + * of those above. If you wish to allow use of your version of this file only |
|
2599 + * under the terms of either the GPL or the LGPL, and not to allow others to |
|
2600 + * use your version of this file under the terms of the MPL, indicate your |
|
2601 + * decision by deleting the provisions above and replace them with the notice |
|
2602 + * and other provisions required by the GPL or the LGPL. If you do not delete |
|
2603 + * the provisions above, a recipient may use your version of this file under |
|
2604 + * the terms of any one of the MPL, the GPL or the LGPL. |
|
2605 + * |
|
2606 + * ***** END LICENSE BLOCK ***** */ |
|
2607 + |
2542 + |
2608 +#ifndef nsKDEUtils_h__ |
2543 +#ifndef nsKDEUtils_h__ |
2609 +#define nsKDEUtils_h__ |
2544 +#define nsKDEUtils_h__ |
2610 + |
2545 + |
2611 +#include "nsStringGlue.h" |
2546 +#include "nsStringGlue.h" |
2674 OSHELPER += nsExternalURLHandlerService.cpp |
2609 OSHELPER += nsExternalURLHandlerService.cpp |
2675 diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp |
2610 diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp |
2676 new file mode 100644 |
2611 new file mode 100644 |
2677 --- /dev/null |
2612 --- /dev/null |
2678 +++ b/uriloader/exthandler/unix/nsCommonRegistry.cpp |
2613 +++ b/uriloader/exthandler/unix/nsCommonRegistry.cpp |
2679 @@ -0,0 +1,87 @@ |
2614 @@ -0,0 +1,54 @@ |
2680 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
2615 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
2681 +/* ***** BEGIN LICENSE BLOCK ***** |
2616 +/* This Source Code Form is subject to the terms of the Mozilla Public |
2682 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
2617 + * License, v. 2.0. If a copy of the MPL was not distributed with this |
2683 + * |
2618 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
2684 + * The contents of this file are subject to the Mozilla Public License Version |
|
2685 + * 1.1 (the "License"); you may not use this file except in compliance with |
|
2686 + * the License. You may obtain a copy of the License at |
|
2687 + * http://www.mozilla.org/MPL/ |
|
2688 + * |
|
2689 + * Software distributed under the License is distributed on an "AS IS" basis, |
|
2690 + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License |
|
2691 + * for the specific language governing rights and limitations under the |
|
2692 + * License. |
|
2693 + * |
|
2694 + * The Original Code is the GNOME helper app implementation. |
|
2695 + * |
|
2696 + * The Initial Developer of the Original Code is |
|
2697 + * IBM Corporation. |
|
2698 + * Portions created by the Initial Developer are Copyright (C) 2003 |
|
2699 + * the Initial Developer. All Rights Reserved. |
|
2700 + * |
|
2701 + * Contributor(s): |
|
2702 + * Brian Ryner <bryner@brianryner.com> (Original Author) |
|
2703 + * |
|
2704 + * Alternatively, the contents of this file may be used under the terms of |
|
2705 + * either the GNU General Public License Version 2 or later (the "GPL"), or |
|
2706 + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), |
|
2707 + * in which case the provisions of the GPL or the LGPL are applicable instead |
|
2708 + * of those above. If you wish to allow use of your version of this file only |
|
2709 + * under the terms of either the GPL or the LGPL, and not to allow others to |
|
2710 + * use your version of this file under the terms of the MPL, indicate your |
|
2711 + * decision by deleting the provisions above and replace them with the notice |
|
2712 + * and other provisions required by the GPL or the LGPL. If you do not delete |
|
2713 + * the provisions above, a recipient may use your version of this file under |
|
2714 + * the terms of any one of the MPL, the GPL or the LGPL. |
|
2715 + * |
|
2716 + * ***** END LICENSE BLOCK ***** */ |
|
2717 + |
2619 + |
2718 +#include "nsCommonRegistry.h" |
2620 +#include "nsCommonRegistry.h" |
2719 + |
2621 + |
2720 +#include "nsGNOMERegistry.h" |
2622 +#include "nsGNOMERegistry.h" |
2721 +#include "nsKDERegistry.h" |
2623 +#include "nsKDERegistry.h" |
2766 +} |
2668 +} |
2767 diff --git a/uriloader/exthandler/unix/nsCommonRegistry.h b/uriloader/exthandler/unix/nsCommonRegistry.h |
2669 diff --git a/uriloader/exthandler/unix/nsCommonRegistry.h b/uriloader/exthandler/unix/nsCommonRegistry.h |
2768 new file mode 100644 |
2670 new file mode 100644 |
2769 --- /dev/null |
2671 --- /dev/null |
2770 +++ b/uriloader/exthandler/unix/nsCommonRegistry.h |
2672 +++ b/uriloader/exthandler/unix/nsCommonRegistry.h |
2771 @@ -0,0 +1,56 @@ |
2673 @@ -0,0 +1,23 @@ |
2772 +/* ***** BEGIN LICENSE BLOCK ***** |
2674 +/* This Source Code Form is subject to the terms of the Mozilla Public |
2773 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
2675 + * License, v. 2.0. If a copy of the MPL was not distributed with this |
2774 + * |
2676 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
2775 + * The contents of this file are subject to the Mozilla Public License Version |
|
2776 + * 1.1 (the "License"); you may not use this file except in compliance with |
|
2777 + * the License. You may obtain a copy of the License at |
|
2778 + * http://www.mozilla.org/MPL/ |
|
2779 + * |
|
2780 + * Software distributed under the License is distributed on an "AS IS" basis, |
|
2781 + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License |
|
2782 + * for the specific language governing rights and limitations under the |
|
2783 + * License. |
|
2784 + * |
|
2785 + * The Original Code is the GNOME helper app implementation. |
|
2786 + * |
|
2787 + * The Initial Developer of the Original Code is |
|
2788 + * IBM Corporation. |
|
2789 + * Portions created by the Initial Developer are Copyright (C) 2003 |
|
2790 + * the Initial Developer. All Rights Reserved. |
|
2791 + * |
|
2792 + * Contributor(s): |
|
2793 + * Brian Ryner <bryner@brianryner.com> (Original Author) |
|
2794 + * |
|
2795 + * Alternatively, the contents of this file may be used under the terms of |
|
2796 + * either the GNU General Public License Version 2 or later (the "GPL"), or |
|
2797 + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), |
|
2798 + * in which case the provisions of the GPL or the LGPL are applicable instead |
|
2799 + * of those above. If you wish to allow use of your version of this file only |
|
2800 + * under the terms of either the GPL or the LGPL, and not to allow others to |
|
2801 + * use your version of this file under the terms of the MPL, indicate your |
|
2802 + * decision by deleting the provisions above and replace them with the notice |
|
2803 + * and other provisions required by the GPL or the LGPL. If you do not delete |
|
2804 + * the provisions above, a recipient may use your version of this file under |
|
2805 + * the terms of any one of the MPL, the GPL or the LGPL. |
|
2806 + * |
|
2807 + * ***** END LICENSE BLOCK ***** */ |
|
2808 + |
2677 + |
2809 +#include "nsIURI.h" |
2678 +#include "nsIURI.h" |
2810 +#include "nsCOMPtr.h" |
2679 +#include "nsCOMPtr.h" |
2811 + |
2680 + |
2812 +class nsMIMEInfoBase; |
2681 +class nsMIMEInfoBase; |
2827 +}; |
2696 +}; |
2828 diff --git a/uriloader/exthandler/unix/nsKDERegistry.cpp b/uriloader/exthandler/unix/nsKDERegistry.cpp |
2697 diff --git a/uriloader/exthandler/unix/nsKDERegistry.cpp b/uriloader/exthandler/unix/nsKDERegistry.cpp |
2829 new file mode 100644 |
2698 new file mode 100644 |
2830 --- /dev/null |
2699 --- /dev/null |
2831 +++ b/uriloader/exthandler/unix/nsKDERegistry.cpp |
2700 +++ b/uriloader/exthandler/unix/nsKDERegistry.cpp |
2832 @@ -0,0 +1,119 @@ |
2701 @@ -0,0 +1,86 @@ |
2833 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
2702 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
2834 +/* ***** BEGIN LICENSE BLOCK ***** |
2703 +/* This Source Code Form is subject to the terms of the Mozilla Public |
2835 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
2704 + * License, v. 2.0. If a copy of the MPL was not distributed with this |
2836 + * |
2705 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
2837 + * The contents of this file are subject to the Mozilla Public License Version |
|
2838 + * 1.1 (the "License"); you may not use this file except in compliance with |
|
2839 + * the License. You may obtain a copy of the License at |
|
2840 + * http://www.mozilla.org/MPL/ |
|
2841 + * |
|
2842 + * Software distributed under the License is distributed on an "AS IS" basis, |
|
2843 + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License |
|
2844 + * for the specific language governing rights and limitations under the |
|
2845 + * License. |
|
2846 + * |
|
2847 + * The Original Code is the GNOME helper app implementation. |
|
2848 + * |
|
2849 + * The Initial Developer of the Original Code is |
|
2850 + * IBM Corporation. |
|
2851 + * Portions created by the Initial Developer are Copyright (C) 2003 |
|
2852 + * the Initial Developer. All Rights Reserved. |
|
2853 + * |
|
2854 + * Contributor(s): |
|
2855 + * Brian Ryner <bryner@brianryner.com> (Original Author) |
|
2856 + * |
|
2857 + * Alternatively, the contents of this file may be used under the terms of |
|
2858 + * either the GNU General Public License Version 2 or later (the "GPL"), or |
|
2859 + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), |
|
2860 + * in which case the provisions of the GPL or the LGPL are applicable instead |
|
2861 + * of those above. If you wish to allow use of your version of this file only |
|
2862 + * under the terms of either the GPL or the LGPL, and not to allow others to |
|
2863 + * use your version of this file under the terms of the MPL, indicate your |
|
2864 + * decision by deleting the provisions above and replace them with the notice |
|
2865 + * and other provisions required by the GPL or the LGPL. If you do not delete |
|
2866 + * the provisions above, a recipient may use your version of this file under |
|
2867 + * the terms of any one of the MPL, the GPL or the LGPL. |
|
2868 + * |
|
2869 + * ***** END LICENSE BLOCK ***** */ |
|
2870 + |
2706 + |
2871 +#include "nsKDERegistry.h" |
2707 +#include "nsKDERegistry.h" |
2872 +#include "prlink.h" |
2708 +#include "prlink.h" |
2873 +#include "prmem.h" |
2709 +#include "prmem.h" |
2874 +#include "nsString.h" |
2710 +#include "nsString.h" |
2951 +} |
2787 +} |
2952 diff --git a/uriloader/exthandler/unix/nsKDERegistry.h b/uriloader/exthandler/unix/nsKDERegistry.h |
2788 diff --git a/uriloader/exthandler/unix/nsKDERegistry.h b/uriloader/exthandler/unix/nsKDERegistry.h |
2953 new file mode 100644 |
2789 new file mode 100644 |
2954 --- /dev/null |
2790 --- /dev/null |
2955 +++ b/uriloader/exthandler/unix/nsKDERegistry.h |
2791 +++ b/uriloader/exthandler/unix/nsKDERegistry.h |
2956 @@ -0,0 +1,62 @@ |
2792 @@ -0,0 +1,29 @@ |
2957 +/* ***** BEGIN LICENSE BLOCK ***** |
2793 +/* This Source Code Form is subject to the terms of the Mozilla Public |
2958 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
2794 + * License, v. 2.0. If a copy of the MPL was not distributed with this |
2959 + * |
2795 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
2960 + * The contents of this file are subject to the Mozilla Public License Version |
|
2961 + * 1.1 (the "License"); you may not use this file except in compliance with |
|
2962 + * the License. You may obtain a copy of the License at |
|
2963 + * http://www.mozilla.org/MPL/ |
|
2964 + * |
|
2965 + * Software distributed under the License is distributed on an "AS IS" basis, |
|
2966 + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License |
|
2967 + * for the specific language governing rights and limitations under the |
|
2968 + * License. |
|
2969 + * |
|
2970 + * The Original Code is the GNOME helper app implementation. |
|
2971 + * |
|
2972 + * The Initial Developer of the Original Code is |
|
2973 + * IBM Corporation. |
|
2974 + * Portions created by the Initial Developer are Copyright (C) 2003 |
|
2975 + * the Initial Developer. All Rights Reserved. |
|
2976 + * |
|
2977 + * Contributor(s): |
|
2978 + * Brian Ryner <bryner@brianryner.com> (Original Author) |
|
2979 + * |
|
2980 + * Alternatively, the contents of this file may be used under the terms of |
|
2981 + * either the GNU General Public License Version 2 or later (the "GPL"), or |
|
2982 + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), |
|
2983 + * in which case the provisions of the GPL or the LGPL are applicable instead |
|
2984 + * of those above. If you wish to allow use of your version of this file only |
|
2985 + * under the terms of either the GPL or the LGPL, and not to allow others to |
|
2986 + * use your version of this file under the terms of the MPL, indicate your |
|
2987 + * decision by deleting the provisions above and replace them with the notice |
|
2988 + * and other provisions required by the GPL or the LGPL. If you do not delete |
|
2989 + * the provisions above, a recipient may use your version of this file under |
|
2990 + * the terms of any one of the MPL, the GPL or the LGPL. |
|
2991 + * |
|
2992 + * ***** END LICENSE BLOCK ***** */ |
|
2993 + |
2796 + |
2994 +#include "nsIURI.h" |
2797 +#include "nsIURI.h" |
2995 +#include "nsCOMPtr.h" |
2798 +#include "nsCOMPtr.h" |
2996 +#include "nsTArray.h" |
2799 +#include "nsTArray.h" |
2997 + |
2800 + |
3226 |
3029 |
3227 // Now look up our extensions |
3030 // Now look up our extensions |
3228 diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in |
3031 diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in |
3229 --- a/widget/gtk2/Makefile.in |
3032 --- a/widget/gtk2/Makefile.in |
3230 +++ b/widget/gtk2/Makefile.in |
3033 +++ b/widget/gtk2/Makefile.in |
3231 @@ -105,11 +105,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME=' |
3034 @@ -104,11 +104,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME=' |
3232 |
3035 |
3233 INCLUDES += \ |
3036 INCLUDES += \ |
3234 -I$(srcdir)/../xpwidgets \ |
3037 -I$(srcdir)/../xpwidgets \ |
3235 -I$(srcdir)/../shared \ |
3038 -I$(srcdir)/../shared \ |
3236 -I$(topsrcdir)/layout/generic \ |
3039 -I$(topsrcdir)/layout/generic \ |