Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/mozilla-firefox/patches/mozilla-firefox-3.0.6-embed-typeaheadfind.patch

    Contents of /trunk/mozilla-firefox/patches/mozilla-firefox-3.0.6-embed-typeaheadfind.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 809 - (show annotations) (download)
    Tue May 12 22:39:29 2009 UTC (15 years ago) by niro
    File size: 8577 byte(s) 
    re-diffed
    1 --- extensions/typeaheadfind/src/Makefile.in.orig 2007-06-19 22:55:23.000000000 +0200
    2 +++ extensions/typeaheadfind/src/Makefile.in 2007-06-19 22:58:33.000000000 +0200
    3 @@ -46,8 +46,7 @@
    4 ifneq ($(OS_ARCH),WINNT)
    5 SHORT_LIBNAME = typahead
    6 endif
    7 -GRE_MODULE = 1
    8 -MOZILLA_INTERNAL_API = 1
    9 +LIBXUL_LIBRARY = 1
    10
    11 PACKAGE_FILE = typeaheadfind.pkg
    12
    13 @@ -84,9 +83,6 @@
    14 nsTypeAheadFindRegistration.cpp \
    15 $(NULL)
    16
    17 -EXTRA_DSO_LIBS = \
    18 - gkgfx \
    19 - $(NULL)
    20
    21 EXTRA_DSO_LDOPTS += \
    22 $(LIBS_DIR) \
    23 --- extensions/typeaheadfind/public/nsITypeAheadFind.idl 2007-08-05 20:29:55.000000000 +0200
    24 +++ /dev/null 2007-08-04 01:52:23.948566729 +0200
    25 @@ -1,88 +0,0 @@
    26 -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
    27 -/* ***** BEGIN LICENSE BLOCK *****
    28 - * Version: MPL 1.1/GPL 2.0/LGPL 2.1
    29 - *
    30 - * The contents of this file are subject to the Mozilla Public License Version
    31 - * 1.1 (the "License"); you may not use this file except in compliance with
    32 - * the License. You may obtain a copy of the License at
    33 - * http://www.mozilla.org/MPL/
    34 - *
    35 - * Software distributed under the License is distributed on an "AS IS" basis,
    36 - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
    37 - * for the specific language governing rights and limitations under the
    38 - * License.
    39 - *
    40 - * The Original Code is mozilla.org code.
    41 - *
    42 - * The Initial Developer of the Original Code is
    43 - * Netscape Communications Corporation.
    44 - * Portions created by the Initial Developer are Copyright (C) 1998
    45 - * the Initial Developer. All Rights Reserved.
    46 - *
    47 - * Contributor(s):
    48 - * Original Author: Aaron Leventhal (aaronl@netscape.com)
    49 - *
    50 - * Alternatively, the contents of this file may be used under the terms of
    51 - * either the GNU General Public License Version 2 or later (the "GPL"), or
    52 - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
    53 - * in which case the provisions of the GPL or the LGPL are applicable instead
    54 - * of those above. If you wish to allow use of your version of this file only
    55 - * under the terms of either the GPL or the LGPL, and not to allow others to
    56 - * use your version of this file under the terms of the MPL, indicate your
    57 - * decision by deleting the provisions above and replace them with the notice
    58 - * and other provisions required by the GPL or the LGPL. If you do not delete
    59 - * the provisions above, a recipient may use your version of this file under
    60 - * the terms of any one of the MPL, the GPL or the LGPL.
    61 - *
    62 - * ***** END LICENSE BLOCK ***** */
    63 -
    64 -#include "nsISupports.idl"
    65 -#include "domstubs.idl"
    66 -#include "nsISupportsPrimitives.idl"
    67 -
    68 -%{ C++
    69 - #include "nsIDOMEvent.h"
    70 -
    71 - #define NS_TYPEAHEADFIND_CID \
    72 - {0x46590685, 0xbc00, 0x4aac, {0xab, 0xed, 0x2c, 0x10, 0xa5, 0xb9, 0x45, 0xa4}}
    73 -
    74 - #define NS_TYPEAHEADFIND_CONTRACTID "@mozilla.org/suitetypeaheadfind;1"
    75 -%}
    76 -
    77 -interface nsIDOMEvent;
    78 -
    79 -[scriptable, uuid(AD1C62CC-72F4-4c5b-BE78-503854F9E0D8)]
    80 -interface nsISuiteTypeAheadFind : nsISupports
    81 -{
    82 - /** Is type ahead find mode currently on? */
    83 - readonly attribute boolean isActive;
    84 -
    85 - /** Manually start type ahead find mode */
    86 - void startNewFind(in nsIDOMWindow aWindow, in boolean aLinksOnly);
    87 -
    88 - /** Manually cancel type ahead find mode */
    89 - void cancelFind();
    90 -
    91 - /**
    92 - * Will find as you type start automatically if the user
    93 - * types with the focus on page content other than a textfield or select?
    94 - * If autostart is off, the startNewFind() method can be used to enact
    95 - * type ahead find, as well as cmd_findTypeLinks or cmd_findTypeText.
    96 - */
    97 - void setAutoStart(in nsIDOMWindow aWindow, in boolean aIsAutoStartOn);
    98 - boolean getAutoStart(in nsIDOMWindow aWindow);
    99 -
    100 - /**
    101 - * Find next recurrence if typeaheadfind was the last used find,
    102 - * as opposed to regular find. Returns false in nsISupportsPRBool if we
    103 - * don't handle the request.
    104 - */
    105 - void findNext(in boolean aReverse, in nsISupportsInterfacePointer aCallerWindowSupports);
    106 -
    107 - /*
    108 - * Go back and remove one character from find string
    109 - * Returns true if backspace used
    110 - */
    111 - boolean backOneChar();
    112 -};
    113 -
    114 --- /dev/null 2007-08-04 01:52:23.948566729 +0200
    115 +++ extensions/typeaheadfind/public/nsISuiteTypeAheadFind.idl 2007-08-05 20:07:55.000000000 +0200
    116 @@ -0,0 +1,88 @@
    117 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
    118 +/* ***** BEGIN LICENSE BLOCK *****
    119 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
    120 + *
    121 + * The contents of this file are subject to the Mozilla Public License Version
    122 + * 1.1 (the "License"); you may not use this file except in compliance with
    123 + * the License. You may obtain a copy of the License at
    124 + * http://www.mozilla.org/MPL/
    125 + *
    126 + * Software distributed under the License is distributed on an "AS IS" basis,
    127 + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
    128 + * for the specific language governing rights and limitations under the
    129 + * License.
    130 + *
    131 + * The Original Code is mozilla.org code.
    132 + *
    133 + * The Initial Developer of the Original Code is
    134 + * Netscape Communications Corporation.
    135 + * Portions created by the Initial Developer are Copyright (C) 1998
    136 + * the Initial Developer. All Rights Reserved.
    137 + *
    138 + * Contributor(s):
    139 + * Original Author: Aaron Leventhal (aaronl@netscape.com)
    140 + *
    141 + * Alternatively, the contents of this file may be used under the terms of
    142 + * either the GNU General Public License Version 2 or later (the "GPL"), or
    143 + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
    144 + * in which case the provisions of the GPL or the LGPL are applicable instead
    145 + * of those above. If you wish to allow use of your version of this file only
    146 + * under the terms of either the GPL or the LGPL, and not to allow others to
    147 + * use your version of this file under the terms of the MPL, indicate your
    148 + * decision by deleting the provisions above and replace them with the notice
    149 + * and other provisions required by the GPL or the LGPL. If you do not delete
    150 + * the provisions above, a recipient may use your version of this file under
    151 + * the terms of any one of the MPL, the GPL or the LGPL.
    152 + *
    153 + * ***** END LICENSE BLOCK ***** */
    154 +
    155 +#include "nsISupports.idl"
    156 +#include "domstubs.idl"
    157 +#include "nsISupportsPrimitives.idl"
    158 +
    159 +%{ C++
    160 + #include "nsIDOMEvent.h"
    161 +
    162 + #define NS_TYPEAHEADFIND_CID \
    163 + {0x46590685, 0xbc00, 0x4aac, {0xab, 0xed, 0x2c, 0x10, 0xa5, 0xb9, 0x45, 0xa4}}
    164 +
    165 + #define NS_TYPEAHEADFIND_CONTRACTID "@mozilla.org/suitetypeaheadfind;1"
    166 +%}
    167 +
    168 +interface nsIDOMEvent;
    169 +
    170 +[scriptable, uuid(AD1C62CC-72F4-4c5b-BE78-503854F9E0D8)]
    171 +interface nsISuiteTypeAheadFind : nsISupports
    172 +{
    173 + /** Is type ahead find mode currently on? */
    174 + readonly attribute boolean isActive;
    175 +
    176 + /** Manually start type ahead find mode */
    177 + void startNewFind(in nsIDOMWindow aWindow, in boolean aLinksOnly);
    178 +
    179 + /** Manually cancel type ahead find mode */
    180 + void cancelFind();
    181 +
    182 + /**
    183 + * Will find as you type start automatically if the user
    184 + * types with the focus on page content other than a textfield or select?
    185 + * If autostart is off, the startNewFind() method can be used to enact
    186 + * type ahead find, as well as cmd_findTypeLinks or cmd_findTypeText.
    187 + */
    188 + void setAutoStart(in nsIDOMWindow aWindow, in boolean aIsAutoStartOn);
    189 + boolean getAutoStart(in nsIDOMWindow aWindow);
    190 +
    191 + /**
    192 + * Find next recurrence if typeaheadfind was the last used find,
    193 + * as opposed to regular find. Returns false in nsISupportsPRBool if we
    194 + * don't handle the request.
    195 + */
    196 + void findNext(in boolean aReverse, in nsISupportsInterfacePointer aCallerWindowSupports);
    197 +
    198 + /*
    199 + * Go back and remove one character from find string
    200 + * Returns true if backspace used
    201 + */
    202 + boolean backOneChar();
    203 +};
    204 +
    205 --- extensions/typeaheadfind/src/nsTypeAheadFind.h.orig 2007-08-05 20:27:01.000000000 +0200
    206 +++ extensions/typeaheadfind/src/nsTypeAheadFind.h 2007-08-05 20:27:12.000000000 +0200
    207 @@ -60,7 +60,7 @@
    208 #include "nsIDOMRange.h"
    209 #include "nsIDOMWindow.h"
    210 #include "nsIDocShellTreeItem.h"
    211 -#include "nsITypeAheadFind.h"
    212 +#include "nsISuiteTypeAheadFind.h"
    213 #include "nsIStringBundle.h"
    214 #include "nsISupportsArray.h"
    215 #include "nsISound.h"
    216 --- extensions/typeaheadfind/public/Makefile.in.orig 2008-02-09 15:11:25.000000000 +0100
    217 +++ extensions/typeaheadfind/public/Makefile.in 2008-02-09 15:12:54.000000000 +0100
    218 @@ -45,6 +45,6 @@
    219 XPIDL_MODULE=suitetypeaheadfind
    220 GRE_MODULE = 1
    221
    222 -XPIDLSRCS = nsITypeAheadFind.idl
    223 +XPIDLSRCS = nsISuiteTypeAheadFind.idl
    224
    225 include $(topsrcdir)/config/rules.mk