Simon McVittie 
							
						 
					 
					
						
						
						
						
							
						
						
							8c8dffe662 
							
						 
					 
					
						
						
							
							Merge commit 'origin' into submit  
						
						
						
					 
					
						2007-05-21 11:27:47 +01:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							7b9c59fb9c 
							
						 
					 
					
						
						
							
							Correctly send IPv4 address when NM already has a connection  
						
						
						
					 
					
						2007-05-17 13:54:26 -04:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							d72ff8c6fb 
							
						 
					 
					
						
						
							
							Don't try to shove None through dbus  
						
						
						
					 
					
						2007-05-17 09:32:34 -04:00 
						 
				 
			
				
					
						
							
							
								Simon McVittie 
							
						 
					 
					
						
						
						
						
							
						
						
							531321740c 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar  
						
						... 
						
						
						
						Conflicts:
	services/presence/server_plugin.py 
						
					 
					
						2007-05-16 12:30:49 +01:00 
						 
				 
			
				
					
						
							
							
								Simon McVittie 
							
						 
					 
					
						
						
						
						
							
						
						
							35d190b55e 
							
						 
					 
					
						
						
							
							services/presence/server_plugin.py: Handle presence more correctly.  
						
						... 
						
						
						
						This avoids unnecessary attempts to look up the buddy properties of
channel-specific handles (which doesn't work) by only looking up the buddy
properties of people we're subscribed to.
Also, this approves subscription requests that come in while we're online,
rather than handling them when we next go from offline to online. 
						
					 
					
						2007-05-16 11:39:16 +01:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							5d9e19a892 
							
						 
					 
					
						
						
							
							Retry getting buddy properties a few times  
						
						
						
					 
					
						2007-05-16 01:03:55 -04:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							82095ea26a 
							
						 
					 
					
						
						
							
							Some PS reliability fixes  
						
						
						
					 
					
						2007-05-15 15:25:30 -04:00 
						 
				 
			
				
					
						
							
							
								Simon McVittie 
							
						 
					 
					
						
						
						
						
							
						
						
							5d77ff680a 
							
						 
					 
					
						
						
							
							services/presence: Stop using deprecated keyword argument named_service  
						
						
						
					 
					
						2007-05-15 15:20:02 +01:00 
						 
				 
			
				
					
						
							
							
								Simon McVittie 
							
						 
					 
					
						
						
						
						
							
						
						
							4b26840333 
							
						 
					 
					
						
						
							
							sugar.presence.presenceservice, services/presence: Use named loggers.  
						
						... 
						
						
						
						This causes events in the log to be annotated with the module that emitted the
message.
Before: DEBUG - root: Starting up...
After: DEBUG - s-p-s.server_plugin: Starting up...
I've used a log domain of "sugar.presence..." for the client library and
e.g. "s-p-s.activity" for the service internals. 
						
					 
					
						2007-05-15 14:58:15 +01:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							871828f307 
							
						 
					 
					
						
						
							
							Set alias twice so server actually gets it  
						
						
						
					 
					
						2007-05-14 22:48:53 -04:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							79aad47327 
							
						 
					 
					
						
						
							
							Don't drop buddies on failure to retrieve their activity list  
						
						
						
					 
					
						2007-05-14 16:20:23 -04:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							9b978f014f 
							
						 
					 
					
						
						
							
							Fix setting owner OLPC properties  
						
						
						
					 
					
						2007-05-14 16:17:33 -04:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							a05d804949 
							
						 
					 
					
						
						
							
							Make reconnection to the jabber server work again  
						
						
						
					 
					
						2007-05-14 13:58:26 -04:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							9e1e851884 
							
						 
					 
					
						
						
							
							Make deferred connection actually work  
						
						
						
					 
					
						2007-05-14 02:46:51 -04:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							e1b3cde65e 
							
						 
					 
					
						
						
							
							Fix uninitialized variable traceback  
						
						
						
					 
					
						2007-05-13 21:40:24 -04:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							5e2ea16e3a 
							
						 
					 
					
						
						
							
							Redo PS connection handling; ensure valid network connection before talking to server  
						
						
						
					 
					
						2007-05-13 21:34:15 -04:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							66dfd363ba 
							
						 
					 
					
						
						
							
							Log the PS getting kicked off the bus  
						
						
						
					 
					
						2007-05-13 21:33:14 -04:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							fddf101885 
							
						 
					 
					
						
						
							
							Quiet error message when unecessary  
						
						
						
					 
					
						2007-05-13 21:31:16 -04:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							de1796605f 
							
						 
					 
					
						
						
							
							Fix member name collision with dbus object superclass  
						
						
						
					 
					
						2007-05-13 21:11:19 -04:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							077b3e3391 
							
						 
					 
					
						
						
							
							Fix debug log statement  
						
						
						
					 
					
						2007-05-13 21:08:54 -04:00 
						 
				 
			
				
					
						
							
							
								Simon McVittie 
							
						 
					 
					
						
						
						
						
							
						
						
							2216f5095d 
							
						 
					 
					
						
						
							
							Use ExportedGObject from dbus-python rather than reimplementing it  
						
						
						
					 
					
						2007-05-11 17:27:36 -04:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							a86293dcb4 
							
						 
					 
					
						
						
							
							Only set our own properties when we're connected  
						
						
						
					 
					
						2007-05-11 17:25:44 -04:00 
						 
				 
			
				
					
						
							
							
								Tomeu Vizoso 
							
						 
					 
					
						
						
						
						
							
						
						
							929dabd165 
							
						 
					 
					
						
						
							
							Use the new DataStore and remove the old one.  
						
						
						
					 
					
						2007-05-10 11:01:32 +02:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							a67d87c2a6 
							
						 
					 
					
						
						
							
							Fix server-based registration  
						
						
						
					 
					
						2007-05-08 16:28:55 -04:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							d598097994 
							
						 
					 
					
						
						
							
							Fix retrieval of owner's object path  
						
						
						
					 
					
						2007-05-07 14:18:20 -04:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							66b7210481 
							
						 
					 
					
						
						
							
							Ignore network properties for the owner when their jabber contact comes online  
						
						
						
					 
					
						2007-05-03 00:43:53 -04:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							46d97015e6 
							
						 
					 
					
						
						
							
							Fix arguments  
						
						
						
					 
					
						2007-05-02 23:20:38 -04:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							570c7e6052 
							
						 
					 
					
						
						
							
							Add buddy ip4-address property (temporary)  
						
						
						
					 
					
						2007-04-30 23:44:39 -04:00 
						 
				 
			
				
					
						
							
							
								Dafydd Harries 
							
						 
					 
					
						
						
						
						
							
						
						
							9a8d5ac32a 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://dev.laptop.org/sugar  
						
						
						
					 
					
						2007-04-30 18:43:59 +01:00 
						 
				 
			
				
					
						
							
							
								Dafydd Harries 
							
						 
					 
					
						
						
						
						
							
						
						
							f6c5b63a58 
							
						 
					 
					
						
						
							
							don't return unused value from D-Bus signal callback  
						
						
						
					 
					
						2007-04-30 18:43:43 +01:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							e432cc91ca 
							
						 
					 
					
						
						
							
							Fix split_properties usage  
						
						
						
					 
					
						2007-04-30 09:51:35 -04:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							58a8cfc795 
							
						 
					 
					
						
						
							
							Fix up activity property handling  
						
						
						
					 
					
						2007-04-29 21:44:57 -04:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							e63accc8be 
							
						 
					 
					
						
						
							
							Make test buddy attribute randomization optional  
						
						
						
					 
					
						2007-04-29 18:01:23 -04:00 
						 
				 
			
				
					
						
							
							
								Tomeu Vizoso 
							
						 
					 
					
						
						
						
						
							
						
						
							395d3f5c96 
							
						 
					 
					
						
						
							
							Fix.  
						
						
						
					 
					
						2007-04-27 13:01:41 +02:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							274cc65c4e 
							
						 
					 
					
						
						
							
							Use hashlib on python 2.5  
						
						
						
					 
					
						2007-04-26 12:34:05 -04:00 
						 
				 
			
				
					
						
							
							
								Tomeu Vizoso 
							
						 
					 
					
						
						
						
						
							
						
						
							1c249a216b 
							
						 
					 
					
						
						
							
							Fix for using with python 2.4.  
						
						
						
					 
					
						2007-04-26 18:25:40 +02:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							60c9e0ecb8 
							
						 
					 
					
						
						
							
							Let PresenceService._buddy_activities_changed see all joined activities, even invalid ones  
						
						
						
					 
					
						2007-04-21 19:20:06 -04:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							51f56ed7a3 
							
						 
					 
					
						
						
							
							Join/leave activity when its validity changes  
						
						
						
					 
					
						2007-04-21 19:09:59 -04:00 
						 
				 
			
				
					
						
							
							
								Mike C. Fletcher 
							
						 
					 
					
						
						
						
						
							
						
						
							2848dc97ab 
							
						 
					 
					
						
						
							
							Documentation patch from Amanda Yilmaz (services/clipboard/typeregistry.py)  
						
						
						
					 
					
						2007-04-21 15:34:39 -04:00 
						 
				 
			
				
					
						
							
							
								Mike's Primary Account 
							
						 
					 
					
						
						
						
						
							
						
						
							a0348a565c 
							
						 
					 
					
						
						
							
							Initial documentation for psutils and server_plugin  
						
						
						
					 
					
						2007-04-20 21:09:51 -04:00 
						 
				 
			
				
					
						
							
							
								Mike's Primary Account 
							
						 
					 
					
						
						
						
						
							
						
						
							83a6a2e73e 
							
						 
					 
					
						
						
							
							Initial documentation pass for activity by Amanda Yilmaz  
						
						
						
					 
					
						2007-04-20 19:07:41 -04:00 
						 
				 
			
				
					
						
							
							
								Mike's Primary Account 
							
						 
					 
					
						
						
						
						
							
						
						
							81d9bed0d8 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git+ssh://mcfletch@dev.laptop.org/git/sugar  
						
						... 
						
						
						
						Conflicts:
	services/presence/buddy.py 
						
					 
					
						2007-04-20 16:42:47 -04:00 
						 
				 
			
				
					
						
							
							
								Mike's Primary Account 
							
						 
					 
					
						
						
						
						
							
						
						
							c0c64809a0 
							
						 
					 
					
						
						
							
							Initial documentation pass for buddy objects  
						
						
						
					 
					
						2007-04-20 16:25:37 -04:00 
						 
				 
			
				
					
						
							
							
								Mike's Primary Account 
							
						 
					 
					
						
						
						
						
							
						
						
							79d17c14f4 
							
						 
					 
					
						
						
							
							Initial documentation of presence service overview.  
						
						... 
						
						
						
						Fix weird indent in server_plugin module 
						
					 
					
						2007-04-20 13:10:40 -04:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							2866d3c4c9 
							
						 
					 
					
						
						
							
							Convert more string-named properties to var-named  
						
						
						
					 
					
						2007-04-20 12:40:53 -04:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							68b402cb86 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar  
						
						
						
					 
					
						2007-04-20 12:34:23 -04:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							37953c47f7 
							
						 
					 
					
						
						
							
							Use well-defined names for properties rather than strings  
						
						
						
					 
					
						2007-04-20 12:34:16 -04:00 
						 
				 
			
				
					
						
							
							
								Tomeu Vizoso 
							
						 
					 
					
						
						
						
						
							
						
						
							276d374b1a 
							
						 
					 
					
						
						
							
							Remove debug message.  
						
						
						
					 
					
						2007-04-19 12:20:48 -03:00 
						 
				 
			
				
					
						
							
							
								Tomeu Vizoso 
							
						 
					 
					
						
						
						
						
							
						
						
							96b0bd1cfa 
							
						 
					 
					
						
						
							
							Recognize downloaded .xo as such.  
						
						
						
					 
					
						2007-04-19 12:13:38 -03:00 
						 
				 
			
				
					
						
							
							
								Dan Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							8aa84cd69e 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar  
						
						
						
					 
					
						2007-04-19 10:35:45 -04:00