| 
							
							
								 Simon McVittie | 4f41f300d8 | Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar Conflicts:
	NEWS | 2007-10-17 11:54:33 +01:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 16d5afb66b | Snapshot 24fbd1ce1c. | 2007-10-16 23:53:08 +02:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 24fbd1ce1c | Fix the object chooser | 2007-10-16 23:51:28 +02:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | fd194afff9 | Snapshot 3c7578577d. | 2007-10-16 21:46:33 +02:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 3c7578577d | Update NEWS | 2007-10-16 21:45:33 +02:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | d9b930e033 | Remove objecttypeservice leftover | 2007-10-16 21:42:33 +02:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 49a8752eb5 | Snapshot fa55b5af09. | 2007-10-16 19:43:45 +02:00 |  | 
			
				
					| 
							
							
								 Simon McVittie | 48bc73d0c4 | Try to make sugar.presence log messages less misleading (#4027) | 2007-10-16 17:51:36 +01:00 |  | 
			
				
					| 
							
							
								 Benjamin Berg | fa55b5af09 | Changed default spacing to 15px (and fixed the palette to use it) | 2007-10-16 18:17:01 +02:00 |  | 
			
				
					| 
							
							
								 Benjamin Berg | 1c1f736a81 | Merge branch 'master' of git://dev.laptop.org/sugar | 2007-10-16 17:50:14 +02:00 |  | 
			
				
					| 
							
							
								 Tomeu Vizoso | 69aaa7145e | One more fix for resuming. | 2007-10-16 17:39:27 +02:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 40fc6e2e47 | Simplify the API to get icon/description for objects. Get rid of the service for now, it's not necessary
until we allow activities to extend the
mime type -> generic type mapping (post 1.0) | 2007-10-16 17:18:43 +02:00 |  | 
			
				
					| 
							
							
								 Benjamin Berg | 977c7d4a99 | Subtract the palette border from the primary label height. | 2007-10-16 17:12:46 +02:00 |  | 
			
				
					| 
							
							
								 Tomeu Vizoso | 05236c6670 | Fix retrieving the activities suitable for resuming a journal entry | 2007-10-16 16:56:02 +02:00 |  | 
			
				
					| 
							
							
								 Tomeu Vizoso | aed093dbc2 | Fix warning. | 2007-10-16 16:18:36 +02:00 |  | 
			
				
					| 
							
							
								 Simon Schampijer | 27b363261a | News update | 2007-10-16 15:54:26 +02:00 |  | 
			
				
					| 
							
							
								 Simon Schampijer | 664e8a636d | Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar | 2007-10-16 15:52:05 +02:00 |  | 
			
				
					| 
							
							
								 Simon Schampijer | 91f55488eb | Use double leading underscores for callback names to avoid name collisions The double underscores invoke Python's name mangling algorithm | 2007-10-16 15:51:48 +02:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | de538ca0a8 | Snapshot 34e2271833. | 2007-10-16 14:46:27 +02:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 34e2271833 | Cast to string, looks like dbus strings confuse pygtk type checking here. | 2007-10-16 14:40:43 +02:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | ff0b45f607 | Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar | 2007-10-16 14:29:51 +02:00 |  | 
			
				
					| 
							
							
								 Morgan Collett | 74dbcd5dfc | Update NEWS | 2007-10-16 14:10:21 +01:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | cb0cedbc40 | Do not use prgname for the bundle id because xulrunner is messing with it. Some activity launch fixes. | 2007-10-16 14:29:38 +02:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | e425c1d886 | Fallback to mime parents if the main one doesn't have matches | 2007-10-16 13:32:53 +02:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 8b11585950 | Snapshot 6d2828e54e. | 2007-10-16 12:06:18 +02:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 6d2828e54e | Use gdk to get/set X11 properties | 2007-10-16 11:50:11 +02:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | c999a3ca80 | Fix distcheck | 2007-10-16 11:24:10 +02:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 6240c1cf6f | Cleanup the source structure | 2007-10-16 11:04:59 +02:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 087856f233 | Remove ltihooks since we are not loading from the source directory at the moment. | 2007-10-16 10:32:03 +02:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 16fa7ff673 | Snapshot 1eb9932ab3. | 2007-10-16 00:01:17 +02:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 1eb9932ab3 | Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar | 2007-10-15 23:48:17 +02:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | c975b11606 | Try to cleanup the activity destruction mess. | 2007-10-15 23:47:02 +02:00 |  | 
			
				
					| 
							
							
								 Simon Schampijer | 0a27ed0c55 | updated news | 2007-10-15 19:05:58 +02:00 |  | 
			
				
					| 
							
							
								 Simon Schampijer | 33143f4e0e | Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar | 2007-10-15 19:04:05 +02:00 |  | 
			
				
					| 
							
							
								 Simon Schampijer | 1ee7191b5d | Added a TimeoutAlert and use GTK Response Type Constants | 2007-10-15 19:03:48 +02:00 |  | 
			
				
					| 
							
							
								 Morgan Collett | a9a9b4c733 | Improve docstring for class Activity | 2007-10-15 17:20:22 +01:00 |  | 
			
				
					| 
							
							
								 Morgan Collett | cd03544dec | Handle failure to get buddy from handle | 2007-10-15 17:17:53 +01:00 |  | 
			
				
					| 
							
							
								 Morgan Collett | d4f16ac02a | Change _buddy_to_handle to _buddy_path_to_handle to avoid mad creation of buddy object when they leave | 2007-10-15 17:17:28 +01:00 |  | 
			
				
					| 
							
							
								 Morgan Collett | dd83813b9e | Revert to tracking BuddyLeft not BuddyHandleLeft. Track buddy_to_handle to get back to the handle | 2007-10-15 17:17:13 +01:00 |  | 
			
				
					| 
							
							
								 Morgan Collett | 61d236e5d4 | Fix _buddy_handle_joined_cb, make _buddy_handle_left_cb more robust | 2007-10-15 17:16:59 +01:00 |  | 
			
				
					| 
							
							
								 Morgan Collett | a618c95fe3 | Use BuddyHandleJoined/Left to track buddy handles | 2007-10-15 17:16:48 +01:00 |  | 
			
				
					| 
							
							
								 Morgan Collett | f1df5361e1 | Cache handle-buddies so we can get them when the buddy has already left | 2007-10-15 17:16:31 +01:00 |  | 
			
				
					| 
							
							
								 Morgan Collett | c9908a6d27 | Call new GetBuddyByHandle to convert handles to buddies | 2007-10-15 17:16:21 +01:00 |  | 
			
				
					| 
							
							
								 Morgan Collett | 4853beb4fb | Document get_channels | 2007-10-15 17:15:48 +01:00 |  | 
			
				
					| 
							
							
								 Morgan Collett | 10f2932b5a | Add logging to _leave_error_cb | 2007-10-15 17:15:23 +01:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | fc98263bb3 | Snapshot 68ff71a0cb. | 2007-10-15 15:43:22 +02:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 68ff71a0cb | Split part of the sugar library to sugar-base | 2007-10-15 15:39:07 +02:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 8c36556ba0 | Snapshot 29bc0a8a20. | 2007-10-14 01:20:02 +02:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | 29bc0a8a20 | Fix native applications handling | 2007-10-14 00:25:53 +02:00 |  | 
			
				
					| 
							
							
								 Marco Pesenti Gritti | e39232a622 | Change icon pulsing interval to 100 per cjb request | 2007-10-12 21:01:07 +02:00 |  |