aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
* Fix the RDF bookmark importer (bug #129852).Vincent Untz2009-03-031-45/+77
* Remove ephy_embed_has_automatic_encoding, it's unused now.Xan Lopez2009-03-022-8/+0
* Use new get_encoding API to properly figure out automatic vs override encoding.Xan Lopez2009-03-022-8/+14
* Remove get_backend function, there's only one possibility now.Xan Lopez2009-02-282-12/+1
* Remove the {_get,_set}_encoding functions from the python bindings definition,Cosimo Cecchi2009-02-271-15/+0
* Add FIXME about encodings.Xan Lopez2009-02-271-0/+1
* Remove embedding APIs for set/get encoding.Xan Lopez2009-02-272-7/+22
* Implement get/set encoding for the embed.Xan Lopez2009-02-272-6/+2
* Use libsoup, getting the session from webkit, to handle cookies.Xan Lopez2009-02-235-201/+92
* Use – (en dash , U+2013) in copyright years. Also fixup surrounding whitesp...Wouter Bolsterlee2009-02-231-10/+10
* Update yearChristian Persch2009-02-231-1/+1
* ephy-window: do not make code conditional on Gecko version.Xan Lopez2009-02-231-8/+4
* ephy-bookmarks: guard zeroconf dependent function declaration.Xan Lopez2009-02-211-0/+2
* ephy-window: do not show progress for pages that load very quickly (eg, about...Xan Lopez2009-02-191-1/+9
* Fix finding extensions in system dir.Xan Lopez2009-02-181-5/+7
* Add option to open new windows in tabs.Xan Lopez2009-02-161-3/+19
* Don't recurse into proxy item construction. Bug #570984Christian Persch2009-02-101-2/+0
* And some more style fixes, should now follow the new code guidelines.Xan Lopez2009-02-084-61/+58
* ephy-seed-extension: untabify, delete-trailing-whitespace, ...Xan Lopez2009-02-081-39/+40
* ephy-seed-extension: free this here.Xan Lopez2009-02-081-3/+3
* ephy-seed-extension: do not return const pointer as char*.Xan Lopez2009-02-081-1/+1
* ephy-seed-extension: add trailing NULL to g_strconcat.Xan Lopez2009-02-081-1/+1
* ephy-seed-extensions: fix coding style.Xan Lopez2009-02-081-34/+34
* Use gtk_activatable_get_related_action instead of the deprecated gtk_widget_g...Xan Lopez2009-02-084-10/+10
* Prepend /data to PKG_CONFIG_PATH so g-ir-scanner can find our not-yet-install...Christian Persch2009-02-081-0/+1
* config.h must be the first includeChristian Persch2009-02-081-2/+2
* Simply use g_irepository_get_option_group()Christian Persch2009-02-081-17/+4
* Add needed -I flags to build the Epiphany gir file.Xan Lopez2009-02-081-0/+6
* Use epiphany_LDADD for Seed libraries.Xan Lopez2009-02-071-1/+4
* Add seed support; use --enable-seed to check it out. Patch by Robert Carr.Christian Persch2009-02-076-0/+535
* Add gobject introspection support; use --enable-introspection.Christian Persch2009-02-072-1/+91
* Only show the fixed toolbar when the leave-fullscreen button is to be shown. ...Christian Persch2009-02-041-0/+3
* ephy-session: plug memory leak.Xan Lopez2009-01-301-2/+4
* ephy-find-toolbar: remove unused variable.Xan Lopez2009-01-281-2/+0
* ephy-find-toolbar: do not search for the empty string or NULL.Xan Lopez2009-01-281-0/+3
* Remove unused auto encoding stuff.Xan Lopez2009-01-261-15/+0
* Remove unused function.Xan Lopez2009-01-261-13/+0
* Remove unused fonts languages and autodetectors stuff. Bug #558407.Christian Persch2009-01-261-95/+0
* Do not use 'gtk-action' object data to get the associated GtkAction for a wid...Xan Lopez2009-01-243-9/+9
* ephy-find-toolbar: make indentation homogenenous.Xan Lopez2009-01-231-37/+36
* Implement scrolling in EphyFindToolbar.Xan Lopez2009-01-231-27/+23
* Remove EphyIconEntry leftovers.Xan Lopez2009-01-221-1/+0
* ephy-window: do not set load progress on already loaded pages.Xan Lopez2009-01-211-2/+8
* Implement multiple keyword-based AND-search for the location barGustavo Noronha Silva2009-01-201-7/+21
* Use C_() instead of Q_() with context for translatable strings.Philip Withnall2009-01-203-36/+16
* Remove useless LocationEntryAction structDiego Escalante Urrelo2009-01-191-23/+3
* Remove $Id$ marker from source files.Xan Lopez2009-01-16104-104/+0
* Include a bookmark indication in the woohoo barDiego Escalante Urrelo2009-01-162-7/+5
* Turn the location bar into the woohoo barDiego Escalante Urrelo2009-01-161-15/+4
* We no longer need a separate pkg-config check for WEBKIT.Gustavo Noronha Silva2009-01-141-1/+0
* Port to use GtkBuilder.Xan Lopez2009-01-123-4/+4
* Allow to reload bypassing cache.Xan Lopez2009-01-081-9/+6
* Remove leftover search_entry_clear_cb functionDiego Escalante Urrelo2009-01-051-19/+0
* Fix bookmark import of ff3 filesDiego Escalante Urrelo2009-01-051-3/+4
* ephy-window: remove entry clear timeout without chaining finalize.Xan Lopez2009-01-051-3/+3
* ephy-window: g_object_get takes a gpointer as first argument.Xan Lopez2009-01-041-7/+6
* ephy-window: also open in new tab for ctrl+click.Xan Lopez2009-01-041-1/+5
* Port EphySearchEntry to use GtkEntry.Xan Lopez2008-12-312-54/+1
* Remove progress from statusbar now that we show it in the location entry.Xan Lopez2008-12-314-65/+0
* ephy-window: draw progress inside the location entry.Xan Lopez2008-12-311-0/+42
* Web Inspector property missing from preferences enum.Gustavo Noronha Silva2008-12-241-0/+1
* Check text_table for nullity before unrefing it in resolver_found_cb.Gustavo Noronha Silva2008-12-241-1/+4
* Open links in new tab with middle click.Xan Lopez2008-12-211-0/+42
* Enable Web Inspector.Xan Lopez2008-12-121-6/+7
* Revert cookies stuff, didn't want to commit that.Xan Lopez2008-12-125-92/+199
* Port ephy to use libsoup for cookies.Xan Lopez2008-12-125-199/+92
* window-commands: fix Send Link by Email for URLs with '&'Xan Lopez2008-12-121-20/+26
* Implement chrome visibility control in popupsDiego Escalante Urrelo2008-12-031-4/+32
* ephy-window: connect web view to web-view-ready signal when it's created.Xan Lopez2008-12-011-7/+7
* ephy-window: use new webkit API to create windows on request.Xan Lopez2008-11-301-0/+52
* window: zoom in/out with ctrl+scroll-{up,down}Xan Lopez2008-11-301-0/+30
* ephy-toolbar: remove useless realize/unrealize methods.Xan Lopez2008-11-301-16/+0
* Remove legacy ephy-history-item from epiphany.hDiego Escalante Urrelo2008-11-271-1/+0
* ephy-home-action: plug leak.Xan Lopez2008-10-271-2/+2
* Use the correct return type for ephy_embed_get_link_message andDiego Escalante Urrelo2008-10-161-2/+2
* Fix conflicting mnemonics in Clear All Personal DataDiego Escalante Urrelo2008-10-131-3/+12
* Sync comment parameters with actual parametersDiego Escalante Urrelo2008-09-292-6/+6
* Avoid the parsing of non doc commentsDiego Escalante Urrelo2008-09-293-5/+5
* Print version to stdout, not stderr.Christian Persch2008-09-271-1/+1
* Readd --version which was lost when removing libgnome usage.Christian Persch2008-09-271-1/+15
* Remove libgnome and libgnomeui dependency, using EggSMClient instead of Gnome...Christian Persch2008-09-2510-117/+141
* Drop usage of EelAppLaunchContext; replace it with GdkAppLaunchContext.Cosimo Cecchi2008-09-051-1/+0
* Port the location bar to use GRegex.Diego Escalante Urrelo2008-08-151-94/+41
* Make the order in which we name the cols consistent.Diego Escalante Urrelo2008-08-142-3/+3
* Move libnotify initialization to ephy-mainDiego Escalante Urrelo2008-08-041-0/+13
* Fix the keyword search for tabs/windows created from toolbar.Diego Escalante Urrelo2008-08-041-4/+4
* Bug #378165: do not activate the smart bookmark entry after middle-clickingCosimo Cecchi2008-08-041-2/+0
* Bug #328710. Re-focus the "Remove" button after the selection has been deleted.Cosimo Cecchi2008-08-011-0/+3
* Fix a typo in src/ephy-main.c and remove a FIXME.Diego Escalante Urrelo2008-07-311-2/+2
* Update yearChristian Persch2008-07-071-1/+1
* embed: remove ephy_embed_close.Xan Lopez2008-07-032-7/+1
* embed: remove ephy_embed_{set,get}_zoom.Xan Lopez2008-07-012-17/+5
* embed: remove ge-zoom-changed and zoom property.Xan Lopez2008-07-011-11/+25
* Bug 529634 – ga_client_start() called twiceChristian Persch2008-07-011-9/+16
* embed: remove history item abstraction from embed.Xan Lopez2008-06-301-1/+0
* embed: remove ephy_embed_go_to_history_item.Xan Lopez2008-06-301-3/+3
* embed: remove ephy_embed_get_{next,previous}_history_item.Xan Lopez2008-06-301-12/+12
* embed: remove ephy_embed_get_{backward,forward}_history.Xan Lopez2008-06-301-19/+46
* misc: add reference to webkit bug about reload_bypass_cacheXan Lopez2008-06-301-0/+1
* embed: remove ephy_embed_print.Xan Lopez2008-06-302-7/+1
* embed: remove ephy_embed_can_go_back.Xan Lopez2008-06-301-6/+0
* embed: remove ephy_embed_can_go_forward.Xan Lopez2008-06-301-6/+0
* embed: remove ephy_embed_go_forward.Xan Lopez2008-06-302-7/+1
* embed: remove ephy_embed_go_back.Xan Lopez2008-06-302-8/+5
* embed: remove ephy_embed_reload.Xan Lopez2008-06-302-10/+5
* embed: remove ephy_embed_stop_load.Xan Lopez2008-06-302-7/+2
* ephy-embed-utils: add macro to get webkitwebview from embed.Xan Lopez2008-06-301-2/+1
* ephy-find-toolbar: remove trailing whitespace.Xan Lopez2008-06-281-17/+17
* ephy-find-toolbar: remove obsolete comment.Xan Lopez2008-06-281-1/+0
* ephy-find-toolbar: copy over embed scroll functionality.Xan Lopez2008-06-281-11/+46
* ephy-find-toolbar: remove $Id$ from license comment.Xan Lopez2008-06-281-1/+0
* ephy-find-toolbar: rename impl_* functions to ephy_find_toolbar_*Xan Lopez2008-06-281-19/+19
* ephy-find-toolbar: M-x tabifyXan Lopez2008-06-281-28/+28
* ephy-find-toolbar: add FIXME about ge-search-key-press never being emitted.Xan Lopez2008-06-281-0/+1
* ephy-find-toolbar: remove _EMBED_ from find results enum.Xan Lopez2008-06-281-9/+9
* embed: remove ephy-embed-find and the webkit implementation.Xan Lopez2008-06-281-1/+0
* ephy-find-toolbar: port to use webkit API directly.Xan Lopez2008-06-282-45/+129
* Reimplement tabs detaching and tabs DND.Christian Persch2008-06-134-11/+93
* Do not do single includes in src/bookmarks/, bug #536090Diego Escalante Urrelo2008-06-0426-88/+22
* Do not do single includes for GTK+, bug #536090Diego Escalante Urrelo2008-06-0439-195/+37
* Make the bookmarks editor search in urls and titles, closes: #328489.Diego Escalante Urrelo2008-05-311-0/+5
* Plug a mem leak.Christian Persch2008-05-261-0/+1
* Rewrite the bookmark HTML importer, it now uses GRegex, this is bug #533986.Diego Escalante Urrelo2008-05-241-56/+74
* Don't free file_info too soon or the pointer to file_type will be lost. ThisDiego Escalante Urrelo2008-05-201-1/+1
* Block updates of the location entry while it is keyboard-focused.Cosimo Cecchi2008-05-201-2/+51
* Remove a forgotten env var in ephy-main.c, it was a leftover of r8192 (removalDiego Escalante Urrelo2008-05-171-1/+0
* Add epiphany.h. Only allow including epiphany/epiphany.h; all otherChristian Persch2008-04-1254-36/+281
* Remove MOZ_DISABLE_PANGO checks.Christian Persch2008-04-071-17/+0
* Remove detailed font prefs, they're obsolete on webkit.Christian Persch2008-04-071-322/+1
* Exorcise gecko configure & build stuffChristian Persch2008-04-043-196/+144
* Remove the ephy-spinner from the toolbar.c, there's enough feebackXan Lopez2008-03-283-58/+0
* Revert the history/bookmark no-dup patch. It was slowing ephy.Diego Escalante Urrelo2008-03-171-12/+0
* Fix multiple crashers in the zeroconf bookmarks. Bug #516008; partially based...Christian Persch2008-03-131-179/+151
* Allow building with xulrunner 1.9. Patch by Alexander Sack; part of bug #503657Christian Persch2008-03-111-0/+15
* Remove cruftChristian Persch2008-02-275-567/+3
* Connect the signal before unreffing the action, just to be absolutely safe.Christian Persch2008-02-261-3/+3
* Remove duplicate bookmarks property update, which is superflous since it was ...Christian Persch2008-02-261-2/+0
* Adapt to gio API changeChristian Persch2008-02-263-5/+5
* Add EPHY_CHECK_VERSION (#513128)Xan Lopez2008-02-182-0/+36
* Add Undo/Redo commands to the location entry, both in the context menuCosimo Cecchi2008-02-152-14/+53
* GConf option to disable messagebox about unsubmitted form data. (#516170)Xan Lopez2008-02-151-6/+11
* Update dependencies in epiphany.pc.in, remove bonobo leftovers.Xan Lopez2008-02-141-224/+0
* Use G_DEFINE_TYPE* macros in src/bookmarks/ when possible. (#516138)Xan Lopez2008-02-139-307/+59
* Use G_DEFINE_TYPE* when possible in src/ (#515601)Xan Lopez2008-02-1128-1096/+243
* Do not use history API if we only want to go back or forward, only use itXan Lopez2008-02-101-14/+2
* Fix back button looping through history.Cosimo Cecchi2008-02-051-15/+19
* Make middle clicking on Back/Forward toolbar buttons open again inCosimo Cecchi2008-02-011-3/+29
* HIG fixes for menu. Bug #483312, patch by Luca Ferretti.Cosimo Cecchi2008-01-291-1/+1
* Better fix for bug #511759.Cosimo Cecchi2008-01-251-2/+7
* Fix compilation when debug is enabled. Patch by Joseph Sacco (#509541)Xan Lopez2008-01-151-1/+1
* Fix cropped close button on tab labels with gnome-icon-theme 2.21.x.Cosimo Cecchi2008-01-151-4/+10
* Update to new glib 2.15.2 API, bump glib dep and remove a Cosimo Cecchi2008-01-151-1/+1
* Add #ifdef for Avahi includes in ephy-bookmarks.c.Cosimo Cecchi2008-01-151-0/+3
* Drop gnome-vfs dependency. Now Epiphany depends on glib >= 2.15.1.Cosimo Cecchi2008-01-1413-309/+541
* Open externally opened link in current tab if it is blank.Cosimo Cecchi2008-01-115-14/+38
* Don't use net-stop signal, it's gone. Switch to notify::load-statusXan Lopez2008-01-091-3/+6
* Fix typo when building the back/forward history menuJan Michael C. Alonzo2007-12-311-1/+1
* Port ephy-window.c to the new API, remove old API.Xan Lopez2007-12-303-98/+11
* Make MozillaHistoryItem create url and title on demand.Xan Lopez2007-12-301-4/+7
* Use the new interfaces for backward/forward menus.Xan Lopez2007-12-301-54/+37
* Catch bookmarks and history in EphyLocationActionPrivate, it's smarter.Diego Escalante Urrelo2007-12-271-9/+10
* Have the completion func also check the bookmark URLs for matches as it doesDiego Escalante Urrelo2007-12-271-3/+14
* Avoid duplicated history and bookmark entries for the same url in the Diego Escalante Urrelo2007-12-271-0/+24
* Remove a trailing whitespace.Diego Escalante Urrelo2007-12-261-1/+1
* Moves the completion_func from lib/widgets/ephy-location-entry.c toDiego Escalante Urrelo2007-12-261-0/+105
* Quick fix for a warning produced by my previous update to epiphany.defs,Diego Escalante Urrelo2007-12-241-1/+1
* Add extra methods to EphyEmbed object:Diego Escalante Urrelo2007-12-241-27/+94
* Adds a "Clear All" dialog to clear all the privacy information, and a helpCosimo Cecchi2007-12-213-181/+295
* Middle click on entries in History Window and Bookmark Editor opens the pageCosimo Cecchi2007-12-202-0/+46
* Hide the Toolbar Editor, if active, when switching to Fullscreen mode.Cosimo Cecchi2007-12-191-0/+11
* Readd "Add to Bookmark" entry to the document context menu.Cosimo Cecchi2007-12-191-0/+5
* Indentation fix for previous commit.Cosimo Cecchi2007-12-191-2/+2
* Add middle-click-paste for smart bookmarks, as it is for new tab/windowCosimo Cecchi2007-12-191-0/+69
* Don't store the tabs menu accels in the accel map file.Christian Persch2007-12-161-1/+3
* Add secondary text in confirmation dialogs for "Remove All" items in the PDM.Cosimo Cecchi2007-12-081-6/+12
* Squashed commit of the following:Jan Michael C. Alonzo2007-12-022-0/+7
* Fix empty line on bookmark tooltip when bookmark has no title.Cosimo Cecchi2007-11-251-5/+21
* 2007-11-22 Reinout van Schouwen <reinouts@gnome.org>Reinout van Schouwen2007-11-231-1/+1
* 2007-11-22 Reinout van Schouwen <reinouts@gnome.org>Reinout van Schouwen2007-11-231-1/+1
* Adds a EPHY_NODE_VIEW_ELLIPSIZED flag and make history window andCosimo Cecchi2007-11-192-4/+9
* Fix a bug in EphyNodeView which caused weird problems when setting columnsCosimo Cecchi2007-11-192-5/+15
* Move EphyNotebook to G_DEFINE_TYPE.Xan Lopez2007-11-181-56/+19
* Use go_back and go_forward methods for navigation.Xan Lopez2007-11-181-5/+2
* Move size-to code to the gecko backend.Xan Lopez2007-11-181-74/+1
* Put visibility property into EphyBaseEmbed, we need it for popups.Xan Lopez2007-11-181-0/+19
* Rename EphyEmbedContainer implementations in EphyWindow.Xan Lopez2007-11-171-35/+36
* Move print-preview property to EphyEmbedContainer interface.Xan Lopez2007-11-175-65/+53
* Add type checkings in the EmbedContainer interface, not in the implementations.Xan Lopez2007-11-171-23/+2
* Do not change session saving format ;)Xan Lopez2007-11-171-2/+2
* Return the new tab's position.Christian Persch2007-11-171-4/+2
* Move active-tab property to the embed-container interface.Xan Lopez2007-11-174-17/+15
* Unbreak the build...Xan Lopez2007-11-171-4/+4
* Use right GtkPaned API to pack history window vbox.Cosimo Cecchi2007-11-171-2/+2
* Make EphyEmbedContainer add_child method return the child's new position insi...Xan Lopez2007-11-171-1/+3
* Rename ephy_embed_container_jump_to_child to ephy_embed_container_set_active_...Xan Lopez2007-11-163-8/+8
* Do not expose {add,remove}_child methods from EphyEmbedContainer to bindings.Xan Lopez2007-11-161-20/+0
* And port all the callers in src/Xan Lopez2007-11-1614-61/+113
* Change epiphany.defsXan Lopez2007-11-161-47/+53
* Port EphyWindow to the new interface.Xan Lopez2007-11-162-220/+193
* Use G_DEFINE_TYPE for EphyWindow.Xan Lopez2007-11-161-54/+15
* Add icon-updated signal to EphyHistory.Xan Lopez2007-11-141-0/+11
* Remove last remainings of EphyTab.Xan Lopez2007-11-132-426/+0
* Use load-status instead of net-stop in EphySession.Xan Lopez2007-11-131-23/+30
* Don't connect to destroy-browser, we do nothing in the cb and it's GtkMozEmbe...Xan Lopez2007-11-131-12/+0
* Hide Back/Forward buttons when disable_history lockdown key is enabled. MakeCyril Brulebois2007-11-121-0/+2
* Add GTK_DISABLE_DEPRECATED back in DEPRECATION_FLAGS. Move the lastCyril Brulebois2007-11-113-10/+9
* Add a checkbox to enable case-sensitive search (disabled by default). No longerCyril Brulebois2007-11-101-8/+84
* Add a "Remove all" button to the Personal Data Manager for both the cookies andCyril Brulebois2007-11-091-0/+170
* Ship epiphany.{defs,override} regardless of whether python is enabled. Fixes ...Cyril Brulebois2007-11-081-11/+3
* Adds a NULL check to avoid passing illegal values to strtol in ephy-session.Cosimo Cecchi2007-11-071-0/+2
* Make the password dialog use ephy-time-helpers instead of stock strftime.Cosimo Cecchi2007-11-071-5/+2
* Adds a column in the history window showing the date and the time of theCosimo Cecchi2007-11-071-59/+131
* Move "address_has_web_scheme" to ephy-embed-utils.Cosimo Cecchi2007-11-051-20/+2
* Moved dom_mouse_click from EphyTab to EphyWindow.Cosimo Cecchi2007-11-052-175/+205
* Display "Javascript scriptlet" string as tooltip for bookmark action insteadCosimo Cecchi2007-11-031-13/+19
* Use -1 as tab size hereChristian Persch2007-10-281-2/+2
* Can't use an interface type in signal registrationChristian Persch2007-10-281-1/+1
* Can't use an interface type in property registrationChristian Persch2007-10-281-1/+1
* Can't use an interface type in signal registrationChristian Persch2007-10-281-2/+2
* Remove EphyTabChristian Persch2007-10-282-85/+12
* Remove EphyTabChristian Persch2007-10-281-11/+10
* Remove EphyTabChristian Persch2007-10-281-34/+22
* Remove EphyTabChristian Persch2007-10-281-7/+7
* Remove EphyTabChristian Persch2007-10-281-4/+5
* Remove EphyTabChristian Persch2007-10-281-11/+11
* Remove EphyTabChristian Persch2007-10-281-20/+19
* Remove EPhyTab.Christian Persch2007-10-281-16/+8
* Remove EphyTab.Christian Persch2007-10-281-7/+3
* Remove EphyTab.Christian Persch2007-10-281-7/+6
* Remove EphyTab.Christian Persch2007-10-281-3/+3
* Remove EphyTab.Christian Persch2007-10-282-2/+1
* Remove Ephytab.Christian Persch2007-10-281-3/+3
* Remove EphyTab.Christian Persch2007-10-281-2/+2
* Remove EPhyTab.Christian Persch2007-10-281-5/+5
* Remove EphyTab.Christian Persch2007-10-281-176/+121
* Remove EphyTab.Christian Persch2007-10-281-3/+0
* Remove EphyTab.Christian Persch2007-10-281-4/+4
* Remove EphyTab.Christian Persch2007-10-282-39/+36
* Remove EphYTab.Christian Persch2007-10-282-17/+18
* Remove EphyTab.Christian Persch2007-10-281-26/+26
* Renamed ephy_tab_get_active_embed to _tab.Christian Persch2007-10-281-1/+1
* Remove EphyTab.Christian Persch2007-10-281-11/+11
* Remove EphyTab.Christian Persch2007-10-281-6/+3
* Remove EphyTab.Christian Persch2007-10-282-8/+8
* Remove EphyTab use.Christian Persch2007-10-282-32/+25
* Remove ephy-tab.h. This breaks the build; we'll fix it step by step.Christian Persch2007-10-281-73/+0
* Move tab ID from EphyTab to EphyTabsMenu which is the only user of it.Christian Persch2007-10-283-69/+89
* Use G_DEFINE_TYPE.Christian Persch2007-10-282-30/+3
* Move popups-allowed and hidden-popup-count from EphyTab to EphyEmbed.Xan Lopez2007-10-272-430/+13
* Fix more issues left with the refactoring.Xan Lopez2007-10-261-1/+1