aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
* | factor out create_markerGuillaume Desmottes2010-03-301-19/+28
* | rename map_view_marker_update_position to map_view_update_contact_position an...Guillaume Desmottes2010-03-301-18/+14
* | map-view: add a mapping from EmpathyContact to ChamplainMarkerGuillaume Desmottes2010-03-301-0/+8
* | call-window: call empathy_call_handler_stop_call when closing a callGuillaume Desmottes2010-03-301-1/+8
* | empathy_call_window_disconnected: remove call to empathy_call_window_reset_pi...Guillaume Desmottes2010-03-301-1/+3
* | don't leak the classes listGuillaume Desmottes2010-03-301-4/+12
* | Unsensitive roomlist expander if roomlist is not supported (#614002)Guillaume Desmottes2010-03-301-0/+2
* | Don't request roomlist channel if not supported (#614002)Guillaume Desmottes2010-03-301-1/+14
* | Sets sensitivity of Previous/Next Tab menu items based on gtk-keynav-wrap-aro...Aaron Brown2010-03-301-2/+7
* | coding style fixesGuillaume Desmottes2010-03-291-6/+5
* | Check for errors when linking the video source into a call (#612020)Olivier Crête2010-03-291-7/+60
* | Verify that the video source could be linked into the pipelineOlivier Crête2010-03-291-1/+5
* | Return error when the audio source can not be startedOlivier Crête2010-03-291-4/+31
* | Return a telepathy error if the source can't be addedOlivier Crête2010-03-291-1/+2
* | Remove false commentOlivier Crête2010-03-291-1/+0
* | Add audio conversion filter to receive pipelineOlivier Crête2010-03-291-1/+43
* | Add fakesink to srcpad if not real sink could be linkedOlivier Crête2010-03-291-0/+30
* | Emit error when failing to link audio padOlivier Crête2010-03-291-1/+12
* | Send stream error when the src pad can't be linkedOlivier Crête2010-03-291-1/+3
* | Handle errors from audio sinkOlivier Crête2010-03-291-5/+53
* | new-chatroom-dialog: filter CM not implementing groupchatAndrew Gorcester2010-03-291-1/+45
* | fix alignment of the label in error-infobarFelix Kaser2010-03-291-0/+1
* | ship a copy of empathy_log_store_empathy_get_dir in migrate-butterfly-logs.cGuillaume Desmottes2010-03-291-5/+32
* | fix menu_tabs_right acceleratorGuillaume Desmottes2010-03-291-1/+1
* | Merge commit 'treitter/bug-613272'Guillaume Desmottes2010-03-291-1/+1
|\ \
| * | Set a default empathy-accounts window size such that any scrolled Advanced se...Travis Reitter2010-03-271-1/+1
| * | Another way to fix Gnome bug #613272. This puts the Advanced expander content...Travis Reitter2010-03-252-112/+95
| * | Make the account details pane scrollable, in case the Advanced section is too...Travis Reitter2010-03-202-95/+112
* | | Adds Ctrl+Shift+PgUp/PgDn accelerator key to move current tab left/right (#61...Aaron Brown2010-03-291-0/+2
* | | Same reap-child fix for empathy-debuggerDanielle Madeley2010-03-241-1/+1
* | | Automatically reap the empathy-accounts child processDanielle Madeley2010-03-244-31/+8
* | | empathy-debugger: set text domainGuillaume Desmottes2010-03-231-0/+1
* | | empathy-accounts: set text domainGuillaume Desmottes2010-03-221-0/+1
* | | chat-window: remove some DEBUG callsGuillaume Desmottes2010-03-221-15/+0
|/ /
* | sidebar: fix assertion in empathy_sidebar_menu_position_underGuillaume Desmottes2010-03-171-1/+1
* | fix escaping of UTF-chars in ui file (#613117)Gabor Kelemen2010-03-171-2/+2
* | Added gtk-keynav-wrap-around check before cycling tabsmrhappypants2010-03-171-2/+10
* | Merge commit 'staz/dnd'Guillaume Desmottes2010-03-161-13/+17
|\ \
| * | DnD: add a new text/path-list target in chat windowOlivier Le Thanh Duong2010-03-161-6/+13
| * | chat_window_drag_motion : search in all the drop targetsOlivier Le Thanh Duong2010-03-051-7/+4
| |/
* | empathy_window_present: remove useless 'steal_focus' argGuillaume Desmottes2010-03-154-5/+5
* | main_window_chat_quit_cb: release the reference on the chatroom mgrGuillaume Desmottes2010-03-151-0/+1
* | call-window: display the 'audio input' page by default (#612450)Guillaume Desmottes2010-03-151-6/+7
* | invite-participant-dialog: filter contacts by accountGuillaume Desmottes2010-03-153-4/+10
* | empathy-accounts: set a title for the assistantDanielle Madeley2010-03-151-0/+3
* | empathy-accounts: set "Empathy Accounts" as application nameGuillaume Desmottes2010-03-151-1/+1
* | empathy-debugger: set "Empathy Debugger" as application nameGuillaume Desmottes2010-03-151-1/+1
* | Separate the debug window into its own process.Mike Ruprecht2010-03-154-3/+87
* | Migrate butterfly logs to remove the network ID suffix.Jonny Lamb2010-03-134-0/+264
* | Window title for the accounts dialog should match the name in the launcher.Ken VanDine2010-03-101-1/+1
* | empathy-accounts: make CcPage insensitive when assistant is being shownDanielle Madeley2010-03-104-5/+59
|/
* set the server field of Google Talk accountGuillaume Desmottes2010-03-052-8/+24
* Fix silly typoSjoerd Simons2010-03-052-2/+2
* Popup the assistant when starting only if there is *no* account configuredGuillaume Desmottes2010-03-051-2/+2
* add empathy_accounts_has_accountsGuillaume Desmottes2010-03-052-0/+15
* remove the salut_created gconf key (#611817)Guillaume Desmottes2010-03-052-25/+0
* Connect to the accounts signals in one central placeSjoerd Simons2010-03-051-10/+5
* Cancel creation in the accounts dialog if the wizard is runningSjoerd Simons2010-03-053-5/+53
* Don't assume there is always a settings widget availableSjoerd Simons2010-03-051-7/+12
* accounts-dialog: set display-name before creating the accountGuillaume Desmottes2010-03-031-9/+0
* assistant: call empathy_account_widget_get_default_display_name before actual...Guillaume Desmottes2010-03-031-10/+10
* assistant: always uses empathy_account_widget_get_default_display_name to get...Guillaume Desmottes2010-03-031-9/+6
* Merge branch 'more-accounts-fixes'Travis Reitter2010-03-032-40/+104
|\
| * Remove EmpathyAccountsPlugin's requirement that it be a singleton, so we can ...Travis Reitter2010-03-032-38/+15
| * Disable the Cancel button in the accounts dialog if there are no existing acc...Travis Reitter2010-03-021-1/+72
| * When we're creating our first account, don't let the remove button become sen...Travis Reitter2010-02-271-1/+8
| * Don't create some extra "ghost" account if we're creating our first account a...Travis Reitter2010-02-271-0/+9
* | empathy-accounts: the TpDBusDaemon is not used any moreGuillaume Desmottes2010-03-021-1/+0
* | account-assistant: ensure that new accounts are connected (#611565)Guillaume Desmottes2010-03-021-0/+2
* | Remove code that will always fail and has no useSjoerd Simons2010-03-021-20/+0
* | Improve debugging and don't use g_debugSjoerd Simons2010-03-023-2/+6
* | Simplify empathy_accounts_importSjoerd Simons2010-03-022-20/+7
* | Make the empathy-account code be slightly more streamlinedSjoerd Simons2010-03-026-103/+55
* | Always popup the accounts wizard if we don't have salut accountsSjoerd Simons2010-03-021-1/+3
* | Only launch empathy-accounts if neededSjoerd Simons2010-03-021-1/+7
* | Also potentially popup the account dialog when activate by libuniqueSjoerd Simons2010-03-021-0/+10
* | accounts-dialog: update the status info when account when account is enabledGuillaume Desmottes2010-02-281-3/+2
* | Merge branch 'show-assistant-611131'Danielle Madeley2010-02-271-0/+4
|\|
| * empathy-accounts: Check to see if there are no accounts thus show the assistantDanielle Madeley2010-02-261-0/+4
* | Merge commit 'ka/empathy-tpl-20100225-ifdef'Guillaume Desmottes2010-02-263-2/+20
|\ \
| * | TPL Enabling patch, all-in-one.Cosimo Alfarano2010-02-263-2/+20
| |/
* | Remove the SKIP_TASKBAR hint when the main window is activatedRob Bradford2010-02-261-0/+1
* | Add the capability to search debug messages in the debug window.Mike Ruprecht2010-02-261-0/+36
|/
* Merge branch 'requests'. Fixes: #598905Sjoerd Simons2010-02-252-3/+3
|\
| * Use a appropriate unique name for Empathy unique appSjoerd Simons2010-02-252-3/+3
* | Remove inset frame from contact list in main windowSander Dijkhuis2010-02-251-1/+0
|/
* Add missing libm linking (#610751)Brian Pepple2010-02-231-0/+1
* Remove the --acounts CLI optionGuillaume Desmottes2010-02-221-43/+13
* define EMPATHY_CLIENT_NAMEGuillaume Desmottes2010-02-222-3/+2
* remove old services from gitignoreGuillaume Desmottes2010-02-221-3/+0
* Stop using org.gnome.EmpathyGuillaume Desmottes2010-02-221-22/+2
* debug_window_fill_cm_chooser: use org.freedesktop.Telepathy.Client.EmpathyGuillaume Desmottes2010-02-221-1/+1
* always use empathy_tp_chat_leave instead of _closeGuillaume Desmottes2010-02-201-1/+1
* assistant: Fix creation of the last account createdGuillaume Desmottes2010-02-191-0/+6
* assistant: check that the enter/create page isn't already valid when switchin...Guillaume Desmottes2010-02-191-0/+6
* assistant: set the salut page as complete if we pre-filled enough fields (#61...Guillaume Desmottes2010-02-191-0/+6
* Rename Moblin to Meego throughout EmpathyDanielle Madeley2010-02-191-6/+6
* Don't display the 'respond' button in presence notifications (#610032)Guillaume Desmottes2010-02-171-1/+2
* remove EMPATHY_EVENT_TYPE_TUBEGuillaume Desmottes2010-02-171-1/+0
* account-assistant: remove '\n' from the salut error web pageGuillaume Desmottes2010-02-171-3/+3
* account-assistant: Wrap secondary error message (#607908)Guillaume Desmottes2010-02-171-0/+1
* main-window: use GTK_MESSAGE_ERROR for account error info barsGuillaume Desmottes2010-02-171-1/+1
* Use TpDebugSender to publish debug messages (#607330)Jonny Lamb2010-02-172-42/+26
* empathy_accounts_dialog_show_application: try to run "empathy-accounts" from ...Guillaume Desmottes2010-02-161-1/+10
* empathy_accounts_dialog_show_application: use g_build_filenameGuillaume Desmottes2010-02-161-1/+4
* accounts-dialog: block the selection 'changed' signal while removing a rowGuillaume Desmottes2010-02-151-0/+14
* Remove workaround for wrong drag behaviourSjoerd Simons2010-02-151-8/+7
* Make the ChatWindow handle dropping items itselfSjoerd Simons2010-02-151-20/+31
* Only act when the account got a connectionSjoerd Simons2010-02-141-0/+2
* Update the FSF's mailing address in the new control center files.Travis Reitter2010-02-135-10/+5
* empathy-accounts-dialog: Prepend BIN_DIR to the binary nameDanielle Madeley2010-02-122-1/+2
* Separate the accounts dialog into its own program which works with the Gnome ...Travis Reitter2010-02-1214-197/+1239
* assistant: filter out facebook from the new account pageGuillaume Desmottes2010-02-121-1/+3
* add is_facebook arg to empathy_protocol_chooser_dup_selectedGuillaume Desmottes2010-02-122-9/+28
* do_show_accounts_ui: don't unref the EmpathyConnectionManagersGuillaume Desmottes2010-02-111-2/+0
* Merge branch 'menu'Xavier Claessens2010-02-112-0/+4
|\
| * Fix leaked GtkMenuXavier Claessens2010-02-112-0/+4
* | Fix leaks, gtk_tree_model_get() returns a ref!Xavier Claessens2010-02-111-20/+33
* | Fix creation of imported accounts (#609439)Guillaume Desmottes2010-02-101-3/+8
* | assistant: store the ID of the current pageGuillaume Desmottes2010-02-101-0/+2
* | accounts-dialog: wrap label status in info barGuillaume Desmottes2010-02-101-0/+1
* | Create the account even when user chooses to not create other one afterGuillaume Desmottes2010-02-101-2/+19
* | impl_signal_apply: this function is not called after the create page any moreGuillaume Desmottes2010-02-101-2/+0
|/
* modifies tab-expand and tab-fill properties of child in chat-window (#608053)Reimundo Heluani2010-02-081-2/+8
* empathy.c: Initialise variable (#609030)Danielle Madeley2010-02-081-0/+4
* Adding myself to contributorsDanielle Madeley2010-02-021-1/+2
* Show protocol in compat mode tooGuillaume Desmottes2010-01-261-3/+0
* Ellipsize connection error infobarsWill Thompson2010-01-261-1/+2
* accounts_dialog_accounts_setup: use empathy_connection_managers_prepare_asyncGuillaume Desmottes2010-01-251-16/+17
* Merge commit 'kaserf/buttons-infobar-606329'Guillaume Desmottes2010-01-251-9/+0
|\
| * remove custom style for buttons in infobarFelix Kaser2010-01-251-9/+0
* | split strings to no translate markupsGuillaume Desmottes2010-01-251-7/+16
* | there is no reasy why error would be NULL if e_book_get_self failedGuillaume Desmottes2010-01-251-2/+1
* | remove create_salut_account_if_needed as it's done in the assistant nowGuillaume Desmottes2010-01-252-111/+0
* | rephrase the salut error pageGuillaume Desmottes2010-01-251-4/+5
* | add a hint about how to reach the accounts dialogGuillaume Desmottes2010-01-251-2/+4
* | Split markups and translated string to make this easier for translatorsGuillaume Desmottes2010-01-251-4/+7
* | rename build_error_page to build_error_vboxGuillaume Desmottes2010-01-251-3/+3
* | account_assistant_page_forward_func: never go forward after the salut pageGuillaume Desmottes2010-01-251-0/+5
* | Display 'back' button in the import and create pageGuillaume Desmottes2010-01-251-2/+2
* | Fix account creation regressionGuillaume Desmottes2010-01-251-4/+9
* | Don't display the salut page after the create one if there is no need toGuillaume Desmottes2010-01-251-3/+27
* | Don't display the salut page after the import one if there is no need toGuillaume Desmottes2010-01-251-1/+10
* | Display the salut page after the create oneGuillaume Desmottes2010-01-251-18/+15
* | Display the salut page after the import oneGuillaume Desmottes2010-01-251-3/+5
* | rename should_create_salut_account to display_salut_pageGuillaume Desmottes2010-01-251-4/+4
* | Display an error message if Salut is not installedGuillaume Desmottes2010-01-251-8/+32
* | factor out build_error_pageGuillaume Desmottes2010-01-251-20/+32
* | assistant: move creation of the page from _init to _constructedGuillaume Desmottes2010-01-251-19/+22
* | Pass a ready EmpathyConnectionManagers to empathy_account_assistant_showGuillaume Desmottes2010-01-253-13/+66
* | Move all the tests checking if we should display the the assistant to a singl...Guillaume Desmottes2010-01-251-25/+63
* | Don't display the salut page if there is no need to create the accountGuillaume Desmottes2010-01-251-0/+57
* | set the salut-account-created gconf key once the account has been createdGuillaume Desmottes2010-01-251-2/+14
* | don't set display name if there is already one definedGuillaume Desmottes2010-01-251-6/+9
* | account-assistant: use existing code to create the salut account and respect ...Guillaume Desmottes2010-01-251-12/+18
* | account-assistant: add a page to configure the salut accountGuillaume Desmottes2010-01-251-12/+124
* | factor out and export create_salut_account_settingsGuillaume Desmottes2010-01-252-48/+68
|/
* replace empathy_connection_managers_call_when_ready by prepare_{async_finish}...Guillaume Desmottes2010-01-222-10/+13
* empathy.c: use empathy_connection_managers_call_when_readyGuillaume Desmottes2010-01-221-21/+11
* empathy-import-widget: use empathy_connection_managers_call_when_readyGuillaume Desmottes2010-01-221-9/+10
* added a "find" menu itemThomas Meire2010-01-212-0/+25
* Call create_salut_account_if_needed when the assistant is closedGuillaume Desmottes2010-01-202-1/+3
* Don't pass managers to create_salut_account_if_neededGuillaume Desmottes2010-01-203-6/+23
* move create_salut_account_if_needed and should_create_salut_account to a new ...Guillaume Desmottes2010-01-204-181/+252
* account-assistant: disable Google Talk when creating a new accountGuillaume Desmottes2010-01-191-0/+3
* Pass a boolean saying if the protocol is Google Talk or not to EmpathyProtoco...Guillaume Desmottes2010-01-191-0/+2
* Add a remove button below the accounts treeview instead of the in-treeview icon.Xavier Claessens2010-01-192-21/+93
* remove empathy-tube-handler.c and empathy-tube-dispatchGuillaume Desmottes2010-01-194-549/+1
* stop dispatching tube channels (#599159)Guillaume Desmottes2010-01-192-129/+0
* Unify the infobar and the account name widgets.Cosimo Cecchi2010-01-192-51/+46
* fix identationGuillaume Desmottes2010-01-181-1/+1
* Stop greysing and blinking the protocol iconGuillaume Desmottes2010-01-181-24/+0
* update account in treeview when it's disabledGuillaume Desmottes2010-01-181-0/+1
* update treeview when account's status is changedGuillaume Desmottes2010-01-181-0/+21
* accounts-dialog: display status of accounts in the treeview (#605309)Guillaume Desmottes2010-01-181-0/+78
* rename accounts_dialog_model_pixbuf_data_func to accounts_dialog_model_protoc...Guillaume Desmottes2010-01-181-3/+3
* accounts-dialog: remember the account and password param when changing protoc...Guillaume Desmottes2010-01-181-0/+29
* Support silent build rules with automake 1.11Javier Jardón2010-01-181-3/+2
* set presence to offline when account is disabledFelix Kaser2010-01-161-0/+5
* Consider connected account which doesn't implement presence as available (#60...Guillaume Desmottes2010-01-161-0/+8
* Call xmlCleanupParser() only once when exiting (#600693)Guillaume Desmottes2010-01-131-0/+1
* Use the proper enum value when checking FsMediaTypeGuillaume Desmottes2010-01-131-1/+1
* Revert "Escape the header of the notification (#599431)"Guillaume Desmottes2010-01-131-7/+2
* chat_window_create_label: ref the widgets stored as data so we are sure they ...Guillaume Desmottes2010-01-121-7/+8
* Wait that the pipeline has been started before enabling cameraGuillaume Desmottes2010-01-111-7/+10
* factor out start_callGuillaume Desmottes2010-01-111-6/+11
* empathy_call_window_constructed: no need to call display_video_previewGuillaume Desmottes2010-01-111-2/+0
* remember handler ids to prevent double invokationFelix Kaser2010-01-111-4/+37
* connect to status-changed signal of new accountsFelix Kaser2010-01-111-0/+10
* connect to signals when account has been createdFelix Kaser2010-01-111-0/+20
* don't make add-button sensitive on protocol changeFelix Kaser2010-01-111-1/+0
* disable treeview when creating an accountFelix Kaser2010-01-111-0/+13
* Convert the context info to a translator comment (#606513)Claude Paroz2010-01-111-3/+3
* accounts-dialog: inherit from GtkDialog (#600023)Guillaume Desmottes2010-01-113-292/+244
* Miscellaneous string fixesPhilip Withnall2010-01-017-11/+11
* Punctuation fixes in translatable stringsPhilip Withnall2010-01-016-16/+16
* Remove the protocol selection screen when adding a new accountGuillaume Desmottes2009-12-262-227/+92
* status_icon_update_tooltip: display the custom status msg, if any (#604481)Guillaume Desmottes2009-12-241-3/+11
* status_icon_update_tooltip: display a translated version of the default statu...Guillaume Desmottes2009-12-241-6/+10
* Use clutter_get_option_group instead of gtk_clutter_initGuillaume Desmottes2009-12-231-4/+3
* remove register radio buttons in the create account frameGuillaume Desmottes2009-12-222-125/+40
* Merge branch 'pmuc'Danielle Madeley2009-12-225-3/+215
|\
| * Remove FIXMEDanielle Madeley2009-12-221-2/+0
| * Remove unneeded private structDanielle Madeley2009-12-221-12/+0
| * Make Invite Participant menu entry sensitive only when availableDanielle Madeley2009-12-211-0/+28
| * Refactor MUC upgrading to be a feature of TpChat->add()Danielle Madeley2009-12-211-74/+10
| * Replace raw Tp call with existing abstraction in EmpathyTpChatDanielle Madeley2009-12-211-9/+5
| * Port EmpathyInviteParticipantDialog over to EmpathyContactSelectorDialogDanielle Madeley2009-12-213-72/+70
| * Don't destroy the request properties, EmpathyDispatcher now owns themDanielle Madeley2009-12-211-1/+1
| * Add support for inviting to MUCsDanielle Madeley2009-12-211-2/+7
| * Add a rudimentry UI to select a 3rd contact to inviteDanielle Madeley2009-12-214-12/+213
| * Use EmpathyDispatcher to create the PMUC channelDanielle Madeley2009-12-211-24/+6
| * Don't leak GPtrArrayDanielle Madeley2009-12-211-0/+1
| * Add an Invite Participants menu item and make it request the Conf channelDanielle Madeley2009-12-212-2/+81
* | event-manager: remove the auto-remove timer when the event is destroyedGuillaume Desmottes2009-12-211-2/+9
|/
* block/unblock the right signals on menu actionsGuillaume Desmottes2009-12-181-2/+2
* save the geometry of the call windowGuillaume Desmottes2009-12-181-0/+3
* Display the audio or video icon in incoming call dialogGuillaume Desmottes2009-12-181-0/+16
* main-window: don't add the protocol icon on top of event iconsGuillaume Desmottes2009-12-171-3/+1
* status-icon: add "New Call" entry in the context menuGuillaume Desmottes2009-12-172-0/+17
* main-window: add "New Call" menu entry (#582599)Guillaume Desmottes2009-12-172-0/+19
* contact_list: displays an icon showing the protocol by the contact (#603877)chantra2009-12-172-4/+66
* remove duplicate expressionFelix Kaser2009-12-161-2/+0
* say if incoming call are video or not (#582596)Guillaume Desmottes2009-12-161-4/+23
* dont show infobar when creating an accountFelix Kaser2009-12-151-14/+8
* get connectivity only when neededFelix Kaser2009-12-151-4/+2
* fixed a crash when creating accountFelix Kaser2009-12-151-7/+33
* update infobar only on selected accountFelix Kaser2009-12-151-0/+20
* updated status messagesFelix Kaser2009-12-151-6/+18
* set infobar message to no network connectionFelix Kaser2009-12-151-0/+9
* refactor friendly status reason messagesFelix Kaser2009-12-152-94/+13
* added case for requested disconnectionFelix Kaser2009-12-151-0/+3
* handle presence changesFelix Kaser2009-12-151-10/+20
* show infobar when connectedFelix Kaser2009-12-151-7/+17
* set expand of infobar to falseFelix Kaser2009-12-151-0/+1
* added case for disabled accountFelix Kaser2009-12-151-80/+100
* added reson to status infobarFelix Kaser2009-12-151-11/+57
* added spinner to connecting infobarFelix Kaser2009-12-151-9/+23
* added status image to infobarFelix Kaser2009-12-151-1/+15
* change position of the infobarFelix Kaser2009-12-152-23/+23
* use different message types in infobarFelix Kaser2009-12-151-0/+6
* show the infobar when not connectedFelix Kaser2009-12-151-0/+39
* added infobar with empty labelFelix Kaser2009-12-151-0/+10
* added vbox for the status-infobarFelix Kaser2009-12-152-7/+21
* refactoring - use main_window_remove_errorFelix Kaser2009-12-151-15/+3
* remove error infobars if account disabled/removedFelix Kaser2009-12-151-5/+29
* add K.Vishnoo Charan Reddy as an artist contributorGuillaume Desmottes2009-12-141-0/+1
* chat-window: ref the contact stored as a data in the chatGuillaume Desmottes2009-12-081-2/+2
* Separate geometry of private and muc chat windows (#604003)Guillaume Desmottes2009-12-081-0/+3
* change empathy_chat_window_get_nb_rooms to get_chats_typeGuillaume Desmottes2009-12-082-9/+18