aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Show "Stop Archiving" only when the EphyWebView is archivingHEADarchive-creationarchive-integrationTing-Wei Lan2013-09-151-1/+4
* Archive creating can be cancelledTing-Wei Lan2013-09-154-0/+22
* Remove all things related to autoarchive, which becomes a shared libraryTing-Wei Lan2013-07-311-1/+0
* Integrate autoarchive functions into Epiphany download panelTing-Wei Lan2013-07-261-0/+1
* Add a checkbutton to toggle the automatical extractionTing-Wei Lan2013-07-082-0/+21
* prefs: Use the correct signal to monitor GtkFileChooserButton's selection cha...Federico Mena Quintero2013-06-221-1/+1
* Move profile directory check to after checking for application modeGustavo Noronha Silva2013-06-101-7/+7
* ephy-find-toolbar: Correct the parent class usedBastien Nocera2013-05-241-1/+1
* ephy-main: actually add the FIXME that goes with the previous wayland fixClaudio Saavedra2013-05-201-0/+4
* Make sure we only rely on X11 to obtain timestamps when we are running in a X...Iago Toral Quiroga2013-05-201-3/+15
* Allow running a regular standalone instance with a different profileGustavo Noronha Silva2013-05-041-6/+7
* Added missing mnemonics in application menu.Adam Dingle2013-05-032-4/+4
* Compile template pages as GResourcesCarlos Garcia Campos2013-04-055-4/+258
* Unify all web context setup in EphyEmbedShell on primary instance startupCarlos Garcia Campos2013-04-052-47/+0
* ephy-encoding-dialog: use the right signal to track load statusXan Lopez2013-03-261-0/+11
* ephy-notebook: fix memory leakXan Lopez2013-03-261-1/+2
* ephy-encoding-dialog: make this work againXan Lopez2013-03-251-3/+3
* ephy-bookmarks-import: sort headersXan Lopez2013-03-241-8/+7
* Get rid of EphyEmbedSingleXan Lopez2013-03-245-10/+0
* Remove dummy work offline codeXan Lopez2013-03-243-22/+0
* ephy-window: do not track network-statusXan Lopez2013-03-241-33/+0
* ephy-shell: remove non-WebKit2 bits for adblock managerXan Lopez2013-03-221-8/+0
* ephy-window: connect the reload/stop button the load statusXan Lopez2013-03-221-0/+20
* Move the clear cache method to EphyEmbedShellXan Lopez2013-03-211-5/+2
* Move code to initialize preferences from ephy-main to ephy-shellCarlos Garcia Campos2013-03-203-29/+47
* Load back item when back is clicked with control held/middle clicked, for wk2Gustavo Noronha Silva2013-03-191-0/+25
* ephy-window: disable a few more actions in application modeXan Lopez2013-03-191-4/+8
* Add spelling suggestion to the context menu in WebKit2Carlos Garcia Campos2013-03-172-7/+57
* ephy-session: fix memory leakXan Lopez2013-03-171-0/+2
* ephy-find-toolbar: freaking tabsXan Lopez2013-03-161-1/+1
* ephy-find-toolbar: fix memory leakXan Lopez2013-03-161-0/+1
* Revert "Add spelling suggestion to the context menu in WebKit2"Xan Lopez2013-03-161-47/+4
* ephy-session: fix GTask leakXan Lopez2013-03-161-0/+1
* Add spelling suggestion to the context menu in WebKit2Carlos Garcia Campos2013-03-161-4/+47
* ephy-bookmarks-export: fix memory leakXan Lopez2013-03-161-0/+2
* web-extension: Implement pre-filled forms in WebKit2Carlos Garcia Campos2013-03-151-0/+2
* ephy-bookmarks-editor: fix compiler warningsXan Lopez2013-03-141-1/+3
* window-commands: do not show favicon.ico downloads in the UIXan Lopez2013-03-141-0/+6
* Set the disk cache directory depending on the ephy mode in WebKit2Carlos Garcia Campos2013-03-131-0/+9
* ephy-navigation-history-action: fix compiler warningsXan Lopez2013-03-111-5/+5
* pdm-dialog: remove compiler warningsXan Lopez2013-03-091-1/+3
* web-extension: Implement adblocker in WebKit2Carlos Garcia Campos2013-03-071-0/+1
* Do not build adblock files in libephyembed for WebKit2Carlos Garcia Campos2013-03-071-1/+5
* ephy-shell: fix opening new pages from the command lineXan Lopez2013-03-071-1/+1
* ephy-window: fix compiler warningsXan Lopez2013-03-061-3/+2
* Implement get best web app icon in WebKit2Manuel Rego Casasnovas2013-03-061-33/+77
* incognito: show about:incognito instead of the overviewClaudio Saavedra2013-03-051-8/+16
* ephy-password-info: remove as it is unused nowClaudio Saavedra2013-03-054-103/+0
* pdm-dialog: migrate to libsecretClaudio Saavedra2013-03-051-174/+84
* window-commands: fix WebKit2 build after 8a00f5c726c9Xan Lopez2013-03-021-0/+1
* Move code to get application icon from DOM to ephy-dom-utilsManuel Rego Casasnovas2013-03-021-3/+30
* Fallback to favicon instead of page snapshotWilliam Jon McCann2013-03-021-14/+29
* Implement get web app title in WebKit2Manuel Rego Casasnovas2013-03-021-12/+53
* Move code to get application title from DOM to ephy-dom-utilsManuel Rego Casasnovas2013-03-021-24/+3
* ephy-session: Port to GTaskCarlos Garcia Campos2013-02-241-88/+69
* Add setting for delayed tab loading, and use it to fix the session testsGustavo Noronha Silva2013-02-241-3/+18
* ephy-main: get rid of a compiler warningXan Lopez2013-02-221-0/+2
* web-extension: Use a different service name for every web process extensionCarlos Garcia Campos2013-02-211-0/+5
* embed: Implement unsubmitted modified forms warning in WebKit2Carlos Garcia Campos2013-02-192-0/+7
* popup-commands: Postpone the creation of the download object until destinatio...Carlos Garcia Campos2013-02-181-11/+25
* ephy-toolbar: make the margins for the New Tab button RTL friendlyXan Lopez2013-02-161-1/+5
* Add a New Tab button in the toolbarXan Lopez2013-02-162-0/+18
* Get rid of epiphany.hXan Lopez2013-02-152-64/+0
* Do not install headersXan Lopez2013-02-152-10/+0
* Remove EphyPermissionManagerXan Lopez2013-02-151-1/+0
* support notification filteringNuno Araujo2013-02-141-0/+1
* ephy-shell: remove some leftovers from the new-window removalXan Lopez2013-02-141-63/+0
* Remove EphyWebView::visibilityXan Lopez2013-02-131-20/+0
* Only load pages when their tab is switched to upon session restoreGustavo Noronha Silva2013-02-124-10/+29
* window-commands: update copyright yearXan Lopez2013-02-111-1/+1
* ephy-notebook: remove two useless forward declarationsXan Lopez2013-02-101-2/+0
* ephy-session: port to GTaskXan Lopez2013-02-101-22/+20
* ephy-shell: add g_return_val_if_fails to ephy_shell_new_tab_fullXan Lopez2013-02-101-0/+9
* ephy-shell: avoid useless call to ephy_embed_shell_get_defaultXan Lopez2013-02-101-1/+1
* Use GtkApplication method to get the list of windowsXan Lopez2013-02-093-73/+10
* ephy-session.c: add ephy_session_clear()Claudio Saavedra2013-02-082-0/+25
* ephy-shell: add application menu item for reopening closed tabsClaudio Saavedra2013-02-084-0/+38
* ephy-embed-shell: add EPHY_EMBED_SHELL_MODE_INCOGNITOClaudio Saavedra2013-02-083-6/+4
* ephy-session: add can-undo-tab-closed boolean propertyClaudio Saavedra2013-02-082-0/+65
* ephy-session: add API to restore closed tabsClaudio Saavedra2013-02-082-0/+251
* ephy-shell: Make it possible to prepend a tab in a windowClaudio Saavedra2013-02-082-7/+11
* ephy-shell: return the proper types for EphySession and GNetworkMonitorXan Lopez2013-02-083-19/+20
* Move ephy_session_open_uris to EphyShellXan Lopez2013-02-084-164/+141
* Don't ask Xlib to skip ARGB visualsGiovanni Campagna2013-02-061-3/+0
* ephy-bookmarks-export: use g_file_set_contents() when saving to RDFClaudio Saavedra2013-01-281-15/+15
* Remove ability to open URIs in the clipboard through middle clickXan Lopez2013-01-181-78/+0
* EphyWindow: don't connect to scroll-event on the web viewGiovanni Campagna2013-01-121-30/+1
* Port delete web application to WebKit2Carlos Garcia Campos2013-01-111-41/+55
* Don't use DOM bindings to delete a web application from about:applicationsCarlos Garcia Campos2013-01-111-0/+32
* ephy-session: Use a XML memory writer and save the contents with g_file_repla...Carlos Garcia Campos2013-01-091-14/+17
* ephy-session: save session in a thread to avoid blocking the UICarlos Garcia Campos2013-01-092-100/+236
* ephy-session: Remove ephy_session_queue_command() APICarlos Garcia Campos2013-01-092-153/+0
* ephy-session: Remove EPHY_SESSION_CMD_OPEN_URISCarlos Garcia Campos2013-01-093-83/+123
* ephy-session: Remove EPHY_SESSION_CMD_MAYBE_OPEN_WINDOW_RESTORECarlos Garcia Campos2013-01-091-2/+0
* ephy-session: Remove EPHY_SESSION_CMD_MAYBE_OPEN_WINDOWCarlos Garcia Campos2013-01-092-22/+22
* ephy-session: Add ephy_session_resume() and use it instead of queueing a resu...Carlos Garcia Campos2013-01-093-86/+129
* ephy-session: Use ephy_session_load() directly instead of queueing a load ses...Carlos Garcia Campos2013-01-093-14/+4
* ephy-session: Load the session asynchronouslyCarlos Garcia Campos2013-01-092-218/+525
* ephy-window: fix compiler warningXan Lopez2013-01-051-2/+2
* prefs-dialog: remove some vertical sizeDiego Escalante Urrelo2013-01-051-99/+124
* e-window: add a smarter CopyEmailAddress actionDiego Escalante Urrelo2013-01-053-2/+27
* ephy-shell: There can be two widgets for the same download in WebKit2Carlos Garcia Campos2013-01-041-3/+11
* Implement embedded view source mode in WebKit2Carlos Garcia Campos2013-01-041-6/+3
* downloads: Create the download with the window of the web view that initiated...Carlos Garcia Campos2013-01-041-3/+16
* ephy-download: Make EphyDownload:window a construct only propertyCarlos Garcia Campos2013-01-042-8/+4
* Revert "ephy-toolbar: set url entry's box style class to .linked"Xan Lopez2012-12-191-1/+1
* ephy-state: rename to 'ephy-initial-state'Xan Lopez2012-12-167-31/+29
* ephy-window: align the toolbar margins with the shell onesClaudio Saavedra2012-12-151-0/+2
* ephy-toolbar: fix the toolbar in RTL environmentsClaudio Saavedra2012-12-152-4/+20
* ephy-window: remove some code that's been dead for agesXan Lopez2012-12-141-21/+5
* Update the save web app dialog to be more like the mockupWilliam Jon McCann2012-12-131-5/+44
* Use better icons for webappsWilliam Jon McCann2012-12-131-32/+164
* Use better application names for web appsWilliam Jon McCann2012-12-131-1/+89
* ephy-toolbar: set url entry's box style class to .linkedXan Lopez2012-12-131-1/+1
* ephy-find-toolbar: fix a warningClaudio Saavedra2012-12-131-0/+1
* ephy-find-toolbar: fix build in wk2Claudio Saavedra2012-12-131-0/+4
* ephy-find-toolbar: silly consistency fixClaudio Saavedra2012-12-131-1/+1
* ephy-window: compiler warningsXan Lopez2012-12-131-2/+0
* ephy-window: we can actually zoom images now, so allow thatXan Lopez2012-12-131-22/+6
* New design for find barWilliam Jon McCann2012-12-133-258/+212
* ephy-main: remove debug leftovers that were broken nowXan Lopez2012-12-121-9/+0
* ephy-main: remove some dead codeXan Lopez2012-12-121-6/+1
* ephy-main: remove unused optionXan Lopez2012-12-121-13/+2
* ephy-main: delete profile on exit in incognito modeXan Lopez2012-12-121-1/+1
* ephy-shell: fix the incognito app menu itemClaudio Saavedra2012-12-122-5/+5
* Define the names of the history and bookmarks files in just one placeXan Lopez2012-12-121-2/+3
* First iteration for 'Incognito mode'Xan Lopez2012-12-127-88/+138
* Remove UUID hacks to prevent self-launchXan Lopez2012-12-122-12/+3
* e-shell: fix compiler warningDiego Escalante Urrelo2012-12-111-4/+4
* Open new windows when called with no URIs to openGustavo Noronha Silva2012-12-111-1/+9
* Append new tab on the window with most tabs in the current workspaceGustavo Noronha Silva2012-12-115-1/+82
* ephy-shell: remove the ephy_shell globalDiego Escalante Urrelo2012-12-1117-42/+59
* e-embed-shell: remove the embed_shell globalDiego Escalante Urrelo2012-12-117-17/+24
* ephy-session: use a better variable name for session recoveryXan Lopez2012-12-111-3/+3
* Do not present the window when running in test modeGustavo Noronha Silva2012-12-101-1/+2
* widgets: do not use deprecated GtkStyleContext APIDiego Escalante Urrelo2012-12-101-1/+4
* ephy-session: fixup session autoresumeXan Lopez2012-12-101-6/+7
* Move async_get_favicon_pixbuf_callback() to a WK2-only regionMario Sanchez Prada2012-12-101-30/+27
* ephy-session: remove unused headerXan Lopez2012-12-101-1/+0
* Remove option to launch Web as the bookmarks editorXan Lopez2012-12-105-33/+1
* ephy-session: remove useless condition in ifXan Lopez2012-12-101-5/+1
* ephy-session: remove the code that handles the 'resume window'Xan Lopez2012-12-101-76/+12
* Add the zoom controls to the gear menuXan Lopez2012-12-102-2/+5
* Remove redundant search labelsWilliam Jon McCann2012-12-102-23/+1
* Use GtkSeachEntry instead of EphySearchEntryBastien Nocera2012-12-102-13/+13
* Don't perform empty searches when toggling case matchesWilliam Jon McCann2012-12-091-0/+3
* resources: tidy up application menu orderDiego Escalante Urrelo2012-12-091-7/+5
* bookmarks: Use the current favicons APICarlos Garcia Campos2012-12-072-2/+34
* Port PdmDialog to WebKit2GTK+ favicons API.Mario Sanchez Prada2012-12-041-2/+4
* Port EphyNavigationHistoryAction to WebKit2GTK+ favicons API.Mario Sanchez Prada2012-12-041-12/+21
* Port EphyCompletionModel to WebKit2GTK+ favicons API.Mario Sanchez Prada2012-12-041-16/+28
* Port EphyBookmarks and EphyBookmarkAction to WebKit2GTK+ favicons API.Mario Sanchez Prada2012-12-042-57/+98
* Initialize the favicon database from WebKit2GTK+ as soon as possible.Mario Sanchez Prada2012-12-041-1/+18
* Fix a couple of compiler warnings spotted by the latest gnome-common flagsXan Lopez2012-12-012-2/+2
* Use gtk_application_get_active_window instead of rolling our ownXan Lopez2012-11-266-26/+5
* Fix a ton of 'warning: function declaration isn’t a prototype'Xan Lopez2012-11-051-3/+3
* Fixed bug #686711Diego Escalante Urrelo2012-10-291-1/+1
* ephy-window: Uuref the existing hit test result instead of the new oneCarlos Garcia Campos2012-10-161-1/+1
* ephy-window: Port button press actions to WebKit2Carlos Garcia Campos2012-10-111-9/+38
* ephy-window: Simplify ephy_window_dom_mouse_click_cbCarlos Garcia Campos2012-10-111-98/+101
* Port context menu to WebKit2Carlos Garcia Campos2012-10-112-10/+235
* Avoid a crash in EphyBookmarksEditor when using WebKit2.Mario Sanchez Prada2012-10-101-5/+4
* ephy-main: remove ancient commented codeXan Lopez2012-10-091-1/+0
* ephy-loader: remove, this is unused nowXan Lopez2012-10-081-1/+0
* ephy-shell: do not configure adblock in test modeXan Lopez2012-10-081-15/+17
* Remove extensions supportXan Lopez2012-10-0812-1619/+15
* Move windows handling code from EphySession to EphyShellCarlos Garcia Campos2012-10-088-247/+177
* ephy-shell: use g_clear_{object, pointer} in disposeXan Lopez2012-10-081-56/+12
* Add 'History' item to the gear menu when not in the ShellXan Lopez2012-10-082-2/+3
* ephy-window: add F10 accel for super menuXan Lopez2012-10-071-1/+1
* Merge the app menu into the gear menu when we are not in the ShellXan Lopez2012-10-075-27/+150
* ephy-lockdown: fix typosXan Lopez2012-10-071-2/+2
* ephy-lockdown: use new coding styleXan Lopez2012-10-072-169/+165
* ephy-lockdown: use glib strcmp methodsXan Lopez2012-10-071-2/+1
* ephy-lockdown: de-extensionifyXan Lopez2012-10-072-28/+19
* prefs-dialog: remove JavaScript preference from the UIXan Lopez2012-10-032-20/+0
* adblock: get rid of AdBlock interfaceXan Lopez2012-10-031-8/+0
* Move adblock extension to embed/Xan Lopez2012-10-035-1153/+0
* Remove UI code from adblock, un-extensionify itXan Lopez2012-10-036-825/+1
* prefs-dialog: add a checkbox to enable/disable the adblock functionalityXan Lopez2012-10-022-47/+56
* uri-tester: do not store the adblock data in the 'extensions' dirXan Lopez2012-10-021-1/+1
* Import adblock extension into the source treeXan Lopez2012-10-0110-0/+1986
* pdm-dialog: Add type-ahead search to personal dataBastien Nocera2012-09-271-0/+32
* Make sure windows are properly closed when quitting from the shell menuCarlos Garcia Campos2012-09-275-65/+121
* ephy-embed-utils: add ephy_embed_utils_is_no_show_address()Claudio Saavedra2012-09-171-18/+1
* ephy-session: fix xmlChar* leakPavel Vasin2012-09-171-0/+3
* ephy-find-toolbar: no need to cast return value hereXan Lopez2012-09-141-3/+3
* ephy-find-toolbar: add a close buttonXan Lopez2012-09-141-1/+15
* ephy-window: use symbolic icon for downloads box close buttonXan Lopez2012-09-131-1/+1
* Focus windows when opening new links in tabsXan Lopez2012-09-133-1/+7
* ephy-session: respect 'new-windows-in-tabs' setting when opening linksXan Lopez2012-09-121-1/+6
* Use ephy_sanitize_filename() for filenames suggested by the serverCarlos Garcia Campos2012-09-101-1/+1
* Use the new EphyHistoryService::urls-visited signalClaudio Saavedra2012-09-101-5/+3
* ephy-bookmarks: remove useless includeXan Lopez2012-09-081-1/+0
* Add code coverage supportXan Lopez2012-09-042-0/+3
* ephy-window: disconnect overview-mode callback from the right objectClaudio Saavedra2012-09-041-1/+1
* ephy-main: run the migration for any instance that is not a temporary private...Claudio Saavedra2012-09-041-2/+3
* ephy-profile-utils: add a profile_dir parameter to ephy_profile_utils_do_migr...Claudio Saavedra2012-09-041-1/+1
* ephy-file-helpers: rename KEEP_TEMP_DIR to KEEP_DIRClaudio Saavedra2012-09-031-1/+1
* ephy-bookmarks-editor: repaint the favicon on "icon-loaded"Sergio Villar Senin2012-09-031-8/+34
* ephy-window: handle key modifiers on overview::item-activateClaudio Saavedra2012-09-031-1/+1
* ephy-shell: consider the overview as a blank pageXan Lopez2012-09-031-2/+3
* ephy-session: do not restore tool windowsXan Lopez2012-09-023-154/+5
* ephy-notebook: fix compiler warningXan Lopez2012-09-011-3/+0
* ephy-main: do not run the browser if the migrator failsXan Lopez2012-09-011-2/+7
* ephy-session: don't check loading status for the overview pageClaudio Saavedra2012-09-011-1/+2
* ephy-overview: define the overview title string hereClaudio Saavedra2012-09-011-1/+2
* ephy-navigation-history-action: fix overview titleXan Lopez2012-09-011-0/+5
* ephy-window: show the overview on alt+homeClaudio Saavedra2012-09-011-0/+11
* ephy-home-action: don't assume this will only be used for "NewTab"Claudio Saavedra2012-09-011-5/+5
* ephy-window: don't assume going to the homepage means opening a new tabClaudio Saavedra2012-09-011-2/+1
* ephy-window: disable default actions when the active embed is showing an over...Claudio Saavedra2012-09-011-0/+19
* ephy-window: add ephy-about:overview to the list of hidden urlsClaudio Saavedra2012-09-011-0/+1
* Add about:overview to actually go to overview modeClaudio Saavedra2012-09-011-1/+1
* ephy-window: handle open-link for the overview in the active tabClaudio Saavedra2012-09-011-0/+20
* ephy-embed: add the overview and a overview-mode propertyClaudio Saavedra2012-09-011-0/+2
* ephy-embed-shell: add a frecent store to the shellClaudio Saavedra2012-09-011-0/+4
* ephy-notebook: be more careful with event coordinates on right clickXan Lopez2012-08-311-9/+1
* ephy-session: remove some now useless headersXan Lopez2012-08-311-3/+0
* ephy-session: use ephy_string_to_int instead of reimplementing itXan Lopez2012-08-311-30/+8
* ephy-session: another micro-fixXan Lopez2012-08-301-1/+1
* ephy-session: remove redundant string comparisonClaudio Saavedra2012-08-291-2/+1
* ephy-window: centralize the logic about invisible URIs in one placeXan Lopez2012-08-241-1/+33
* window-commands: Get the suggested filename from the response in WebKit2 tooCarlos Garcia Campos2012-08-231-1/+1
* Port save as to WebKit2Carlos Garcia Campos2012-08-171-1/+5
* ephy-window: Add update_link_actions_sensitivity()Carlos Garcia Campos2012-08-141-10/+17
* Mave avahi a hard dependencyXan Lopez2012-08-102-51/+5
* Show information about the SSL errors when clicking on lock iconCarlos Garcia Campos2012-08-091-0/+27
* ephy-web-view: Return the certificate and TLS errors in ephy_web_view_get_sec...Carlos Garcia Campos2012-08-091-2/+1
* ephy-session: remove some unneeded declarations, reorder headersXan Lopez2012-08-041-4/+1
* window-commands: fix WebKit2 buildXan Lopez2012-08-021-2/+2
* window-commands: fallback correctly when Content-Disposition is not availableXan Lopez2012-08-021-2/+15
* window-commands: suggest the right name in 'Save As'Xan Lopez2012-08-021-3/+2
* popup-commands: don't cancel a download that hasn't even been startedClaudio Saavedra2012-08-021-4/+0
* ephy-home-action: remove useless headersXan Lopez2012-08-011-3/+0
* ephy-window: do not copy history for new empty tabsXan Lopez2012-08-011-0/+4
* ephy-home-action: add implicit NEW_TAB flagZan Dobersek2012-08-011-1/+1
* ephy-home-action: drop DnD functionalityXan Lopez2012-08-011-62/+4
* e-file-chooser: remove persist-keyDiego Escalante Urrelo2012-08-014-6/+2
* ephy-session: spawn the default window if the session state file is brokenXan Lopez2012-08-011-0/+6
* Use $(pkglibdir) instead of $(libdir)/epiphanyMichael Biebl2012-07-311-2/+2
* window-commands: update About dialog taglineDiego Escalante Urrelo2012-07-311-2/+2
* extensions: remove seed supportDiego Escalante Urrelo2012-07-316-542/+2
* ephy-encodings: rewrite to drop usage of EphyNodeXan Lopez2012-07-313-117/+194
* ephy-extensions-manager: don't include EphyNode, it's not used hereXan Lopez2012-07-282-9/+4
* Use G_DEFINE_BOXED_TYPE to define boxed typesXan Lopez2012-07-191-15/+2
* window-commands: Port WebKit version information in about dialog to WebKit2Carlos Garcia Campos2012-07-091-1/+5
* Port cookies to WebKit2Carlos Garcia Campos2012-07-041-6/+118
* window-commands: initialize string variables to NULLXan Lopez2012-06-281-1/+1
* ephy-web-view: get rid of 'ephy_web_view_get_location'Xan Lopez2012-06-281-3/+2