aboutsummaryrefslogtreecommitdiffstats
path: root/embed
Commit message (Expand)AuthorAgeFilesLines
* ephy-web-view: factor statusbar drawing code out of expose handlerXan Lopez2010-05-231-39/+47
* ephy-web-view: add a bit of padding to the statusbarXan Lopez2010-05-231-12/+17
* Update the status message from within the EphyWebViewXan Lopez2010-05-191-0/+24
* Do not hardcode the statusbar context descriptionsXan Lopez2010-05-191-0/+3
* Use a chromium-like status bar by defaultXan Lopez2010-05-192-61/+325
* Fix crash when trying to load URIs with no pathGustavo Noronha Silva2010-05-171-1/+1
* ephy-embed-single: remove add_sidebar signalDiego Escalante Urrelo2010-05-142-24/+0
* Do not consider dots in directory names when looking for the extension of a f...Sergio Villar Senin2010-05-051-1/+3
* Handle the WEBKIT_NETWORK_ERROR_CANCELLED failAlejandro G. Castro2010-05-041-1/+9
* Handle LOAD_FAILED statusAlejandro G. Castro2010-05-041-0/+36
* Fix title modification in provisional stateAlejandro G. Castro2010-05-041-3/+5
* ephy-embed: add FIXME about redirects and EphyHistoryXan Lopez2010-05-041-0/+2
* ephy-web-view: fix compiler warningXan Lopez2010-05-041-1/+1
* Remove obsolete get_type function from headerXan Lopez2010-05-031-1/+0
* Emit a signal when loading the homepageXan Lopez2010-05-031-12/+29
* Move homepage loading code to EphyWebViewXan Lopez2010-05-032-0/+33
* Move helper function into ephy-embed-utils.cXan Lopez2010-05-032-0/+16
* Move link message updating to EphyWebViewXan Lopez2010-05-032-10/+10
* Move URI handling to EphyWebViewXan Lopez2010-05-032-21/+21
* Move title update to EphyWebViewXan Lopez2010-05-032-24/+35
* Refactored the load status callback of ephy-web-view.cAlejandro G. Castro2010-05-033-201/+113
* Removed the EphyWebViewNetState enumAlejandro G. Castro2010-05-023-52/+12
* docs: missing comment in ephy-favicon-cacheDiego Escalante Urrelo2010-04-241-2/+2
* Make sure WebKitWebHistory is cleared when cleared EphyHistoryMario Sanchez Prada2010-04-203-26/+72
* Send 'Referer' on headers sent for context menu HTTP downloadsMario Sanchez Prada2010-04-171-1/+30
* Check if URL is NULL before setting its history titleJose Millan Soto2010-04-071-0/+1
* Ignore case of URL schemesJose Millan Soto2010-04-071-9/+14
* Improve page print implementationJose Millan Soto2010-04-072-13/+32
* Only offer to open files with safe mime typesOlivier Tilloy2010-03-261-0/+1
* downloader-view: stay alive until notifications are goneDiego Escalante Urrelo2010-03-161-65/+69
* downloader-view: change lifetime logicDiego Escalante Urrelo2010-03-161-5/+11
* downloader-view: use update_download_row correctly on addDiego Escalante Urrelo2010-03-161-2/+8
* downloader-view: hide the view when last download finishesDiego Escalante Urrelo2010-03-161-0/+11
* downloader-view: use g_object_get not get_propertyDiego Escalante Urrelo2010-03-161-6/+3
* downloader-view: properly disconnect signalsDiego Escalante Urrelo2010-03-161-4/+21
* downloader-view: fix controls sensitivityDiego Escalante Urrelo2010-03-161-1/+2
* downloader-view: make status icon visible on showDiego Escalante Urrelo2010-03-161-0/+2
* Handle EPHY_EMBED_PERSIST_NO_VIEW flagDiego Escalante Urrelo2010-03-091-0/+19
* Remove download only after showing its notificationDiego Escalante Urrelo2010-03-091-1/+1
* downloader-view: handle DOWNLOAD_ACTION_DOWNLOAD actionDiego Escalante Urrelo2010-03-091-0/+2
* Inspect type property when hooking to login formsDiego Escalante Urrelo2010-03-091-1/+2
* ephy-web-view: add js_get_element_propertyDiego Escalante Urrelo2010-03-091-0/+15
* Correctly handle shit+click only in ephy-windowDiego Escalante Urrelo2010-02-261-4/+0
* Fix last patch to account for changes in soup API, and bump required version2.29.91Gustavo Noronha Silva2010-02-231-1/+1
* Report broken certs through the padlock iconGustavo Noronha Silva2010-02-232-8/+36
* Change 'Enable Java' setting to 'Enable Plugins'Xan Lopez2010-02-202-2/+5
* Make sure the strings are initialized to NULLGustavo Noronha Silva2010-02-191-4/+4
* ephy-embed: don't use g_signal_connect_objectDiego Escalante Urrelo2010-02-181-14/+24
* ephy-web-view: be precise in what modifiers to catchDiego Escalante Urrelo2010-02-171-4/+8
* Random formatting fixesDiego Escalante Urrelo2010-02-171-14/+14
* Enable window auto resize/move.Xan Lopez2010-02-161-0/+1
* Use correct UTF8 length when converting JSStringsDiego Escalante Urrelo2010-02-151-1/+1
* downloader-view: current-size is guint64 not gint64Diego Escalante Urrelo2010-02-121-1/+1
* ephy-web-view: fix password storageXan Lopez2010-02-101-4/+4
* ephy-embed-prefs: reenable page cache by defaultXan Lopez2010-02-091-1/+1
* Implemented print previewJose Millan Soto2010-02-093-52/+41
* ephy-embed-prefs: disable the cache page for nowXan Lopez2010-02-091-1/+1
* Check for null/empty username and password before saving to gnome-keyringEstêvão Samuel Procópio2010-02-071-12/+17
* Using webkit_web_view_get_uri instead of js_get_domain_and_pathEstêvão Samuel Procópio2010-02-071-88/+24
* Make SoupCookieJarAcceptPolicy match our cookie policiesXan Lopez2010-02-054-5/+70
* ephy-embed: comment typoDiego Escalante Urrelo2010-02-021-1/+1
* Implement EphyEmbedPersist using WebKitDownloadDiego Escalante Urrelo2010-01-301-4/+188
* ephy-web-view.c: allow all windows to be closed by JSactual-2.29.6Xan Lopez2010-01-261-1/+8
* Enable page cache for real, now.Gustavo Noronha Silva2010-01-221-0/+1
* Escape the name of resources before saving themDiego Escalante Urrelo2010-01-211-4/+6
* Rename a variable to make its relation obviousDiego Escalante Urrelo2010-01-211-15/+15
* ephy-web-view: plug leaks in ephy_web_view_saveDiego Escalante Urrelo2010-01-211-8/+11
* Ask for confirmation when replacing files, in save asJorge Kalmbach2010-01-211-4/+6
* Disable page cache - I committed it by mistakeGustavo Noronha Silva2010-01-161-1/+0
* Remove error handling work-aroundsGustavo Noronha Silva2010-01-162-31/+22
* Remove legacy fields in EphyEmbedPersistDiego Escalante Urrelo2010-01-141-7/+0
* Improve infobar text a bitDiego Escalante Urrelo2010-01-121-3/+12
* Rename EphyWebView::ge-new-window to EphyWebView::new-windowXan Lopez2010-01-091-8/+8
* Don't omit notifications for downloadsDiego Escalante Urrelo2009-12-301-24/+11
* Implement replace action for downloadsDiego Escalante Urrelo2009-12-302-20/+81
* downloader-view: fix wrong return typeDiego Escalante Urrelo2009-12-301-1/+3
* Minor style fixes in downloads code.Diego Escalante Urrelo2009-12-302-5/+7
* ephy-embed: fix download button actionDiego Escalante Urrelo2009-12-301-0/+8
* ephy-embed: minor style fixDiego Escalante Urrelo2009-12-291-2/+1
* Enable mime type safety check in downloadsDiego Escalante Urrelo2009-12-291-0/+1
* Reimplement window.closeXan Lopez2009-12-261-0/+18
* Copy WebKitWebHistoryItem objectsGustavo Noronha Silva2009-12-211-1/+2
* ephy-embed-prefs: enable quirks mode by defaultXan Lopez2009-12-211-0/+1
* Restrict number of password infobars to oneGustavo Noronha Silva2009-12-201-0/+13
* Finish porting the favicon cache to WebKitDownloadGustavo Noronha Silva2009-12-201-5/+5
* Add custom user-agent supportVincent Untz2009-12-192-1/+88
* Properly manage the list of languages for the "Accept-Language" headerMario Sanchez Prada2009-12-191-1/+56
* Make form code safe against unnamed password/username elementsBenjamin Otte2009-12-181-2/+7
* Restore download on shift-click functionalityGustavo Noronha Silva2009-12-183-2/+23
* Make Ctrl-rightclick always display the browser keyboardGustavo Noronha Silva2009-12-181-0/+11
* docs: ephy-web-viewDiego Escalante Urrelo2009-12-182-27/+185
* ephy-web-view: add missing includeDiego Escalante Urrelo2009-12-181-0/+1
* ephy-web-view.c: use NULL-safe str compare functionXan Lopez2009-12-181-1/+1
* Use the new top-widget infrastructure to ask whether to store passwordsGustavo Noronha Silva2009-12-171-19/+190
* Make it possible to add arbitrary widgets above the WebViewGustavo Noronha Silva2009-12-172-3/+93
* Make EphyEmbed inherit from GtkVBox instead of GtkScrolledWindowGustavo Noronha Silva2009-12-174-11/+19
* Allow dialog buttons be the defaultBenjamin Otte2009-12-171-0/+1
* ephy-web-view: do not auto-fill passwords when using a private profileXan Lopez2009-12-161-3/+3
* Emitting ge-feed-link signal for rss extensionEstêvão Samuel Procópio2009-12-161-0/+93
* Implement the actual form authentication saving and pre-fillingGustavo Noronha Silva2009-12-162-0/+517
* ephy-embed-single: add a function to update the form auth cache with a new entryXan Lopez2009-12-152-12/+47
* ephy-embed-single: add a function to get the form auth data for a URIXan Lopez2009-12-152-13/+45
* ephy-embed-single: cache form auth dataXan Lopez2009-12-151-0/+153
* Let web pages handle mouse clicks before doing our own handlingGustavo Noronha Silva2009-12-141-1/+4
* ephy-web-view: url-decode javascript URIs before executing themXan Lopez2009-12-141-3/+7
* ephy-web-view: do not set favicon when we have no addressNguyen Thai Ngoc Duy2009-12-121-1/+1
* ephy-web-view: get rid of 'icon-address' propertyXan Lopez2009-12-112-85/+48
* ephy-web-view.h: remove old signal from class structXan Lopez2009-12-111-2/+0
* Remove the 'favicon' signal from EphyWebViewXan Lopez2009-12-113-29/+1
* Make the favicon cache work on top of new WebKit API, and WebKitDownloadGustavo Noronha Silva2009-12-103-57/+54
* Add gconf key to control the search engine used in auto-searchCarl van Tonder2009-12-091-2/+14
* Use new WebKit API to respect the Content-Disposition headerGustavo Noronha Silva2009-12-091-1/+29
* Get rid of 'ge-document-type' signalXan Lopez2009-12-082-88/+60
* ephy-web-view: fix typoXan Lopez2009-12-081-1/+1
* ephy-embed: consider text/plain pages as document-type HTMLXan Lopez2009-12-081-2/+3
* docs: nitpick in ephy-web-viewDiego Escalante Urrelo2009-12-031-1/+1
* docs: ephy-web-view missing @view descriptionsDiego Escalante Urrelo2009-12-031-15/+15
* ephy-web-view: formatting nitpickDiego Escalante Urrelo2009-12-031-8/+8
* ephy-embed: reimplent EphyEmbedSingle 'handle-content' signalXan Lopez2009-12-031-1/+13
* ephy-web-view.c: fix auto-google search when using Ctrl-EnterXan Lopez2009-11-301-26/+34
* Add GObject introspection annotations to more functionsIain Nicol2009-11-231-0/+5
* ephy-embed: only fetch the document type for a page from the main frameXan Lopez2009-11-191-16/+19
* Add GObject introspection annotations to many *_get_* functionsIain Nicol2009-11-186-13/+71
* Initialize ephy_web_view_get_security_level's output param "description"Iain Nicol2009-10-301-2/+6
* Correct "ReturnValue" to "Return value" in gtk-doc commentsIain Nicol2009-10-272-3/+3
* Reimplement content type checkingGustavo Noronha Silva2009-10-261-13/+19
* Refactor EphyShell lifetime trackingXan Lopez2009-10-243-16/+45
* Allow popups when the user asks for them.Xan Lopez2009-10-231-0/+3
* Pass mailto: URI to gtk_show_uri()Frédéric Péters2009-10-191-0/+1
* Execute "javascript:" URIs instead of browsing for them.Chris Lamb2009-10-192-1/+5
* Encode the typed URL before passing it as a query string for searchingGustavo Noronha Silva2009-10-071-3/+6
* Improve localhost matchingGustavo Noronha Silva2009-10-041-1/+1
* ephy-web-view.c: update comment of ephy_web_view_is_loadingXan Lopez2009-09-241-3/+4
* ephy-web-view.c: take into account FAILED status for is_loadingXan Lopez2009-09-241-8/+8
* GTK+ 2.17.11 is now the required versionJavier Jardón2009-09-222-5/+8
* Add back support for the "direction up" navigation (GNOME bug 595653)Frédéric Péters2009-09-221-4/+66
* Cleanup string freeze break for save asGustavo Noronha Silva2009-09-211-1/+8
* ephy-embed-container.h: fix indentationXan Lopez2009-09-201-30/+23
* Bring back epiphany context menuXan Lopez2009-09-204-124/+150
* Implement saving the page using the DataSource APIGustavo Noronha Silva2009-09-152-1/+240
* Setup nspluginwrapper if availableBastien Nocera2009-09-151-0/+5
* ephy-web-view.c: also allow to expire addresses after a new PROVISIONAL statusXan Lopez2009-09-111-0/+2
* Get rid of EphyCommandManagerXan Lopez2009-09-104-239/+1
* Automatically append (n) to duplicated downloadsDiego Escalante Urrelo2009-09-101-4/+81
* Delay obtaining suggested filename for dialogsGustavo Noronha Silva2009-09-091-13/+33
* Fixing style issues I introducedGustavo Noronha Silva2009-09-081-5/+5
* Re-adding basic ad blocking supportGustavo Noronha Silva2009-09-081-0/+25
* ephy-embed-single: protect against SoupPasswordManager going awayXan Lopez2009-09-071-0/+4
* Simplify EXPIRE logic in ephy_web_view_set_typed_addressXan Lopez2009-09-072-26/+13
* ephy-embed-prefs.c: do not auto-shrink imagesXan Lopez2009-09-071-0/+4
* ephy-embed-prefs.c: use 'minimum-logical-font-size' for minimum font size pre...Xan Lopez2009-09-071-1/+1
* ephy-embed: remove some whitespaceDiego Escalante Urrelo2009-09-051-1/+1
* Making gcc shut up, by initializing loading_uriGustavo Noronha Silva2009-09-051-1/+1
* ephy-web-view.c: remove some unused variablesXan Lopez2009-09-041-5/+0
* ephy-embed.c: use the initial request to fill the URL entryXan Lopez2009-09-031-7/+13
* Reimplement "search keys" structure for the WebKit backendGustavo Noronha Silva2009-08-281-3/+22
* ephy-embed.c: workaround possibly bogus COMMITTED load-status from WebKitXan Lopez2009-08-271-2/+41
* ephy-web-view.c: do not duplicate the logic to figure out if a page is secureXan Lopez2009-08-271-9/+3
* Make non-critical g_warning() into LOG()Benjamin Otte2009-08-271-3/+3
* Reimplement search on the location barGustavo Noronha Silva2009-08-271-1/+43
* ephy-embed.c: enable undo/redoXan Lopez2009-08-261-0/+8
* Rename ephy_web_view_get_load_status to ephy_web_view_is_loadingXan Lopez2009-08-252-7/+7
* ephy-embed.c: update URL in location when clicking on #anchorsXan Lopez2009-08-211-0/+21
* ephy-embed-single.c: use new keyring support in libsoup to store passwordsXan Lopez2009-08-131-0/+7
* Remove unused stuff and clean old references to Mozilla.Xan Lopez2009-08-123-26/+3
* Remove ephy-glib-compat.h, since we depend on a newer glib nowXan Lopez2009-08-122-2/+0
* ephy-embed.c: add FIXMEXan Lopez2009-08-111-0/+5
* ephy-web-view: style fixXan Lopez2009-08-111-2/+2
* Prefix noisy commands with AM_V_GENXan Lopez2009-08-111-2/+2
* ephy-web-view: whitespace fixesXan Lopez2009-08-101-169/+169
* Move address normalization to the EphyWebView functions.Xan Lopez2009-08-101-4/+15
* Move URL normalization into a utility functionXan Lopez2009-08-102-2/+18
* downloader-view.c: hide the tray icon before unrefDiego Escalante Urrelo2009-08-101-0/+5
* ephy-embed.c: sort headersXan Lopez2009-08-091-11/+10
* Re-implement PDM's password viewer.Xan Lopez2009-08-094-359/+0
* Add NULL-check as the returned item can be NULLBenjamin Otte2009-08-081-1/+2
* embed/ephy-embed.c: Fix mnemonic usage.Priit Laes2009-08-051-1/+1
* Ignore load status changes after LOAD_FINISHED is emittedCarlos Garcia Campos2009-08-041-0/+16
* Revert "Move Epiphany to solely use GnomeKeyring for password management."Priit Laes2009-07-295-2/+365
* Move Epiphany to solely use GnomeKeyring for password management.Priit Laes2009-07-295-365/+2
* ephy-embed-prefs.c: also set the sans-serif familyXan Lopez2009-07-251-0/+3
* ephy-embed-prefs: use the font families set in the GNOME preferencesXan Lopez2009-07-252-4/+39
* ephy-embed-prefs.h: remove duplicated defineXan Lopez2009-07-251-1/+0
* ephy-favicon-cache.c: recognize icons with mime type image/vnd.microsoft.iconPeter Bui2009-07-211-0/+1
* Try again to fix bug #588143Xan Lopez2009-07-211-6/+0
* ephy-embed.c: use 'address' if 'typed-address' is NULL when updating the addressXan Lopez2009-07-211-0/+6
* ephy-embed.h: remove unneeded header.Xan Lopez2009-06-211-1/+0
* Add a function to get the EphyWebView inside an EphyEmbed.Xan Lopez2009-06-212-1/+17
* ephy-web-view.c: adapt to another API change in WebKitGTK+.Xan Lopez2009-06-211-2/+2
* ephy-web-view.c: do not try to get the EphyWebView inside an EphyWebView.Xan Lopez2009-06-171-1/+1
* Simplify widget hierarchy.Xan Lopez2009-06-163-54/+22
* Move the get_title_composite function to EphyWebView.Xan Lopez2009-06-164-38/+38
* ephy-web-view.c: use 'load-status' property from WebKitWebView also internally.Xan Lopez2009-06-141-36/+7
* Use WebKitWebView::load-status instead of our own solution.Xan Lopez2009-06-141-106/+53
* Get rid of redundant 'load-progress' property in EphyWebView.Xan Lopez2009-06-143-84/+2
* ephy-web-view.c: s/embed/view/ in a few places.Xan Lopez2009-06-141-5/+5
* downloader-view.c: fix warning.Xan Lopez2009-06-061-1/+1
* ephy-embeds-single.c: style fix.Xan Lopez2009-06-061-1/+1
* ephy-embed-single.*: re-indent and untabify.Xan Lopez2009-06-062-156/+158
* Get rid of EphyEmbedFactory.Xan Lopez2009-06-066-114/+3
* Make EphyEmbedPersist a non-interface type.Xan Lopez2009-06-066-165/+7
* Make EphyEmbedSingle a non-interface type.Xan Lopez2009-06-067-474/+268
* Fold WebKitEmbedPrefs into EphyEmbedPrefs.Xan Lopez2009-06-067-48/+46
* Kill EphyBaseEmbed, move the small widget logic it had to EphyEmbed.Xan Lopez2009-06-054-167/+48
* Change EphyEmbed to not be an interface type.Xan Lopez2009-06-0510-119/+110
* Move all methods, signals and properties from EphyEmbed and EphyBaseEmbed to ...Xan Lopez2009-06-0513-2645/+2239
* Move load_url method to EphyWebView.Xan Lopez2009-06-035-45/+24
* Remove ephy_embed_load, it's obsoleted by ephy_web_view_load_request.Xan Lopez2009-06-033-34/+0
* ephy-web-view.c: use nil for false value in elisp, not 'f'.Xan Lopez2009-06-031-1/+1
* Correctly handle the 'cancel' case in the download decision dialogGustavo Noronha Silva2009-06-021-1/+2
* webkit-embed.c: we still do need to update loading_uri here.Xan Lopez2009-05-311-0/+3
* Move method to copy history between embeds/views to EphyWebView from EphyEmbed.Xan Lopez2009-05-315-74/+49
* Remove LoadFlagsGustavo Noronha Silva2009-05-303-12/+1
* Move URL normalization out of embed, to a higher levelGustavo Noronha Silva2009-05-301-13/+1
* Provide API to loading using WebKitNetworkRequestGustavo Noronha Silva2009-05-302-0/+22
* Adding a new EphyWebView objectGustavo Noronha Silva2009-05-304-3/+130
* webkit-embed.c: do not reinvent ephy-embed-utils functions.Xan Lopez2009-05-291-10/+2
* webkit-embed: use C gettext macro for translation context.Xan Lopez2009-05-281-3/+1
* Preserve back/forward history when opening links in new tabs/windows.Xan Lopez2009-05-282-0/+32
* Fix variable declaration mixed with the code.Gustavo Noronha Silva2009-05-231-1/+2
* Reimplement the original download logic and dialog.Gustavo Noronha Silva2009-05-233-3/+229
* ephy-embed: remove scroll methods from embedXan Lopez2009-05-221-17/+0
* Implement caret browsing mode (bug #562621)Xan Lopez2009-04-282-1/+5
* ephy-embed: Mark favicon cache as dirty after deletion (bug #120826)Priit Laes2009-04-251-0/+1
* webkit-embed: don use deprecated 'title-changed' signal, connect to notify::t...Xan Lopez2009-04-241-11/+14
* Use GNOME settings for default font sizes.Xan Lopez2009-04-222-4/+40
* Remove unnecessary passing around of WebKitEmbed, and fix some styleGustavo Noronha Silva2009-03-271-13/+6
* Adding myself to the header as copyright holder, for earlierGustavo Noronha Silva2009-03-271-0/+1
* Implementing auto-download, and respecting download lock-down.Gustavo Noronha Silva2009-03-271-30/+88
* Remove downloading files when cancelling the download.Gustavo Noronha Silva2009-03-262-1/+4
* Use Epiphany's profile directory to store the downloaded fileGustavo Noronha Silva2009-03-261-7/+8
* webkit-embed: 'foo ? foo : NULL' == 'foo'Xan Lopez2009-03-221-1/+1
* Removing unused variableGustavo Noronha Silva2009-03-211-1/+0
* Do not use gtk_dialog_run() for the file chooser dialog whenGustavo Noronha Silva2009-03-212-26/+68
* ephy-base-embed: remove note about using force reload when available.Xan Lopez2009-03-181-4/+0
* webkit-embed: re-add support for click-to-download.Xan Lopez2009-03-161-0/+8
* webkit-embed-single: couple of cleanups.Xan Lopez2009-03-141-8/+0
* Adapt WebKitDownload-related code to the changes done today inGustavo Noronha Silva2009-03-131-28/+36
* webkit-embed.c: set security information.Xan Lopez2009-03-061-1/+24
* Fix a few compiler warnings and coding style.Xan Lopez2009-03-052-11/+14
* Basic download functionality for ephy/webkit. This update also removesGustavo Noronha Silva2009-03-056-400/+173
* webkit-embed: increase default size of inspector window.Xan Lopez2009-03-041-1/+1
* Remove ephy_embed_has_automatic_encoding, it's unused now.Xan Lopez2009-03-023-25/+0
* Remove get_backend function, there's only one possibility now.Xan Lopez2009-02-283-28/+0
* webkit-embed-prefs: use utils macro to get WebView from embed.Xan Lopez2009-02-281-1/+2
* webkit-embed-prefs: support user style sheets.Xan Lopez2009-02-271-1/+36
* Remove embedding APIs for set/get encoding.Xan Lopez2009-02-273-62/+1
* webkit-embed: remove extra ';'.Xan Lopez2009-02-271-1/+1
* Implement get/set encoding for the embed.Xan Lopez2009-02-273-5/+8
* webkit-embed-single: use SoupProxyResolverGNOME to use GNOME proxy settings.Xan Lopez2009-02-261-1/+6