aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Get rid of the unneeded convenience callback since no one is try to makeDavid Bordoley2003-05-135-34/+4
* Don't allow to have more than one bookmark with the same URL^H^H^Haddress,Xan Lopez2003-05-137-47/+132
* Fix google smart bookmarks to use utf8Marco Pesenti Gritti2003-05-121-2/+6
* Fix refcount, patch by Christian.Xan Lopez2003-05-111-1/+3
* Show the full page title in tooltip on the tab label. Loosely based on aChristian Persch2003-05-111-15/+25
* *** empty log message ***Marco Pesenti Gritti2003-05-112-0/+173
* UpdateMarco Pesenti Gritti2003-05-112-1/+12
* Small cleanup.Xan Lopez2003-05-111-46/+51
* Alphabetical sort of bookmarks menu elements, fixes #111315. Also createXan Lopez2003-05-113-19/+120
* Use sys language as defaultMarco Pesenti Gritti2003-05-111-0/+1
* Implement security page. Remove some useless hidden prefs in the process.Marco Pesenti Gritti2003-05-102-1/+14
* *** empty log message ***Marco Pesenti Gritti2003-05-101-58/+0
* Rework prefs dialog ui a bit. Remove jumpto and tabbed_popups prefsMarco Pesenti Gritti2003-05-109-1202/+722
* Share signal emission for all dom mouse events, so they dont go out ofMarco Pesenti Gritti2003-05-101-153/+123
* Fix 64 bit problems. Patch from katzj@redhat.com.Christopher Blizzard2003-05-101-2/+2
* Remove unused varMarco Pesenti Gritti2003-05-101-1/+0
* Don't show broken sub-menus for topics that have no children in theLee Willis2003-05-101-0/+12
* s/items/links to match the docs.David Adam Bordoley2003-05-091-1/+1
* Don't set an icon unless their is a favicon. Append a colon onto the labelDavid Adam Bordoley2003-05-091-7/+14
* s/location/address. Fix up mnemonic collisions in the print dialog. MarkDavid Adam Bordoley2003-05-095-23/+26
* Convenience function for displaying help. Remove unneeded include ofDavid Adam Bordoley2003-05-096-71/+31
* Implement the EPHY_NEW_TAB_APPEND_AFTER flag.Christian Persch2003-05-066-8/+138
* Fix memory leak while saving bookmarks, and performance problem duringOsma Ahvenlampi2003-05-064-2/+12
* Better sensitivity updates for historyMarco Pesenti Gritti2003-05-063-66/+141
* If there is only one "toolbar" make it non-removable.David Adam Bordoley2003-05-063-5/+57
* Update (removing toolbars with context menu works again).Marco Pesenti Gritti2003-05-061-15/+43
* Port confirmation dialog for clearing history to new history dialog.Jon Svendsen2003-05-051-2/+88
* Use uri as title when the page is untitled.Christian Persch2003-05-051-1/+21
* ctrl+u view sourceMarco Pesenti Gritti2003-05-051-1/+1
* Hide view menus in the xml, not working.Marco Pesenti Gritti2003-05-041-0/+5
* Search for ui files in the share dirMarco Pesenti Gritti2003-05-043-8/+18
* Do not assert on corrupted xml, just warn. Put back views shadows for now.Marco Pesenti Gritti2003-05-033-1/+5
* Remove old unused sidebar and toolbar config stuff.David Bordoley2003-05-011-1/+0
* Don't set/save window position if it is maximized.David Bordoley2003-05-012-5/+0
* src/ephy-window.c data/epiphany.schemas.inDavid Bordoley2003-04-301-29/+12
* Remove unused variables.David Bordoley2003-04-301-3/+0
* Use ephy_shell_new_tab instead of doing exactly the same work itself.David Bordoley2003-04-301-8/+4
* Respect all the new_tab used flags, drop unused ones. Patch by ChristianXan Lopez2003-04-304-15/+17
* Update go menu to match the default toolbar layout.David Bordoley2003-04-302-4/+6
* We dont need a _remove api, unrefing the node will work better. Try toMarco Pesenti Gritti2003-04-305-7/+57
* Remove add_icon_column func and add the functionality to the normalMarco Pesenti Gritti2003-04-293-30/+64
* Check if the bookmarks bar already contains the dragged bm or topic beforeDavid Bordoley2003-04-291-5/+10
* Move notebook in src/. An abstract notebook is an overkill.Marco Pesenti Gritti2003-04-294-0/+1028
* Consistent use of the term "Bookmarks Bar" in the code, ui and schema.David Bordoley2003-04-287-37/+37
* Actually pass a parent to history/bookmarks window, where to open the url.Marco Pesenti Gritti2003-04-284-19/+35
* Sync toolbar on bookmark properties changes.Marco Pesenti Gritti2003-04-282-29/+99
* Save the position of windows on the screen, and checks if the position isDavid Bordoley2003-04-281-1/+1
* Make the view paned and monitor the state.David Bordoley2003-04-281-12/+15
* Emit removed signal after the node is actually removed. This could causeMarco Pesenti Gritti2003-04-281-47/+73
* Update sensitivity on selection changes. Thanks xan to find this one.Marco Pesenti Gritti2003-04-282-6/+57
* Change the way sensitivity is updated once again. We need to test thisMarco Pesenti Gritti2003-04-271-16/+53
* updateMarco Pesenti Gritti2003-04-274-42/+32
* Update.David Bordoley2003-04-271-1/+20
* Use epiphany logo in about window.Xan Lopez2003-04-271-1/+11
* Update.Marco Pesenti Gritti2003-04-265-40/+207
* Hookup to the response signal instead of using gtk_dialog_run. Prevents usDavid Bordoley2003-04-266-52/+67
* Get back toolbar editing functionalities. More work on the bookmarksMarco Pesenti Gritti2003-04-258-63/+226
* Connect to the "toggled" signal instead of "button_press_event" so thatDavid Bordoley2003-04-251-12/+8
* Commented out the include egg_toolbars_group.h so that it builds.David Bordoley2003-04-251-1/+1
* *** empty log message ***Marco Pesenti Gritti2003-04-252-0/+203
* Update from eggMarco Pesenti Gritti2003-04-257-119/+51
* Always save a page's content if there i content to be saved. Remove theDavid Bordoley2003-04-241-1/+1
* Set spacing between a topic and the arrow to 6px.David Bordoley2003-04-241-1/+1
* Add a down arrow to topics in bm toolbars.David Bordoley2003-04-241-0/+5
* Remove --geometry option, we weren't respecting it anyway (this patchXan Lopez2003-04-243-10/+1
* Use gettext instead of gettext_noop call for g_object_set's thirdChristian Neumair2003-04-241-4/+4
* Use delete key to remove history items.David Bordoley2003-04-222-6/+42
* Revert the bookmarks toolbar implementation. We really need to integrateMarco Pesenti Gritti2003-04-224-430/+0
* Added tooltips to all the actions.David Bordoley2003-04-212-35/+66
* Added back code to clear the location entry. Marco I hope this is ok withDavid Bordoley2003-04-211-0/+15
* Fixed a duplicate seperator. Add a view menu.David Bordoley2003-04-213-36/+50
* *** empty log message ***Marco Pesenti Gritti2003-04-211-1/+0
* Remove unused filesMarco Pesenti Gritti2003-04-213-351/+0
* Allow to add topics, update when changing bookmarks.Marco Pesenti Gritti2003-04-212-16/+163
* Use g_list_free instead of g_free.Xan Lopez2003-04-212-2/+2
* *** empty log message ***Marco Pesenti Gritti2003-04-202-0/+341
* UpdateMarco Pesenti Gritti2003-04-206-29/+102
* Delete and Bookmark page menu.Erich Lesh2003-04-201-4/+66
* Update tabs menu sensitivity when switching.Marco Pesenti Gritti2003-04-201-0/+4
* Update Tabs and Zoom menus sensitivityMarco Pesenti Gritti2003-04-201-0/+48
* Add copy to the bookmark context menu.David Bordoley2003-04-202-13/+183
* Update Edit menu sensitivityMarco Pesenti Gritti2003-04-201-1/+61
* Open view source and copy page next to the current tab, not at the endXan Lopez2003-04-191-3/+9
* Implement clear history. Put favicons near sites names.Marco Pesenti Gritti2003-04-192-0/+29
* Do not install two copies of epiphany.pngMarco Pesenti Gritti2003-04-182-15/+28
* New history dialog implementation. More similar to bookmarks. Yeah itMarco Pesenti Gritti2003-04-1812-1676/+835
* *** empty log message ***Marco Pesenti Gritti2003-04-171-0/+3
* New abstracted implementations. Nicer and will be useful for historyMarco Pesenti Gritti2003-04-1710-2008/+51
* Moved the new_window_orphan signal to EphyEmbedSingle.Dave Camp2003-04-171-1/+1
* Add a way to decide if the view is target. The impl is an hack but we keepMarco Pesenti Gritti2003-04-173-20/+58
* Dont set icon on bookmarks when the url is NULL ! Fix a bad crasher.Marco Pesenti Gritti2003-04-161-7/+8
* "Intelligent" selection in node removal.Xan Lopez2003-04-161-0/+33
* Set sizing of the icon column to GTK_TREE_VIEW_COLUMN_GROW_ONLY.David Bordoley2003-04-161-1/+1
* Fix context menu selection mess, tricky, tricky, tricky. It's all krisMarco Pesenti Gritti2003-04-162-47/+83
* *src/bookmarks/ephy-bookmark-editor.c:David Bordoley2003-04-161-0/+1
* *src/bookmarks/ephy-bookmark-editor.c:David Bordoley2003-04-161-6/+9
* Hidden pref for middle click open url. Default off.Marco Pesenti Gritti2003-04-154-73/+63
* Added a confirmation dialog for clearing history.David Bordoley2003-04-151-4/+68
* Remove some api that was just silly wrappers. Return GtkTreeViewColumn onMarco Pesenti Gritti2003-04-159-46/+37
* Declare all the variables before the first instruction. Fixes aVincent Untz2003-04-153-12/+73
* Added some help buttons to the new bookmark, and properties dialogs.David Bordoley2003-04-152-2/+24
* s/galeon/epiphany ;)Marco Pesenti Gritti2003-04-152-8/+101
* Add a help menu and associated "Contents" and "About" menu entries. Add aDavid Bordoley2003-04-144-10/+59
* Fix leaks. Dont truncate utf8 strings.Marco Pesenti Gritti2003-04-141-15/+14
* Install the script.Marco Pesenti Gritti2003-04-141-0/+1
* Use google feel like for keywordsMarco Pesenti Gritti2003-04-132-3/+50
* *** empty log message ***Marco Pesenti Gritti2003-04-133-3/+24
* We cant assume the favicon is already in the cache.Marco Pesenti Gritti2003-04-091-16/+20
* Allow to launch the BME alone, rework some CORBA code, add a .desktop fileXan Lopez2003-04-096-62/+85
* Add funcs to add/remove focus monitor. Make the code nicer and fix warningMarco Pesenti Gritti2003-04-091-67/+78
* If there exist a favicon for the bookmark, add it to the menu.Johan Dahlin2003-04-091-1/+20
* Update.Marco Pesenti Gritti2003-04-096-10/+117
* Move and autoupdate these from egg.Marco Pesenti Gritti2003-04-081-1/+1
* Typo. Drag url, not title.Christian Persch2003-04-071-1/+1
* Just show the new bookmark dialog, don't go modal.David Bordoley2003-04-066-9/+15
* The callback return a boolean !Marco Pesenti Gritti2003-04-051-1/+3
* Rewrite sensitivity code. Should take in account focus now.Marco Pesenti Gritti2003-04-055-95/+107
* Have a decent size for popups that doesnt specify it. Do not allow to dragMarco Pesenti Gritti2003-04-053-6/+39
* Set drag source on the event box, to avoid conflicts with toolbars dragChristian Persch2003-04-052-31/+37
* Use EggEditableToolbar. Update to latest versions (not EggMenuMerge, weMarco Pesenti Gritti2003-04-024-28/+25
* Marco-is-silly-patch. Update to latest version of the favicons patch.Christian Persch2003-04-022-4/+4
* Show favicons on tabsChristian Persch2003-04-013-21/+67
* Added place holders for help text for preferences dialog added code toPatanjali Somayaji2003-04-012-1/+50
* Update to reflect changes in EphyTopicSelector api. Wrap the topicDavid Bordoley2003-03-317-152/+121
* Use hotkeys to navigate around the dialog.David Bordoley2003-03-304-44/+72
* More sensitive stuff.Xan Lopez2003-03-301-20/+58
* Do not update menus on unselect.Xan Lopez2003-03-301-19/+13
* Add alt+s mneumonic to the search box and activate it.David Bordoley2003-03-301-9/+13
* Fix warning.Xan Lopez2003-03-301-0/+2
* Make dnd code smarter, so it can support more than just urls types.Marco Pesenti Gritti2003-03-306-40/+244
* Implement topics menu. TODO: All should generate the crappy bookmarksMarco Pesenti Gritti2003-03-291-14/+75
* Makes Delete and Rename menu entries in the BME unsensitive under theXan Lopez2003-03-291-0/+57
* Use the same key_press callback for both the topics and bm's view.David Bordoley2003-03-292-30/+45
* Fix warning.Xan Lopez2003-03-281-1/+1
* Reorganize the menus a bit. Unifiy topic/bookmarks rename/delete items.David Bordoley2003-03-274-49/+204
* Added help support, help manual and scrollkeeper updatesPatanjali Somayaji2003-03-271-1/+27
* Make ids privateMarco Pesenti Gritti2003-03-269-102/+447
* Fix compilation with -WerrorXan Lopez2003-03-261-0/+2
* Missing bits from old commit.Xan Lopez2003-03-251-2/+13
* Fix to use the new apiMarco Pesenti Gritti2003-03-251-8/+28
* Insensitive case ordering of strings.Xan Lopez2003-03-251-6/+7
* fix a warningMarco Pesenti Gritti2003-03-251-0/+1
* Dont put special keywords in the topics list. Use ephy-state for size ofMarco Pesenti Gritti2003-03-258-25/+41
* New epiphany-bookmark-page stock image. I'm not at all attached to thisDavid Bordoley2003-03-256-7/+90
* Fix warning.Xan Lopez2003-03-251-0/+1
* s/EPHY_NODE_KEYWORD_PROP_ALL_PRIORITY/EPHY_NODE_KEYWORD_PROP_PRIORITY/ AddXan Lopez2003-03-255-14/+29
* Fix warning opening selector. Destroy the editor on exit, ref the shell soMarco Pesenti Gritti2003-03-253-0/+66
* Add close to the file menu. Add some keybindings.David Bordoley2003-03-241-5/+5
* Use the ephy-bookmarks.png for the window icon.David Bordoley2003-03-241-0/+3
* Some ground work on the PRIORITY property, change it from bool to int, addXan Lopez2003-03-244-7/+29
* Complete implementation of the editor functionalities.Marco Pesenti Gritti2003-03-235-6/+149
* Fix right click selection logic.Xan Lopez2003-03-231-3/+18
* Never destroy but hide the bme. Present the window on activate. Allow toMarco Pesenti Gritti2003-03-233-17/+71
* Some more bookmarks work ...Marco Pesenti Gritti2003-03-227-91/+141
* Begin bookmarks editor redesign. Please still dont use it or you reallyMarco Pesenti Gritti2003-03-2211-385/+856
* Cleanup: get active tab using the functionMarco Pesenti Gritti2003-03-221-2/+5
* Reimplement ephystate using xml and make it easier to use. -> remove someMarco Pesenti Gritti2003-03-193-57/+9
* Cleanup filepicker api behavior. Put pdm buttons in a size group, to makeMarco Pesenti Gritti2003-03-172-2/+29
* Fix Warning.Xan Lopez2003-03-161-1/+1
* Put the bookmark view in hinted mode. Fix multiple selection actions inXan Lopez2003-03-163-1/+17
* Fix leak and a double freeChristian Persch2003-03-151-0/+2
* Add Application NameXan Lopez2003-03-151-0/+1
* More cleaner way of length calculation from previous commit.Xan Lopez2003-03-101-1/+1
* Properly autocomplete when topics have national characters, fix #107685Xan Lopez2003-03-101-7/+6
* s/Keywords/Topics/Xan Lopez2003-03-092-3/+3
* Code cleanup from galeonMarco Pesenti Gritti2003-03-091-1/+1
* Add a stock icon for entry box so that it has an icon in the tbe.David Bordoley2003-03-081-0/+2
* New toolbar action so that the "Go" button is always text only. RemovedDavid Bordoley2003-03-075-5/+173
* Try to handle better editing/multiple selectionMarco Pesenti Gritti2003-03-061-12/+16
* Translate menusMarco Pesenti Gritti2003-03-054-3/+16
* about:options and about:epiphanyMarco Pesenti Gritti2003-03-045-295/+19
* Fix 105990.Xan Lopez2003-03-011-0/+25
* Fix embed dialog to pass a good EphyEmbed when the initial one has beenMarco Pesenti Gritti2003-03-011-0/+5
* Remove old toolbar editor uiMarco Pesenti Gritti2003-03-013-7/+31
* fix compilationMarco Pesenti Gritti2003-02-281-8/+10
* Typo.Xan Lopez2003-02-271-1/+1
* BE auto sort.Xan Lopez2003-02-266-3/+111
* Make tbe a normal dialog for now.Marco Pesenti Gritti2003-02-261-1/+2
* Remove an hack used to work around a fixed combo problemMarco Pesenti Gritti2003-02-262-8/+1
* Revert unwanted checkinMarco Pesenti Gritti2003-02-231-5/+0
* Update location entry with the urls selected on the drop down. ImplementMarco Pesenti Gritti2003-02-234-4/+32
* Dont create duped actions, fix crash on exitMarco Pesenti Gritti2003-02-221-19/+18
* Add lots of debug code to solve these damned crashes. Dont create multipleMarco Pesenti Gritti2003-02-211-7/+8
* History go to button.Xan Lopez2003-02-211-3/+50
* Dont crash when dragging a new bookmark on the toolbar and then clickMarco Pesenti Gritti2003-02-211-3/+8
* Dont have a separate context menu for copy, just put it inside theMarco Pesenti Gritti2003-02-204-41/+0
* data/ui/epiphany-bookmark-editor-ui.xml.inDave Bordoley2003-02-191-5/+5
* src/ephy-window.c Fix mneumonic collision between back and bookmarks.Dave Bordoley2003-02-161-1/+1
* data/ui/epiphany-toolbar.xml.in data/ui/epiphany-ui.xml.inDave Bordoley2003-02-165-22/+22
* Implement a selected text context menu.Marco Pesenti Gritti2003-02-151-1/+11
* src/ephy-window.c src/window-commands.c src/window-commands.hDave Bordoley2003-02-153-1/+14
* Add tab load notification (a little spinning icon), and a context menu forJames Willcox2003-02-151-0/+137
* data/ui/epiphany-ui.xml.in Added some separators. Changed "bookmark" verbsDave Bordoley2003-02-145-37/+37
* + 2003-02-13 Lee Willis <lwillis@plus.net>Marco Pesenti Gritti2003-02-141-1/+1
* *** empty log message ***Dave Bordoley2003-02-141-1/+1
* Make "Go to" button insensitive when no bookmark is selected.Xan Lopez2003-02-141-1/+10
* Fix a heap corruption bug that was causing bad stuff when smart bookmarksJames Willcox2003-02-142-3/+1
* Fix default size, remove some unnecessary spacesMarco Pesenti Gritti2003-02-131-6/+6
* Add "Go to" button to the BE.Xan Lopez2003-02-131-4/+33
* *** empty log message ***Marco Pesenti Gritti2003-02-134-103/+56
* Make the bookmarks editor properly select the "All" keyword if it was theJames Willcox2003-02-111-1/+1
* Remove Location field from BE bookmarks view, add a location entryXan Lopez2003-02-113-18/+43
* Have just one Close menu item and make it behave like other gnome apps.Marco Pesenti Gritti2003-02-101-2/+2
* Have just one Close menu item and make it behave like other gnome apps.Marco Pesenti Gritti2003-02-103-18/+5
* Make nautilus view actually workMarco Pesenti Gritti2003-02-102-2/+6
* Changed GtkType to GType.Christian Meyer2003-02-095-5/+5
* Error handling in moz bookmarks import.Xan Lopez2003-02-091-8/+18
* Fix some i18n problemsMarco Pesenti Gritti2003-02-081-6/+6
* Add a go button to the toolbar editor. The icon is duped with defaultMarco Pesenti Gritti2003-02-083-0/+27
* Better toolbar appeareance. More clear buttons labels on resume dialog.Marco Pesenti Gritti2003-02-081-1/+2
* Make the bookmarks editor not crash-on-close if no keyword is selected.James Willcox2003-02-081-0/+7
* *** empty log message ***Marco Pesenti Gritti2003-02-081-9/+9
* Fix two memleaks (I hope).Xan Lopez2003-02-081-1/+1
* Make the bookmarks editor remember the last selected keyword, and makeJames Willcox2003-02-073-1/+65
* Do not use a button for spinner. Correctly update spinner size for toolbarMarco Pesenti Gritti2003-02-061-8/+39
* Clear also location history when clearing history. Doesnt updateMarco Pesenti Gritti2003-02-063-0/+32
* Make importing actually work properly. *cough*James Willcox2003-02-061-17/+2
* Added the ability to import galeon and konqueror bookmarks.James Willcox2003-02-063-1/+221
* *** empty log message ***Marco Pesenti Gritti2003-02-069-44/+85
* Fix back/forward accels. Add startup feedback.Marco Pesenti Gritti2003-02-051-3/+3
* Set proper title in bookmarks editor window.Xan Lopez2003-02-051-0/+2
* Fix several menu accels I borked when porting to egg. Connect drag sourceMarco Pesenti Gritti2003-02-052-9/+9
* Add some icons, thanks to jorn to provide them. last api change seem toMarco Pesenti Gritti2003-02-031-3/+3
* Make favorites really work and avoid they crash when closing window, 0.5Marco Pesenti Gritti2003-02-012-2/+3
* Add icons, fix some minor appeareance stuff, rework ui updating to dealMarco Pesenti Gritti2003-01-311-4/+5
* Allow to drag also normal urls in the toolbars. Commit some fixes I did toMarco Pesenti Gritti2003-01-306-21/+84
* Fix bookmarks/smart bookmarks add to the toolbars.Marco Pesenti Gritti2003-01-301-7/+0
* Complete (or nearly) toolbar editor implementation. Bookmarks areMarco Pesenti Gritti2003-01-304-39/+80
* Changed copyright notice in about dialog (src/window-commands.c).Christian Neumair2003-01-291-6/+2
* Reimplement data using GNode, cleaner. Give up on "autoapply" for now, gtkMarco Pesenti Gritti2003-01-291-7/+0
* Implement dragging from the editor. It's stilly buggy but I didnt expectMarco Pesenti Gritti2003-01-283-7/+6
* *** empty log message ***Marco Pesenti Gritti2003-01-263-0/+16
* Complete bookmark action implementation (with smb too)Marco Pesenti Gritti2003-01-263-10/+213
* Implement the data part of the toolbar editor. Partial implementation ofMarco Pesenti Gritti2003-01-247-18/+306
* *** empty log message ***Marco Pesenti Gritti2003-01-232-0/+353
* Reimplement encoding menus. Work around eggmenu finalization problems. FixMarco Pesenti Gritti2003-01-235-22/+20
* Fix autocompletion to not show duped entries. Complete print preview impl.Marco Pesenti Gritti2003-01-235-36/+75
* Fix chromesMarco Pesenti Gritti2003-01-226-22/+100
* hmmmMarco Pesenti Gritti2003-01-211-1/+0
* *** empty log message ***Marco Pesenti Gritti2003-01-211-0/+2
* Api changes.Marco Pesenti Gritti2003-01-212-8/+4
* Set stop button sensitivityMarco Pesenti Gritti2003-01-211-0/+2
* Fix a stupid mistake porting galeon changes, no more freeze.Marco Pesenti Gritti2003-01-212-4/+27
* Merge eog-menu-api branchMarco Pesenti Gritti2003-01-2130-2612/+2447
* Port several leaks fixes from galeon.Marco Pesenti Gritti2003-01-209-34/+37
* Dont crash when schemas installed incorrectlyMarco Pesenti Gritti2003-01-141-0/+1
* Use the title also for hosts in history. Cleanup hosts matching code aMarco Pesenti Gritti2003-01-142-2/+2
* Use favicons in bookmarks. Use titles for session history when possible.Marco Pesenti Gritti2003-01-1312-3/+118
* correctly update window icon when the page doesnt specify any favicon url.Marco Pesenti Gritti2003-01-131-2/+2
* 2003-01-12 Marco Pesenti Gritti <marco@it.gnome.org>Marco Pesenti Gritti2003-01-1212-90/+54