Commit Graph

106 Commits

Author SHA1 Message Date
Marco Pesenti Gritti
e2719f7fb4 Don't need this anymore 2006-06-22 18:29:46 -04:00
Marco Pesenti Gritti
59f25b0741 Get one-to-one chat to actually work... 2006-06-22 18:07:54 -04:00
Marco Pesenti Gritti
c234b7b4a3 Merge branch 'master' of git+ssh://crank.laptop.org/git/sugar
Conflicts:

	sugar/presence/Buddy.py
2006-06-22 16:01:14 -04:00
Marco Pesenti Gritti
0a305004b0 Some work getting the one-to-one chat back 2006-06-22 15:59:38 -04:00
Dan Williams
be992586b1 Don't create more than one activity chat, and join a published chat when it appears 2006-06-22 14:37:34 -04:00
Dan Williams
2840af85ce Stop abusing ZeroConf by overloading the service type field; overload the service name field instead like everyone else does 2006-06-22 14:05:38 -04:00
Dan Williams
2351ee0458 [hack] don't traceback when there's no network connection 2006-06-22 12:52:51 -04:00
Marco Pesenti Gritti
8797223ccd Fixup the chat toolbar layout a bit 2006-06-22 09:22:23 -04:00
Marco Pesenti Gritti
974ef81c1e Get back mesh chat (for the everyone tab) 2006-06-21 23:49:37 -04:00
Marco Pesenti Gritti
9ea6805174 More work on packages refactoring, mostly working 2006-06-21 16:05:52 -04:00
Dan Williams
e9f20cfe0f pylint fixes 2006-06-20 09:39:36 -04:00
Dan Williams
5485a4f958 Fix some typos 2006-06-19 21:24:24 -04:00
Dan Williams
78ee3d2b20 Find chat service that may have already been resolved, and make sure we don't user services that aren't for our activity 2006-06-19 21:17:58 -04:00
Marco Pesenti Gritti
4cef4cb3bd Implement sliding, dead slow with gradients.
Get keyboard focus in the dock with some evil hack.
2006-06-19 15:31:18 -04:00
Dan Williams
c65ef6f9cd Make the presence service resolve all shared activity services by default; it's up to the activities to ignore services that aren't theirs. Also add 'joined-activity' and 'left-activity' signals on Buddy objects, mainly for the PresenceWindow's 'Who's here' bits 2006-06-19 09:49:57 -04:00
Marco Pesenti Gritti
b129956aba Add back colors in the toolbar. Layout/appeareance sucks atm 2006-06-18 15:35:44 -04:00
Marco Pesenti Gritti
3fe0d7a580 Get sketches back to work, add a send button 2006-06-18 15:13:50 -04:00
Marco Pesenti Gritti
be051b2726 Mention ctrl+s 2006-06-18 14:45:04 -04:00
Marco Pesenti Gritti
3553882352 Factor out window logic to ChatWindow.
Hook the sketchpad to ctrl+s combination
2006-06-18 14:44:08 -04:00
Marco Pesenti Gritti
9d7a7f8050 Fix the confusion when running multiple instances on the
same box by passing the nick name in the message.
2006-06-18 14:14:59 -04:00
Marco Pesenti Gritti
51ea9eedba Get chat back to work. Well except it get very confused
if users have the same ip address.

Dan I commented out the service deserialization in BrowserShell
because it was not really working (also there was a few typos in
that code)
2006-06-18 03:00:23 -04:00
Marco Pesenti Gritti
b4413fe3c2 Some work to make group chat work again 2006-06-18 01:05:40 -04:00
Marco Pesenti Gritti
0363ed5457 More work on chats 2006-06-16 16:29:51 -04:00
Dan Williams
f234ebfff0 Merge with Marco 2006-06-15 17:42:35 -04:00
Dan Williams
31e9671190 Validate options for compose_service_type 2006-06-15 17:40:33 -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
1b611fc842 More chat refactoring 2006-06-15 16:51:30 -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
cdf7583d39 Adapt to the new api... get back the browser running 2006-06-12 19:52:37 -04:00
Dan Williams
17c371119d More presence service rework 2006-06-12 18:31:26 -04:00
Marco Pesenti Gritti
3710eea217 Start factoring out the presence stuff from chat UI... very very very broken right now 2006-06-06 12:43:26 -04:00
Dan Williams
046a954de1 Change Activity so that subclasses don't have to call Activity superclass methods from the shell callbacks. Makes subclasses simpler since they don't (necessarily) have to care about OO concepts like superclasses right away. 2006-06-05 12:35:00 -04:00
Dan Williams
a0f7a4abc6 Only try for buddy icon 3 times 2006-06-05 10:46:41 -04:00
Dan Williams
f2161d533b Further fixes for Activity refactoring changes. 2006-06-02 15:02:59 -04:00
Dan Williams
4c7f15f694 Refactor dbus out of Activity objects so that we're sure when 2006-06-02 14:52:20 -04:00
Marco Pesenti Gritti
f96fbfc10b Split up the browser, some cleanups and 2006-05-31 18:01:24 -04:00
Marco Pesenti Gritti
03af8bceea Simplify redirecting output to the console 2006-05-23 16:02:13 -04:00
Marco Pesenti Gritti
92280c8503 Remove notify_new.. again, bad dcbw 2006-05-23 13:47:01 -04:00
Marco Pesenti Gritti
b9734f4da3 Add missing file 2006-05-23 13:04:06 -04:00
Marco Pesenti Gritti
dde63625a5 Merge 2006-05-23 12:48:29 -04:00
Marco Pesenti Gritti
178468e2c0 Don't show hidden tabs border in the editor 2006-05-23 12:48:08 -04:00
Dan Williams
a7a0c2cda5 Fix some spacing issues; catch exceptions in XMLRPC client code and return result status (success or failure) to XMLRPC client callback 2006-05-23 12:42:26 -04:00
Marco Pesenti Gritti
89f9730641 Merge 2006-05-23 12:42:17 -04:00
Marco Pesenti Gritti
dcf78f2665 Change notification for browser sharing 2006-05-23 12:37:31 -04:00
Dan Williams
d9314f5314 Remove hack for scroll-to-bottom and do it properly. 2006-05-23 12:23:38 -04:00
Marco Pesenti Gritti
5879cc8190 Fix links in one-to-one chat 2006-05-23 12:01:42 -04:00