aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* empathy_contact_dup_from_folks_individual: add a debug msg if no contact is f...Guillaume Desmottes2011-09-061-0/+6
* empathy-accounts.desktop.in.in: remove X-GNOME-Settings-PanelGuillaume Desmottes2011-09-061-2/+1
* don't leak the keys returned by g_key_file_get_keys()Guillaume Desmottes2011-09-061-0/+2
* mcp_account_manager_goa_get: rename 'n' to nkeysGuillaume Desmottes2011-09-061-6/+3
* Store variable parameters to a key fileGuillaume Desmottes2011-09-061-7/+124
* watch for chat properties change to detect if Chat has enabled/disabledGuillaume Desmottes2011-09-061-19/+19
* set TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_ENABLED restrictionGuillaume Desmottes2011-09-061-1/+2
* Remove old Facebook codeGuillaume Desmottes2011-09-061-42/+4
* watch for Chat feature changes to enable/disable the accountGuillaume Desmottes2011-09-061-23/+18
* mcp_account_manager_goa_set: pretend we save everythingGuillaume Desmottes2011-09-061-0/+2
* Enable TP account only if Chat has been turned on in GOAGuillaume Desmottes2011-09-061-22/+6
* store the GoaObject rather than the GoaAccountGuillaume Desmottes2011-09-061-11/+17
* Add params fallback-servers, extra-certificate-identities and require-encryptionDanielle Madeley2011-09-061-0/+6
* Document hashtable allocation/reffingDanielle Madeley2011-09-061-1/+4
* Track accounts created and destroyed from GOADanielle Madeley2011-09-061-2/+32
* Support launching GNOME Online Accounts in empathy-accountsDanielle Madeley2011-09-061-7/+65
* Initial work on a GNOME Online Accounts Mission Control pluginDanielle Madeley2011-09-066-1/+634
* Updated Spanish translationJorge González2011-09-061-57/+114
* help/share-desktop: Updated and improved wordingEkaterina Gerasimova2011-09-061-21/+35
* Updated Dutch translation by Hannie DumoleynHannie Dumoleyn2011-09-061-273/+312
* Updated galician translationsFran Dieguez2011-09-051-205/+231
* Updated Belarusian translation.Ihar Hrachyshka2011-09-041-48/+48
* Updated Spanish translationJorge González2011-09-041-24/+18
* help/irc-manage: Add install link for telepathy-idleShaun McCance2011-09-041-0/+6
* main-window: add back the primary-toolbar hintCosimo Cecchi2011-09-031-0/+3
* log-window: add the "raised" style class to the account chooserCosimo Cecchi2011-09-031-0/+3
* Updated Belarusian translation.Ihar Hrachyshka2011-09-031-171/+196
* Use format-justify-fill everywhereEmilio Pozuelo Monfort2011-09-021-2/+2
* LogWindow: fix toolbar iconsEmilio Pozuelo Monfort2011-09-021-2/+2
* log-window: align the account chooser and search widgetGuillaume Desmottes2011-09-021-0/+26
* empathy_connection_can_*_personas: check if connection is connectedGuillaume Desmottes2011-09-021-0/+12
* Fixes a segfault in empathy-individual-store.cCosimo Alfarano2011-09-021-0/+8
* Updated Tamil translationDr.T.Vasudevan2011-09-021-790/+1383
* Updated Tamil translationDr.T.Vasudevan2011-09-021-2/+2
* Updated Lithuanian translationAurimas Černius2011-09-021-831/+906
* Updated Russian translationYuri Myasoedov2011-09-021-220/+181
* build: fix typo in configure summaryCosimo Cecchi2011-09-011-1/+1
* Updated Swedish translationDaniel Nylander2011-09-011-184/+213
* Updated Brazilian Portuguese translation.Antonio Fernandes C. Neto2011-09-011-179/+206
* Merge branch 'timezones-656189'Danielle Madeley2011-09-011-3/+3
|\
| * Use g_date_time_new_from_unix_local() to read timestamps from loggerDanielle Madeley2011-08-311-3/+3
* | Updated Norwegian bokmål translationKjartan Maraas2011-09-011-169/+194
* | Correct grouping in the hostname regexpSjoerd Simons2011-08-311-3/+4
* | CallWindow: make video buttons unsensitive when video not supportedEmilio Pozuelo Monfort2011-08-311-0/+6
* | remove released flagGuillaume Desmottes2011-08-311-1/+1
* | prepare 3.1.90.1EMPATHY_3_1_90_1Guillaume Desmottes2011-08-312-2/+21
* | build: use an autoconf macro to get to -lmFrédéric Péters2011-08-313-3/+6
|/
* Updated Spanish translationJorge González2011-08-311-131/+138
* CallWindow: destroy the preview clone when restarting the pipelineEmilio Pozuelo Monfort2011-08-301-6/+20
* Don't update presence on session changes if the Shell is runningGuillaume Desmottes2011-08-301-20/+27
* fix typoGuillaume Desmottes2011-08-301-1/+1
* build: remove -enumtypes rulesFrédéric Péters2011-08-301-18/+0
* build: add -lm where requiredFrédéric Péters2011-08-302-2/+3
* Don't set presence to offline when Shell is runningGuillaume Desmottes2011-08-301-4/+8
* CallWindow: don't spit unnecessary criticalsEmilio Pozuelo Monfort2011-08-301-2/+2
* Save the video preview position in gsettingsEmilio Pozuelo Monfort2011-08-302-0/+20
* don't create the status icon if GNOME Shell is runningGuillaume Desmottes2011-08-301-2/+48
* remove released flagGuillaume Desmottes2011-08-291-1/+1
* coding style fixEMPATHY_3_1_90Guillaume Desmottes2011-08-292-3/+3
* prepare 3.1.90Guillaume Desmottes2011-08-292-3/+42
* Merge branch 'account-widget-657616'Guillaume Desmottes2011-08-291-0/+10
|\
| * account-widget-local-xmpp: put all the labels in a GtkSizeGroupGuillaume Desmottes2011-08-291-0/+10
* | contact list: optimize loading contactsAlban Crequy2011-08-292-194/+220
* | Updated Traditional Chinese translation(Hong Kong and Taiwan)Cheng-Chia Tseng2011-08-292-1090/+1258
* | Updated Spanish translationJorge González2011-08-291-34/+49
|/
* contact-widget: use the day-selected sig to update birthdayGuillaume Desmottes2011-08-291-1/+1
* Allow to call phone number of contactsGuillaume Desmottes2011-08-293-1/+212
* add EmpathyAccountSelectorDialogGuillaume Desmottes2011-08-293-0/+268
* export empathy_account_has_uri_scheme_tel()Guillaume Desmottes2011-08-293-22/+25
* chatroom_manager_parse_chatroom: check account path is validGuillaume Desmottes2011-08-291-2/+8
* Updated galician translationsFran Dieguez2011-08-281-5/+5
* [l10n] Updated German translationMario Blättermann2011-08-281-746/+882
* Updated Russian translationYuri Myasoedov2011-08-271-833/+1427
* Updated Spanish translationDaniel Mustieles2011-08-271-53/+59
* Don't leak FDs when loading avatars.Will Thompson2011-08-261-5/+5
* Move the 'Show previous conversation' menu entryGuillaume Desmottes2011-08-262-15/+15
* Updated Norwegian bokmål translationKjartan Maraas2011-08-261-4/+4
* Fix unclear string in avatar chooserMilo Casagrande2011-08-261-1/+1
* Updated Belarusian translation.Ihar Hrachyshka2011-08-261-1646/+3194
* Configure: produce useful dependency errorsWill Thompson2011-08-251-12/+36
* Revert "configure: simplify error path in --enable-call"Will Thompson2011-08-251-1/+4
* configure: simplify error path in --enable-callWill Thompson2011-08-251-4/+1
* Updated Brazilian Portuguese translation.Og B. Maciel2011-08-251-527/+597
* src: install empathy-main-window-menubar.uiRaluca Elena Podiuc2011-08-251-0/+1
* Updated Galician translationsFran Dieguez2011-08-251-344/+365
* Updated Spanish translationDaniel Mustieles2011-08-251-318/+328
* Updated Norwegian bokmål translationKjartan Maraas2011-08-251-12/+16
* Do not auto-accept publish requests if contact is not subscribedXavier Claessens2011-08-241-2/+8
* account-widget-sip: add option to mark account as being able to call phonesGuillaume Desmottes2011-08-242-1/+40
* widget-sip: load/save file in GladeGuillaume Desmottes2011-08-241-18/+73
* account-widget: add empathy_account_widget_get_settings()Guillaume Desmottes2011-08-242-0/+11
* account-settings: add API to set 'tel' in the URISchemes property of the accountGuillaume Desmottes2011-08-242-0/+71
* Updated Norwegian bokmål translationKjartan Maraas2011-08-241-333/+340
* Updated Hebrew translation.Yaron Shahrabani2011-08-241-194/+211
* Updated Swedish translationDaniel Nylander2011-08-241-700/+515
* libempathy-gtk: Explicitly close the input stream used for reading avatarsPhilip Withnall2011-08-241-0/+20
* main-window.ui: load and save the file in GladeGuillaume Desmottes2011-08-231-81/+83
* Move main window's UI manager to its own UI fileGuillaume Desmottes2011-08-234-317/+331
* main-window: remove the throbber tooltipGuillaume Desmottes2011-08-231-1/+0
* geocode: fix uninitialized variable (-Werror=uninitialized)Alban Crequy2011-08-231-1/+1
* Add a configure option for GProfAlban Crequy2011-08-231-0/+12
* Merge branch 'search-bar'Jonny Lamb2011-08-231-16/+27
|\
| * search-bar: shorten labels to just Next & PreviousJonny Lamb2011-08-221-3/+6
| * search-bar: use smaller iconsJonny Lamb2011-08-221-1/+1
| * search-bar: make close button non-important stock gtk-closeJonny Lamb2011-08-221-3/+2
| * search-bar: move close button to RHSJonny Lamb2011-08-221-12/+21
* | widget-irc: quit message entry shouldn't be invisibleGuillaume Desmottes2011-08-231-3/+0
* | Updated Dutch translation by Wouter BolsterleeWouter Bolsterlee2011-08-231-146/+159
|/
* EmpathyChatWindow: Set "im.received" on notification so gnome-shell can ignor...Xavier Claessens2011-08-221-0/+4
* contact_set_avatar_from_tp_contact: don't crash if we failed to load the avatarGuillaume Desmottes2011-08-221-1/+10
* Move live search to top of Contact listGuillaume Desmottes2011-08-222-2/+18
* Freenode has added 6697 to the list of SSL portsDebarshi Ray2011-08-221-0/+1
* remove released flagGuillaume Desmottes2011-08-221-1/+1
* add empathy-webkit-utils.c to POTFILES.inEMPATHY_3_1_5_1Guillaume Desmottes2011-08-221-0/+1
* prepare 3.1.5.1Guillaume Desmottes2011-08-222-2/+45
* Don't assume that all FolksIndividuals have a corresponding EmpathyContact.Travis Reitter2011-08-222-17/+25
* Don't assume that all TpfPersonas contain valid TpContactsTravis Reitter2011-08-229-116/+203
* Merge remote-tracking branch 'pochu/preview-position'Jonny Lamb2011-08-221-1/+6
|\
| * CallWindow: correctly position the preview when draggingEmilio Pozuelo Monfort2011-08-201-1/+6
* | Merge remote-tracking branch 'pochu/request-message'Jonny Lamb2011-08-223-3/+63
|\ \
| * | Hide the request message entry if it can't be usedEmilio Pozuelo Monfort2011-08-201-8/+30
| * | EmpathyContactListFlags: add _MESSAGE_ADD flagEmilio Pozuelo Monfort2011-08-202-0/+5
| * | Set the scrolled window shadow type to Etched inEmilio Pozuelo Monfort2011-08-201-0/+2
| * | Allow to specify the subscription request messageEmilio Pozuelo Monfort2011-08-201-3/+34
| |/
* | Update Simplified Chinese translation.Aron Xu2011-08-211-380/+400
* | Fix call-event.h detectionLaurent Bigonville2011-08-191-0/+3
|/
* CameraMenu: don't change the device if it's the current oneEmilio Pozuelo Monfort2011-08-191-0/+9
* Flip the preview in RoundedTexture->paint()Emilio Pozuelo Monfort2011-08-192-19/+4
* CallWindow: make the preview button reactiveEmilio Pozuelo Monfort2011-08-191-0/+1
* contact-chooser: use tp_connection_get_account()Guillaume Desmottes2011-08-191-5/+1
* main-window: use tp_connection_get_account()Guillaume Desmottes2011-08-191-12/+4
* Reset all the necessary elements when switching camerasEmilio Pozuelo Monfort2011-08-192-2/+4
* CallWindow: make empathy_call_window_play_camera() publicEmilio Pozuelo Monfort2011-08-192-4/+7
* CallWindow: make the rectangles have rounded cornersEmilio Pozuelo Monfort2011-08-191-14/+12
* Add a rectangle actor with rounded cornersEmilio Pozuelo Monfort2011-08-193-0/+210
* CallWindow: make the info buttons roundedEmilio Pozuelo Monfort2011-08-191-4/+11
* CallWindow: round the video preview cornersEmilio Pozuelo Monfort2011-08-191-1/+2
* Add a ClutterTexture subclass with rounded cornersEmilio Pozuelo Monfort2011-08-193-0/+134
* CallWindow: don't hide the toolbar when not in a callEmilio Pozuelo Monfort2011-08-191-1/+11
* Merge branch 'trivia'Danielle Madeley2011-08-192-5/+5
|\
| * [log-window] Change Quit for CloseDanielle Madeley2011-08-192-5/+5
* | rely on the factory to prepare TP_CONNECTION_FEATURE_BALANCEGuillaume Desmottes2011-08-192-28/+11
* | tp-chat: rely on the factory to prepare TP_CONNECTION_FEATURE_CAPABILITIESGuillaume Desmottes2011-08-191-35/+13
* | new-message-dialog: rely on the factory to prepare TP_CONNECTION_FEATURE_CAPA...Guillaume Desmottes2011-08-191-44/+11
* | ft-handler: rely on the factory to prepare TP_CONNECTION_FEATURE_CAPABILITIESGuillaume Desmottes2011-08-191-17/+8
* | new-call-dialog: rely on the factory to prepare TP_CONNECTION_FEATURE_CAPABIL...Guillaume Desmottes2011-08-191-44/+17
* | individual-widget: rely on the factory to prepare TP_CONNECTION_FEATURE_CONTA...Guillaume Desmottes2011-08-191-61/+35
* | contact-widget: rely on the factory to prepare TP_CONNECTION_FEATURE_CONTACT_...Guillaume Desmottes2011-08-192-10/+9
* | contact-search-dialog: rely on the factory to prepare TP_CONNECTION_FEATURE_A...Guillaume Desmottes2011-08-191-50/+10
* | avatar-chooser: rely on the factory to prepare TP_CONNECTION_FEATURE_AVATAR_R...Guillaume Desmottes2011-08-192-5/+4
* | account-chooser: rely on the factory to prepare TP_CONNECTION_FEATURE_CAPABIL...Guillaume Desmottes2011-08-191-44/+11
* | ask factory to prepare TP_ACCOUNT_FEATURE_CONNECTIONGuillaume Desmottes2011-08-191-0/+18
|/
* Updated Hebrew translation.Yaron Shahrabani2011-08-191-300/+320
* Updated Dutch translation by Hannie DumoleynHannie Dumoleyn2011-08-191-547/+692
* Updated Slovenian translationAndrej Žnidaršič2011-08-191-42/+4
* CallWindow: hide the preview button while dragging itEmilio Pozuelo Monfort2011-08-191-1/+5
* CallWindow: hide the preview while dragging itEmilio Pozuelo Monfort2011-08-191-0/+4
* CallWindow: flip the dragged previewEmilio Pozuelo Monfort2011-08-191-0/+11
* CallWindow: make the preview follow the pointer when dragging itEmilio Pozuelo Monfort2011-08-191-7/+22
* Don't install Call service files if empathy-call is not builtEmilio Pozuelo Monfort2011-08-181-2/+10
* mic-monitor: add set_default functionJonny Lamb2011-08-182-0/+69
* mic-monitor: add get_default functionJonny Lamb2011-08-182-0/+63
* mic-menu: don't show the menu if we can't switch microphonesJonny Lamb2011-08-181-2/+8
* audio-src: make supports_changing_mic publicJonny Lamb2011-08-182-1/+3
* mic-monitor: move the PA-specific stuff from audio-src to hereJonny Lamb2011-08-186-364/+724
* chatroom-manager: removed set and unused priv variableJonny Lamb2011-08-181-3/+0
* Port to new tp-glib client factoryGuillaume Desmottes2011-08-1823-430/+329
* Depend on telepathy-glib 0.15.5Guillaume Desmottes2011-08-181-1/+1
* update git ignore with new build systemGuillaume Desmottes2011-08-183-1/+38
* update translation for PunjabiA S Alam2011-08-181-534/+594
* Merge branch 'log-window-webview'Danielle Madeley2011-08-1813-467/+1017
|\
| * Use context menu utility in log viewerDanielle Madeley2011-08-171-5/+25
| * Factor out WebKit context menu as a utilityDanielle Madeley2011-08-173-118/+145
| * Allow clicking on a row to select the contactDanielle Madeley2011-08-162-30/+108
| * Reimplement scrollToRowDanielle Madeley2011-08-162-14/+48
| * Make WebKit compulsoryDanielle Madeley2011-08-166-85/+14
| * Style fixDanielle Madeley2011-08-121-1/+1
| * Remove some commented-out debuggingDanielle Madeley2011-08-121-6/+0
| * Remove unused variableDanielle Madeley2011-08-121-2/+0
| * Remove old codeDanielle Madeley2011-08-091-15/+0
| * Set the primary toolbar styleDanielle Madeley2011-08-091-0/+3
| * Toggle the expander on row double clickDanielle Madeley2011-08-091-8/+11
| * Add icons to the new log viewerDanielle Madeley2011-08-092-6/+42
| * Add dates to new log viewerDanielle Madeley2011-08-092-7/+16
| * Use the same font-setting utility for empathy-theme-adiumDanielle Madeley2011-08-091-62/+15
| * Use this utility in the log viewerDanielle Madeley2011-08-093-2/+15
| * Utility to set the webkit default font/size from GSettingsDanielle Madeley2011-08-092-0/+77
| * Reimplement log_window_maybe_expand_events()Danielle Madeley2011-08-082-9/+25
| * Factor out toggleExpander()Danielle Madeley2011-08-081-18/+25
| * Remove treeview_events -- make the webview the only viewing componentDanielle Madeley2011-08-072-117/+58
| * Replace highlighting of search stringsDanielle Madeley2011-08-051-41/+6
| * Support smileys in log viewerDanielle Madeley2011-08-041-2/+9
| * Handle links via external browserDanielle Madeley2011-08-011-0/+19
| * Add expander togglesDanielle Madeley2011-08-012-0/+89
| * Use webkit-utils in LogWindow webviewDanielle Madeley2011-08-011-45/+56
| * Abstract WebKit string parsers into empathy-webkit-utilsDanielle Madeley2011-08-014-68/+137
| * Copy fix for bug #625745 from empathy-theme-adiumDanielle Madeley2011-08-011-0/+5
| * Add a webview widget for displaying the logDanielle Madeley2011-07-293-1/+263
* | Updated Galician translationsFran Dieguez2011-08-181-3155/+1120
* | configure.ac: Generate xz tarballs with ustar format by defaultJavier Jardón2011-08-172-8/+5
* | configure.ac: Use upstream gettext instead the glib oneJavier Jardón2011-08-171-2/+3
* | build: Update autotools config a bitJavier Jardón2011-08-172-16/+27
* | Updated Spanish translationDaniel Mustieles2011-08-171-174/+201
* | Updated Galician translationsFran Dieguez2011-08-171-182/+208
* | Updated Indonesian translationAndika Triwidada2011-08-161-1312/+1557
* | Updated Norwegian bokmål translation.Kjartan Maraas2011-08-161-177/+205
* | CallWindow: move preview rectangles on top of remote videoEmilio Pozuelo Monfort2011-08-161-2/+24
* | remove released flagGuillaume Desmottes2011-08-161-1/+1
* | prepare 3.1.5EMPATHY_3_1_5Guillaume Desmottes2011-08-162-2/+62
* | coding style fixGuillaume Desmottes2011-08-161-1/+1
* | CallWindow: add some padding to the dialpadEmilio Pozuelo Monfort2011-08-161-1/+1
* | Use AC_ARG_ENABLE with --enable-*Emilio Pozuelo Monfort2011-08-161-10/+10
* | CallWindow: fix typoEmilio Pozuelo Monfort2011-08-161-12/+12
* | Don't show empathy-call preferences when not building empathy-callEmilio Pozuelo Monfort2011-08-162-2/+11
* | Merge branch 'blockade'Will Thompson2011-08-164-20/+38
|\ \
| * | tests: simplify running blocking dialogWill Thompson2011-08-091-8/+1
| * | Blocking: don't critical if ContactBlockingCapabilities is missingWill Thompson2011-08-091-1/+13
| * | Blocking dialog: use a sensible default sizeWill Thompson2011-08-091-0/+2
| * | Blocking dialog: Gnome 3-ify Remove buttonWill Thompson2011-08-092-11/+22
* | | Get the preview position from preview_posEmilio Pozuelo Monfort2011-08-161-4/+4
* | | Add some space between the status and the end of the toolbarEmilio Pozuelo Monfort2011-08-161-0/+6
* | | Display the preview video button in the preview cornerEmilio Pozuelo Monfort2011-08-161-4/+9
* | | Bug 655212 — Update for libfolks API changes to AvatarDetailsPhilip Withnall2011-08-162-40/+102
* | | audio-sink: check if sink implements the GstStreamVolume interfaceGuillaume Desmottes2011-08-151-2/+3
* | | manually build the GstStructureGuillaume Desmottes2011-08-151-5/+11
* | | Get the env variable in create_{src,sink} directlyGuillaume Desmottes2011-08-152-4/+10
* | | Enable echo cancellation if neededGuillaume Desmottes2011-08-151-2/+16
* | | Add Echo cancellation preferenceGuillaume Desmottes2011-08-154-0/+27
* | | Use gst_parse_bin_from_description() when EMPATHY_AUDIO_* vars are setGuillaume Desmottes2011-08-154-29/+80
* | | Set stream-properties on GStreamer elements to set the media roleGuillaume Desmottes2011-08-154-2/+19
* | | Use pulesink as audio sinkGuillaume Desmottes2011-08-151-205/+40
* | | Merge branch 'move-video-preview-656268'Emilio Pozuelo Monfort2011-08-152-4/+377
|\ \ \
| * | | Don't define the same thing twiceEmilio Pozuelo Monfort2011-08-151-22/+20
| * | | CallWindow: add extra bottom margin for the floating toolbarEmilio Pozuelo Monfort2011-08-151-14/+32
| * | | CallWindow: create the rectangles after the avatarEmilio Pozuelo Monfort2011-08-151-2/+2
| * | | empathy-call: add COGL and Clutter option groupsEmilio Pozuelo Monfort2011-08-151-0/+4
| * | | Use self->priv->preview_pos to determine the preview positionEmilio Pozuelo Monfort2011-08-151-3/+2
| * | | Darken the rectangles when starting a drag operationEmilio Pozuelo Monfort2011-08-151-0/+1
| * | | Don't darken the preview when dragging itEmilio Pozuelo Monfort2011-08-151-8/+25
| * | | Highlight the preview when hoveredEmilio Pozuelo Monfort2011-08-151-1/+42
| * | | Factor out empathy_call_window_darken_preview_rectangleEmilio Pozuelo Monfort2011-08-151-20/+17
| * | | Factor out empathy_call_window_get_preview_rectangleEmilio Pozuelo Monfort2011-08-151-18/+28
| * | | Move empathy_call_window_get_preview_position aroundEmilio Pozuelo Monfort2011-08-151-42/+42
| * | | CallWindow: highlight drop zones when hoveredEmilio Pozuelo Monfort2011-08-151-0/+85
| * | | Factor out empathy_call_window_get_preview_position()Emilio Pozuelo Monfort2011-08-151-6/+18
| * | | CallWindow: show drop zones when dragging the previewEmilio Pozuelo Monfort2011-08-151-0/+85
| * | | CallWindow: allow to move the video previewEmilio Pozuelo Monfort2011-08-151-0/+103
| * | | CallWindow: add top and right margin to the preview containerEmilio Pozuelo Monfort2011-08-151-4/+4
| * | | empathy-call: call gdk_disable_multidevice()Emilio Pozuelo Monfort2011-08-151-0/+3
* | | | CameraMenu: don't crash if there are no camerasEmilio Pozuelo Monfort2011-08-151-3/+4