]>
git.0d.be Git - empathy.git/log
Xavier Claessens [Fri, 21 Nov 2008 16:21:01 +0000 (16:21 +0000)]
Channel_Type_File_Transfer.xml: sync with latest draft
svn path=/trunk/; revision=1850
Xavier Claessens [Fri, 21 Nov 2008 16:20:57 +0000 (16:20 +0000)]
Implement latest ft draft
svn path=/trunk/; revision=1849
Xavier Claessens [Fri, 21 Nov 2008 16:20:53 +0000 (16:20 +0000)]
Channel_Type_File_Transfer.xml: sync with latest draft
svn path=/trunk/; revision=1848
Xavier Claessens [Fri, 21 Nov 2008 16:20:49 +0000 (16:20 +0000)]
remove blank line
svn path=/trunk/; revision=1847
Xavier Claessens [Fri, 21 Nov 2008 16:20:43 +0000 (16:20 +0000)]
Use the RequestableChannelClasses property instead of hardcoding salut to check if we can send file or not
svn path=/trunk/; revision=1846
Xavier Claessens [Fri, 21 Nov 2008 16:20:40 +0000 (16:20 +0000)]
Set the Date property when requesting a FT channel
svn path=/trunk/; revision=1845
Xavier Claessens [Fri, 21 Nov 2008 16:20:36 +0000 (16:20 +0000)]
use Requestotron to request the FT channel
svn path=/trunk/; revision=1844
Xavier Claessens [Fri, 21 Nov 2008 16:20:32 +0000 (16:20 +0000)]
fix FT client side code as the generated code changed
svn path=/trunk/; revision=1843
Xavier Claessens [Fri, 21 Nov 2008 16:20:27 +0000 (16:20 +0000)]
add Unix_Timestamp64 to all.xml
svn path=/trunk/; revision=1842
Xavier Claessens [Fri, 21 Nov 2008 16:20:23 +0000 (16:20 +0000)]
upgrade to new FT draft
svn path=/trunk/; revision=1841
Jonny Lamb [Fri, 21 Nov 2008 16:20:20 +0000 (16:20 +0000)]
Renamed free_copy_data_if_closed to copy_data_unref and have a ref_count in the CopyData struct. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1840
Jonny Lamb [Fri, 21 Nov 2008 16:20:16 +0000 (16:20 +0000)]
Use _call_request_channel instead of _run_request_channel. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1839
Jonny Lamb [Fri, 21 Nov 2008 16:20:12 +0000 (16:20 +0000)]
Added a wait for file channels so outgoing transfers are only added to the manager when they are remote pending.
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1838
Jonny Lamb [Fri, 21 Nov 2008 16:20:08 +0000 (16:20 +0000)]
Don't expose streams in EmpathyTpFile, but use the GFile. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1837
Jonny Lamb [Fri, 21 Nov 2008 16:20:04 +0000 (16:20 +0000)]
Fixed typo in FT manager glade file. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1836
Jonny Lamb [Fri, 21 Nov 2008 16:20:00 +0000 (16:20 +0000)]
Moved empathy_send_file to EmpathyDispatcher and renamed it. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1835
Jonny Lamb [Fri, 21 Nov 2008 16:19:56 +0000 (16:19 +0000)]
Handle new file channels regardless of direction in the dispatcher. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1834
Jonny Lamb [Fri, 21 Nov 2008 16:19:52 +0000 (16:19 +0000)]
Fixed Makefile by including missing backslash. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1833
Jonny Lamb [Fri, 21 Nov 2008 16:19:48 +0000 (16:19 +0000)]
Removed empathy_send_file_with_file_chooser_and_manager and made file transfers always use the manager. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1832
Jonny Lamb [Fri, 21 Nov 2008 16:19:45 +0000 (16:19 +0000)]
Changed suppress_handler to TRUE in a requested channel. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1831
Jonny Lamb [Fri, 21 Nov 2008 16:19:41 +0000 (16:19 +0000)]
Moved capabilities hack to empathy_contact_set_account. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1830
Jonny Lamb [Fri, 21 Nov 2008 16:19:37 +0000 (16:19 +0000)]
Renamed is_salut to contact_is_salut. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1829
Jonny Lamb [Fri, 21 Nov 2008 16:19:33 +0000 (16:19 +0000)]
Removed useless test to check whether a GList has items. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1828
Jonny Lamb [Fri, 21 Nov 2008 16:19:30 +0000 (16:19 +0000)]
Use gtk_file_chooser_dialog_new and the document-send icon. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1827
Jonny Lamb [Fri, 21 Nov 2008 16:19:26 +0000 (16:19 +0000)]
Removed useless include. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1826
Jonny Lamb [Fri, 21 Nov 2008 16:19:22 +0000 (16:19 +0000)]
In ft_manager_receive_response_cb, just call empathy_tp_file_cancel instead of getting the channel and calling close on it. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1825
Jonny Lamb [Fri, 21 Nov 2008 16:19:18 +0000 (16:19 +0000)]
Removed "Save as" file filter. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1824
Jonny Lamb [Fri, 21 Nov 2008 16:19:15 +0000 (16:19 +0000)]
Made creating a save dialog a bit nicer by using proper GTK functions. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1823
Jonny Lamb [Fri, 21 Nov 2008 16:19:11 +0000 (16:19 +0000)]
Use g_slice functions with ReceiveResponseData. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1822
Jonny Lamb [Fri, 21 Nov 2008 16:19:07 +0000 (16:19 +0000)]
Renamed ft_manager_free_receive_response_data to ft_manager_receive_response_data_free. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1821
Jonny Lamb [Fri, 21 Nov 2008 16:19:04 +0000 (16:19 +0000)]
Removed useless ref of the FT manager in the build_ui method. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1820
Jonny Lamb [Fri, 21 Nov 2008 16:19:00 +0000 (16:19 +0000)]
Moved gtk_window_set_icon name into the glade. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1819
Jonny Lamb [Fri, 21 Nov 2008 16:18:56 +0000 (16:18 +0000)]
Removed call to gtk_tree_selection_unselect_all. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1818
Jonny Lamb [Fri, 21 Nov 2008 16:18:53 +0000 (16:18 +0000)]
Set manager_p to NULL in delete_event_cb, not in _finalize. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1817
Jonny Lamb [Fri, 21 Nov 2008 16:18:49 +0000 (16:18 +0000)]
Don't call _finalize in the delete_event_cb. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1816
Jonny Lamb [Fri, 21 Nov 2008 16:18:45 +0000 (16:18 +0000)]
Simplified code to add files to the list store. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1815
Jonny Lamb [Fri, 21 Nov 2008 16:18:41 +0000 (16:18 +0000)]
Made ft_manager_update_ft_row handle Local_Pending slightly nicer. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1814
Jonny Lamb [Fri, 21 Nov 2008 16:18:38 +0000 (16:18 +0000)]
Renamed ft_manager_get_state_change_reason_description to ft_manager_state_change_reason_to_string and fixed the default unknown state return type. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1813
Jonny Lamb [Fri, 21 Nov 2008 16:18:34 +0000 (16:18 +0000)]
Renamed private methods in the FT manager to ft_manager_*. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1812
Jonny Lamb [Fri, 21 Nov 2008 16:18:30 +0000 (16:18 +0000)]
Changed gtk_tree_model_get_value calls to use gtk_tree_model_get. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1811
Jonny Lamb [Fri, 21 Nov 2008 16:18:26 +0000 (16:18 +0000)]
Removed useless libtelepathy headers. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1810
Jonny Lamb [Fri, 21 Nov 2008 16:18:23 +0000 (16:18 +0000)]
Added EMPATHY_PREFS_FILE_TRANSFER_DEFAULT_FOLDER to schema. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1809
Jonny Lamb [Fri, 21 Nov 2008 16:18:19 +0000 (16:18 +0000)]
Removed useless +0.5 in get_time_remaining. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1808
Jonny Lamb [Fri, 21 Nov 2008 16:18:15 +0000 (16:18 +0000)]
Made state_change_reason None in the constructor instead of an invalid value. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1807
Jonny Lamb [Fri, 21 Nov 2008 16:18:11 +0000 (16:18 +0000)]
Removed pointless test whether the tp_file is a GObject in the finalize function. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1806
Jonny Lamb [Fri, 21 Nov 2008 16:18:08 +0000 (16:18 +0000)]
Use empathy_time_get_current_time instead of g_get_current_time. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1805
Jonny Lamb [Fri, 21 Nov 2008 16:18:04 +0000 (16:18 +0000)]
Removed cached_empathy_file from EmpathyTpFilePriv. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1804
Jonny Lamb [Fri, 21 Nov 2008 16:18:01 +0000 (16:18 +0000)]
Removed account property of EmpathyTpFile as it's only actually used once and easy obtainable. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1803
Jonny Lamb [Fri, 21 Nov 2008 16:17:57 +0000 (16:17 +0000)]
Made property-getting synchronous again so there isn't a massive race condition (Jonny Lamb)
This is more of a workaround than a fix and should be fixed fairly
soonish.
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1802
Jonny Lamb [Fri, 21 Nov 2008 16:17:53 +0000 (16:17 +0000)]
Fixed channel property setting typo so ContentType is actually set. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1801
Jonny Lamb [Fri, 21 Nov 2008 16:17:49 +0000 (16:17 +0000)]
Fix typo in extension glib client generation code. This is already fixed upstream in telepathy-glib. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1800
Jonny Lamb [Fri, 21 Nov 2008 16:17:45 +0000 (16:17 +0000)]
Updated parameter checks to return appropriate values. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1799
Jonny Lamb [Fri, 21 Nov 2008 16:17:42 +0000 (16:17 +0000)]
Use empathy_contact_run_until_ready in EmpathyEventManager.
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1798
Jonny Lamb [Fri, 21 Nov 2008 16:17:38 +0000 (16:17 +0000)]
Add parameter checks to public functions. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1797
Jonny Lamb [Fri, 21 Nov 2008 16:17:34 +0000 (16:17 +0000)]
Updated the way to access the EmpathyTpFilePriv instance within empathy-tp-file. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1796
Jonny Lamb [Fri, 21 Nov 2008 16:17:31 +0000 (16:17 +0000)]
Updated the way to access the EmpathyFTManagerPriv instance within empathy-ft-manager. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1795
Jonny Lamb [Fri, 21 Nov 2008 16:17:27 +0000 (16:17 +0000)]
Re-ordered EmpathyTpFile so static functions need no declaration at the top of the file. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1794
Jonny Lamb [Fri, 21 Nov 2008 16:17:23 +0000 (16:17 +0000)]
Re-ordered EmpathyFTManager so functions need no declaration at the top of the file. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1793
Jonny Lamb [Fri, 21 Nov 2008 16:17:19 +0000 (16:17 +0000)]
Use FIXME instead of TODO in comments. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1792
Jonny Lamb [Fri, 21 Nov 2008 16:17:15 +0000 (16:17 +0000)]
Changed _run_ method calls to _call_ calls. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1791
Jonny Lamb [Fri, 21 Nov 2008 16:17:11 +0000 (16:17 +0000)]
Fixed copyright and author headers. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1790
Jonny Lamb [Fri, 21 Nov 2008 16:17:07 +0000 (16:17 +0000)]
Various whitespace and comment fixes. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1789
Jonny Lamb [Fri, 21 Nov 2008 16:17:03 +0000 (16:17 +0000)]
Added empathy_offer_file function and updated accept_file. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1788
Jonny Lamb [Fri, 21 Nov 2008 16:17:00 +0000 (16:17 +0000)]
Do not set the MD5 hash of the file when sending. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1787
Jonny Lamb [Fri, 21 Nov 2008 16:16:55 +0000 (16:16 +0000)]
Removed SocketPath channel property. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1786
Jonny Lamb [Fri, 21 Nov 2008 16:16:51 +0000 (16:16 +0000)]
Added ContentHashType channel property, and renamed ContentMD5 to ContentHash. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1785
Jonny Lamb [Fri, 21 Nov 2008 16:16:48 +0000 (16:16 +0000)]
Updated yet more places to use s/direction/incoming/ (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1784
Jonny Lamb [Fri, 21 Nov 2008 16:16:44 +0000 (16:16 +0000)]
Replaced the Direction channel property a more-private GObject incoming property. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1783
Jonny Lamb [Fri, 21 Nov 2008 16:16:40 +0000 (16:16 +0000)]
Fixed yet more references to EMPATHY_FILE. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1782
Jonny Lamb [Fri, 21 Nov 2008 16:16:36 +0000 (16:16 +0000)]
Fixed include of empathy-file.h to empathy-tp-file.h. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1781
Jonny Lamb [Fri, 21 Nov 2008 16:16:33 +0000 (16:16 +0000)]
Changed EmpathyEventManager to not rely on the Direction property of the file channel. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1780
Jonny Lamb [Fri, 21 Nov 2008 16:16:29 +0000 (16:16 +0000)]
Updated extensions external-types to include types from tubes.
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1779
Jonny Lamb [Fri, 21 Nov 2008 16:16:25 +0000 (16:16 +0000)]
Updated Channel.Type.File spec. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1778
Jonny Lamb [Fri, 21 Nov 2008 16:16:22 +0000 (16:16 +0000)]
Added a proper Empathy event for an incoming file transfer so that the status icon flashes. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1777
Jonny Lamb [Fri, 21 Nov 2008 16:16:18 +0000 (16:16 +0000)]
Renamed EmpathyFile to EmpathyTpFile. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1776
Jonny Lamb [Fri, 21 Nov 2008 16:16:14 +0000 (16:16 +0000)]
Removed pointless gio-2.0 deps in megaphone, nothere, and python. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1775
Jonny Lamb [Fri, 21 Nov 2008 16:16:10 +0000 (16:16 +0000)]
Added ability to get an md5sum of the file being sent using GChecksum. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1774
Jonny Lamb [Fri, 21 Nov 2008 16:16:06 +0000 (16:16 +0000)]
Removed empathy_init in favour of calling emp_cli_init directly. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1773
Jonny Lamb [Fri, 21 Nov 2008 16:16:02 +0000 (16:16 +0000)]
Fixed function declaration style. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1772
Jonny Lamb [Fri, 21 Nov 2008 16:15:58 +0000 (16:15 +0000)]
Only display "Send Files" if the contact is in Salut. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1771
Jonny Lamb [Fri, 21 Nov 2008 16:15:54 +0000 (16:15 +0000)]
Converted sources to Collabora coding style. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1770
Jonny Lamb [Fri, 21 Nov 2008 16:15:50 +0000 (16:15 +0000)]
Replaced gnome_vfs_format_file_size_for_display with its GIO equivalent. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1769
Jonny Lamb [Fri, 21 Nov 2008 16:15:47 +0000 (16:15 +0000)]
Merged empathy_send_file and empathy_send_file_from_stream, and dropped the dependency on gnome-vfs in favour of GIO. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1768
Jonny Lamb [Fri, 21 Nov 2008 16:15:43 +0000 (16:15 +0000)]
Set the ContentType property properly on a new file channel. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1767
Jonny Lamb [Fri, 21 Nov 2008 16:15:39 +0000 (16:15 +0000)]
Added ability for the ft manager to stay around when closed. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1766
Jonny Lamb [Fri, 21 Nov 2008 16:15:35 +0000 (16:15 +0000)]
Show an error to the terminal when there's a problem in getting the output stream. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1765
Jonny Lamb [Fri, 21 Nov 2008 16:15:32 +0000 (16:15 +0000)]
Changed order of closing channel and cancelling socket transfers. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1764
Jonny Lamb [Fri, 21 Nov 2008 16:15:28 +0000 (16:15 +0000)]
Fixed small coding style issue. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1763
Jonny Lamb [Fri, 21 Nov 2008 16:15:25 +0000 (16:15 +0000)]
Display cancel reasons in the file transfer manager. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1762
Jonny Lamb [Fri, 21 Nov 2008 16:15:21 +0000 (16:15 +0000)]
Actually stop a file transfer if in the ft manager when requested. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1761
Jonny Lamb [Fri, 21 Nov 2008 16:15:17 +0000 (16:15 +0000)]
Implemented empathy_file_cancel. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1760
Jonny Lamb [Fri, 21 Nov 2008 16:15:13 +0000 (16:15 +0000)]
Added a missing "break". (Jonny Lamb)
Credits to Dafydd Harries for his work in helping to get to the bottom
of this one.
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1759
Jonny Lamb [Fri, 21 Nov 2008 16:15:10 +0000 (16:15 +0000)]
Handled TransferredBytes signal properly and show in the progress bar. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1758
Jonny Lamb [Fri, 21 Nov 2008 16:15:06 +0000 (16:15 +0000)]
Handle incoming file transfers in the event manager. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1757
Jonny Lamb [Fri, 21 Nov 2008 16:15:01 +0000 (16:15 +0000)]
Actually use accept and receive file functions. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1756
Jonny Lamb [Fri, 21 Nov 2008 16:14:57 +0000 (16:14 +0000)]
Implemented accept_file and empathy_receive_file in empathy-file. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1755
Jonny Lamb [Fri, 21 Nov 2008 16:14:53 +0000 (16:14 +0000)]
Fixed _get_local_socket in empathy-file so that it calls connect(2). (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1754
Jonny Lamb [Fri, 21 Nov 2008 16:14:49 +0000 (16:14 +0000)]
Removed g_object_notify that doesn't actually map to a property. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1753
Jonny Lamb [Fri, 21 Nov 2008 16:14:46 +0000 (16:14 +0000)]
Allow transfers to be declined by closing the channel. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1752
Jonny Lamb [Fri, 21 Nov 2008 16:14:42 +0000 (16:14 +0000)]
Added fix for an empty default folder. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1751