aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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
* fix commentsGuillaume Desmottes2009-12-081-2/+2
* empathy_chat_window_get_default: rename room_filter to roomGuillaume Desmottes2009-12-082-4/+4
* empathy_chat_window_get_default: check if the window has at least one roomGuillaume Desmottes2009-12-081-2/+12
* add empathy_chat_window_get_nb_roomsGuillaume Desmottes2009-12-082-0/+15
* Grouping all 1-to-1 chats in one window and MUC's in another one. (Fixes #588...Abner Silva2009-12-082-4/+7
* rephrase the 'redial' tooltipGuillaume Desmottes2009-12-011-1/+1
* add tooltips on the hang-up, redial and audio buttons (#576542)Guillaume Desmottes2009-12-011-0/+3
* rename update_join_button_sensitivy to update_join_button_sensitivityGuillaume Desmottes2009-12-011-4/+4
* new-chatroom-dialog: unsensitive the join button when account is disconnectedGuillaume Desmottes2009-12-011-1/+36
* factor out update_join_button_sensitivyGuillaume Desmottes2009-12-011-6/+11
* new-chatroom-dialog: store the currently selected accountGuillaume Desmottes2009-12-011-12/+15
* debug-window: don't disconnect the new debug msg signal once the proxy has be...Guillaume Desmottes2009-12-011-1/+22
* Merge commit 'shaunm/dndfiles2'Guillaume Desmottes2009-11-301-1/+115
|\
| * Some improvements to file drag-and-drop based on comments on #595226Shaun McCance2009-11-251-10/+18
| * [empathy-chat-window] Cleanup DND, don't accept drags to offline contactsShaun McCance2009-11-251-20/+62
| * Move GtkTargetLists into priv so they're no longer staticShaun McCance2009-11-251-6/+13
| * [empathy-chat-window] Documented MOVE/COPY selection in drag_motionShaun McCance2009-11-251-0/+4
| * Utilitiy function to send files from a URI list, for dnd implementationsShaun McCance2009-11-251-25/+2
| * Implemented file drags to contact list, along with row highlightsShaun McCance2009-11-251-2/+2
| * Handle MOVE and COPY drags better, change contact-id drags to COPYShaun McCance2009-11-251-4/+6
| * Always prefer GDK_ACTION_COPY for text/uri-list dragsShaun McCance2009-11-251-8/+31
| * Don't try to offer file transfers to MUCsShaun McCance2009-11-251-2/+8
| * Call gtk_drag_finish when we get a file transfer drag on a chat windowShaun McCance2009-11-251-0/+1
| * Implementing drag and drop file sending on chat windowsShaun McCance2009-11-251-0/+44
* | add tooltips on the camera buttonsGuillaume Desmottes2009-11-301-0/+3
* | use conn-status-reason instead of conn-statusFelix Kaser2009-11-291-1/+1
* | Set the stock-person icon for contact online/offline notificationGuillaume Desmottes2009-11-281-2/+2
* | Capitalize first letter of debug msgGuillaume Desmottes2009-11-281-3/+3
* | Disable video preview when there is no callGuillaume Desmottes2009-11-281-0/+14
* | enable the camera-off button if call doens't have initial videoGuillaume Desmottes2009-11-281-0/+5
* | enable the camera-off button when call is disconnectedGuillaume Desmottes2009-11-281-3/+1
* | empathy_call_window_set_send_video: don't request video stream if the call is...Guillaume Desmottes2009-11-281-0/+3
* | disable_camera: disable send video only if we were sending itGuillaume Desmottes2009-11-281-1/+3
* | update toggle buttons when the camera state is changed because of radio buttonsGuillaume Desmottes2009-11-281-0/+6
* | hook the camera radio buttonsGuillaume Desmottes2009-11-281-1/+34
* | make disable_camera, enable_preview and enable_camera no-op if we are already...Guillaume Desmottes2009-11-281-12/+15
* | update radio actions when a button is pressedGuillaume Desmottes2009-11-281-0/+11
* | add video menu containing radio actions to control videoGuillaume Desmottes2009-11-281-0/+41
* | remove the "send video" menu itemGuillaume Desmottes2009-11-282-43/+0
* | empathy_call_window_set_send_video: add a debug msgGuillaume Desmottes2009-11-281-0/+1
* | stop sending video when 'camera off' or 'preview' is enabledGuillaume Desmottes2009-11-281-3/+11
* | early return if the camera_state is already the one we wantGuillaume Desmottes2009-11-281-0/+9
* | disable the others button when 'camera on' is enabledGuillaume Desmottes2009-11-281-11/+31
* | rename camera to camera_onGuillaume Desmottes2009-11-282-40/+37
* | remove the "Always Show Video Preview" menuitemGuillaume Desmottes2009-11-282-33/+0
* | connect the 'camera off' and 'preview' buttonsGuillaume Desmottes2009-11-281-0/+121
* | set the icon of the camera_off buttonGuillaume Desmottes2009-11-281-0/+20
* | add "camera off" and "preview" buttons to the toolbarGuillaume Desmottes2009-11-281-1/+30
* | call-window: check box labels should use sentence capitalizationGuillaume Desmottes2009-11-281-1/+1
* | We should display the avatar/preview when call is disconnectedGuillaume Desmottes2009-11-281-0/+3
* | call-window: add some debug msgGuillaume Desmottes2009-11-281-0/+3
* | disable video preview when we turn off video sendingGuillaume Desmottes2009-11-281-4/+1
* | Enable 'send video' buttons and display the preview if call has 'initial vide...Guillaume Desmottes2009-11-281-0/+10
* | Don't display the video preview when the sink is addedGuillaume Desmottes2009-11-281-10/+0
* | we don't want to hide the self frame anymoreGuillaume Desmottes2009-11-281-3/+0
* | remove empathy_call_window_update_self_avatar_visibilityGuillaume Desmottes2009-11-281-24/+0
* | call-window: factor out display_video_preview to display/hide the video previewGuillaume Desmottes2009-11-281-14/+37
* | call-window: change the semantic of the "Video Preview" menu item (#601288)Guillaume Desmottes2009-11-282-38/+12
* | change 'unread from everyone' to 'unread from all'Guillaume Desmottes2009-11-271-2/+2
* | fix typo in commentsGuillaume Desmottes2009-11-271-3/+2
* | update the window title when a new message is receivedGuillaume Desmottes2009-11-271-0/+3
* | display the number of unread message in the window title (#548701)Guillaume Desmottes2009-11-271-5/+62
* | call empathy_chat_messages_read when messages have been read in a tabGuillaume Desmottes2009-11-271-0/+6
* | display the number of other tabsGuillaume Desmottes2009-11-271-1/+19
* | factor out empathy_chat_get_nameGuillaume Desmottes2009-11-271-3/+9
* | Always display the 'Room' column (#586678)Guillaume Desmottes2009-11-261-15/+0
* | Remember the geometry of debug windowXavier Claessens2009-11-261-0/+2
|/
* Drop workaround that restore window position when it gets deiconifiedXavier Claessens2009-11-241-16/+0
* Don't set the accounts dialog transient when running empathy -aGuillaume Desmottes2009-11-231-1/+1
* event-manager: event_manager_ft_got_contact_cb: ref the contactGuillaume Desmottes2009-11-231-1/+1
* empathy.c: use tp_account_manager_get_most_available_presence instead of empa...Guillaume Desmottes2009-11-191-1/+5
* status-icon: use the account-manager directly to get our state and statusGuillaume Desmottes2009-11-191-10/+10
* Move empathy-log to tests/interactive and don't install it anymoreLaurent Bigonville2009-11-193-65/+1
* Use accessor functions instead direct access.Javier Jardón2009-11-175-22/+35
* Reload the main window geometry when deiconify to workaround WM bugs.Xavier Claessens2009-11-161-0/+16
* Correctly store/restore maximized state of windows.Xavier Claessens2009-11-163-192/+11
* media_stream_error_to_txt: display a link to the fdo bugzillaGuillaume Desmottes2009-11-161-4/+13
* rephrase the TP_MEDIA_STREAM_ERROR_NO_CODECS errorGuillaume Desmottes2009-11-161-2/+4
* Display the name of the CM in the TP_MEDIA_STREAM_ERROR_INVALID_CM_BEHAVIOR msgGuillaume Desmottes2009-11-161-7/+13
* media_stream_error_to_txt: add a msg for TP_MEDIA_STREAM_ERROR_NETWORK_ERRORGuillaume Desmottes2009-11-161-1/+3
* media_stream_error_to_txt: add a msg for TP_MEDIA_STREAM_ERROR_MEDIA_ERRORGuillaume Desmottes2009-11-161-0/+3
* media_stream_error_to_txt: add a msg for TP_MEDIA_STREAM_ERROR_INVALID_CM_BEH...Guillaume Desmottes2009-11-161-0/+5
* media_stream_error_to_txt: add a msg for TP_MEDIA_STREAM_ERROR_NO_CODECSGuillaume Desmottes2009-11-161-0/+6
* accounts-dialog: wait that account is prepared before calling accounts_dialog...Guillaume Desmottes2009-11-131-1/+20
* change 'capa' to 'cap'Guillaume Desmottes2009-11-131-1/+1
* remove old commentGuillaume Desmottes2009-11-131-1/+0
* change empathy_notification_is_enabled to empathy_notify_manager_notification...Guillaume Desmottes2009-11-132-4/+4
* change empathy_misc_get_pixbuf_for_notification to empathy_notify_manager_get...Guillaume Desmottes2009-11-132-2/+8
* move empathy-misc to empathy-notify-managerGuillaume Desmottes2009-11-135-129/+1
* define constants for notify capabilitiesGuillaume Desmottes2009-11-131-1/+2
* status-icon: use EmpathyNotifyManager to check if the server supports the 'ac...Guillaume Desmottes2009-11-131-12/+5
* src/Makefile.am: sort filesGuillaume Desmottes2009-11-131-9/+9
* account-assistant: set default display name to newly created accounts (#600705)Guillaume Desmottes2009-11-131-0/+10
* move code generating the default display name of new account to account-widgetGuillaume Desmottes2009-11-131-51/+2
* Call g_object_unref instead of gtk_rc_style_unrefGustavo Noronha Silva2009-11-131-1/+1
* empathy-call-window: display_error: simplify showing of the widgetsGuillaume Desmottes2009-11-121-4/+1
* empathy-call-window: display_error: align the main message on the rightGuillaume Desmottes2009-11-121-0/+1
* empathy-call-window: display_error: put the image and vbox in a hboxGuillaume Desmottes2009-11-121-5/+11
* empathy-call-window: display_error: wrap the translated error msg as wellGuillaume Desmottes2009-11-121-0/+1
* Force an unset presence type to appear as offline in the presence chooser and...Jonny Lamb2009-11-121-0/+7
* use new tpAccount apiFelix Kaser2009-11-101-5/+5
* added tooltips to buttonsFelix Kaser2009-11-101-0/+3
* ui change: added 3 buttons to infobarFelix Kaser2009-11-101-13/+97
* two line messageFelix Kaser2009-11-101-1/+1
* removed double codeFelix Kaser2009-11-101-6/+4
* make the infobar smallerFelix Kaser2009-11-101-1/+0
* use only one button in error-infobarFelix Kaser2009-11-101-20/+2
* use smaller account icons for error messageFelix Kaser2009-11-101-1/+1
* use one lined error notificationsFelix Kaser2009-11-101-2/+2
* use gtk_box_pack_startFelix Kaser2009-11-101-2/+2
* use account icon instead of warning signFelix Kaser2009-11-101-4/+5
* added set message type to infobarFelix Kaser2009-11-101-1/+1
* refactoringFelix Kaser2009-11-101-25/+21
* changed variable nameFelix Kaser2009-11-101-17/+17
* removed trailing whitespacesFelix Kaser2009-11-101-1/+1
* Added GtkInfobar and Retry buttonFelix Kaser2009-11-101-101/+48
* empathy_accounts_dialog_show: check if priv->cms is not NULL before using itGuillaume Desmottes2009-11-101-1/+1
* set 'R' as accelerator for the preferences dialogGuillaume Desmottes2009-11-101-1/+1
* set 'C' as accelerator for the Contact menu as 'C' is already used by Convers...Guillaume Desmottes2009-11-101-1/+1
* accounts-dialog: set the ypad on the "Name" cellGuillaume Desmottes2009-11-101-1/+1
* Fix race where UI sensitivity was being set before the AM was readyDanielle Madeley2009-11-101-2/+2
* main-window: save the size of the window when destroyedGuillaume Desmottes2009-11-091-0/+4
* empathy-ft-manager: save the size of the window when disposingGuillaume Desmottes2009-11-091-1/+5
* chat-window: save the size of the window when disposingGuillaume Desmottes2009-11-091-0/+1
* Don't leak references to dup'ed objectsDanielle Madeley2009-11-091-0/+3
* Move the call to empathy_idle_get_state() to once the AM is readyDanielle Madeley2009-11-091-11/+17
* media_stream_error_to_txt: correct the error message if the error was an audi...Guillaume Desmottes2009-11-061-7/+15
* accounts-dialog: display the 'remove' icon only on the selected rowGuillaume Desmottes2009-11-061-2/+0
* accounts-dialog: set the 'ypad' of cells in the account treeview to 4Guillaume Desmottes2009-11-061-2/+0
* accounts-dialog: simplify the remove acount confirmation dialogGuillaume Desmottes2009-11-061-15/+0
* rephrase the TP_MEDIA_STREAM_ERROR_CODEC_NEGOTIATION_FAILED messageGuillaume Desmottes2009-11-061-1/+2
* debug-window: format timestamp in a readable wayPascal Terjan2009-11-061-8/+59
* Better reorganization of chat_window_update (#600732)Ryan LaBelle2009-11-061-24/+76
* empathy-call-window: add a friendly message for TP_MEDIA_STREAM_ERROR_CONNECT...Guillaume Desmottes2009-11-061-0/+7
* use 'Technical Details' as title of the expanderGuillaume Desmottes2009-11-051-1/+1
* pass NULL to gtk_label_new when creating an empty labelGuillaume Desmottes2009-11-051-2/+2
* Display the error message in a expanderGuillaume Desmottes2009-11-051-5/+30
* use the error message if we don't have a nice descriptionGuillaume Desmottes2009-11-051-4/+10
* factor out empathy_call_window_stream_errorGuillaume Desmottes2009-11-051-13/+16
* fix typo in commentGuillaume Desmottes2009-11-051-1/+1
* call_handler_notify_tp_call_cb: return if call is NULLGuillaume Desmottes2009-11-051-1/+2
* empathy-call-window: fix phrasing of the codec negotation failed msg and mark...Guillaume Desmottes2009-11-051-1/+2
* empathy-call-window: display an error message when codec negotiation failed (...Guillaume Desmottes2009-11-051-0/+136
* empathy-call-window: add a VBox to display errorsGuillaume Desmottes2009-11-051-2/+11
* ensure that the "Previous Conversations" menu entry stays sensitive if there ...Guillaume Desmottes2009-11-051-1/+5
* debug window shouldn't be transientGuillaume Desmottes2009-11-042-2/+2
* debug-window: debug level names shouldn't be translatedGuillaume Desmottes2009-11-041-6/+6
* empathy-chat-window: always display the title of the current tabGuillaume Desmottes2009-11-041-9/+1
* get_default_display_name: use the real protocol name to check if it's IRC or notGuillaume Desmottes2009-11-031-4/+7
* new-chatroom-dialog: swap the position of the 'Room' and 'Server' entries.Guillaume Desmottes2009-11-031-8/+8
* Allow accounts_dialog_has_pending_change to return a NULL TpAccountGuillaume Desmottes2009-11-031-13/+24
* Use call-{start,stop} icons in the incoming call dialogGuillaume Desmottes2009-11-031-2/+2
* accounts-dialog: don't always select the first account automaticallyJonny Lamb2009-11-031-2/+7
* empathy-accounts-dialog: account-validity-changed signal now has a 'valid' ar...Guillaume Desmottes2009-11-031-0/+1
* Merge branch 'accountz'Jonny Lamb2009-11-0213-370/+408
|\
| * empathy: when creating salut account, be sure to wait for the account managerJonny Lamb2009-10-301-14/+37
| * all: log error messages if preparing the account manager failsJonny Lamb2009-10-305-12/+43
| * empathy: port to new tp-glib account APIJonny Lamb2009-10-241-85/+76
| * status-icon: port to new tp-glib account APIJonny Lamb2009-10-241-21/+36
| * new-chatroom-dialog: port to new tp-glib account APIJonny Lamb2009-10-241-3/+3
| * main-window: port to new tp-glib account APIJonny Lamb2009-10-241-48/+87
| * import-widget: port to new tp-glib account APIJonny Lamb2009-10-241-27/+30
| * import-mc4-accounts: port to new tp-glib account APIJonny Lamb2009-10-241-5/+5
| * event-manager: port to new tp-glib account APIJonny Lamb2009-10-241-4/+11
| * chatrooms-window: port to new tp-glib account APIJonny Lamb2009-10-241-2/+2
| * chat-window: port to new tp-glib account APIJonny Lamb2009-10-242-14/+18
| * accounts-dialog: port to new tp-glib account APIJonny Lamb2009-10-242-145/+70
| * account-assistant: port to new tp-glib account APIJonny Lamb2009-10-241-3/+3
* | Fixes cycling tab bug in chat window (#589263)Rômulo Fernandes Machado2009-10-301-12/+49
* | empathy-accounts-dialog: do_constructor: always return a new referenceGuillaume Desmottes2009-10-291-3/+7
* | empathy-accounts-dialog: do_constructor: don't ref the dialog if it already e...Guillaume Desmottes2009-10-291-1/+3
* | Escape the header of the notification (#599431)Guillaume Desmottes2009-10-291-2/+7
* | Add MissionControl to the debug windowDanielle Madeley2009-10-271-0/+7
* | Fix crash when joining a chat, GTK_WIDGET_VISIBLE is not NULL-safeXavier Claessens2009-10-261-2/+1
* | empathy-chat-window: Don't update the Contact menu if visibleRob Bradford2009-10-241-5/+26
* | empathy.c: document how the reference on the newly created EmpathyChat is man...Guillaume Desmottes2009-10-231-2/+9
|/
* ft-manager: allow closing the dialog with C-w or EscJonny Lamb2009-10-231-0/+17
* Enable extra error CFLAGS in src/Guillaume Desmottes2009-10-231-0/+1
* Also allow Esc to close debug window and map view.Jonny Lamb2009-10-212-3/+4