aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Save the certificate when we are told to rememberCosimo Cecchi2010-08-131-0/+5
* Integrate the dialog into the auth helperCosimo Cecchi2010-08-131-1/+41
* Verify the certificate from the helper.Cosimo Cecchi2010-08-131-4/+52
* Add EmpathyTLSVerifierCosimo Cecchi2010-08-131-0/+9
* Add a first skeleton of the auth helper.Cosimo Cecchi2010-08-132-1/+98
* event-manager: we don't use the dispatcher any moreGuillaume Desmottes2010-08-131-4/+0
* tp-call: add account propertyGuillaume Desmottes2010-08-121-1/+1
* tp-chat: add 'account' propertyGuillaume Desmottes2010-08-122-2/+2
* remove empathy-dispatch-operationGuillaume Desmottes2010-08-111-1/+0
* empathy_dispatcher_join_muc: get an account instead of a connectionGuillaume Desmottes2010-08-114-65/+17
* empathy_dispatcher_chat_with_contact_id: get a TpAccount instead of a TpConne...Guillaume Desmottes2010-08-112-9/+7
* empathy_dispatcher_chat_with_contact_id: remove callback argumentGuillaume Desmottes2010-08-112-2/+2
* Don't abort when closing the FT dialoguePhilip Withnall2010-08-111-0/+4
* Use TpSimpleHandler to handle incoming file transfer (#623139)Guillaume Desmottes2010-08-111-0/+6
* tp-file: no need to pass the incoming property during constructionGuillaume Desmottes2010-08-111-1/+1
* stop handling internally FT channelsGuillaume Desmottes2010-08-111-62/+3
* empathy_contact_selector_dialog_get_selected: allow to get the account as wellGuillaume Desmottes2010-08-101-1/+1
* only show label during searchFelix Kaser2010-08-091-13/+7
* use gtk_clutter_init rather than clutter_initGuillaume Desmottes2010-08-091-3/+5
* Remove uses of new GStreamer APIPhilip Withnall2010-08-061-6/+0
* Add casts to fix constness problems in empathy-import-pidgin.cPhilip Withnall2010-08-061-5/+5
* Add noreturn annotation to version callback functionPhilip Withnall2010-08-051-2/+5
* Fix constness of various variables and parametersPhilip Withnall2010-08-053-7/+7
* Fix missing entries in switch statementsPhilip Withnall2010-08-054-9/+39
* Use #ifdef instead of #if to avoid warnings of undefined symbolsPhilip Withnall2010-08-053-8/+8
* use different labels if view is emptyFelix Kaser2010-08-052-19/+28
* show label if contact list is emptyFelix Kaser2010-08-051-4/+48
* added structure to show text when list emptyFelix Kaser2010-08-052-5/+35
* no need to pass the reason to main_window_error_displayGuillaume Desmottes2010-08-051-3/+2
* no need to pass the reason to empathy_account_get_error_messageGuillaume Desmottes2010-08-052-3/+3
* accounts-dialog: use empathy_account_get_error_message (#523895)Guillaume Desmottes2010-08-051-2/+2
* main-window: use empathy_account_get_error_message (#523895)Guillaume Desmottes2010-08-051-4/+1
* main-window: pass the TpConnectionStatusReason to main_window_error_displayGuillaume Desmottes2010-08-051-6/+5
* display the tooltip on the info imageGuillaume Desmottes2010-08-051-7/+17
* add 'info' icon next to the candidatesGuillaume Desmottes2010-08-051-16/+80
* call-window: use candidates-changed signalGuillaume Desmottes2010-08-051-79/+37
* use a space to separate the IP from the portGuillaume Desmottes2010-08-051-1/+1
* add tooltips giving a bit more context about the candidateGuillaume Desmottes2010-08-051-0/+23
* call-window: display candidates info (#599166)Guillaume Desmottes2010-08-052-0/+370
* removed fixme comment when toggling show_offlineFelix Kaser2010-08-031-3/+0
* refactored show_offline property to the viewFelix Kaser2010-08-031-1/+1
* Add a translator comment explaining the "reduce location" semantic (#624062)Guillaume Desmottes2010-08-031-1/+1
* map-view: be a proper GtkWindow (#625826)Guillaume Desmottes2010-08-023-154/+221
* free the list returned by clutter_container_get_children()Guillaume Desmottes2010-08-021-3/+4
* Merge EmpathyContact:name and *_set_alias() to EmpathyContact:aliasPhilip Withnall2010-07-225-21/+21
* Merge remote branch 'pwith/folks-integ-rebase1-fixes-rebase1' into folks-fixesTravis Reitter2010-07-221-0/+2
* Add authors and fix copyrights for empathy-accounts-moduleDanielle Madeley2010-07-213-3/+7
* Remove unneccesary signal disconnection in EmpathyAccountsDialogDanielle Madeley2010-07-211-35/+9
* Update cc-empathy-accounts-panel for latest gnome-control-centerDanielle Madeley2010-07-215-365/+129
* Take advantage of tp_clear_object().Travis Reitter2010-07-211-7/+4
* Fix alignment.Travis Reitter2010-07-211-1/+1
* Add 'dup' to the names of empathy_contact_from_folks_individual() and folks_i...Travis Reitter2010-07-211-2/+2
* Use explicit boolean expressions for if-conditionals, according to Telepathy ...Travis Reitter2010-07-211-3/+3
* Support contact addingTravis Reitter2010-07-211-1/+2
* Fixes from merging masterPhilip Withnall2010-07-211-0/+1
* Re-implement the context menu for IndividualsTravis Reitter2010-07-211-0/+3
* Base the contact list around libfolks metacontacts. Not yet to feature-parityTravis Reitter2010-07-211-49/+73
* GtkNotebookPage no longer exists in GTK+ 3Danielle Madeley2010-07-191-1/+4
* avoid segfault in event_manager_add (#624462)Marc-Antoine Perennou2010-07-161-1/+3
* Merge branch 'debug-av-599166'Guillaume Desmottes2010-07-142-0/+546
|\
| * display the clock rate of the codec as wellGuillaume Desmottes2010-07-131-12/+11
| * reset codecs when call is disconnectedGuillaume Desmottes2010-07-121-0/+13
| * call-window: display receiving codecsGuillaume Desmottes2010-07-122-0/+195
| * call-window: Add 'details' pane containing encoding codecs (#599166)Guillaume Desmottes2010-07-122-0/+339
* | preferences: coding style fixGuillaume Desmottes2010-07-131-1/+1
* | main-window: coding style fixGuillaume Desmottes2010-07-131-1/+1
|/
* empathy-accounts.1: document --if-neededGuillaume Desmottes2010-07-121-0/+3
* empathy-accounts.1: --import has been removedGuillaume Desmottes2010-07-121-3/+0
* import empathy-accounts manpage from DebianGuillaume Desmottes2010-07-122-1/+38
* sync empathy manpage with Debian packageGuillaume Desmottes2010-07-121-9/+31
* empathy_status_icon_new: always call status_icon_set_visibilityGuillaume Desmottes2010-07-121-3/+1
* empathy_status_icon_new: don't ignore hide_contact_list (#623937)Guillaume Desmottes2010-07-121-1/+5
* Merge branch 'auto-approve'Guillaume Desmottes2010-07-091-0/+1
|\
| * Pass EMPATHY_DISPATCHER_NON_USER_ACTION as action time when auto-approving mucsGuillaume Desmottes2010-07-091-0/+1
* | debug_window_name_owner_changed_cb: update client services as wellGuillaume Desmottes2010-07-091-33/+32
* | Store the unique name in the modelGuillaume Desmottes2010-07-091-13/+10
* | FillCmChooserData: rename, add type field and helper functionsGuillaume Desmottes2010-07-091-12/+35
* | rename vars, functions and constants to make code less CM specificGuillaume Desmottes2010-07-091-82/+82
* | coding style fixGuillaume Desmottes2010-07-091-2/+2
* | debug-window: add Telepathy clientsGuillaume Desmottes2010-07-091-0/+54
* | debug-window: remove hardcoded clientsGuillaume Desmottes2010-07-091-22/+0
|/
* tell the chatroom manager asap about chatsSjoerd Simons2010-07-091-10/+20
* link on unique-3 when using GTK3Guillaume Desmottes2010-07-081-0/+4
* move GTK+ check to its own PKG_CHECK_MODULESGuillaume Desmottes2010-07-081-0/+2
* call-window: use gtk_widget_get_allocation()Guillaume Desmottes2010-07-071-1/+3
* rephrase 'Important Room' menu entryGuillaume Desmottes2010-07-071-1/+1
* set a title to the room invitation dialogGuillaume Desmottes2010-07-071-0/+7
* Add a title to the incoming call dialogGuillaume Desmottes2010-07-071-0/+7
* display incoming events right away if user asked toGuillaume Desmottes2010-07-071-3/+38
* Add option to disable displaying events in the notif area (#585914)Guillaume Desmottes2010-07-072-1/+24
* add accept/decline buttons to invitation notificationsGuillaume Desmottes2010-07-071-0/+1
* use a specific event type for muc invitationsGuillaume Desmottes2010-07-072-3/+4
* add accept/decline buttons to FT notificationsGuillaume Desmottes2010-07-071-0/+10
* event-manager: allow to reject FT channelsGuillaume Desmottes2010-07-071-0/+7
* add answer/decline buttons in call notifications (#597124)Guillaume Desmottes2010-07-071-0/+21
* add empathy_event_declineGuillaume Desmottes2010-07-072-0/+11
* Add 'Respond' button only for text channels and approve it directlyGuillaume Desmottes2010-07-071-7/+11
* add empathy_event_approve()Guillaume Desmottes2010-07-072-0/+11
* factor out add_notification_actionsGuillaume Desmottes2010-07-071-9/+16
* empathy_dispatcher_join_muc: remove callback argGuillaume Desmottes2010-07-074-6/+5
* Revert "no need to specify each time of handle"Sjoerd Simons2010-07-061-0/+11
* Inform the chatroom mgr when we are handling a new roomGuillaume Desmottes2010-07-052-1/+10
* no need to specify each time of handleGuillaume Desmottes2010-07-051-11/+0
* Handle text channels using TpSimpleHandler (#623358)Guillaume Desmottes2010-07-052-46/+169
* chat-manager: document the queueGuillaume Desmottes2010-07-051-0/+1
* stop handling text channels using EmpathyDispatcherGuillaume Desmottes2010-07-051-21/+1
* room list channels are not dispatchedGuillaume Desmottes2010-07-051-2/+0
* main: destroy the window when we're done (#623396)Guillaume Desmottes2010-07-021-0/+1
* status-icon: drop our ref on the window when disposingGuillaume Desmottes2010-07-021-0/+1
* install empathy-av to libexecGuillaume Desmottes2010-06-291-1/+3
* add AV client to the debug windowGuillaume Desmottes2010-06-291-0/+7
* Disable timer if EMPATHY_PERSIST is setGuillaume Desmottes2010-06-291-0/+11
* Add a timer stopping the proccess after a while if idlingGuillaume Desmottes2010-06-291-0/+61
* add empathy_call_factory_registerGuillaume Desmottes2010-06-291-0/+8
* Add empathy-av, a new process handling media channels (#599161)Guillaume Desmottes2010-06-293-6/+122
* empathy: stop handling media channelsGuillaume Desmottes2010-06-291-24/+1
* Approve right away group text channels if we are not invitedGuillaume Desmottes2010-06-241-1/+5
* rename approver service to Empathy.EventManagerGuillaume Desmottes2010-06-241-1/+1
* Add missing signal to EmpathyMainWindowDanielle Madeley2010-06-241-1/+3
* remove empathy-import-mc4-accounts (#622578)Guillaume Desmottes2010-06-243-567/+0
* stop importing MC4 accountsGuillaume Desmottes2010-06-243-50/+3
* Port EmpathyPreferences to GtkDialog subclassDanielle Madeley2010-06-244-197/+215
* Port EmpathyMainWindow to GtkWindow subclassDanielle Madeley2010-06-245-224/+308
* Merge branch 'av-handler-622368'Guillaume Desmottes2010-06-221-35/+1
|\
| * stop handling internally stream media channelsGuillaume Desmottes2010-06-221-35/+1
* | debug-window: add the logger (#622381)Guillaume Desmottes2010-06-221-0/+7
|/
* Delay setting both contact list values until the each is set.Danielle Madeley2010-06-211-4/+16
* strip name of the room (#622201)Guillaume Desmottes2010-06-211-0/+2
* Grab focus on the main window's tree view by defaultXavier Claessens2010-06-211-0/+2
* Remove useless occurences of 'gconf' wordXavier Claessens2010-06-211-1/+1
* Merge branch 'approvers-redone-599158'Guillaume Desmottes2010-06-192-116/+269
|\
| * rename channel_claim_cb to reject_channel_claim_cbGuillaume Desmottes2010-06-181-2/+3
| * factor out reject_approvalGuillaume Desmottes2010-06-171-34/+20
| * approve_channels: use quarks to compare channel typesGuillaume Desmottes2010-06-171-6/+7
| * fix typoGuillaume Desmottes2010-06-171-1/+1
| * event-manager: re-implement approving using a proper Approver (#599158)Guillaume Desmottes2010-06-171-101/+275
| * add inviter arg to empathy_tp_chat_is_invitedGuillaume Desmottes2010-06-171-1/+1
| * event-manager: disable approving for nowGuillaume Desmottes2010-06-171-15/+6
* | Depend on telepathy-logger (#610956)Guillaume Desmottes2010-06-182-15/+0
* | port to latest tp-logger APIGuillaume Desmottes2010-06-181-1/+0
* | Add shortcut keys for contact list item sizesWill Thompson2010-06-181-0/+3
* | Port empathy-import-mc4-accounts imported setting to GSettingsDanielle Madeley2010-06-181-15/+14
* | Port Empathy code to GSettings, remove EmpathyConfDanielle Madeley2010-06-1811-655/+360
|/
* map-view: add a debug message when adding a markerGuillaume Desmottes2010-06-161-0/+2
* use tp_g_signal_connect_object to connect the "closed" signal on the notifica...Guillaume Desmottes2010-06-161-2/+2
* Don't display the 'Important Room' menu item in private chatsGuillaume Desmottes2010-06-111-0/+1
* Use EmpathyLiveSearch in main window's contact listFelix Kaser2010-06-091-1/+13
* Join room where we have been invited when handling the channel rather than we...Guillaume Desmottes2010-06-072-14/+8
* empathy_call_window_set_send_video: only disable preview if we need toGuillaume Desmottes2010-06-071-15/+27
* Fix some coding stylesXavier Claessens2010-06-051-28/+28
* chatrooms-window: remove the 'edit' buttonGuillaume Desmottes2010-06-042-80/+10
* accounts-dialog: avoid leaking the account status messageRob Bradford2010-06-031-12/+41
* accounts-dialog: Ensure correct connectivity informationRob Bradford2010-06-031-4/+10
* change 'disconnect' label to 'finally'Guillaume Desmottes2010-06-031-2/+2
* Don't wait longer than 5 seconds when trying to join chatroomsGuillaume Desmottes2010-06-031-2/+23
* Join chatroom favorites once the account is connected (#620439)Guillaume Desmottes2010-06-031-1/+68
* factor out join_chatroomGuillaume Desmottes2010-06-031-6/+16
* Only create the EmpathyAccountsDialog if requiredDanielle Madeley2010-06-031-2/+3
* empathy-debug-window: Add protocol names next to the CMs in the dropdownDanielle Madeley2010-06-021-14/+106
* Merge branch 'import-617971'Guillaume Desmottes2010-05-281-0/+4
|\
| * assistant: call empathy_import_widget_add_selected_accounts in impl_signal_ap...Guillaume Desmottes2010-05-251-0/+4
* | coding style fixesGuillaume Desmottes2010-05-271-2/+2
* | rephrase important room menuGuillaume Desmottes2010-05-271-1/+1
* | Add option to make chatroom "always urgent" (#611894)Jonas Bonn2010-05-272-3/+60
* | Use ensure_chatroom in callbackJonas Bonn2010-05-271-11/+6
* | Do not use EmpathyContactMonitor to know when a contact gets online/offlineXavier Claessens2010-05-261-10/+19
* | Play sound for contact connected/disconnected from EmpathyEventManager instea...Xavier Claessens2010-05-262-60/+25
* | Do not use EmpathyContactMonitor to know when a contact is addedXavier Claessens2010-05-261-9/+17
* | Port to new EmpathyTpContactFactory APIXavier Claessens2010-05-263-25/+8
* | invite-participant-dialog: translate the 'invite' button (#619678)Guillaume Desmottes2010-05-261-1/+1
|/
* hardcode facebook server to workaround SRV lookup issuesGuillaume Desmottes2010-05-252-0/+6
* main_window_favorite_chatroom_join: skip not connected accounts (#606738)Guillaume Desmottes2010-05-211-5/+7
* Change names of variables that shadow libc symbolsDanielle Madeley2010-05-212-4/+4
* use avatar-default instead of the deprecated stock_person iconGuillaume Desmottes2010-05-203-5/+6
* Use library i18n method for source files included in shared libraryRob Bradford2010-05-187-7/+14
* Use 'A' as accelerator for the "Automatically connect on startup" option (#61...ekspiulo2010-05-181-1/+1
* Don't try to start change the camera when there is no inputSjoerd Simons2010-05-101-6/+14
* Add missing tp-glib/util.h header to the AccountsPage.Travis Reitter2010-05-081-0/+1
* Remove unused #include from empathy-map-view.cXavier Claessens2010-05-061-3/+1
* Merge branch 'timestamp-615976'Guillaume Desmottes2010-05-048-14/+79
|\
| * define EMPATHY_DISPATCHER_CURRENT_TIME rather than using G_MAXINT64 directlyGuillaume Desmottes2010-05-042-4/+4
| * fix typo in commentGuillaume Desmottes2010-05-041-1/+1
| * Set the user action time when the user approves stuffSjoerd Simons2010-05-041-0/+19
| * Consider G_MAXIN64 as a secred code for GDK_CURRENT_TIMESjoerd Simons2010-05-041-9/+13
| * Add a comment, fix indentationSjoerd Simons2010-05-041-2/+3
| * Only present and tab switch for new eventsSjoerd Simons2010-04-251-2/+25
| * Always at least show new chat windows even if not presenting themSjoerd Simons2010-04-251-0/+1
| * Pass the ChannelDispatcher timestamp onwards to window_presentSjoerd Simons2010-04-251-1/+8
| * pass timestamp to empathy_chat_window_present_chatGuillaume Desmottes2010-04-253-4/+8
| * add timestamp arg to empathy_dispatcher_create_channelSjoerd Simons2010-04-251-1/+2
| * add timestamp arg to empathy_dispatcher_join_mucSjoerd Simons2010-04-254-5/+10
| * add timestamp arg to empathy_dispatcher_chat_with_contact(_id)Sjoerd Simons2010-04-252-2/+2
* | accounts-module: Remove call to textdomain ()Rob Bradford2010-05-041-2/+0
* | cc-empathy-accounts-panel: Enable gettext when the panel is createdRob Bradford2010-04-262-0/+5
|/
* disconnect empathy_call_window_bus_message() in dispose (#616301)David Laban2010-04-211-6/+6
* fix show_offline gconf key (#616267)Guillaume Desmottes2010-04-201-3/+3
* Move the spinner next to the expander label in new chatroom dialogXavier Claessens2010-04-192-16/+23
* Do not use deprecated GTK symbolsXavier Claessens2010-04-191-1/+1
* Replace EphySpinner by GtkSpinnerXavier Claessens2010-04-197-1088/+42
* Update the Tabs menu when a tab is moved.Mike Ruprecht2010-04-191-2/+8
* src/empathy-chat-window.ui: Swap keyboard controls for moving tabsMirsal Ennaime2010-04-161-2/+2
* account-assistant: make impl_signal_apply() behave more like impl_signal_prep...David Laban2010-04-141-1/+3
* src/empathy-status-icon.c: use tp_g_signal_connect_object instead of empathy_...Guillaume Desmottes2010-04-091-2/+2
* src/empathy-chat-window.c: use tp_g_signal_connect_object instead of empathy_...Guillaume Desmottes2010-04-091-2/+2
* src/empathy-call-window.c: use tp_g_signal_connect_object instead of empathy_...Guillaume Desmottes2010-04-091-11/+14
* src/empathy-accounts-dialog.c: use tp_g_signal_connect_object instead of empa...Guillaume Desmottes2010-04-091-6/+6
* src/cc-empathy-accounts-page.c: use tp_g_signal_connect_object instead of emp...Guillaume Desmottes2010-04-091-2/+2
* account_assistant_apply_account_and_finish: explicitely ask to set the displa...Guillaume Desmottes2010-04-091-7/+10
* status-icon: don't approve event if notification bubble has been dismissedGuillaume Desmottes2010-04-091-26/+2
* remove NotificationDataGuillaume Desmottes2010-04-091-27/+3
* chat-window: don't present chat if notification has been dismissedGuillaume Desmottes2010-04-091-8/+0
* add the current date as suffix the the log nameGuillaume Desmottes2010-04-071-2/+15
* set default name when saving logs (#615052)Guillaume Desmottes2010-04-071-0/+8
* factor out get_active_cm_nameGuillaume Desmottes2010-04-071-10/+18
* debug-window: set temp directory as default folder when saving logsGuillaume Desmottes2010-04-071-0/+3
* map-view: no need to create a modelGuillaume Desmottes2010-04-051-41/+17
* Support append hint in notifications (#607446)Nicolò Chieffo2010-04-012-32/+79
* empathy_call_window_sink_added_cb: unref the padGuillaume Desmottes2010-04-011-0/+1
* unref liveadder when disposingGuillaume Desmottes2010-04-011-0/+4
* don't recreate a video preview or update the window if we're about to destroy itGuillaume Desmottes2010-04-011-4/+11
* don't leak the fullscreen windowGuillaume Desmottes2010-04-011-0/+4
* init_contact_avatar_with_size: don't leak the pixbufGuillaume Desmottes2010-04-011-0/+3
* stop using gst_bin_add_many and gst_element_link_manyGuillaume Desmottes2010-04-011-4/+30
* use tp_g_signal_connect_object so we don't have to disconnect empathy_call_wi...Guillaume Desmottes2010-04-011-4/+4
* Fix race when restarting a callGuillaume Desmottes2010-04-011-1/+12
* Allow to use the video preview when the call has been terminated (#602937)Guillaume Desmottes2010-04-011-4/+15
* empathy_call_window_restart_call: there is no reason to show_all all the hboxGuillaume Desmottes2010-04-011-2/+0
* empathy_call_window_reset_pipeline: start the new pipeline right awayGuillaume Desmottes2010-04-011-2/+13
* Actually turn off the camera when preview/sending is disabledGuillaume Desmottes2010-04-011-26/+54
* stop disabling the video-preview button when call is disconnected (#602937)Guillaume Desmottes2010-04-011-12/+0
* recreate the pipeline as soon we destroyed the old oneGuillaume Desmottes2010-04-011-1/+2
* split create_video_output_widget out of create_pipelineGuillaume Desmottes2010-04-011-3/+9
* recycle the audio input gst elementGuillaume Desmottes2010-04-011-15/+3
* recycle the video input gst elementGuillaume Desmottes2010-04-011-5/+9
* rename initialize_output_elements to create_video_output_widgetGuillaume Desmottes2010-04-011-2/+2
* recycle the audio output gst elementGuillaume Desmottes2010-04-011-4/+8
* destroy the video_output widget when the call is disconnectedGuillaume Desmottes2010-04-011-3/+7
* No need to recreate GTK+ widgets when recreating the pipelineGuillaume Desmottes2010-04-011-29/+30
* call-window: factor out create_pipelineGuillaume Desmottes2010-04-011-31/+33
* Merge branch 'undo-close-tab'Jonny Lamb2010-03-307-0/+406
|\
| * chat-manager: take an EmpathyChat instead of an EmpathyContactJonny Lamb2010-03-063-20/+105
| * Add EmpathyChatManager::chats-changed signal and make the chat window listen ...Jonny Lamb2010-03-063-7/+67
| * Add chat manager which tracks chats closing and can respawn them (bug #609832)Jonny Lamb2010-03-067-0/+261
* | fix #endif commentGuillaume Desmottes2010-03-301-1/+1
* | add gconf key to disable auto-away (#613603)Christian Kampka2010-03-301-2/+23
* | map-view: display position of contacts added after the map has been created (...Guillaume Desmottes2010-03-301-0/+41
* | factor out contact_addedGuillaume Desmottes2010-03-301-4/+11
* | map_view_update_contact_position: don't call contact_has_location twiceGuillaume Desmottes2010-03-301-5/+7
* | Always connect "notify::location" on contactGuillaume Desmottes2010-03-301-3/+0
* | map_view_contacts_foreach: no need to create the marker any moreGuillaume Desmottes2010-03-301-1/+0