aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
Commit message (Expand)AuthorAgeFilesLines
* irc-network-chooser-dialog: use network accessorsGuillaume Desmottes2010-08-251-18/+4
* irc-network-chooser-dialog: add live search supportGuillaume Desmottes2010-08-251-7/+91
* account-widget-irc: use EmpathyIrcNetworkChooserGuillaume Desmottes2010-08-252-459/+24
* irc-network-chooser: popup network chooser dialog when clickedGuillaume Desmottes2010-08-251-1/+62
* add empathy-irc-network-chooser-dialogGuillaume Desmottes2010-08-253-0/+559
* add empathy-irc-network-chooserGuillaume Desmottes2010-08-253-0/+362
* Don't leak a reference when updating an IndividualWidget.Travis Reitter2010-08-241-0/+2
* Merge branch 'tls-connection'Cosimo Cecchi2010-08-245-0/+635
|\
| * Use the hostname properties in the dialogCosimo Cecchi2010-08-191-3/+28
| * Add a details hash table to the dialog propertiesCosimo Cecchi2010-08-192-2/+30
| * Add reference to the original gnome-keyring repoCosimo Cecchi2010-08-182-0/+6
| * Add the checkbox only if the reason is SelfSignedCosimo Cecchi2010-08-131-5/+14
| * Add a 'remember' checkbox and property to the dialogCosimo Cecchi2010-08-131-2/+33
| * Import gcr-simple-certificate from gcrCosimo Cecchi2010-08-133-0/+190
| * Add EmpathyTLSDialogCosimo Cecchi2010-08-133-0/+345
| * Depend on gcr from gnome-keyringCosimo Cecchi2010-08-131-0/+1
* | Remove EmpathyAvatar->tokenPhilip Withnall2010-08-241-2/+2
* | Use the avatar filename rather than token for change detectionPhilip Withnall2010-08-241-5/+7
* | use proper model in linking uiFelix Kaser2010-08-241-1/+1
* | linker: add some padding in the 2 part of the paneGuillaume Desmottes2010-08-231-2/+13
* | individual-widget: adapt number of rows to the features neededGuillaume Desmottes2010-08-231-3/+7
* | linker: add a label explaining how to use the dialogGuillaume Desmottes2010-08-231-2/+18
* | Display the number of personas only in tooltipsGuillaume Desmottes2010-08-231-19/+25
* | linker: display titles in boldGuillaume Desmottes2010-08-231-2/+9
* | Add a "Linked Contacts" label at the top of the Information dialoguePhilip Withnall2010-08-201-3/+35
* | Allow EmpathyIndividualInformationDialog to be resizedPhilip Withnall2010-08-201-1/+1
* | Fix some visual breakage of EmpathyIndividualWidget in tooltipsPhilip Withnall2010-08-202-6/+12
* | Bug 627360 — "Information" of a meta contact is too big for the screenPhilip Withnall2010-08-202-3/+56
* | Display Personas' accounts in the linking dialoguePhilip Withnall2010-08-201-1/+3
* | Add an "account" column to EmpathyPersonaStorePhilip Withnall2010-08-202-0/+10
* | Avoid conflicting accelerators in New Call dialog.Will Thompson2010-08-201-1/+1
* | Add EmpathyIndividualEditDialogPhilip Withnall2010-08-204-6/+336
* | Don't try to expand groups if the EmpathyIndividualView's store is unsetPhilip Withnall2010-08-201-2/+6
* | Bug 627219 — Link dialog search doesn't workPhilip Withnall2010-08-203-25/+81
* | Use EmpathyIndividualWidget in EmpathyIndividualInformationDialogPhilip Withnall2010-08-201-28/+10
* | Use EmpathyIndividualWidget in EmpathyIndividualView tooltipsPhilip Withnall2010-08-201-12/+8
* | Fix the flags given to the widget in EmpathyIndividualLinkerPhilip Withnall2010-08-201-1/+1
* | Expand EmpathyIndividualWidgetPhilip Withnall2010-08-204-72/+1982
* | Split the group editing widgets out of EmpathyContactWidgetPhilip Withnall2010-08-205-392/+687
* | live-search: fix typoGuillaume Desmottes2010-08-191-1/+1
* | Ensure we disconnect signals from all Personas in an IndividualPhilip Withnall2010-08-191-19/+58
* | Allow cancellation of avatar load operationsPhilip Withnall2010-08-193-13/+54
* | use TP_USER_ACTION_TIME_* (#627165)Guillaume Desmottes2010-08-182-3/+3
* | Aggregate group expansion/contraction in EmpathyIndividualViewPhilip Withnall2010-08-181-36/+96
* | Don't recursively expand contact list rows unnecessarilyPhilip Withnall2010-08-181-1/+1
* | Bug 626552 — Sporadic tree model warnings upon initial fill in EmpathyPhilip Withnall2010-08-181-5/+15
* | Rearrange functions in EmpathyIndividualViewPhilip Withnall2010-08-181-109/+109
* | Support previous conversations in the Personas menu.Travis Reitter2010-08-162-25/+33
* | Support chat room invites in the Personas menu.Travis Reitter2010-08-162-42/+68
* | Support desktop sharing in the Personas menu.Travis Reitter2010-08-161-6/+18
* | Also support file transfer in the Personas menu.Travis Reitter2010-08-162-7/+20
* | Support calls in the Personas menu.Travis Reitter2010-08-163-16/+42
* | Add Personas entries to the contact menu.Travis Reitter2010-08-162-8/+143
* | Make the Share my Desktop item map to the first capable contact.Travis Reitter2010-08-161-19/+5
* | Make the Invite to Chat Room list all possible rooms for all subcontacts.Travis Reitter2010-08-161-16/+99
* | Make Send File context menu choose the first capable contact.Travis Reitter2010-08-161-18/+6
* | Make the individual menu items map to the first capable contact.Philip Withnall2010-08-161-42/+79
* | Show information for all an individual's personas in the information dialoguePhilip Withnall2010-08-164-6/+326
* | log-viewer: rename labels of the Back and Previous buttonsGuillaume Desmottes2010-08-161-4/+12
* | log-window: fix ordering of the Back and Previous buttons (#626992)Guillaume Desmottes2010-08-161-21/+37
|/
* persona-view: use empathy_contact_dup_from_tp_contact instead of empathy_cont...Guillaume Desmottes2010-08-131-1/+1
* persona-store: use empathy_contact_dup_from_tp_contact instead of empathy_con...Guillaume Desmottes2010-08-131-5/+5
* chat: get the account from the tp-chatGuillaume Desmottes2010-08-121-3/+2
* widget-irc: call update_server_params in setup so buttons are updated (#626620)Guillaume Desmottes2010-08-121-0/+1
* compare accounts using their object paths rather than their TpAccountGuillaume Desmottes2010-08-121-1/+3
* use tp_strdiffGuillaume Desmottes2010-08-121-3/+3
* use explicit pointer comparaisonsGuillaume Desmottes2010-08-121-11/+11
* select_account_once_ready: free the account and ID to avoid leaksGuillaume Desmottes2010-08-121-0/+4
* select the account once we have populated the model with its chats (#622714)Guillaume Desmottes2010-08-121-6/+16
* log_manager_got_chats_cb: don't rely on the selected account any moreGuillaume Desmottes2010-08-121-8/+4
* no need to pass account and chat infos to log_window_chats_set_selectedGuillaume Desmottes2010-08-121-14/+8
* also use select_account_once_ready when the window already existsGuillaume Desmottes2010-08-121-2/+1
* keep a ref on the accountGuillaume Desmottes2010-08-121-1/+2
* factor out select_account_once_readyGuillaume Desmottes2010-08-121-12/+22
* Fix linking menu entry mnemonicPhilip Withnall2010-08-121-1/+1
* Add EmpathyLinkingDialogPhilip Withnall2010-08-125-2/+279
* Add EmpathyIndividualLinkerPhilip Withnall2010-08-123-0/+681
* Add EmpathyIndividualWidgetPhilip Withnall2010-08-123-0/+365
* Add EmpathyPersonaStore and EmpathyPersonaViewPhilip Withnall2010-08-125-0/+1927
* Only enable row reordering in EmpathyIndividualView if dragging is enabledPhilip Withnall2010-08-121-6/+9
* empathy_dispatcher_join_muc: get an account instead of a connectionGuillaume Desmottes2010-08-111-4/+5
* re-implement empathy_dispatcher_chat_with_contact using empathy_dispatcher_ch...Guillaume Desmottes2010-08-114-6/+4
* empathy_dispatcher_chat_with_contact_id: get a TpAccount instead of a TpConne...Guillaume Desmottes2010-08-112-18/+10
* empathy_dispatcher_chat_with_contact_id: remove callback argumentGuillaume Desmottes2010-08-112-3/+2
* share-my-desktop: use TpAccountChannelRequestGuillaume Desmottes2010-08-111-8/+24
* new-call-dialog: use TpAccountChannelRequestGuillaume Desmottes2010-08-111-10/+25
* empathy_call_factory_new_call_with_streams: remove callback argGuillaume Desmottes2010-08-112-4/+4
* Use GimpNet as default IRC network (#625675)Bilal Akhtar2010-08-111-0/+6
* empathy_contact_selector_dialog_get_selected: allow to get the account as wellGuillaume Desmottes2010-08-104-5/+17
* Minor coding style fixes in EmpathyIndividual[Store|View]Philip Withnall2010-08-092-3/+3
* empathy-individual-menu: no need to get the call factoryGuillaume Desmottes2010-08-091-4/+0
* Fix capability change notification in the EmpathyIndividualStorePhilip Withnall2010-08-091-6/+35
* Cast away constness of strings in GtkTargetEntry structsPhilip Withnall2010-08-051-8/+13
* Fix old-style function definition (missing void)Philip Withnall2010-08-051-1/+1
* Fix constness of various variables and parametersPhilip Withnall2010-08-055-11/+11
* Fix missing entries in switch statementsPhilip Withnall2010-08-059-9/+39
* Use #ifdef instead of #if to avoid warnings of undefined symbolsPhilip Withnall2010-08-051-5/+5
* Fix memory corruption introduced by not removing a weak pointerPhilip Withnall2010-08-051-17/+39
* use different labels if view is emptyFelix Kaser2010-08-052-0/+16
* Fix an assertion failure in the filtering code due to show-offline changesPhilip Withnall2010-08-051-2/+4
* use member variable instead of getterFelix Kaser2010-08-031-5/+3
* refactored show_offline property to the viewFelix Kaser2010-08-034-114/+69
* Connect signals only once, it's enoughXavier Claessens2010-08-031-7/+0
* fixing a method name typoFelix Kaser2010-08-031-2/+2
* show the date in messages coming from history (#624599)Nicolò Chieffo2010-08-022-6/+12
* Group all matching functions togetherXavier Claessens2010-07-301-69/+69
* Simplify code: Avoid nested loopsXavier Claessens2010-07-301-61/+63
* Make livesearch work if accentued letters are pre-decomposedXavier Claessens2010-07-301-6/+6
* Make EmpathyLiveSearch's match algo smarter with wordsXavier Claessens2010-07-301-27/+74
* backport the last commit to contact-list-viewFelix Kaser2010-07-291-6/+10
* added return value for the keynav signalFelix Kaser2010-07-292-7/+13
* changed the type of keynav signalFelix Kaser2010-07-292-6/+6
* added check for null before scroll to cellFelix Kaser2010-07-291-2/+5
* add key navigation possibilities to searchFelix Kaser2010-07-291-0/+23
* keep the selected contact visible after searchFelix Kaser2010-07-291-0/+7
* enable keynavigation during search in contact-listFelix Kaser2010-07-292-4/+48
* dont catch key up and down from the treeviewFelix Kaser2010-07-291-0/+5
* fixed a critical when quiting while searchingFelix Kaser2010-07-291-1/+1
* fix small regression with expanding groupsFelix Kaser2010-07-281-1/+1
* Adjust for signature change in folks_groups_change_group()Travis Reitter2010-07-271-2/+20
* Re-enable setting of groups for newly-added contactsPhilip Withnall2010-07-221-11/+2
* Merge EmpathyContact:name and *_set_alias() to EmpathyContact:aliasPhilip Withnall2010-07-2210-37/+37
* Remove folks_individual_dup_from_empathy_contact()Philip Withnall2010-07-221-33/+15
* Merge remote branch 'pwith/folks-integ-rebase1-fixes-rebase1' into folks-fixesTravis Reitter2010-07-223-14/+23
* Re-add support for the "People Nearby" groupPhilip Withnall2010-07-211-4/+12
* Use the proper source_tag in empathy_pixbuf_avatar_from_individual_scaled_*().Travis Reitter2010-07-211-2/+2
* Don't depend on Folks capabilities in the IndividualViewTravis Reitter2010-07-211-2/+13
* Calculate contact capabilities ourselves.Travis Reitter2010-07-211-12/+33
* Take advantage of tp_clear_object().Travis Reitter2010-07-211-2/+1
* Minimize the scope of some variables and avoid risk of double-freeing a string.Travis Reitter2010-07-211-3/+4
* Enclose a non-trivial expression in () in an assignment.Travis Reitter2010-07-211-1/+1
* Also sort the IndividualStore by underlying protocol and account ID.Travis Reitter2010-07-211-3/+24
* Don't enclose trivial blocks in {}.Travis Reitter2010-07-212-96/+33
* Use explicit '!= NULL' for pointer boolean expressions.Travis Reitter2010-07-212-12/+13
* Cut obsolete comment.Travis Reitter2010-07-211-1/+0
* Simplify validation.Travis Reitter2010-07-211-1/+1
* Take advantage of tp_clear_object().Travis Reitter2010-07-211-2/+1
* We already know that this contact is a FolksIndividual if it isn't NULL, so s...Travis Reitter2010-07-211-1/+1
* Stick with the term 'contact' instead of adding 'individual'.Travis Reitter2010-07-211-1/+1
* Update copyright notice.Travis Reitter2010-07-211-1/+1
* Don't leak references to the contacts returned from empathy_contact_dup_from_...Travis Reitter2010-07-214-1/+15
* Add 'dup' to the names of empathy_contact_from_folks_individual() and folks_i...Travis Reitter2010-07-215-30/+30
* Use the gio async pattern for fetching Individuals' avatarsTravis Reitter2010-07-213-39/+92
* Reduce line length.Travis Reitter2010-07-211-5/+6
* Take advantage of the tp_clear_* utility functions.Travis Reitter2010-07-213-55/+14
* Cut misinformed comment about a potential race condition.Travis Reitter2010-07-211-1/+0
* Create a constructor for PixbufAvatarFromIndividualClosure.Travis Reitter2010-07-211-11/+26
* Clarify that toggling a group in the EmpathyContactWidget actually toggles it.Travis Reitter2010-07-211-4/+5
* Use explicit boolean expressions for if-conditionals, according to Telepathy ...Travis Reitter2010-07-213-10/+10
* Add some more validation when sorting the contact list.Travis Reitter2010-07-211-8/+10
* Fix setting favourites from the contact editing dialoguePhilip Withnall2010-07-211-17/+16
* Allow changing of individuals' aliasesPhilip Withnall2010-07-212-4/+9
* Re-enable changing individuals' groupsPhilip Withnall2010-07-211-13/+15
* Support removing groupsPhilip Withnall2010-07-211-2/+4
* Fix some referencing bugs with the IndividualStore and IndividualViewPhilip Withnall2010-07-212-13/+13
* Re-implement file sending with drag and dropPhilip Withnall2010-07-211-2/+3
* Remove unused EmpathyIndividualManager instances from the individual menuPhilip Withnall2010-07-211-9/+0
* Take advantage of favourites being a hard requirement and add stubs for addin...Travis Reitter2010-07-211-4/+0
* Hide/show groups as necessary when their members change.Travis Reitter2010-07-211-0/+7
* Replace the IndividualView's setup function with a more-conventional construc...Travis Reitter2010-07-211-1/+0
* Catch up with convention for getting the view's model.Travis Reitter2010-07-211-1/+1
* Follow the new tree store insertion convention used by the contact list store...Travis Reitter2010-07-211-7/+8
* Finish adding favourites supportPhilip Withnall2010-07-212-27/+21
* Support contact removalTravis Reitter2010-07-211-2/+8
* Support contact addingTravis Reitter2010-07-214-7/+195
* Use the new FolksFavourite interface for favourites supportPhilip Withnall2010-07-213-9/+6
* Avoid potential segfaults if there are no contacts on the first pass.Travis Reitter2010-07-212-23/+13
* Re-add the audio and video call menu items in the call-activated handler.Travis Reitter2010-07-211-4/+6
* Support the contact list tooltipTravis Reitter2010-07-211-1/+48
* Re-implement the context menu for IndividualsTravis Reitter2010-07-215-36/+817
* Don't crash if a row gets deleted before being expanded.Travis Reitter2010-07-211-1/+0
* Fix the formatting of some calls to g_object_set()Travis Reitter2010-07-211-6/+26
* Back-port better solution for incorrect-groups-expanded problem.Travis Reitter2010-07-211-0/+1
* Implement avatar support.Travis Reitter2010-07-213-31/+170
* Base the contact list around libfolks metacontacts. Not yet to feature-parityTravis Reitter2010-07-218-3/+4274
* Disable /query and /msg commands for now (#624268)Guillaume Desmottes2010-07-141-0/+7
* empathy-log-window: coding style fixesGuillaume Desmottes2010-07-131-2/+2
* empathy-contact-list-view: coding style fixGuillaume Desmottes2010-07-131-1/+1
* Fix activating [ ] Enabled with the keyboard.Will Thompson2010-07-121-3/+3
* simplify empathy_presence_chooser_newGuillaume Desmottes2010-07-081-5/+1
* Merge branch 'gtk3-621753'Guillaume Desmottes2010-07-082-2/+8
|\
| * notify-manager: include empathy-contact.h as we use itGuillaume Desmottes2010-07-081-0/+2
| * use libcanberra-gtk3 when building with GTK3Guillaume Desmottes2010-07-081-0/+2
| * move GTK+ check to its own PKG_CHECK_MODULESGuillaume Desmottes2010-07-081-0/+2
| * Simplify checking of the depsGuillaume Desmottes2010-07-071-2/+2
* | empathy_pixbuf_contact_status_icon_with_icon_name: don't use icon_filename af...Guillaume Desmottes2010-07-081-2/+3
|/
* Make incoming file chooser dialog's title more informativeGuillaume Desmottes2010-07-071-2/+10
* chat: add FIXME explaining how we should ideally request channelsGuillaume Desmottes2010-07-071-0/+6
* empathy_dispatcher_join_muc: remove callback argGuillaume Desmottes2010-07-071-4/+2
* chat: no need to pass a callback to empathy_dispatcher_chat_with_contact_id a...Guillaume Desmottes2010-07-071-26/+2
* /join: don't pass a call when calling empathy_dispatcher_join_muc()Guillaume Desmottes2010-07-071-16/+1
* empathy_geometry_save: fix string leakGuillaume Desmottes2010-07-021-0/+1
* contact_widget_location_update: fix string leakGuillaume Desmottes2010-07-021-0/+1
* chat: display pending messages once constructed if the channel is a room (#62...Guillaume Desmottes2010-06-291-1/+8
* empathy_call_factory_new_call_with_streams: no need to pass a EmpathyCallFactoryGuillaume Desmottes2010-06-291-7/+2
* Work around GCompletion deprecation for the time beingDanielle Madeley2010-06-291-0/+1
* Use document font by default for adium themesXavier Claessens2010-06-231-2/+2
* log_window_get_messages_for_date: don't clear the marks on the calendarGuillaume Desmottes2010-06-221-2/+0
* add 2 commentsGuillaume Desmottes2010-06-221-1/+3
* Merge branch 'av-handler-622368'Guillaume Desmottes2010-06-222-19/+27
|\
| * new-call-dialog: create the AV channel using the TargetID so we don't have to...Guillaume Desmottes2010-06-221-43/+22
| * empathy_call_factory_new_call_with_streams: request channel using the CDGuillaume Desmottes2010-06-222-5/+34
* | log-window: check if the window still exist in async cb (#622273)Guillaume Desmottes2010-06-221-0/+21
* | move the static variable used by the singleton out of empathy_log_window_showGuillaume Desmottes2010-06-221-9/+13
|/
* share-my-desktop: ownership of the request hash table is passed to empathy_di...Guillaume Desmottes2010-06-211-1/+0
* Make sure taping ENTER when searching contact starts a chat.Xavier Claessens2010-06-211-0/+65
* Add "activate" signal on EmpathyLiveSearchXavier Claessens2010-06-211-0/+25
* Merge branch 'vino-621998'Guillaume Desmottes2010-06-211-203/+28
|\
| * share-my-desktop: request the tube using the CDOGuillaume Desmottes2010-06-211-203/+28
* | Merge branch 'check-vinagre-589225'Guillaume Desmottes2010-06-211-1/+2
|\ \
| * | replace empathy_contact_can_use_stream_tube by empathy_contact_can_use_rfb_st...Guillaume Desmottes2010-06-211-1/+2
| |/
* | Rely on compare_separator_and_groups when either A or B isn't a contactSjoerd Simons2010-06-201-4/+3
* | Now that we depend on the logger always enable favourite contact supportSjoerd Simons2010-06-203-14/+0
* | Pick the right sort function earlySjoerd Simons2010-06-201-4/+4
* | Throw a warning if the contact sort function didn't get two contactsSjoerd Simons2010-06-201-0/+2
* | Use the right GSettings schemeSjoerd Simons2010-06-201-6/+6
* | EmpathyChat: use an opaque struct for priv not a void pointerSjoerd Simons2010-06-202-3/+4
|/
* Depend on telepathy-logger (#610956)Guillaume Desmottes2010-06-184-431/+2
* use ISO-8601 dates in DEBUGGuillaume Desmottes2010-06-181-5/+5
* don't use strptimeGuillaume Desmottes2010-06-181-19/+8
* TplLogEntry(Text) has been renamed to TplEntry(Text)Guillaume Desmottes2010-06-182-4/+4
* tpl_log_manager_search_new_async has been renamed to tpl_log_manager_search_a...Guillaume Desmottes2010-06-181-2/+2
* tp-logger now use GDate rather than strings in its APIGuillaume Desmottes2010-06-181-64/+100
* port to latest tp-logger APIGuillaume Desmottes2010-06-182-21/+14
* Port Empathy code to GSettings, remove EmpathyConfDanielle Madeley2010-06-1814-702/+219
* Remove the treeview's build-in search function, we use the live search now.Xavier Claessens2010-06-173-51/+0
* Fix the visibility of group when live search is activeXavier Claessens2010-06-171-0/+56
* Make status preset editor taller by defaultWill Thompson2010-06-161-0/+1
* Merge branch 'gseal'Danielle Madeley2010-06-154-37/+22
|\
| * Access GdkDragContext members via gettersDanielle Madeley2010-06-122-4/+6
| * Use gtk_text_view_get_vadjustment() instead of assuming parent is a GtkScroll...Xavier Claessens2010-06-121-31/+14
| * Use new GtkTextView API to make EmpathyChat build with GSEAL enabledXavier Claessens2010-06-121-2/+2
* | Add a GtkSpinner to notify the RequestContactInfo progressXavier Claessens2010-06-151-0/+8
* | Display contact vCard in information dialog, add basic vCard editor for self ...Xavier Claessens2010-06-154-71/+403
* | Fix authors and copyright of EmpathyLiveSearchXavier Claessens2010-06-142-0/+6
* | If path is NULL, the signal is blocked foreverXavier Claessens2010-06-141-4/+4
* | Do not crash if the row gets deleted before the expand idle cbXavier Claessens2010-06-131-0/+4
* | Use a GtkTreeRowReference instead of GtkTreePath to expand/collapse a group i...Xavier Claessens2010-06-131-7/+9
* | check if the search widget exists before trying to use itGuillaume Desmottes2010-06-111-1/+4
|/
* coding style fixesGuillaume Desmottes2010-06-091-3/+3
* empathy_string_replace_escaped: use gsize instead of gssizeGuillaume Desmottes2010-06-091-1/+1
* Strip the @server.com part of the contact ID for the live search matching.Xavier Claessens2010-06-091-2/+14
* Show/Hide the live search before refilteringXavier Claessens2010-06-091-5/+5
* Use EmpathyLiveSearch in main window's contact listFelix Kaser2010-06-092-37/+308
* factor out set_requirementsGuillaume Desmottes2010-06-091-14/+22
* Call geoclue_master_client_set_requirements before asking for position/addressLaurent Bigonville2010-06-091-1/+7
* refactored how contacts are added to the storeFelix Kaser2010-06-091-19/+7
* empathy_string_replace_escaped: remove '\r' (#620903)Guillaume Desmottes2010-06-081-1/+15
* Add EmpathyLiveSearch widgetFelix Kaser2010-06-083-0/+632
* Do not require geoclue provider to support updatesLaurent Bigonville2010-06-071-1/+1