Commit Graph

6768 Commits

Author SHA1 Message Date
js 6fe9bee70b * Fixed a BT when receiving receipt request for offline messages.
* Fixed a BT when receiving receipt request for users not in roster.
2008-06-09 15:04:13 +00:00
Jean-Marie Traissard f9c981df5d -Set General and Observer group directly in contact instance, instead of calculating it each time
-When creating self-contact contact instance, store it with group 'self_contact', so it never goes in General
-Make general group not be seen visible because of self contact even if self.regroup
-Remove the self contact instance itself too when WE deconnect or when IT deconnect, so we will
not see it as offline if refilling roster (regroup account for example)
2008-06-08 21:27:31 +00:00
js d0b15bf5fd Don't return 1 on error, but None. 1 could also be a message ID. 2008-06-08 16:54:59 +00:00
js 593ed0c6d8 * Fix passing of message ID.
* Don't asnwer to receipt requests from users not in roster.
2008-06-08 15:51:55 +00:00
js c2eb4b5a9f Completely remove OTR.
Sorry, it just wasn't maintainable. The problem is the current libotr
API. I'm sick of working around the strange libotr API, sick of getting
HTML messages, sick of losing messages. The final argument for
completely removing it was that we can't get the message ID of a sent
msg anymore - which we need. I tried to work around this as well, but
there seems to be no way to wait for a signal in glib the way I would
need it for the workaround (I wanted to emit a signal in inject_message
and then wait for it after the call to otr_message_fragment_and_send
so the signal can pass us the message id). And the last reason is that
we're heading towards a new release and thus want to stabilize the code,
thus don't have time to work around even more libotr API strangeness.
I will give feedback to the libotr developers, who are currently
planning a new API, so that we can hopefully see OTR support once again
as soon as libotr4 is released.

Kjell already announced that he will continue his branch:
https://code.launchpad.net/~afflux/gajim/otr

I really hope the libotr devs will provide a sane API with libotr4 so
we can integrate OTR support again.

Oh, and I added one more try/except block for OS X.
2008-06-08 15:27:05 +00:00
Jean-Marie Traissard 0d645437d8 Don't act like if self contact is in group General. See #4000.
Don't make General group visible when we have self contact.
2008-06-08 14:35:40 +00:00
Jean-Marie Traissard 40e360d1c8 [modelfilter]Fix row behind that expand when moving contact problem.
This code seems not necessary. But why does that created that problem ?
It seems for some reason, path is not good. Probably the iter itself is not good. So expand act on the wrong
group (I can proove that).
2008-06-08 13:20:46 +00:00
js 1eeee2d531 We really need a way to start X11 without an xterm on OS X. Any idea? 2008-06-08 10:29:06 +00:00
js 03d68c0d26 Be more specific on excepts. 2008-06-08 10:19:26 +00:00
js 0551c9ddac * Start X11 automatically on OS X if not running.
* Moved one import in osx/__init__.py. If that import fails, we still
  got the few functions defined we need, even if the rest of that file
  doesn't work due to missing deps.
2008-06-07 21:12:27 +00:00
js 8def8de5c7 Make Gajim work on OS X again.
Someone completely broke it by trying to port it to native GTK.
However, that person didn't only break it with X11 GTK, with
native GTK it wasn't working correctly either.
Fixed it by adding lots of try/except blocks. Someone definitely
deserves to be slaughtered for completely breaking it on OS X…
2008-06-07 20:42:15 +00:00
js 8fefd0ede4 Comment options. 2008-06-07 19:52:13 +00:00
js a495d090c3 Initial XEP-0184 support.
TODO:
 * Implement section 5.
 * Think of a way to show in GUI
    Possible way: Grey out the sent msg until we receive a <received/>,
    but only if we know the other end supports XEP-0184.
 * Maybe implement section 6?
2008-06-07 19:47:19 +00:00
Jean-Marie Traissard 7fbfa0547d Regroup window.present() calls. See #3908. 2008-06-05 15:09:17 +00:00
Jean-Marie Traissard e487aa7802 Change the way to remember last message time in groupchat again. Save the time on
disconnection or exit. Previous version seemed perfect, but if server don't have the
same exact time than us (always), lots of messages can be logged twice. Here we will
lost log for messages that were sent beetween we lost connection and we see it. But that
seems better for me. For previous version, see [9516].
2008-06-05 11:18:33 +00:00
Jean-Marie Traissard a0f57f5e99 Simpler way to do [9756], thanks steve-e 2008-06-04 18:58:14 +00:00
Brendan Taylor cb1c24ff7d remove empty branches of sessionless_ctrls (fixes single window mode) 2008-06-03 23:54:14 +00:00
Jean-Marie Traissard e5b2e38792 Fix regression introduced in [9727]. Do not fail if the jid line contain 'Enter
JID or Contact name' or something at opening.
2008-06-03 18:44:32 +00:00
Yann Leboulanger d1762dd9a0 improve new gmail e-mail popup window. Fixes #3252 2008-06-03 14:15:57 +00:00
Yann Leboulanger e4d5625210 fix argument order in new_chat 2008-06-03 06:06:42 +00:00
Brendan Taylor ccca9332c6 fix undefined 'session' variable in _messageCB 2008-06-03 01:13:30 +00:00
Brendan Taylor dc89b61d37 fix lazy session binding to reuse sessions and pick them up from pending events 2008-06-02 23:26:40 +00:00
Brendan Taylor d19cb43ee0 don't assign a session to a control until it's needed 2008-06-02 23:26:32 +00:00
Brendan Taylor 7b6b6de1c5 fix TB in move_from_sessionless 2008-06-02 23:26:23 +00:00
Yann Leboulanger 03cbc6e2d5 ability to rename zeroconf account. Fixes #3945 2008-06-02 21:22:35 +00:00
Stephan Erb fa48c480ff Fix modelfilter regression. Renaming a group duplicated it.
Even make it work in merged accounts mode.
2008-06-02 17:59:59 +00:00
Yann Leboulanger 3fe89676ac don't allow to send custom status nor revoke subscription for transport contacts. fixes #3984 2008-06-02 10:27:16 +00:00
Yann Leboulanger e5f682a81a fix wrong syntax 2008-06-02 10:23:27 +00:00
Yann Leboulanger b3d57ed5b1 coding standards 2008-06-02 10:04:27 +00:00
Yann Leboulanger 8f9c097343 [Yrogirg] configurable latex formulas font size. Fixes #3986 2008-06-02 08:10:36 +00:00
Jean-Marie Traissard d927d260c2 Removing tic tac toe game. Maybe one day a full version in a plugin ? :) 2008-06-01 23:07:34 +00:00
Stephan Erb 82edfdf42e Small cleanups to roster and modelfilter.
* rename draw_roster to better express its functionality
 * remove unnecessary call of refilter()
 * directly remove groups when there is only one child left and we want to remove it

Note: in gtkTreeStore iters persist as long as the row isn't removed. Iters in Modelfilter persist as long as the model is unchanged.
2008-06-01 22:46:41 +00:00
Jean-Marie Traissard c6aa116db8 try another way do redraw roster. See #3955. 2008-06-01 22:23:16 +00:00
Jean-Marie Traissard 9f613afd4f Don't traceback when refiltering during the model.clear (has a bad account name).
Fixes #3893.
2008-06-01 21:13:06 +00:00
Yann Leboulanger 5a459104d5 fix traceback when joining a room without a nick. Fixes #3979 2008-06-01 08:44:03 +00:00
Jean-Marie Traissard f604ed373a Remove unused temp var 2008-05-31 22:13:57 +00:00
Jean-Marie Traissard 4dc8ad861c -Fix TB in my last commit
-Stop using idle_call for marking days with log in calendar, because this was... longer !
-Stop emiting month changed signal two times (so it was even longer)
2008-05-31 20:49:48 +00:00
Jean-Marie Traissard 57a1c4b130 Use idle_add for history_win._fill_completion_dict (LOT faster) 2008-05-31 19:41:42 +00:00
Stephan Erb 794a5f33d5 Use correct modelfilter API to expand to selected contacts. 2008-05-31 15:31:49 +00:00
Yann Leboulanger 4b8f1137f6 make some strings translatable 2008-05-31 14:48:15 +00:00
Yann Leboulanger 1a683098e9 set publish_tune False by default 2008-05-31 08:28:33 +00:00
Brendan Taylor 1796a6006b fix on_vadjustment TB 2008-05-31 00:54:57 +00:00
Brendan Taylor 0b16f4bb20 fix a multiple tab regression 2008-05-31 00:54:48 +00:00
Stephan Erb e2c3555e6f A few expand/collapse related changes.
* always adjust account toggle state
 * try to eliminate extra adjustmants to group state
 * small function renaming
2008-05-30 23:09:13 +00:00
Yann Leboulanger 6733ba484c show current mood / activity in the dialog for changing them. Fixes #3952 2008-05-30 22:39:01 +00:00
Yann Leboulanger 533e955cf1 make pep work, move config options per account, make publish_tune configurable in account context menu. fixes #3954 2008-05-30 21:43:53 +00:00
Stephan Erb ac8faf47ca Fix eventhandling for non chat message events.
Evens were not properly removed.
2008-05-30 20:56:54 +00:00
Stephan Erb 6fd860a1b3 Remove debug print. 2008-05-30 20:21:12 +00:00
Stephan Erb 7259f95b0b Fix drag and drop within the same group. 2008-05-30 20:16:00 +00:00
Stephan Erb 0e519bce9e Do not recalibrate metacontacts if there is only one brother (the big brother). 2008-05-30 20:07:14 +00:00
Stephan Erb 4b6fabadd9 Don't remove contacts from roster when they have pending events.
* update documentation and fix indentation
 * don't remove offline contacts from roster when we open the last pending, non chat message event
 * store account and jid per event
2008-05-30 17:42:53 +00:00
Yann Leboulanger 8973b91070 auto_join_bookmarks only join non-opened groupchats. Opened one are already auto-joined on re-connection. Fixes #3891 2008-05-30 10:26:33 +00:00
Yann Leboulanger 685707e2e0 check active tab with control variable, not jid. fixes #3876 2008-05-30 10:07:01 +00:00
js 37b6f7058a [Kjell Braden] Fix OTR SMP. 2008-05-29 18:42:58 +00:00
Brendan Taylor bcf7018fce gave sessionless window location its own method 2008-05-29 02:48:55 +00:00
Mateusz Biliński 45fe866240 Reduced too big indentation inside first try-catch (was 2 tabs, now it's 1 tab). 2008-05-28 16:15:39 +00:00
Jean-Marie Traissard 7d21a1a624 Fix account parameter for gajim-remote handle_uri with a groupchat. Fixes #3344. 2008-05-27 16:47:33 +00:00
js 6c9063b702 [Kjell Braden] Fix HTML on OTR.
@bct: When moving the OTR stuff, you would've needed to adjust the
XHTML killing part. This patch fixes it. I didn't even notice since
I have XHTML disabled globally.
2008-05-27 14:50:54 +00:00
Yann Leboulanger c127493e58 remove pep options from pref window, store them per account, store caps_hash per account. see #3954 2008-05-27 10:24:29 +00:00
Brendan Taylor e09c93621e don't send termination unless we've sent a message
fixes #3963
2008-05-26 23:53:40 +00:00
Brendan Taylor dbcfc984f5 don't do first message notification if we can pick up a sessionless control
fixes #3961
2008-05-25 21:28:40 +00:00
Brendan Taylor df5200b3bb try not to send session termination messages to non-XEP-0201 clients 2008-05-25 21:28:32 +00:00
Brendan Taylor f7874d29c7 reuse chat controls after session termination
fixes #3950
2008-05-23 23:27:08 +00:00
Brendan Taylor f68ffc3816 not every OTR message needs a session 2008-05-23 23:26:53 +00:00
Yann Leboulanger 21f332221e typos. see #3953 2008-05-20 14:30:19 +00:00
Yann Leboulanger 8bda3a5543 upadte all contact instances when we get a pep event for a contact. See #3953 2008-05-20 14:18:12 +00:00
Brendan Taylor 4feacc73ab moved OTR stuff from session.received to connection._messageCB
fixed lock icon when session has been terminated
2008-05-20 00:44:30 +00:00
Stephan Erb 3bcf189dfd Show pep tooltip info also for multiple resources and SelfContacts.
(Tooltips might not be complete because of some not yet addressed backend bugs)
2008-05-19 21:31:25 +00:00
Stephan Erb a06468b846 Always remove contacts from GUI when we receive a roster via xmppy.
This fixes a bug with metacontacts over different groups and should stop contact duplication in most cases.
2008-05-19 21:17:43 +00:00
js ea3e43c15a Always pass the special message '?OTR?' to libotr. 2008-05-19 20:25:58 +00:00
js f1c333410e Revert r9682, it was a bad idea. The solution is not to send the
thread id, but to even remove the lock symbol when OTR was ended
and we don't have a thread id.
2008-05-19 20:13:24 +00:00
Stephan Erb abe75901d4 Remove some extra model refiltering.
Whenever we write to the underlying child_model gtk will call the _visible_func on itself.
2008-05-19 20:08:32 +00:00
js f92f5f5c64 Send thread ID on ending OTR session so that self.session is defined
when that event is received and the lock icon updated.
2008-05-19 20:04:48 +00:00
Brendan Taylor b0aeefcbb5 flush xmpppy's send queue before disconnecting 2008-05-19 20:04:14 +00:00
Stephan Erb ea00e4d933 Improve select_contact method.
* use correct API in session.py
 * only filter when really needed
2008-05-19 20:00:41 +00:00
js 5f7f717e29 Again, not update_ui(), but update_otr()! 2008-05-19 19:06:11 +00:00
js 50e31a5072 Again, it's update_otr(), not update_ui()! 2008-05-19 19:04:44 +00:00
js 303a09d7c8 update_ui() doesn't call update_otr(). We want update_otr() here. 2008-05-19 18:57:14 +00:00
js acc78e6d48 Coding style & make translatable. 2008-05-19 18:48:53 +00:00
Brendan Taylor 368dd9fe66 missed part of that last patch 2008-05-19 18:30:04 +00:00
Brendan Taylor f413a8a7e8 should fix zeroconf-related tb on exit 2008-05-19 18:27:45 +00:00
js 0346e29e89 *sigh* I'm too confused today. This is nicer. 2008-05-19 18:01:50 +00:00
js 03f64fb23c Sorry, empty messages killed OTR. Fixed. 2008-05-19 17:58:16 +00:00
js 41fe6ed927 Better check if msgtxt is not None. 2008-05-19 17:54:51 +00:00
js 1cbe5678da * When we receive a plaintext, non-tagged message, don't append OTR
tag to outgoing messages anymore. Messages are not even passed to
  libotr anymore then.
* If we don't support OTR, strip OTR tags from the message before
  displaying it.
2008-05-19 17:41:51 +00:00
js 0deebd859d * Close our session when the remote end does.
* Don't set encrypted = True if it was only a tagged plaintext msg.
2008-05-19 14:24:34 +00:00
js 2586c999fe Fix automatic start of OTR session. 2008-05-19 13:52:45 +00:00
js 12014b40b6 * If found, automatically use included gtk on win32.
* Don't include docutils stuff in win32 builds.
2008-05-19 10:58:03 +00:00
Brendan Taylor fad6d2ef7e pass session when dispatching MSGNOTSENT 2008-05-19 00:17:39 +00:00
Brendan Taylor 4ddadc68d9 fix clicking on notification-daemon sign-in notification 2008-05-18 21:17:53 +00:00
js ad5248f3dc Coding style. 2008-05-18 21:15:58 +00:00
js 0cc5b4c377 Lock icon didn't show authenticated correctly. Fixed. 2008-05-18 21:14:59 +00:00
js 24afebd309 Link to the OTR wiki page in the features window. 2008-05-18 20:39:03 +00:00
js fcbb71a6d2 This shoudl fix tab completion in GC. For real now, I hope. 2008-05-18 19:51:58 +00:00
js 2be8792fd3 Coding style. 2008-05-18 19:44:43 +00:00
js b8909e86ce Fixed a BT. 2008-05-18 19:26:05 +00:00
js 8a6615a5d0 Renable OTR. I found a way no messages will get lost, but it's more
or less a workaround. We never let libotr handle unencrypted messages
now and handle notifying the user about the message not being encrypted
ourself.
2008-05-18 19:11:13 +00:00
Julien Pivotto 9e8e34403c Correct some bugs with the name used to create a MUC from a 1-to-1 chat when the server can't send a unique key. See #2095. 2008-05-18 18:00:02 +00:00
Brendan Taylor e5fac7315e don't create sessions for pubsub and xep-0070 messages 2008-05-18 17:35:00 +00:00
js b0a7998934 Set type hint for notifications NOT using pynotify. 2008-05-18 13:03:40 +00:00
Julien Pivotto 79678de341 make continued conversations unbrowsable. fix #3783 2008-05-17 16:23:44 +00:00
Julien Pivotto 3d21a3b6b0 One-to-one chat to MUC: set a beter tab name than the jid of the room. See #2095. 2008-05-17 14:00:27 +00:00
js f6e74e22b6 Same for groupchat. 2008-05-17 13:32:37 +00:00
js edf8738a39 Don't show events from buttons in advanced menu, only show them when
triggered via the banner right-click menu.
2008-05-17 13:14:34 +00:00
Brendan Taylor 517d962221 fixed link-local messaging (broken by session-centric) and removed a ton of duplicated/unused code 2008-05-17 02:23:46 +00:00
js 75ad801f62 Fix music_track_info for multiple accounts. 2008-05-16 16:04:51 +00:00
js aaf3ca3161 Disable OTR until the libotr devs fix their very broken API. 2008-05-16 15:29:23 +00:00
js 96a5b497a8 * Remove old code to update status to current track.
* Don't bind the track listener when not enabled anymore.
* Remove the signal / add the signal when changed in preferences.
2008-05-15 19:52:04 +00:00
js 129c115837 PEP creates less traffic now and MPRIS is now more tolerant. 2008-05-15 17:42:32 +00:00
Brendan Taylor b7863b0316 fix tb when closing chat control after e2e ended 2008-05-15 04:03:19 +00:00
Stephan Erb d41f245370 Remove debug print. 2008-05-14 18:45:06 +00:00
Yann Leboulanger 44fc7ddd0c fix caps hash computaion according to XEP-0115. fixes #3925 2008-05-14 18:30:39 +00:00
Brendan Taylor 2552e1024f fixed dropped messages after initiating a tic-tac-toe game with a contact that doesn't support sessions 2008-05-14 02:57:29 +00:00
Brendan Taylor 58478b032d fixed opening chat with multiple resources 2008-05-14 02:20:31 +00:00
Brendan Taylor 63d6c2875e fix an undefined variable when scrolling the roster 2008-05-14 01:47:10 +00:00
Brendan Taylor 8d7750b203 fix multipopup when receiving several unthreaded messages 2008-05-14 00:37:06 +00:00
Brendan Taylor ade56853fe moved session.remove_events. fixes #3942 2008-05-14 00:34:02 +00:00
Yann Leboulanger f8b12e3b6b fix traceback: get variable where it is. fixes #3943 2008-05-13 22:04:50 +00:00
Yann Leboulanger 005cc0770e fix indentation 2008-05-13 21:27:13 +00:00
Yann Leboulanger b7eff5b22d fix function call. fixes #3941 2008-05-13 21:26:53 +00:00
Yann Leboulanger a7f8053e5e fix coordinate convertion in tictactoe 2008-05-13 14:26:52 +00:00
Yann Leboulanger 35aefc2df8 indentation is with tabs 2008-05-13 14:03:30 +00:00
Brendan Taylor fffa574015 fixed bt when closing tab when multiple tabs with a JID are open 2008-05-13 12:51:35 +00:00
Brendan Taylor 371e75ef40 fixed tab/space consistency 2008-05-13 02:03:26 +00:00
Brendan Taylor d511b5afc4 merged in session-centric branch, with fixes for OTR compatibility 2008-05-13 01:59:10 +00:00
js d2a62f39f8 [Kjell Braden] Fix a crash with OTR. 2008-05-11 20:19:45 +00:00
js 7d02042f6d Make logging of OTR status changes a bit nicer.
Still not ideal. Maybe add a new log type for encryption? ESessions
could also use this…
2008-05-11 18:18:34 +00:00
js 0378ed821d Don't log the OTR initiation request (?OTR?). 2008-05-11 17:40:22 +00:00
js 2a51c443e5 D'oh. 2008-05-11 17:19:54 +00:00
js fc762157c0 * Disable OTRv1 by default.
* Don't send our JID on OTR request! It might reveal our JID in MUC!
2008-05-11 17:18:44 +00:00
js 4958b28e1d Sorry, last commit missed one hunk. 2008-05-11 13:41:23 +00:00
js d2731268d7 [Kjell Braden] Fix OTR for chat and GC queries for real now. 2008-05-11 13:20:22 +00:00
js 573568f9ac Reverted r9614 and r9615.
Sorry, bct, but I think it is to early to merge that as it completely
breaks. It seems nobody in gajim@conference.gajim.org considers it
usable yet.
I don't know if you got asterix' ok for it and I'm sorry if I reverted
it now although you had his ok, but having broken trunk is very
contra-productive. I think it was just too early to merge.
2008-05-11 13:17:28 +00:00
Brendan Taylor 24203f367f fixed use of get_control 2008-05-11 01:48:10 +00:00
Brendan Taylor 2162c3730a merged in session_centric branch 2008-05-11 01:19:59 +00:00
js d69d5266b5 Fix a OTR related crash on exit. 2008-05-11 01:07:38 +00:00
js b5a9edc6b4 Fix crash in GC query when OTR is active. 2008-05-11 00:45:15 +00:00
js 4c3dc0b092 That still was the wrong place, it was initialized too early. Fixed. 2008-05-10 23:42:29 +00:00
js 91211e189d Fix DnD FT on Windows:
* Fix helpers.py so URL is decoded correctly.
* Fix code in roster_window.py so the \0 that's alway the last file
  on win32 is ignored.

This also fixes and closes #2398.
2008-05-10 23:21:28 +00:00
js e335055709 Fix broken exception handling for OTR in connection.py. 2008-05-10 22:22:09 +00:00
js 4eeb96368b Store otr_userstates at the right place and create it the right way.
This fixes the crash when creating a new account, which made Gajim
unusable on systems where it never ran before.
2008-05-10 21:29:47 +00:00
js 04725e830c Fix file transfers on win32. 2008-05-10 15:40:27 +00:00
js 64ee7c14a7 Fix a backtrace. session isn't always defined here. Fixed. 2008-05-10 14:23:55 +00:00
js 9438e3d175 Add OTR in features window. 2008-05-10 11:47:04 +00:00
js c4b2cdc31f * Add button for new chat window GUI.
* Buttons get disabled as needed now [we still need something to update
  this while the window is open (it might change, for example, the
  contact was added)].
* Remove the new accelerators in destroy_menu().
* Move some OTR stuff.
* Don't hide OTR from the user if not available, but set unsensitive.
2008-05-10 11:39:25 +00:00
js 435042968e Added OTR support.
Work done by Kjell Braden <fnord@pentabarf.de>.
Some fixes done by me.
2008-05-09 12:35:25 +00:00
js b04250cf9f Added bookmarks for *EVERY* button in chat window and GC window. 2008-05-09 09:34:38 +00:00
Stephan Erb 115006fa14 Fix add_transport function. TODO: Use it.... xD 2008-05-08 22:15:56 +00:00
Stephan Erb 56da8d7cfb Some random roster cleanups:
* remove unused code
 * use self.model directly when obvious
 * cleanup some FIXME comments
2008-05-08 22:09:43 +00:00
Stephan Erb 708e48a2a7 Do not redefine built-in 'iter'. Follow recommendation and use 'titer' instead. 2008-05-08 21:53:26 +00:00