Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed Bug 586284 – Crasher: click on the microphone once disconnected | Jonathan Tellier | 2009-06-23 | 1 | -2/+11 |
| | |||||
* | The EmpathyCallHandler correctly initializes it "initial_video" property | Jonathan Tellier | 2009-06-16 | 1 | -3/+28 |
| | | | | | | | | | when the remote contact initiates the call. empathy_tp_call_is_(sending/receiving)_video correctly returns a gboolean. The remote avatar is correctly shown when the remote site does not send video. When a call is disconnected, the video preview is hidden. | ||||
* | The video preview is no longer hidden when we get connected to a audio | Jonathan Tellier | 2009-06-13 | 1 | -20/+14 |
| | | | | only call. | ||||
* | Corrected code style in empathy_call_window_setup_video_preview. | Jonathan Tellier | 2009-06-12 | 1 | -45/+56 |
| | | | | The video preview is now shown no matter if we are sending video or not. | ||||
* | Added an early return in empathy_call_window_setup_video_preview. | Jonathan Tellier | 2009-06-12 | 1 | -87/+96 |
| | | | | | | | | | Code style correction in empathy_call_window_setup_video_preview_visibility. Corrected a bug which prevented a user with no video input to redial video calls. The "Send video" option should be properly disabled when we can't send video. | ||||
* | Better implemented empathy_tp_call_is_receiving_video and ↵ | Jonathan Tellier | 2009-06-12 | 1 | -52/+73 |
| | | | | | | | | | | | empathy_tp_call_is_sending_video. Removed the "video-stream-changed" from EmpathyCallHandler Corrected gtk-doc in EmpathyCallHandler. empathy_call_window_stup_video_preview now checks the status of the video_tee and the video_preview. empathy_call_window_sink_added_cb does not automatically starts the preview. | ||||
* | Not creating the video preview if we don't want to show it (in audio | Jonathan Tellier | 2009-06-12 | 1 | -56/+97 |
| | | | | calls for instance). | ||||
* | Implemented the call window's "View -> Video preview" option. | Jonathan Tellier | 2009-06-12 | 1 | -1/+35 |
| | |||||
* | When no video is received or sent we show contacts' avatars instead of showing | Jonathan Tellier | 2009-06-12 | 1 | -0/+49 |
| | | | | black widgets. | ||||
* | empathy-call-window: remove unused variables | Guillaume Desmottes | 2009-06-11 | 1 | -3/+0 |
| | |||||
* | Added a "Redial" button to the call window. | Jonathan Tellier | 2009-06-09 | 1 | -98/+244 |
| | |||||
* | empathy-call-window: coding style fix | Guillaume Desmottes | 2009-05-28 | 1 | -1/+1 |
| | |||||
* | When initializing users' avatar, the pixbuf representing it is now | Jonathan Tellier | 2009-05-26 | 1 | -1/+1 |
| | | | | initialized to NULL. | ||||
* | When no video is received or sent we show contacts' avatars instead of showing | Jonathan Tellier | 2009-05-26 | 1 | -8/+138 |
| | | | | black widgets. | ||||
* | empathy-call-window: fix coding style | Guillaume Desmottes | 2009-05-18 | 1 | -1/+1 |
| | |||||
* | empathy_call_window_bus_message: init GError | Guillaume Desmottes | 2009-05-18 | 1 | -1/+1 |
| | |||||
* | Fixed some coding style. | jtellier | 2009-05-13 | 1 | -3/+3 |
| | | | | | | | | - empathy-call-window-fullscreen.c and .h now has no line > 80 caracters. - The return type and the signature in the declaration of empathy_call_window_fullscreen_new and of empathy_call_window_new are on the same line. - Removed a trailing space and a tab (which was replaced by spaces). | ||||
* | Usability fix: The "Leave Fullscreen" button is now using the | jtellier | 2009-05-12 | 1 | -0/+4 |
| | | | | "gtk-leave-fullscreen" stock id instead of "gtk-fullscreen". | ||||
* | Fixed coding style by removing trailing spaces and not using a mix of | jtellier | 2009-05-12 | 1 | -15/+64 |
| | | | | | | tabs and spaces. Removed some responsabilities from EmpathyCallWindowFullscreen. It now only manages the "Leave Fullscreen" popup and button. | ||||
* | Video playback fullscreen mode | jtellier | 2009-05-08 | 1 | -13/+227 |
| | | | | See http://bugzilla.gnome.org/show_bug.cgi?id=580771 | ||||
* | empathy_call_window_dispose: disconnect signals before unrefing the contact | Guillaume Desmottes | 2009-04-29 | 1 | -1/+1 |
| | |||||
* | empathy_call_window_constructed: set default title if the call handler ↵ | Guillaume Desmottes | 2009-04-29 | 1 | -0/+5 |
| | | | | doesn't have a contact | ||||
* | call-window: update window's title when contact's name is changed | Guillaume Desmottes | 2009-04-29 | 1 | -10/+34 |
| | |||||
* | call-window: set remote contact's name in window's title. Fixes #530119 | Guillaume Desmottes | 2009-04-29 | 1 | -0/+25 |
| | |||||
* | call-window: handler property has to be construct only | Guillaume Desmottes | 2009-04-29 | 1 | -1/+1 |
| | |||||
* | empathy-call-window.c: update priv->sending_video *before* changing widget's ↵ | Guillaume Desmottes | 2009-04-24 | 1 | -2/+2 |
| | | | | state | ||||
* | empathy-call-window: add priv->sending_video so we don't call ↵ | Guillaume Desmottes | 2009-04-24 | 1 | -0/+12 |
| | | | | empathy_call_window_set_send_video when it's not needed | ||||
* | Sync 'Send Video' button and 'Call -> Send video' menu entry. Fixes #576394 | Guillaume Desmottes | 2009-04-23 | 1 | -0/+5 |
| | |||||
* | Make use of GtkUIManager in EmpathyCallWindow | Xavier Claessens | 2009-04-16 | 1 | -36/+60 |
| | | | | | | From: Xavier Claessens <xclaesse@gmail.com> svn path=/trunk/; revision=2867 | ||||
* | Port EmpathyCallWindow to new API | Xavier Claessens | 2009-04-16 | 1 | -33/+26 |
| | | | | | | From: Xavier Claessens <xclaesse@gmail.com> svn path=/trunk/; revision=2855 | ||||
* | Use UTF-8 em dash (U+2014) instead of two hyphen/minus (U+002D) | Frederic Peters | 2009-03-24 | 1 | -1/+1 |
| | | | | | | (bug 574192) svn path=/trunk/; revision=2743 | ||||
* | First connect to the sink pad, then start playing | Sjoerd Simons | 2009-03-10 | 1 | -1/+2 |
| | | | | | | Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2650 | ||||
* | Refer to the gnome bug number belonging to the TODO | Sjoerd Simons | 2009-03-10 | 1 | -1/+1 |
| | | | | | | Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2649 | ||||
* | Make the sidebar nicely pop in and out | Sjoerd Simons | 2009-03-09 | 1 | -0/+13 |
| | | | | | | Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2645 | ||||
* | Only check if the error came from the video_input if it's there | Sjoerd Simons | 2009-03-09 | 1 | -2/+3 |
| | | | | | | Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2644 | ||||
* | Hook up audio mute button | Sjoerd Simons | 2009-03-09 | 1 | -6/+59 |
| | | | | | | Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2642 | ||||
* | Set the camera button sensitive while connected and there is a video input | Sjoerd Simons | 2009-03-09 | 1 | -0/+4 |
| | | | | | | Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2641 | ||||
* | Handle resource-request | Sjoerd Simons | 2009-03-09 | 1 | -0/+19 |
| | | | | | | Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2640 | ||||
* | Unref the video input and tee after removing | Sjoerd Simons | 2009-03-09 | 1 | -2/+10 |
| | | | | | | Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2639 | ||||
* | Set the pipeline to pause before starting the call | Sjoerd Simons | 2009-03-09 | 1 | -8/+107 |
| | | | | | | | | | | Initially set the pipeline to PAUSED, if that fails because of the videoinput remove that input and continue as an audio-only call (we can still receive video though). Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2636 | ||||
* | Hook up the video input sidebar item | Sjoerd Simons | 2009-03-04 | 1 | -16/+146 |
| | | | | | | Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2564 | ||||
* | Hook up audio input panel | Sjoerd Simons | 2009-03-04 | 1 | -3/+37 |
| | | | | | | Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2561 | ||||
* | Put locks around timer_id | Sjoerd Simons | 2009-03-04 | 1 | -2/+12 |
| | | | | | | Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2556 | ||||
* | Add timer and make all gtk calls in the main thread | Sjoerd Simons | 2009-03-04 | 1 | -13/+62 |
| | | | | | | Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2555 | ||||
* | Use livesrc and fsfunnel to funnel the mediastreams to their outputs | Sjoerd Simons | 2009-03-04 | 1 | -16/+72 |
| | | | | | | Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2554 | ||||
* | Set the preview video widget not sync and async | Sjoerd Simons | 2009-03-04 | 1 | -0/+1 |
| | | | | | | Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2553 | ||||
* | Add comments for callbacks that come from a different thread | Sjoerd Simons | 2009-03-04 | 1 | -0/+2 |
| | | | | | | Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2551 | ||||
* | Ensure to always call gtk/gdk functions while holding the gdk lock | Sjoerd Simons | 2009-03-04 | 1 | -0/+4 |
| | | | | | | Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2550 | ||||
* | Some string comments requested by translators (#572875) | Frederic Peters | 2009-02-24 | 1 | -0/+1 |
| | | | | svn path=/trunk/; revision=2532 | ||||
* | Set the intial volume button level to a more correct one | Sjoerd Simons | 2009-02-17 | 1 | -0/+4 |
| | | | | | | Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2496 | ||||
* | Set the camera button insensitive after a call | Sjoerd Simons | 2009-02-17 | 1 | -0/+3 |
| | | | | | | Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2495 | ||||
* | Hook up the volume button | Sjoerd Simons | 2009-02-17 | 1 | -1/+14 |
| | | | | | | Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2494 | ||||
* | Hook up DTFM support | Sjoerd Simons | 2009-02-17 | 1 | -12/+86 |
| | | | | | | Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2493 | ||||
* | rename toolbar1 to toolbar | Guillaume Desmottes | 2009-02-17 | 1 | -1/+1 |
| | | | | | | From: Guillaume Desmottes <gdesmott@gnome.org> svn path=/trunk/; revision=2483 | ||||
* | Add an empty expanded GtkToolItem so the volume button is at the end of the ↵ | Guillaume Desmottes | 2009-02-17 | 1 | -0/+7 |
| | | | | | | | | toolbar. From: Guillaume Desmottes <gdesmott@gnome.org> svn path=/trunk/; revision=2482 | ||||
* | Manually add the GtkVolumeButton to the toolbar instead of fitting an empty ↵ | Guillaume Desmottes | 2009-02-17 | 1 | -3/+8 |
| | | | | | | | | hole defined in Glade From: Guillaume Desmottes <gdesmott@gnome.org> svn path=/trunk/; revision=2481 | ||||
* | Signal closed from the call-handler | Sjoerd Simons | 2009-02-17 | 1 | -16/+2 |
| | | | | | | Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2478 | ||||
* | Fix pad leak | Olivier Crête | 2009-02-12 | 1 | -0/+2 |
| | | | | | | | From: Olivier Crête <olivier.crete@collabora.co.uk> Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2441 | ||||
* | Fix spacing of video preview widgets in call UI (bug 570400) | Jonathon Jongsma | 2009-02-12 | 1 | -1/+2 |
| | | | | | | | | | | | | Add some additional spacing between the toolbar and statusbar and the main content of the window so that it doesn't look quite as cramped. Also remove align the top edges of the remote video preview and the self video preview widgets. From: Jonathon Jongsma <jonathon.jongsma@collabora.co.uk> Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2437 | ||||
* | Fix typo | Sjoerd Simons | 2009-02-04 | 1 | -1/+1 |
| | | | | | | Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2424 | ||||
* | Add information in the statusbar | Sjoerd Simons | 2009-02-03 | 1 | -4/+56 |
| | | | | | | Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2410 | ||||
* | Start streaming video when webcam icon is clicked | Sjoerd Simons | 2009-02-03 | 1 | -0/+23 |
| | | | | | | Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2408 | ||||
* | Rename DTFM to Dailpad | Sjoerd Simons | 2009-02-03 | 1 | -1/+1 |
| | | | | | | Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2407 | ||||
* | Put in new VOIP UI | Sjoerd Simons | 2009-02-03 | 1 | -7/+232 |
| | | | | | | Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2404 | ||||
* | stop the pipeline and unref everything when the window goes away | Sjoerd Simons | 2009-02-03 | 1 | -14/+49 |
| | | | | | | Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2399 | ||||
* | Start of a simple ui | Sjoerd Simons | 2009-02-03 | 1 | -12/+231 |
| | | | | | | Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2388 | ||||
* | Toss out the old EmpathyCallWindow initialise the CallFactory and hook into ↵ | Sjoerd Simons | 2009-02-03 | 1 | -597/+50 |
| | | | | | | | | its signals Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2383 | ||||
* | Initial port from telepathy-stream-engine to telepathy-farsight | Sjoerd Simons | 2009-02-03 | 1 | -0/+3 |
| | | | | | | Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2380 | ||||
* | Remove useless include of empathy-tp-group.h | Xavier Claessens | 2009-01-13 | 1 | -1/+0 |
| | | | | svn path=/trunk/; revision=2226 | ||||
* | Initialize with a EmpathyTpCall instead of a TpChannel and explicitly close the | Sjoerd Simons | 2009-01-10 | 1 | -9/+18 |
| | | | | | | | | channel after uses Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2162 | ||||
* | Update empathy_sound_play () to be nicer to use and centralize the list | Xavier Claessens | 2009-01-07 | 1 | -15/+8 |
| | | | | | | of sounds we support. svn path=/trunk/; revision=2082 | ||||
* | Adapt the libcanberra calls to use the new functions. | Xavier Claessens | 2009-01-07 | 1 | -3/+0 |
| | | | | svn path=/trunk/; revision=2025 | ||||
* | Adapt Patryk's patch to trunk. | Xavier Claessens | 2009-01-07 | 1 | -0/+23 |
| | | | | svn path=/trunk/; revision=2022 | ||||
* | Pick the correct contact alias for the message telling incoming call is ↵ | Xavier Claessens | 2008-08-04 | 1 | -1/+8 |
| | | | | | | rejected. Fixes bug #546218. svn path=/trunk/; revision=1294 | ||||
* | Fix translators complains about ambigous strings. Fixes bug #546154. | Xavier Claessens | 2008-08-04 | 1 | -0/+2 |
| | | | | svn path=/trunk/; revision=1291 | ||||
* | Coding style (Alban Crequy) | Xavier Claessens | 2008-06-13 | 1 | -3/+2 |
| | | | | svn path=/trunk/; revision=1169 | ||||
* | g_object_unref the right variable (Alban Crequy) | Xavier Claessens | 2008-06-13 | 1 | -1/+1 |
| | | | | svn path=/trunk/; revision=1168 | ||||
* | Replace the has-dtmf property by empathy_tp_call_has_dtmf() (Alban Crequy) | Xavier Claessens | 2008-06-13 | 1 | -3/+1 |
| | | | | svn path=/trunk/; revision=1165 | ||||
* | Fix identation (Alban Crequy) | Xavier Claessens | 2008-06-13 | 1 | -1/+2 |
| | | | | svn path=/trunk/; revision=1164 | ||||
* | g_object_unref after g_object_get (Alban Crequy) | Xavier Claessens | 2008-06-13 | 1 | -0/+3 |
| | | | | svn path=/trunk/; revision=1163 | ||||
* | Do not show the keypad when the media channel does not have the DTMF ↵ | Xavier Claessens | 2008-06-13 | 1 | -0/+11 |
| | | | | | | interface (Alban Crequy) svn path=/trunk/; revision=1162 | ||||
* | Better dialog message when a call is rejected (Alban Crequy) | Xavier Claessens | 2008-06-13 | 1 | -1/+5 |
| | | | | | | | Example: "Incoming call from xxx rejected because there is already a running call." svn path=/trunk/; revision=1161 | ||||
* | EmpathyCallWindow: Get a new video preview when pushing a new call into the ↵ | Xavier Claessens | 2008-06-08 | 1 | -0/+6 |
| | | | | | | window. (Sjoerd Simons). svn path=/trunk/; revision=1154 | ||||
* | Only permit to have one running call at any time. Fixes bug #527970. | Xavier Claessens | 2008-05-27 | 1 | -49/+30 |
| | | | | svn path=/trunk/; revision=1126 | ||||
* | Improve dispatcher. Fixes bug #465928. | Xavier Claessens | 2008-05-18 | 1 | -4/+59 |
| | | | | svn path=/trunk/; revision=1108 | ||||
* | Keypad is unsensitive if the call is not ACCEPTED | Xavier Claessens | 2008-05-02 | 1 | -0/+5 |
| | | | | svn path=/trunk/; revision=1072 | ||||
* | Implement DTMF. | Xavier Claessens | 2008-05-02 | 1 | -0/+52 |
| | | | | svn path=/trunk/; revision=1071 | ||||
* | Fix packing of the preview video. | Xavier Claessens | 2008-05-02 | 1 | -2/+4 |
| | | | | svn path=/trunk/; revision=1069 | ||||
* | Make use of tp-glib debug system. | Xavier Claessens | 2008-05-01 | 1 | -11/+10 |
| | | | | svn path=/trunk/; revision=1066 | ||||
* | Add a confirmation dialog to accept/reject incoming calls. Do not show ↵ | Xavier Claessens | 2008-04-30 | 1 | -73/+85 |
| | | | | | | remote video area if there is no video stream. svn path=/trunk/; revision=1064 | ||||
* | Fix type: s/hand up/hang up/ | Xavier Claessens | 2008-04-30 | 1 | -2/+2 |
| | | | | svn path=/trunk/; revision=1063 | ||||
* | Reword call window: Use GtkVolumeButton, only one button to accept/reject ↵ | Xavier Claessens | 2008-04-29 | 1 | -114/+131 |
| | | | | | | calls, let s-e add black borders to keep good video ration. svn path=/trunk/; revision=1061 | ||||
* | Improve the close warning message. (Elliot Fairweather). | Xavier Claessens | 2008-04-25 | 1 | -1/+1 |
| | | | | svn path=/trunk/; revision=1048 | ||||
* | Comply to HIG guidelines. Fixes bug #526926 (Elliot Fairweather, Xavier ↵ | Xavier Claessens | 2008-04-23 | 1 | -3/+6 |
| | | | | | | Claessens) svn path=/trunk/; revision=1037 | ||||
* | Fix warning when changing send video button before accepting the call.EMPATHY_0_23_1 | Xavier Claessens | 2008-04-21 | 1 | -1/+4 |
| | | | | svn path=/trunk/; revision=1024 | ||||
* | If window->call is NULL consider the call as CLOSED | Xavier Claessens | 2008-04-21 | 1 | -2/+4 |
| | | | | svn path=/trunk/; revision=1021 | ||||
* | Marked strings for translation. Fixes bug #528596 (Frederic Peters) | Frederic Peters | 2008-04-18 | 1 | -4/+4 |
| | | | | svn path=/trunk/; revision=960 | ||||
* | Mute input/output if the button is not active. | Xavier Claessens | 2008-04-16 | 1 | -2/+2 |
| | | | | svn path=/trunk/; revision=954 | ||||
* | Add collabora in copyright and myself in authors since I did lots of changes ↵ | Xavier Claessens | 2008-04-15 | 1 | -13/+16 |
| | | | | | | in that module. svn path=/trunk/; revision=947 | ||||
* | Fix some warnings | Xavier Claessens | 2008-04-11 | 1 | -2/+2 |
| | | | | svn path=/trunk/; revision=926 | ||||
* | Update for new API and cleanup the code. | Xavier Claessens | 2008-04-11 | 1 | -240/+185 |
| | | | | svn path=/trunk/; revision=908 | ||||
* | Ask confirmation to close call only if it was accepted. Fixes bug #526927 ↵ | Xavier Claessens | 2008-04-09 | 1 | -1/+1 |
| | | | | | | (Frederic Peters). svn path=/trunk/; revision=879 | ||||
* | More coding style | Xavier Claessens | 2008-03-23 | 1 | -19/+5 |
| | | | | svn path=/trunk/; revision=821 | ||||
* | Fix includes | Xavier Claessens | 2008-03-19 | 1 | -2/+2 |
| | | | | svn path=/trunk/; revision=817 | ||||
* | Use empathy_file_lookup for glade files since some are in libempathy-gtk/ ↵ | Xavier Claessens | 2008-03-17 | 1 | -1/+4 |
| | | | | | | and others in src/ svn path=/trunk/; revision=813 | ||||
* | Move modules that make no sense to be used in other applicaton from ↵ | Xavier Claessens | 2008-03-14 | 1 | -0/+532 |
libempathy-gtk/ to src/ svn path=/trunk/; revision=789 |