| 
							
							
								 Dan Williams | 5446b2509f | test merge | 2006-06-16 13:30:54 -04:00 |  | 
			
				
					| 
							
							
								 Dan Williams | 4a564775bd | Another stupid git test | 2006-06-16 13:22:04 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 792481c669 | Merge branch 'master' of git+ssh://crank.laptop.org/git/sugar | 2006-06-16 13:21:34 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | e633c2ef8d | Missing import | 2006-06-16 13:21:28 -04:00 |  | 
			
				
					| 
							
							
								 Dan Williams | 73aecebb90 | Another git test | 2006-06-16 13:19:35 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 541f386ad0 | Merge branch 'master' of git+ssh://crank.laptop.org/git/sugar | 2006-06-16 13:17:35 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | af79e35cdb | Test commit | 2006-06-16 13:17:26 -04:00 |  | 
			
				
					| 
							
							
								 Dan Williams | b16dd2a549 | Test stuff to see if git is as irritating as mercurial | 2006-06-16 13:11:01 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 06f1e67ce7 | Test commit | 2006-06-16 13:10:43 -04:00 |  | 
			
				
					| 
							
							
								 Dan Williams | 48fa6a8934 | Merge branch 'master' of git+ssh://dcbw@crank.laptop.org/git/sugar | 2006-06-16 13:09:37 -04:00 |  | 
			
				
					| 
							
							
								 Dan Williams | d62060ae0d | Test stuff to see if git is as irritating as mercurial | 2006-06-16 13:09:02 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | e30f9c337a | Merge branch 'master' of git+ssh://crank.laptop.org/git/sugar | 2006-06-16 13:07:10 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 4a0e8ac2d4 | Some work on the getting model back | 2006-06-16 13:06:11 -04:00 |  | 
			
				
					| 
							
							
								 Dan Williams | 6db22150b1 | Remove unused function | 2006-06-16 13:05:45 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 29fb2321fe | Unquote title | 2006-06-16 02:37:28 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | a6b2b4981c | More unescaping... | 2006-06-16 02:36:18 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 7eeb43b98a | Fix with_id method signature | 2006-06-16 02:04:31 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | bdce0eb48c | Get activities sharing sort of working | 2006-06-16 01:43:42 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 20afcfa475 | Merge | 2006-06-15 18:28:21 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 6a8e863a16 | Fix the problem with service resolution (Dan please have a look...) | 2006-06-15 18:27:50 -04:00 |  | 
			
				
					| 
							
							
								 Dan Williams | 7b507d545b | Shorten activity service type | 2006-06-15 18:03:12 -04:00 |  | 
			
				
					| 
							
							
								 Dan Williams | be575803ae | remove debug print | 2006-06-15 18:02:52 -04:00 |  | 
			
				
					| 
							
							
								 Dan Williams | f234ebfff0 | Merge with Marco | 2006-06-15 17:42:35 -04:00 |  | 
			
				
					| 
							
							
								 Dan Williams | 2aaefdd52b | Hook into PresenceService to find new advertisements and track them | 2006-06-15 17:41:49 -04:00 |  | 
			
				
					| 
							
							
								 Dan Williams | e4677ee22a | Announce new activities when we resolve them, and add a hook to intercept new service advertisements | 2006-06-15 17:41:26 -04:00 |  | 
			
				
					| 
							
							
								 Dan Williams | 31e9671190 | Validate options for compose_service_type | 2006-06-15 17:40:33 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | e1070a21cb | Document keybindings | 2006-06-15 17:34:01 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 9c4da3c172 | F11 now put the activities window in fullscreen, | 2006-06-15 17:31:41 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 122c0dad16 | Simplify focus a lot by using transient windows | 2006-06-15 17:22:36 -04:00 |  | 
			
				
					| 
							
							
								 Dan Williams | 9034dc8f3b | More fixes for sharing activities | 2006-06-15 17:05:44 -04:00 |  | 
			
				
					| 
							
							
								 Dan Williams | 97881ae7c0 | Escape markup so we don't make pango angry | 2006-06-15 17:03:59 -04:00 |  | 
			
				
					| 
							
							
								 Dan Williams | a03f850ce8 | Accept unicode types too | 2006-06-15 17:03:43 -04:00 |  | 
			
				
					| 
							
							
								 Dan Williams | 465c49179c | Make xmlrpc client non-blocking | 2006-06-15 17:03:20 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 1b611fc842 | More chat refactoring | 2006-06-15 16:51:30 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | c05bc5a669 | Fix | 2006-06-15 11:46:42 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 4a61f35796 | Remove | 2006-06-15 11:34:10 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 27b4f25fad | Merge | 2006-06-15 11:29:00 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | f0af49616c | Fixed a bunch of issues reported by pylint | 2006-06-15 11:18:33 -04:00 |  | 
			
				
					| 
							
							
								 Dan Williams | ecf81ba35f | Generalize activity publishing code for > 1 activity per process | 2006-06-15 11:20:18 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | f2ae132410 | Fix a bunch of outdated makefiles. | 2006-06-15 08:38:21 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 4fda4b8cb4 | Start refactoring chat. Get the UI to show as a slide in (ctrl+up) | 2006-06-14 23:24:11 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 7e6f6ec349 | Dan doesn't like the big share button, tasteless! | 2006-06-14 22:20:28 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 4eaa096576 | Cast to int where necessary | 2006-06-14 22:08:18 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | a4b2e74d25 | Get rid of the web search activity, refactor | 2006-06-14 22:04:44 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 3e3c168ab0 | Cleanup searching some | 2006-06-14 21:52:46 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 3497fd3ad2 | More work on the slide in windows | 2006-06-14 19:00:56 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 6cca4f34f3 | My first window manager!!! :P | 2006-06-14 16:30:53 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 26b117cff0 | Use ignore_reply rather than idle_add, thanks j5 | 2006-06-14 15:27:54 -04:00 |  | 
			
				
					| 
							
							
								 Dan Williams | ca60226fb0 | Do callbacks in an idle handler so we don't dbus deadlock at any point | 2006-06-14 15:06:25 -04:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 3ea146e17c | Initial start page implementation | 2006-06-14 15:01:17 -04:00 |  |